Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up of ":" in the code

Browse Source 
svn: r356
This commit is contained in:
Don Allingham 2001-08-21 22:42:33 +00:00
parent 7f5db36763
commit dd6322f97c
8 changed files with 1186 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gramps/src/Config.py
View File

@ -126,6 +126,9 @@ ODDFGCOLOR = "oddForeground"
ODDBGCOLOR = "oddBackground" ODDBGCOLOR = "oddBackground"
EVENFGCOLOR = "evenForeground" EVENFGCOLOR = "evenForeground"
EVENBGCOLOR = "evenBackground" 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): if webdir_temp != None and os.path.isdir(webdir_temp):
web_dir = os.path.normpath(webdir_temp) + os.sep web_dir = os.path.normpath(webdir_temp) + os.sep
paper_preference = paper_obj.get_data("d") paper_preference = paper_obj.get_data(DATA)
output_preference = output_obj.get_data("d") output_preference = output_obj.get_data(DATA)
gnome.config.set_bool("/gramps/config/UseTabs",usetabs) gnome.config.set_bool("/gramps/config/UseTabs",usetabs)
gnome.config.set_bool("/gramps/config/DontCompressXML",uncompress) 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 # search for the active date format selection
format_menu = prefsTop.get_widget("date_format").get_menu() 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) set_format_code(active)
gnome.config.set_int("/gramps/config/dateFormat",active) gnome.config.set_int("/gramps/config/dateFormat",active)
format_menu = prefsTop.get_widget("date_entry_format").get_menu() 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 Date.entryCode = entry_active
gnome.config.set_int("/gramps/config/dateEntry",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 # get the name format
format_menu = prefsTop.get_widget("name_format").get_menu() 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] name_tuple = _name_format_list[active_name]
nameof = name_tuple[1] nameof = name_tuple[1]
@ -474,7 +477,7 @@ def on_object_toggled(obj):
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def on_format_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: if name == paper_preference:
choice = index choice = index
item = GtkMenuItem(name) item = GtkMenuItem(name)
item.set_data("o",pbox) item.set_data(OBJECT,pbox)
item.set_data("d",name) item.set_data(DATA,name)
item.connect("activate", on_format_toggled) item.connect("activate", on_format_toggled)
item.show() item.show()
menu.append(item) menu.append(item)
@ -568,8 +571,8 @@ def display_preferences_box():
if name == output_preference: if name == output_preference:
choice = index choice = index
item = GtkMenuItem(name) item = GtkMenuItem(name)
item.set_data("o",pbox) item.set_data(OBJECT,pbox)
item.set_data("d",name) item.set_data(DATA,name)
item.connect("activate", on_format_toggled) item.connect("activate", on_format_toggled)
item.show() item.show()
menu.append(item) menu.append(item)
@ -581,8 +584,8 @@ def display_preferences_box():
date_menu = GtkMenu() date_menu = GtkMenu()
for index in range(0,len(_date_format_list)): for index in range(0,len(_date_format_list)):
item = GtkMenuItem(_date_format_list[index]) item = GtkMenuItem(_date_format_list[index])
item.set_data("i",index) item.set_data(INDEX,index)
item.set_data("o",pbox) item.set_data(OBJECT,pbox)
item.connect("activate", on_format_toggled) item.connect("activate", on_format_toggled)
item.show() item.show()
date_menu.append(item) date_menu.append(item)
@ -593,8 +596,8 @@ def display_preferences_box():
date_menu = GtkMenu() date_menu = GtkMenu()
for index in range(0,len(_date_entry_list)): for index in range(0,len(_date_entry_list)):
item = GtkMenuItem(_date_entry_list[index]) item = GtkMenuItem(_date_entry_list[index])
item.set_data("i",index) item.set_data(INDEX,index)
item.set_data("o",pbox) item.set_data(OBJECT,pbox)
item.connect("activate", on_format_toggled) item.connect("activate", on_format_toggled)
item.show() item.show()
date_menu.append(item) date_menu.append(item)
@ -606,8 +609,8 @@ def display_preferences_box():
for index in range(0,len(_name_format_list)): for index in range(0,len(_name_format_list)):
name_tuple = _name_format_list[index] name_tuple = _name_format_list[index]
item = GtkMenuItem(name_tuple[0]) item = GtkMenuItem(name_tuple[0])
item.set_data("i",index) item.set_data(INDEX,index)
item.set_data("o",pbox) item.set_data(OBJECT,pbox)
item.connect("activate", on_format_toggled) item.connect("activate", on_format_toggled)
item.show() item.show()
name_menu.append(item) name_menu.append(item)

813
gramps/src/EditPerson.glade
View File

File diff suppressed because it is too large Load Diff

61
gramps/src/EditPerson.py
View File

@ -101,7 +101,7 @@ class EditPerson:
self.attr_type = self.get_widget("attr_type") self.attr_type = self.get_widget("attr_type")
self.attr_value = self.get_widget("attr_value") self.attr_value = self.get_widget("attr_value")
self.web_list = self.get_widget("web_list") 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.web_description = self.get_widget("url_des")
self.address_label = self.get_widget("address_label") self.address_label = self.get_widget("address_label")
self.address_list = self.get_widget("address_list") self.address_list = self.get_widget("address_list")
@ -193,13 +193,14 @@ class EditPerson:
const.surnames.sort() const.surnames.sort()
self.get_widget("lastNameList").set_popdown_strings(const.surnames) 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.event_list.set_column_visibility(3,Config.show_detail)
self.name_list.set_column_visibility(1,Config.show_detail) self.name_list.set_column_visibility(1,Config.show_detail)
self.attr_list.set_column_visibility(2,Config.show_detail) self.attr_list.set_column_visibility(2,Config.show_detail)
self.address_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.dpcombo,self.death.getPlace())
attach_places(plist,self.bpcombo,self.birth.getPlace()) attach_places(plist,self.bpcombo,self.birth.getPlace())
@ -210,10 +211,11 @@ class EditPerson:
if attr.getType() == const.save_pattr(Config.attr_name): if attr.getType() == const.save_pattr(Config.attr_name):
val = attr.getValue() val = attr.getValue()
break 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: else:
self.get_widget("user_label").hide() self.get_widget("user_label").hide()
self.get_widget("user_colon").hide()
self.get_widget("user_data").hide() self.get_widget("user_data").hide()
# initial values # initial values
@ -334,6 +336,11 @@ class EditPerson:
current_row = current_row - 1 current_row = current_row - 1
self.web_list.select_row(current_row,0) self.web_list.select_row(current_row,0)
self.web_list.moveto(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.set_data(INDEX,current_row)
self.web_list.thaw() self.web_list.thaw()
@ -639,10 +646,10 @@ def on_name_list_select_row(obj,row,b,c):
name = obj.get_row_data(row) name = obj.get_row_data(row)
epo.name_frame.set_label(name.getName()) epo.name_frame.set_label(name.getName())
epo.alt_given_field.set_text(": %s" % name.getFirstName()) epo.alt_given_field.set_text(name.getFirstName())
epo.alt_last_field.set_text(": %s" % name.getSurname()) epo.alt_last_field.set_text(name.getSurname())
epo.alt_suffix_field.set_text(": %s" % name.getSuffix()) epo.alt_suffix_field.set_text(name.getSuffix())
epo.name_details_field.set_text(": %s" % get_detail_text(name)) 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) epo = obj.get_data(EDITPERSON)
url = obj.get_row_data(row) url = obj.get_row_data(row)
epo.web_url.set_text(": %s " % url.get_path()) epo.web_url.set_label(url.get_path())
epo.web_description.set_text(": %s" % url.get_description()) 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) attr = obj.get_row_data(row)
epo.attr_type.set_label(const.display_pattr(attr.getType())) epo.attr_type.set_label(const.display_pattr(attr.getType()))
epo.attr_value.set_text(": %s" % attr.getValue()) epo.attr_value.set_text(attr.getValue())
epo.attr_details_field.set_text(": %s" % get_detail_text(attr)) 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" % \ epo.address_label.set_label("%s %s %s" % \
(a.getCity(),a.getState(),a.getCountry())) (a.getCity(),a.getState(),a.getCountry()))
epo.address_start.set_text(": %s" % a.getDate()) epo.address_start.set_text(a.getDate())
epo.address_street.set_text(": %s" % a.getStreet()) epo.address_street.set_text(a.getStreet())
epo.address_city.set_text(": %s" % a.getCity()) epo.address_city.set_text(a.getCity())
epo.address_state.set_text(": %s" % a.getState()) epo.address_state.set_text(a.getState())
epo.address_country.set_text(": %s" % a.getCountry()) epo.address_country.set_text(a.getCountry())
epo.address_postal.set_text(": %s" % a.getPostal()) epo.address_postal.set_text(a.getPostal())
epo.addr_details_field.set_text(": %s" % get_detail_text(a)) 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) event = obj.get_row_data(row)
epo = obj.get_data(EDITPERSON) 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(): 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: 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_name_field.set_label(const.display_pevent(event.getName()))
epo.event_descr_field.set_text(": %s" % event.getDescription()) epo.event_descr_field.set_text(event.getDescription())
epo.event_details_field.set_text(": %s" % get_detail_text(event)) epo.event_details_field.set_text(get_detail_text(event))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

24
gramps/src/EditPlace.py
View File

@ -83,7 +83,7 @@ class EditPlace:
self.note = self.top_window.get_widget("place_note") self.note = self.top_window.get_widget("place_note")
self.web_list = self.top_window.get_widget("web_list") 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.web_description = self.top_window.get_widget("url_des")
self.source_field = self.top_window.get_widget("source_field") self.source_field = self.top_window.get_widget("source_field")
@ -192,6 +192,12 @@ class EditPlace:
current_row = current_row - 1 current_row = current_row - 1
self.web_list.select_row(current_row,0) self.web_list.select_row(current_row,0)
self.web_list.moveto(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.set_data(INDEX,current_row)
self.web_list.thaw() self.web_list.thaw()
@ -720,8 +726,9 @@ def on_web_list_select_row(obj,row,b,c):
epo = obj.get_data(PLACE) epo = obj.get_data(PLACE)
url = obj.get_row_data(row) url = obj.get_row_data(row)
epo.web_url.set_text(": %s " % url.get_path()) epo.web_url.set_label(url.get_path())
epo.web_description.set_text(": %s" % url.get_description()) 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) epo = obj.get_data(PLACE)
loc = obj.get_row_data(row) loc = obj.get_row_data(row)
epo.loc_city.set_text(": %s " % loc.get_city()) epo.loc_city.set_text(loc.get_city())
epo.loc_county.set_text(": %s " % loc.get_county()) epo.loc_county.set_text(loc.get_county())
epo.loc_state.set_text(": %s " % loc.get_state()) epo.loc_state.set_text(loc.get_state())
epo.loc_country.set_text(": %s " % loc.get_country()) 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) epo = obj.get_data(PLACE)
loc = obj.get_row_data(row) loc = obj.get_row_data(row)
# epo.web_url.set_text(": %s " % url.get_path())
# epo.web_description.set_text(": %s" % url.get_description())
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# #

186
gramps/src/const.py
View File

@ -105,7 +105,12 @@ female = _("female")
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
output_formats = ["OpenOffice", "AbiWord", "PDF", "HTML" ] output_formats = [
"OpenOffice",
"AbiWord",
"PDF",
"HTML"
]
childRelations = { childRelations = {
_("Birth") : "Birth", _("Birth") : "Birth",
@ -122,12 +127,13 @@ childRelations = {
# Confidence # Confidence
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
confidence = [ _("Very Low"), confidence = [
_("Low"), _("Very Low"),
_("Normal"), _("Low"),
_("High"), _("Normal"),
_("Very High") _("High"),
] _("Very High")
]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -135,25 +141,25 @@ confidence = [ _("Very Low"),
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
familyConstantEvents = { familyConstantEvents = {
"Annulment" : "ANUL", "Annulment" : "ANUL",
"Divorce Filing" : "DIVF", "Divorce Filing" : "DIVF",
"Divorce" : "DIV", "Divorce" : "DIV",
"Engagement" : "ENGA", "Engagement" : "ENGA",
"Marriage Contract" : "MARC", "Marriage Contract" : "MARC",
"Marriage License" : "MARL", "Marriage License" : "MARL",
"Marriage Settlement" : "MARS", "Marriage Settlement" : "MARS",
"Marriage" : "MARR" "Marriage" : "MARR"
} }
_fe_e2l = { _fe_e2l = {
"Annulment" : _("Annulment"), "Annulment" : _("Annulment"),
"Divorce Filing" : _("Divorce Filing"), "Divorce Filing" : _("Divorce Filing"),
"Divorce" : _("Divorce"), "Divorce" : _("Divorce"),
"Engagement" : _("Engagement"), "Engagement" : _("Engagement"),
"Marriage Contract" : _("Marriage Contract"), "Marriage Contract" : _("Marriage Contract"),
"Marriage License" : _("Marriage License"), "Marriage License" : _("Marriage License"),
"Marriage Settlement" : _("Marriage Settlement"), "Marriage Settlement" : _("Marriage Settlement"),
"Marriage" : _("Marriage") "Marriage" : _("Marriage")
} }
_fe_l2e = {} _fe_l2e = {}
@ -188,71 +194,71 @@ def save_fevent(st):
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
personalConstantEvents = { personalConstantEvents = {
"Adopted" : "ADOP", "Adopted" : "ADOP",
"Adult Christening" : "CHRA", "Adult Christening" : "CHRA",
"Alternate Birth" : "BIRT", "Alternate Birth" : "BIRT",
"Alternate Death" : "DEAT", "Alternate Death" : "DEAT",
"Baptism (LDS)" : "BAPL", "Baptism (LDS)" : "BAPL",
"Baptism" : "BAPM", "Baptism" : "BAPM",
"Bar Mitzvah" : "BARM", "Bar Mitzvah" : "BARM",
"Bas Mitzvah" : "BASM", "Bas Mitzvah" : "BASM",
"Burial" : "BURI", "Burial" : "BURI",
"Cause Of Death" : "CAUS", "Cause Of Death" : "CAUS",
"Ordination" : "ORID", "Ordination" : "ORID",
"Census" : "CENS", "Census" : "CENS",
"Christening" : "CHR" , "Christening" : "CHR" ,
"Confirmation" : "CONF", "Confirmation" : "CONF",
"Cremation" : "CREM", "Cremation" : "CREM",
"Degree" : "_DEG", "Degree" : "_DEG",
"Divorce Filing" : "DIVF", "Divorce Filing" : "DIVF",
"Education" : "EDUC", "Education" : "EDUC",
"Elected" : "_ELEC", "Elected" : "_ELEC",
"Emigration" : "EMIG", "Emigration" : "EMIG",
"First Communion" : "FCOM", "First Communion" : "FCOM",
"Graduation" : "GRAD", "Graduation" : "GRAD",
"Military Service" : "_MILT", "Military Service" : "_MILT",
"Naturalization" : "NATU", "Naturalization" : "NATU",
"Immigration" : "IMMI", "Immigration" : "IMMI",
"Occupation" : "OCCU", "Occupation" : "OCCU",
"Probate" : "PROB", "Probate" : "PROB",
"Religion" : "RELI", "Religion" : "RELI",
"Residence" : "RESI", "Residence" : "RESI",
"Retirement" : "RETI", "Retirement" : "RETI",
"Will" : "WILL" "Will" : "WILL"
} }
_pe_e2l = { _pe_e2l = {
"Adopted" : _("Adopted"), "Adopted" : _("Adopted"),
"Alternate Birth" : _("Alternate Birth"), "Alternate Birth" : _("Alternate Birth"),
"Alternate Death" : _("Alternate Death"), "Alternate Death" : _("Alternate Death"),
"Adult Christening" : _("Adult Christening"), "Adult Christening" : _("Adult Christening"),
"Baptism (LDS)" : _("Baptism (LDS)"), "Baptism (LDS)" : _("Baptism (LDS)"),
"Baptism" : _("Baptism"), "Baptism" : _("Baptism"),
"Bar Mitzvah" : _("Bar Mitzvah"), "Bar Mitzvah" : _("Bar Mitzvah"),
"Bas Mitzvah" : _("Bas Mitzvah"), "Bas Mitzvah" : _("Bas Mitzvah"),
"Burial" : _("Burial"), "Burial" : _("Burial"),
"Cause Of Death" : _("Cause Of Death"), "Cause Of Death" : _("Cause Of Death"),
"Census" : _("Census"), "Census" : _("Census"),
"Christening" : _("Christening"), "Christening" : _("Christening"),
"Confirmation" : _("Confirmation"), "Confirmation" : _("Confirmation"),
"Cremation" : _("Cremation"), "Cremation" : _("Cremation"),
"Degree" : _("Degree"), "Degree" : _("Degree"),
"Divorce Filing" : _("Divorce Filing"), "Divorce Filing" : _("Divorce Filing"),
"Education" : _("Education"), "Education" : _("Education"),
"Elected" : _("Elected"), "Elected" : _("Elected"),
"Emigration" : _("Emigration"), "Emigration" : _("Emigration"),
"First Communion" : _("First Communion"), "First Communion" : _("First Communion"),
"Immigration" : _("Immigration"), "Immigration" : _("Immigration"),
"Graduation" : _("Graduation"), "Graduation" : _("Graduation"),
"Military Service" : _("Military Service"), "Military Service" : _("Military Service"),
"Naturalization" : _("Naturalization"), "Naturalization" : _("Naturalization"),
"Occupation" : _("Occupation"), "Occupation" : _("Occupation"),
"Ordination" : _("Ordination"), "Ordination" : _("Ordination"),
"Probate" : _("Probate"), "Probate" : _("Probate"),
"Religion" : _("Religion"), "Religion" : _("Religion"),
"Residence" : _("Residence"), "Residence" : _("Residence"),
"Retirement" : _("Retirement"), "Retirement" : _("Retirement"),
"Will" : _("Will") "Will" : _("Will")
} }
_pe_l2e = {} _pe_l2e = {}
@ -372,11 +378,11 @@ def save_fattr(st):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_fr_e2l = { _fr_e2l = {
"Married" : _("Married"), "Married" : _("Married"),
"Unmarried" : _("Unmarried"), "Unmarried" : _("Unmarried"),
"Partners" : _("Partners"), "Partners" : _("Partners"),
"Unknown" : _("Unknown"), "Unknown" : _("Unknown"),
"Other" : _("Other") "Other" : _("Other")
} }
_fr_l2e = {} _fr_l2e = {}

5
gramps/src/gramps_main.py
View File

@ -731,7 +731,6 @@ def new_database_response(val):
const.marriageEvents = const.initialize_marriage_event_list() const.marriageEvents = const.initialize_marriage_event_list()
const.familyAttributes = const.initialize_family_attribute_list() const.familyAttributes = const.initialize_family_attribute_list()
const.familyRelations = const.initialize_family_relation_list() const.familyRelations = const.initialize_family_relation_list()
const.places = []
database.new() database.new()
topWindow.set_title("Gramps") topWindow.set_title("Gramps")
@ -1761,7 +1760,6 @@ def on_revert_activate(obj):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def revert_query(value): def revert_query(value):
if value == 0: if value == 0:
const.places = []
const.personalEvents = const.initialize_personal_event_list() const.personalEvents = const.initialize_personal_event_list()
const.personalAttributes = const.initialize_personal_attribute_list() const.personalAttributes = const.initialize_personal_attribute_list()
const.marriageEvents = const.initialize_marriage_event_list() const.marriageEvents = const.initialize_marriage_event_list()
@ -2450,9 +2448,6 @@ def load_database(name):
if ntype not in const.personalEvents: if ntype not in const.personalEvents:
const.personalEvents.append(ntype) const.personalEvents.append(ntype)
const.places = database.getPlaces()
const.places.sort()
mylist = database.getFamilyEventTypes() mylist = database.getFamilyEventTypes()
for type in mylist: for type in mylist:
ntype = const.display_fevent(type) ntype = const.display_fevent(type)

196
gramps/src/marriage.glade
View File

@ -241,7 +241,7 @@
<class>GtkTable</class> <class>GtkTable</class>
<name>table8</name> <name>table8</name>
<rows>4</rows> <rows>4</rows>
<columns>2</columns> <columns>3</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
<column_spacing>0</column_spacing> <column_spacing>0</column_spacing>
@ -249,7 +249,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label212</name> <name>label212</name>
<label>Date :</label> <label>Date</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -275,7 +275,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label213</name> <name>label213</name>
<label>Place :</label> <label>Place</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -301,7 +301,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label214</name> <name>label214</name>
<label>Description :</label> <label>Description</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -335,8 +335,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>0</top_attach> <top_attach>0</top_attach>
<bottom_attach>1</bottom_attach> <bottom_attach>1</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -361,8 +361,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>1</top_attach> <top_attach>1</top_attach>
<bottom_attach>2</bottom_attach> <bottom_attach>2</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -387,8 +387,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>2</top_attach> <top_attach>2</top_attach>
<bottom_attach>3</bottom_attach> <bottom_attach>3</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -405,7 +405,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label218</name> <name>label218</name>
<label>Details :</label> <label>Details</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -439,8 +439,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>3</top_attach> <top_attach>3</top_attach>
<bottom_attach>4</bottom_attach> <bottom_attach>4</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -453,6 +453,110 @@
<yfill>False</yfill> <yfill>False</yfill>
</child> </child>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<name>label223</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label224</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label225</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label226</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
</widget> </widget>
</widget> </widget>
@ -628,7 +732,7 @@
<class>GtkTable</class> <class>GtkTable</class>
<name>table9</name> <name>table9</name>
<rows>2</rows> <rows>2</rows>
<columns>2</columns> <columns>3</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
<column_spacing>0</column_spacing> <column_spacing>0</column_spacing>
@ -636,7 +740,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label220</name> <name>label220</name>
<label>Value :</label> <label>Value</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -670,8 +774,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>0</top_attach> <top_attach>0</top_attach>
<bottom_attach>1</bottom_attach> <bottom_attach>1</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -688,7 +792,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label222</name> <name>label222</name>
<label>Details :</label> <label>Details</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -722,8 +826,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>1</top_attach> <top_attach>1</top_attach>
<bottom_attach>2</bottom_attach> <bottom_attach>2</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -736,6 +840,58 @@
<yfill>False</yfill> <yfill>False</yfill>
</child> </child>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<name>label227</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label228</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
</widget> </widget>
</widget> </widget>

224
gramps/src/places.glade
View File

@ -635,7 +635,7 @@
<class>GtkTable</class> <class>GtkTable</class>
<name>table21</name> <name>table21</name>
<rows>4</rows> <rows>4</rows>
<columns>2</columns> <columns>3</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
<column_spacing>0</column_spacing> <column_spacing>0</column_spacing>
@ -695,7 +695,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>loc_county</name> <name>loc_county</name>
<label>:</label> <label></label>
<justify>GTK_JUSTIFY_LEFT</justify> <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
@ -703,8 +703,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>1</top_attach> <top_attach>1</top_attach>
<bottom_attach>2</bottom_attach> <bottom_attach>2</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -773,7 +773,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>loc_state</name> <name>loc_state</name>
<label>:</label> <label></label>
<justify>GTK_JUSTIFY_LEFT</justify> <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
@ -781,8 +781,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>2</top_attach> <top_attach>2</top_attach>
<bottom_attach>3</bottom_attach> <bottom_attach>3</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -799,7 +799,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>loc_country</name> <name>loc_country</name>
<label>:</label> <label></label>
<justify>GTK_JUSTIFY_LEFT</justify> <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
@ -807,8 +807,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>3</top_attach> <top_attach>3</top_attach>
<bottom_attach>4</bottom_attach> <bottom_attach>4</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -824,9 +824,9 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>loc_city</name> <name>label272</name>
<label>:</label> <label>:</label>
<justify>GTK_JUSTIFY_LEFT</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
<yalign>0.5</yalign> <yalign>0.5</yalign>
@ -839,6 +839,110 @@
<bottom_attach>1</bottom_attach> <bottom_attach>1</bottom_attach>
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label273</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label274</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label275</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>loc_city</name>
<label></label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>3</xpad>
<ypad>3</ypad>
<xexpand>True</xexpand> <xexpand>True</xexpand>
<yexpand>False</yexpand> <yexpand>False</yexpand>
<xshrink>False</xshrink> <xshrink>False</xshrink>
@ -1173,7 +1277,7 @@
<class>GtkTable</class> <class>GtkTable</class>
<name>table20</name> <name>table20</name>
<rows>2</rows> <rows>2</rows>
<columns>2</columns> <columns>3</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
<column_spacing>0</column_spacing> <column_spacing>0</column_spacing>
@ -1233,7 +1337,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>url_des</name> <name>url_des</name>
<label>:</label> <label></label>
<justify>GTK_JUSTIFY_LEFT</justify> <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
@ -1241,8 +1345,8 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>1</top_attach> <top_attach>1</top_attach>
<bottom_attach>2</bottom_attach> <bottom_attach>2</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -1262,8 +1366,8 @@
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<spacing>0</spacing> <spacing>0</spacing>
<child> <child>
<left_attach>1</left_attach> <left_attach>2</left_attach>
<right_attach>2</right_attach> <right_attach>3</right_attach>
<top_attach>0</top_attach> <top_attach>0</top_attach>
<bottom_attach>1</bottom_attach> <bottom_attach>1</bottom_attach>
<xpad>3</xpad> <xpad>3</xpad>
@ -1277,40 +1381,68 @@
</child> </child>
<widget> <widget>
<class>GtkLabel</class> <class>GnomeHRef</class>
<name>url_addr</name> <name>web_url</name>
<label>:</label> <can_focus>True</can_focus>
<justify>GTK_JUSTIFY_LEFT</justify> <label></label>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child> <child>
<padding>0</padding> <padding>0</padding>
<expand>True</expand> <expand>False</expand>
<fill>True</fill> <fill>True</fill>
</child> </child>
</widget> </widget>
</widget>
<widget> <widget>
<class>GtkButton</class> <class>GtkLabel</class>
<name>button122</name> <name>label276</name>
<can_focus>True</can_focus> <label>:</label>
<signal> <justify>GTK_JUSTIFY_CENTER</justify>
<name>clicked</name> <wrap>False</wrap>
<handler>on_browse_clicked</handler> <xalign>0</xalign>
<object>url_addr</object> <yalign>0.5</yalign>
<last_modification_time>Tue, 24 Apr 2001 14:16:09 GMT</last_modification_time> <xpad>0</xpad>
</signal> <ypad>0</ypad>
<label>Go</label> <child>
<relief>GTK_RELIEF_NORMAL</relief> <left_attach>1</left_attach>
<child> <right_attach>2</right_attach>
<padding>5</padding> <top_attach>0</top_attach>
<expand>False</expand> <bottom_attach>1</bottom_attach>
<fill>False</fill> <xpad>0</xpad>
</child> <ypad>0</ypad>
</widget> <xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label277</name>
<label>:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget> </widget>
</widget> </widget>
</widget> </widget>