Clean up of ":" in the code
svn: r356
This commit is contained in:
@ -101,7 +101,7 @@ class EditPerson:
|
||||
self.attr_type = self.get_widget("attr_type")
|
||||
self.attr_value = self.get_widget("attr_value")
|
||||
self.web_list = self.get_widget("web_list")
|
||||
self.web_url = self.get_widget("url_addr")
|
||||
self.web_url = self.get_widget("web_url")
|
||||
self.web_description = self.get_widget("url_des")
|
||||
self.address_label = self.get_widget("address_label")
|
||||
self.address_list = self.get_widget("address_list")
|
||||
@ -193,13 +193,14 @@ class EditPerson:
|
||||
const.surnames.sort()
|
||||
self.get_widget("lastNameList").set_popdown_strings(const.surnames)
|
||||
|
||||
self.get_widget("gid").set_text(": %s" % person.getId())
|
||||
self.get_widget("gid").set_text(person.getId())
|
||||
self.event_list.set_column_visibility(3,Config.show_detail)
|
||||
self.name_list.set_column_visibility(1,Config.show_detail)
|
||||
self.attr_list.set_column_visibility(2,Config.show_detail)
|
||||
self.address_list.set_column_visibility(2,Config.show_detail)
|
||||
if len(const.places) > 0:
|
||||
plist = self.db.getPlaceMap().values()
|
||||
|
||||
plist = self.db.getPlaceMap().values()
|
||||
if len(plist) > 0:
|
||||
attach_places(plist,self.dpcombo,self.death.getPlace())
|
||||
attach_places(plist,self.bpcombo,self.birth.getPlace())
|
||||
|
||||
@ -210,10 +211,11 @@ class EditPerson:
|
||||
if attr.getType() == const.save_pattr(Config.attr_name):
|
||||
val = attr.getValue()
|
||||
break
|
||||
self.get_widget("user_data").set_text(": %s" % val)
|
||||
|
||||
self.get_widget("user_data").set_text(val)
|
||||
self.get_widget("user_colon").show()
|
||||
else:
|
||||
self.get_widget("user_label").hide()
|
||||
self.get_widget("user_colon").hide()
|
||||
self.get_widget("user_data").hide()
|
||||
|
||||
# initial values
|
||||
@ -334,6 +336,11 @@ class EditPerson:
|
||||
current_row = current_row - 1
|
||||
self.web_list.select_row(current_row,0)
|
||||
self.web_list.moveto(current_row,0)
|
||||
self.web_url.set_sensitive(1)
|
||||
else:
|
||||
self.web_url.set_sensitive(0)
|
||||
self.web_url.set_label("")
|
||||
self.web_description.set_text("")
|
||||
self.web_list.set_data(INDEX,current_row)
|
||||
self.web_list.thaw()
|
||||
|
||||
@ -639,10 +646,10 @@ def on_name_list_select_row(obj,row,b,c):
|
||||
name = obj.get_row_data(row)
|
||||
|
||||
epo.name_frame.set_label(name.getName())
|
||||
epo.alt_given_field.set_text(": %s" % name.getFirstName())
|
||||
epo.alt_last_field.set_text(": %s" % name.getSurname())
|
||||
epo.alt_suffix_field.set_text(": %s" % name.getSuffix())
|
||||
epo.name_details_field.set_text(": %s" % get_detail_text(name))
|
||||
epo.alt_given_field.set_text(name.getFirstName())
|
||||
epo.alt_last_field.set_text(name.getSurname())
|
||||
epo.alt_suffix_field.set_text(name.getSuffix())
|
||||
epo.name_details_field.set_text(get_detail_text(name))
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -657,8 +664,10 @@ def on_web_list_select_row(obj,row,b,c):
|
||||
epo = obj.get_data(EDITPERSON)
|
||||
url = obj.get_row_data(row)
|
||||
|
||||
epo.web_url.set_text(": %s " % url.get_path())
|
||||
epo.web_description.set_text(": %s" % url.get_description())
|
||||
epo.web_url.set_label(url.get_path())
|
||||
epo.web_url.set_url(url.get_path())
|
||||
epo.web_url.set_sensitive(0)
|
||||
epo.web_description.set_text(url.get_description())
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -674,8 +683,8 @@ def on_attr_list_select_row(obj,row,b,c):
|
||||
attr = obj.get_row_data(row)
|
||||
|
||||
epo.attr_type.set_label(const.display_pattr(attr.getType()))
|
||||
epo.attr_value.set_text(": %s" % attr.getValue())
|
||||
epo.attr_details_field.set_text(": %s" % get_detail_text(attr))
|
||||
epo.attr_value.set_text(attr.getValue())
|
||||
epo.attr_details_field.set_text(get_detail_text(attr))
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -692,13 +701,13 @@ def on_address_list_select_row(obj,row,b,c):
|
||||
|
||||
epo.address_label.set_label("%s %s %s" % \
|
||||
(a.getCity(),a.getState(),a.getCountry()))
|
||||
epo.address_start.set_text(": %s" % a.getDate())
|
||||
epo.address_street.set_text(": %s" % a.getStreet())
|
||||
epo.address_city.set_text(": %s" % a.getCity())
|
||||
epo.address_state.set_text(": %s" % a.getState())
|
||||
epo.address_country.set_text(": %s" % a.getCountry())
|
||||
epo.address_postal.set_text(": %s" % a.getPostal())
|
||||
epo.addr_details_field.set_text(": %s" % get_detail_text(a))
|
||||
epo.address_start.set_text(a.getDate())
|
||||
epo.address_street.set_text(a.getStreet())
|
||||
epo.address_city.set_text(a.getCity())
|
||||
epo.address_state.set_text(a.getState())
|
||||
epo.address_country.set_text(a.getCountry())
|
||||
epo.address_postal.set_text(a.getPostal())
|
||||
epo.addr_details_field.set_text(get_detail_text(a))
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -925,14 +934,14 @@ def on_event_select_row(obj,row,b,c):
|
||||
event = obj.get_row_data(row)
|
||||
|
||||
epo = obj.get_data(EDITPERSON)
|
||||
epo.event_date_field.set_text(": %s" % event.getDate())
|
||||
epo.event_date_field.set_text(event.getDate())
|
||||
if event.getPlace():
|
||||
epo.event_place_field.set_text(": %s" % event.getPlace().get_title())
|
||||
epo.event_place_field.set_text(event.getPlace().get_title())
|
||||
else:
|
||||
epo.event_place_field.set_text(":")
|
||||
epo.event_place_field.set_text("")
|
||||
epo.event_name_field.set_label(const.display_pevent(event.getName()))
|
||||
epo.event_descr_field.set_text(": %s" % event.getDescription())
|
||||
epo.event_details_field.set_text(": %s" % get_detail_text(event))
|
||||
epo.event_descr_field.set_text(event.getDescription())
|
||||
epo.event_details_field.set_text(get_detail_text(event))
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
|
Reference in New Issue
Block a user