diff --git a/gramps/src/Config.py b/gramps/src/Config.py index 96e64f7a0..2c01f264a 100644 --- a/gramps/src/Config.py +++ b/gramps/src/Config.py @@ -126,6 +126,9 @@ ODDFGCOLOR = "oddForeground" ODDBGCOLOR = "oddBackground" EVENFGCOLOR = "evenForeground" EVENBGCOLOR = "evenBackground" +INDEX = "i" +OBJECT = "o" +DATA = "d" #------------------------------------------------------------------------- # @@ -377,8 +380,8 @@ def on_propertybox_apply(obj,page): if webdir_temp != None and os.path.isdir(webdir_temp): web_dir = os.path.normpath(webdir_temp) + os.sep - paper_preference = paper_obj.get_data("d") - output_preference = output_obj.get_data("d") + paper_preference = paper_obj.get_data(DATA) + output_preference = output_obj.get_data(DATA) gnome.config.set_bool("/gramps/config/UseTabs",usetabs) gnome.config.set_bool("/gramps/config/DontCompressXML",uncompress) @@ -398,13 +401,13 @@ def on_propertybox_apply(obj,page): # search for the active date format selection format_menu = prefsTop.get_widget("date_format").get_menu() - active = format_menu.get_active().get_data("i") + active = format_menu.get_active().get_data(INDEX) set_format_code(active) gnome.config.set_int("/gramps/config/dateFormat",active) format_menu = prefsTop.get_widget("date_entry_format").get_menu() - entry_active = format_menu.get_active().get_data("i") + entry_active = format_menu.get_active().get_data(INDEX) Date.entryCode = entry_active gnome.config.set_int("/gramps/config/dateEntry",entry_active) @@ -412,7 +415,7 @@ def on_propertybox_apply(obj,page): # get the name format format_menu = prefsTop.get_widget("name_format").get_menu() - active_name = format_menu.get_active().get_data("i") + active_name = format_menu.get_active().get_data(INDEX) name_tuple = _name_format_list[active_name] nameof = name_tuple[1] @@ -474,7 +477,7 @@ def on_object_toggled(obj): # #------------------------------------------------------------------------- def on_format_toggled(obj): - obj.get_data("o").changed() + obj.get_data(OBJECT).changed() #------------------------------------------------------------------------- # @@ -550,8 +553,8 @@ def display_preferences_box(): if name == paper_preference: choice = index item = GtkMenuItem(name) - item.set_data("o",pbox) - item.set_data("d",name) + item.set_data(OBJECT,pbox) + item.set_data(DATA,name) item.connect("activate", on_format_toggled) item.show() menu.append(item) @@ -568,8 +571,8 @@ def display_preferences_box(): if name == output_preference: choice = index item = GtkMenuItem(name) - item.set_data("o",pbox) - item.set_data("d",name) + item.set_data(OBJECT,pbox) + item.set_data(DATA,name) item.connect("activate", on_format_toggled) item.show() menu.append(item) @@ -581,8 +584,8 @@ def display_preferences_box(): date_menu = GtkMenu() for index in range(0,len(_date_format_list)): item = GtkMenuItem(_date_format_list[index]) - item.set_data("i",index) - item.set_data("o",pbox) + item.set_data(INDEX,index) + item.set_data(OBJECT,pbox) item.connect("activate", on_format_toggled) item.show() date_menu.append(item) @@ -593,8 +596,8 @@ def display_preferences_box(): date_menu = GtkMenu() for index in range(0,len(_date_entry_list)): item = GtkMenuItem(_date_entry_list[index]) - item.set_data("i",index) - item.set_data("o",pbox) + item.set_data(INDEX,index) + item.set_data(OBJECT,pbox) item.connect("activate", on_format_toggled) item.show() date_menu.append(item) @@ -606,8 +609,8 @@ def display_preferences_box(): for index in range(0,len(_name_format_list)): name_tuple = _name_format_list[index] item = GtkMenuItem(name_tuple[0]) - item.set_data("i",index) - item.set_data("o",pbox) + item.set_data(INDEX,index) + item.set_data(OBJECT,pbox) item.connect("activate", on_format_toggled) item.show() name_menu.append(item) diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade index 7f896c6bf..10279a782 100644 --- a/gramps/src/EditPerson.glade +++ b/gramps/src/EditPerson.glade @@ -965,7 +965,7 @@ GtkTable table18 2 - 2 + 3 False 0 0 @@ -981,8 +981,8 @@ 0 0 - 1 - 2 + 2 + 3 0 1 5 @@ -1007,8 +1007,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 5 @@ -1073,6 +1073,58 @@ False + + + GtkLabel + label240 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + user_colon + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + @@ -1114,7 +1166,7 @@ GtkTable table10 4 - 2 + 3 False 0 0 @@ -1200,7 +1252,7 @@ GtkLabel alt_given - + GTK_JUSTIFY_CENTER False 0 @@ -1208,8 +1260,8 @@ 0 0 - 1 - 2 + 2 + 3 0 1 3 @@ -1226,7 +1278,7 @@ GtkLabel alt_last - + GTK_JUSTIFY_CENTER False 0 @@ -1234,8 +1286,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -1252,7 +1304,7 @@ GtkLabel alt_suffix - + GTK_JUSTIFY_CENTER False 0 @@ -1260,8 +1312,8 @@ 0 0 - 1 - 2 + 2 + 3 2 3 3 @@ -1304,6 +1356,110 @@ GtkLabel name_details + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label236 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label237 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label238 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label239 GTK_JUSTIFY_CENTER False @@ -1316,8 +1472,8 @@ 2 3 4 - 3 - 3 + 0 + 0 False False False @@ -1494,7 +1650,7 @@ GtkTable table7 4 - 2 + 3 False 0 0 @@ -1580,7 +1736,7 @@ GtkLabel eventDate - + GTK_JUSTIFY_CENTER False 0 @@ -1588,8 +1744,8 @@ 0 0 - 1 - 2 + 2 + 3 0 1 3 @@ -1606,7 +1762,7 @@ GtkLabel eventPlace - + GTK_JUSTIFY_CENTER False 0 @@ -1614,8 +1770,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -1632,7 +1788,7 @@ GtkLabel eventDescription - + GTK_JUSTIFY_CENTER False 0 @@ -1640,8 +1796,8 @@ 0 0 - 1 - 2 + 2 + 3 2 3 3 @@ -1684,6 +1840,110 @@ GtkLabel event_details + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + label232 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label233 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label234 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label235 GTK_JUSTIFY_CENTER False @@ -1696,9 +1956,9 @@ 2 3 4 - 3 - 3 - True + 0 + 0 + False False False False @@ -1905,7 +2165,7 @@ GtkTable table24 2 - 2 + 3 False 0 0 @@ -1939,7 +2199,7 @@ GtkLabel attr_value - + GTK_JUSTIFY_CENTER False 0 @@ -1947,8 +2207,8 @@ 0 0 - 1 - 2 + 2 + 3 0 1 3 @@ -1991,20 +2251,72 @@ GtkLabel attr_details - + GTK_JUSTIFY_LEFT False 0 0.5 0 0 + + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label230 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label231 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 1 2 1 2 - 3 - 3 + 0 + 0 False False False @@ -2187,7 +2499,7 @@ GtkTable table20 5 - 4 + 6 False 0 0 @@ -2307,8 +2619,8 @@ 5 0 - 2 - 3 + 3 + 4 2 3 0 @@ -2333,8 +2645,8 @@ 5 0 - 2 - 3 + 3 + 4 3 4 0 @@ -2348,62 +2660,10 @@ - - GtkLabel - street - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 1 - 2 - 3 - 3 - True - False - False - False - True - False - - - - - GtkLabel - address_start - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 0 - 1 - 3 - 3 - True - False - False - False - True - False - - - GtkLabel city - + GTK_JUSTIFY_LEFT False 0 @@ -2411,8 +2671,8 @@ 0 0 - 1 - 2 + 2 + 3 2 3 3 @@ -2429,7 +2689,7 @@ GtkLabel postal - + GTK_JUSTIFY_LEFT False 0 @@ -2437,8 +2697,8 @@ 3 3 - 3 - 4 + 5 + 6 3 4 0 @@ -2455,7 +2715,7 @@ GtkLabel state - + GTK_JUSTIFY_LEFT False 0 @@ -2463,8 +2723,8 @@ 3 3 - 3 - 4 + 5 + 6 2 3 0 @@ -2506,8 +2766,8 @@ GtkLabel - addr_details - + country + GTK_JUSTIFY_LEFT False 0 @@ -2515,10 +2775,10 @@ 0 0 - 1 - 4 - 4 - 5 + 2 + 3 + 3 + 4 3 3 False @@ -2532,9 +2792,87 @@ GtkLabel - country + label223 - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label224 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label225 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label226 + + GTK_JUSTIFY_CENTER False 0 0.5 @@ -2545,6 +2883,162 @@ 2 3 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label227 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label228 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 4 + 5 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label229 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 4 + 5 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + address_start + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + street + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + addr_details + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 4 + 5 3 3 False @@ -2890,7 +3384,7 @@ GtkTable table25 2 - 2 + 3 False 0 0 @@ -2950,7 +3444,7 @@ GtkLabel url_des - + GTK_JUSTIFY_LEFT False 0 @@ -2958,8 +3452,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -2979,8 +3473,8 @@ False 0 - 1 - 2 + 2 + 3 0 1 3 @@ -2994,41 +3488,70 @@ - GtkLabel - url_addr - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 + GnomeHRef + web_url + False + True + 0 - True - True - - - - - GtkButton - browse - True - - clicked - on_browse_clicked - url_addr - Tue, 24 Apr 2001 14:16:09 GMT - - - GTK_RELIEF_NORMAL - - 5 False False + + + GtkLabel + label221 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label222 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py index 3bc4a95d6..e4e8e3140 100644 --- a/gramps/src/EditPerson.py +++ b/gramps/src/EditPerson.py @@ -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)) #------------------------------------------------------------------------- # diff --git a/gramps/src/EditPlace.py b/gramps/src/EditPlace.py index 4cf4f2b9f..a9f27352b 100644 --- a/gramps/src/EditPlace.py +++ b/gramps/src/EditPlace.py @@ -83,7 +83,7 @@ class EditPlace: self.note = self.top_window.get_widget("place_note") self.web_list = self.top_window.get_widget("web_list") - self.web_url = self.top_window.get_widget("url_addr") + self.web_url = self.top_window.get_widget("web_url") self.web_description = self.top_window.get_widget("url_des") self.source_field = self.top_window.get_widget("source_field") @@ -192,6 +192,12 @@ class EditPlace: 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_label("") + self.web_url.set_sensitive(0) + self.web_description.set_text("") + self.web_list.set_data(INDEX,current_row) self.web_list.thaw() @@ -720,8 +726,9 @@ def on_web_list_select_row(obj,row,b,c): epo = obj.get_data(PLACE) 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_description.set_text(url.get_description()) #------------------------------------------------------------------------- # @@ -736,10 +743,10 @@ def on_loc_list_select_row(obj,row,b,c): epo = obj.get_data(PLACE) loc = obj.get_row_data(row) - epo.loc_city.set_text(": %s " % loc.get_city()) - epo.loc_county.set_text(": %s " % loc.get_county()) - epo.loc_state.set_text(": %s " % loc.get_state()) - epo.loc_country.set_text(": %s " % loc.get_country()) + epo.loc_city.set_text(loc.get_city()) + epo.loc_county.set_text(loc.get_county()) + epo.loc_state.set_text(loc.get_state()) + epo.loc_country.set_text(loc.get_country()) #------------------------------------------------------------------------- # @@ -882,9 +889,6 @@ def on_location_list_select_row(obj,row,b,c): epo = obj.get_data(PLACE) loc = obj.get_row_data(row) -# epo.web_url.set_text(": %s " % url.get_path()) -# epo.web_description.set_text(": %s" % url.get_description()) - #------------------------------------------------------------------------- # # diff --git a/gramps/src/const.py b/gramps/src/const.py index 9348871cd..d04757477 100644 --- a/gramps/src/const.py +++ b/gramps/src/const.py @@ -105,7 +105,12 @@ female = _("female") # #------------------------------------------------------------------------- -output_formats = ["OpenOffice", "AbiWord", "PDF", "HTML" ] +output_formats = [ + "OpenOffice", + "AbiWord", + "PDF", + "HTML" + ] childRelations = { _("Birth") : "Birth", @@ -122,12 +127,13 @@ childRelations = { # Confidence # #------------------------------------------------------------------------- -confidence = [ _("Very Low"), - _("Low"), - _("Normal"), - _("High"), - _("Very High") - ] +confidence = [ + _("Very Low"), + _("Low"), + _("Normal"), + _("High"), + _("Very High") + ] #------------------------------------------------------------------------- # @@ -135,25 +141,25 @@ confidence = [ _("Very Low"), # #------------------------------------------------------------------------- familyConstantEvents = { - "Annulment" : "ANUL", - "Divorce Filing" : "DIVF", - "Divorce" : "DIV", - "Engagement" : "ENGA", - "Marriage Contract" : "MARC", - "Marriage License" : "MARL", - "Marriage Settlement" : "MARS", - "Marriage" : "MARR" + "Annulment" : "ANUL", + "Divorce Filing" : "DIVF", + "Divorce" : "DIV", + "Engagement" : "ENGA", + "Marriage Contract" : "MARC", + "Marriage License" : "MARL", + "Marriage Settlement" : "MARS", + "Marriage" : "MARR" } _fe_e2l = { - "Annulment" : _("Annulment"), - "Divorce Filing" : _("Divorce Filing"), - "Divorce" : _("Divorce"), - "Engagement" : _("Engagement"), - "Marriage Contract" : _("Marriage Contract"), - "Marriage License" : _("Marriage License"), - "Marriage Settlement" : _("Marriage Settlement"), - "Marriage" : _("Marriage") + "Annulment" : _("Annulment"), + "Divorce Filing" : _("Divorce Filing"), + "Divorce" : _("Divorce"), + "Engagement" : _("Engagement"), + "Marriage Contract" : _("Marriage Contract"), + "Marriage License" : _("Marriage License"), + "Marriage Settlement" : _("Marriage Settlement"), + "Marriage" : _("Marriage") } _fe_l2e = {} @@ -188,71 +194,71 @@ def save_fevent(st): # #------------------------------------------------------------------------- personalConstantEvents = { - "Adopted" : "ADOP", - "Adult Christening" : "CHRA", - "Alternate Birth" : "BIRT", - "Alternate Death" : "DEAT", - "Baptism (LDS)" : "BAPL", - "Baptism" : "BAPM", - "Bar Mitzvah" : "BARM", - "Bas Mitzvah" : "BASM", - "Burial" : "BURI", - "Cause Of Death" : "CAUS", - "Ordination" : "ORID", - "Census" : "CENS", - "Christening" : "CHR" , - "Confirmation" : "CONF", - "Cremation" : "CREM", - "Degree" : "_DEG", - "Divorce Filing" : "DIVF", - "Education" : "EDUC", - "Elected" : "_ELEC", - "Emigration" : "EMIG", - "First Communion" : "FCOM", - "Graduation" : "GRAD", - "Military Service" : "_MILT", - "Naturalization" : "NATU", - "Immigration" : "IMMI", - "Occupation" : "OCCU", - "Probate" : "PROB", - "Religion" : "RELI", - "Residence" : "RESI", - "Retirement" : "RETI", - "Will" : "WILL" + "Adopted" : "ADOP", + "Adult Christening" : "CHRA", + "Alternate Birth" : "BIRT", + "Alternate Death" : "DEAT", + "Baptism (LDS)" : "BAPL", + "Baptism" : "BAPM", + "Bar Mitzvah" : "BARM", + "Bas Mitzvah" : "BASM", + "Burial" : "BURI", + "Cause Of Death" : "CAUS", + "Ordination" : "ORID", + "Census" : "CENS", + "Christening" : "CHR" , + "Confirmation" : "CONF", + "Cremation" : "CREM", + "Degree" : "_DEG", + "Divorce Filing" : "DIVF", + "Education" : "EDUC", + "Elected" : "_ELEC", + "Emigration" : "EMIG", + "First Communion" : "FCOM", + "Graduation" : "GRAD", + "Military Service" : "_MILT", + "Naturalization" : "NATU", + "Immigration" : "IMMI", + "Occupation" : "OCCU", + "Probate" : "PROB", + "Religion" : "RELI", + "Residence" : "RESI", + "Retirement" : "RETI", + "Will" : "WILL" } _pe_e2l = { - "Adopted" : _("Adopted"), - "Alternate Birth" : _("Alternate Birth"), - "Alternate Death" : _("Alternate Death"), - "Adult Christening" : _("Adult Christening"), - "Baptism (LDS)" : _("Baptism (LDS)"), - "Baptism" : _("Baptism"), - "Bar Mitzvah" : _("Bar Mitzvah"), - "Bas Mitzvah" : _("Bas Mitzvah"), - "Burial" : _("Burial"), - "Cause Of Death" : _("Cause Of Death"), - "Census" : _("Census"), - "Christening" : _("Christening"), - "Confirmation" : _("Confirmation"), - "Cremation" : _("Cremation"), - "Degree" : _("Degree"), - "Divorce Filing" : _("Divorce Filing"), - "Education" : _("Education"), - "Elected" : _("Elected"), - "Emigration" : _("Emigration"), - "First Communion" : _("First Communion"), - "Immigration" : _("Immigration"), - "Graduation" : _("Graduation"), - "Military Service" : _("Military Service"), - "Naturalization" : _("Naturalization"), - "Occupation" : _("Occupation"), - "Ordination" : _("Ordination"), - "Probate" : _("Probate"), - "Religion" : _("Religion"), - "Residence" : _("Residence"), - "Retirement" : _("Retirement"), - "Will" : _("Will") + "Adopted" : _("Adopted"), + "Alternate Birth" : _("Alternate Birth"), + "Alternate Death" : _("Alternate Death"), + "Adult Christening" : _("Adult Christening"), + "Baptism (LDS)" : _("Baptism (LDS)"), + "Baptism" : _("Baptism"), + "Bar Mitzvah" : _("Bar Mitzvah"), + "Bas Mitzvah" : _("Bas Mitzvah"), + "Burial" : _("Burial"), + "Cause Of Death" : _("Cause Of Death"), + "Census" : _("Census"), + "Christening" : _("Christening"), + "Confirmation" : _("Confirmation"), + "Cremation" : _("Cremation"), + "Degree" : _("Degree"), + "Divorce Filing" : _("Divorce Filing"), + "Education" : _("Education"), + "Elected" : _("Elected"), + "Emigration" : _("Emigration"), + "First Communion" : _("First Communion"), + "Immigration" : _("Immigration"), + "Graduation" : _("Graduation"), + "Military Service" : _("Military Service"), + "Naturalization" : _("Naturalization"), + "Occupation" : _("Occupation"), + "Ordination" : _("Ordination"), + "Probate" : _("Probate"), + "Religion" : _("Religion"), + "Residence" : _("Residence"), + "Retirement" : _("Retirement"), + "Will" : _("Will") } _pe_l2e = {} @@ -372,11 +378,11 @@ def save_fattr(st): #------------------------------------------------------------------------- _fr_e2l = { - "Married" : _("Married"), - "Unmarried" : _("Unmarried"), - "Partners" : _("Partners"), - "Unknown" : _("Unknown"), - "Other" : _("Other") + "Married" : _("Married"), + "Unmarried" : _("Unmarried"), + "Partners" : _("Partners"), + "Unknown" : _("Unknown"), + "Other" : _("Other") } _fr_l2e = {} diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py index 0d53c4a99..3af8a4ad6 100755 --- a/gramps/src/gramps_main.py +++ b/gramps/src/gramps_main.py @@ -731,7 +731,6 @@ def new_database_response(val): const.marriageEvents = const.initialize_marriage_event_list() const.familyAttributes = const.initialize_family_attribute_list() const.familyRelations = const.initialize_family_relation_list() - const.places = [] database.new() topWindow.set_title("Gramps") @@ -1761,7 +1760,6 @@ def on_revert_activate(obj): #------------------------------------------------------------------------- def revert_query(value): if value == 0: - const.places = [] const.personalEvents = const.initialize_personal_event_list() const.personalAttributes = const.initialize_personal_attribute_list() const.marriageEvents = const.initialize_marriage_event_list() @@ -2450,9 +2448,6 @@ def load_database(name): if ntype not in const.personalEvents: const.personalEvents.append(ntype) - const.places = database.getPlaces() - const.places.sort() - mylist = database.getFamilyEventTypes() for type in mylist: ntype = const.display_fevent(type) diff --git a/gramps/src/marriage.glade b/gramps/src/marriage.glade index 1dcb38c18..6a383b14d 100644 --- a/gramps/src/marriage.glade +++ b/gramps/src/marriage.glade @@ -241,7 +241,7 @@ GtkTable table8 4 - 2 + 3 False 0 0 @@ -249,7 +249,7 @@ GtkLabel label212 - + GTK_JUSTIFY_CENTER False 1 @@ -275,7 +275,7 @@ GtkLabel label213 - + GTK_JUSTIFY_CENTER False 1 @@ -301,7 +301,7 @@ GtkLabel label214 - + GTK_JUSTIFY_CENTER False 1 @@ -335,8 +335,8 @@ 0 0 - 1 - 2 + 2 + 3 0 1 3 @@ -361,8 +361,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -387,8 +387,8 @@ 0 0 - 1 - 2 + 2 + 3 2 3 3 @@ -405,7 +405,7 @@ GtkLabel label218 - + GTK_JUSTIFY_CENTER False 1 @@ -439,8 +439,8 @@ 0 0 - 1 - 2 + 2 + 3 3 4 3 @@ -453,6 +453,110 @@ False + + + GtkLabel + label223 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label224 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label225 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label226 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + @@ -628,7 +732,7 @@ GtkTable table9 2 - 2 + 3 False 0 0 @@ -636,7 +740,7 @@ GtkLabel label220 - + GTK_JUSTIFY_CENTER False 1 @@ -670,8 +774,8 @@ 0 0 - 1 - 2 + 2 + 3 0 1 3 @@ -688,7 +792,7 @@ GtkLabel label222 - + GTK_JUSTIFY_CENTER False 1 @@ -722,8 +826,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -736,6 +840,58 @@ False + + + GtkLabel + label227 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label228 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + diff --git a/gramps/src/places.glade b/gramps/src/places.glade index a1352fcf8..2498e9c33 100644 --- a/gramps/src/places.glade +++ b/gramps/src/places.glade @@ -635,7 +635,7 @@ GtkTable table21 4 - 2 + 3 False 0 0 @@ -695,7 +695,7 @@ GtkLabel loc_county - + GTK_JUSTIFY_LEFT False 0 @@ -703,8 +703,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -773,7 +773,7 @@ GtkLabel loc_state - + GTK_JUSTIFY_LEFT False 0 @@ -781,8 +781,8 @@ 0 0 - 1 - 2 + 2 + 3 2 3 3 @@ -799,7 +799,7 @@ GtkLabel loc_country - + GTK_JUSTIFY_LEFT False 0 @@ -807,8 +807,8 @@ 0 0 - 1 - 2 + 2 + 3 3 4 3 @@ -824,9 +824,9 @@ GtkLabel - loc_city + label272 - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False 0 0.5 @@ -839,6 +839,110 @@ 1 0 0 + False + False + False + False + True + False + + + + + GtkLabel + label273 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label274 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label275 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + loc_city + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 0 + 1 + 3 + 3 True False False @@ -1173,7 +1277,7 @@ GtkTable table20 2 - 2 + 3 False 0 0 @@ -1233,7 +1337,7 @@ GtkLabel url_des - + GTK_JUSTIFY_LEFT False 0 @@ -1241,8 +1345,8 @@ 0 0 - 1 - 2 + 2 + 3 1 2 3 @@ -1262,8 +1366,8 @@ False 0 - 1 - 2 + 2 + 3 0 1 3 @@ -1277,40 +1381,68 @@ - GtkLabel - url_addr - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 + GnomeHRef + web_url + True + 0 - True + False True + - - GtkButton - button122 - True - - clicked - on_browse_clicked - url_addr - Tue, 24 Apr 2001 14:16:09 GMT - - - GTK_RELIEF_NORMAL - - 5 - False - False - - + + GtkLabel + label276 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label277 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False +