From 604e035bfa033581141befd749930b800a045f87 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 19 Aug 2001 03:53:02 +0000 Subject: [PATCH] Update filters and plugins for new place objects svn: r347 --- gramps/src/filters/EventPlace.py | 2 +- gramps/src/places.glade | 456 ++++++++++++++++++++++----- gramps/src/plugins/AncestorChart.py | 4 +- gramps/src/plugins/AncestorReport.py | 6 +- gramps/src/plugins/EventCmp.py | 10 +- gramps/src/plugins/FamilyGroup.py | 6 +- gramps/src/plugins/HtmlReport.py | 4 +- gramps/src/plugins/IndivSummary.py | 2 +- gramps/src/plugins/Merge.py | 8 +- gramps/src/plugins/ReadGedcom.py | 4 +- gramps/src/plugins/WebPage.py | 4 +- gramps/src/plugins/WriteGedcom.py | 8 +- 12 files changed, 410 insertions(+), 104 deletions(-) diff --git a/gramps/src/filters/EventPlace.py b/gramps/src/filters/EventPlace.py index b5af35b9a..d01fb6775 100644 --- a/gramps/src/filters/EventPlace.py +++ b/gramps/src/filters/EventPlace.py @@ -44,7 +44,7 @@ class EventPlace(Filter.Filter): list.append(person.getBirth()) list.append(person.getDeath()) for event in list: - if self.regexp.search(event.getPlace()): + if self.regexp.search(event.getPlace().get_title()): val = 1 break return val diff --git a/gramps/src/places.glade b/gramps/src/places.glade index 4c62e8d87..9051ec698 100644 --- a/gramps/src/places.glade +++ b/gramps/src/places.glade @@ -15,40 +15,30 @@ - GnomeDialog + GtkDialog placeEditor Gramps - Place Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False - False - False + True + True False - False - False GtkVBox - GnomeDialog:vbox - dialog-vbox11 + Dialog:vbox + dialog-vbox12 False - 8 - - 4 - True - True - + 0 - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area11 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 + GtkHBox + Dialog:action_area + dialog-action_area12 + 10 + True + 5 0 False @@ -57,37 +47,55 @@ - GtkButton - button88 - True - True - - clicked - on_apply_clicked - placeEditor - Sat, 18 Aug 2001 17:26:41 GMT - - GNOME_STOCK_BUTTON_OK - + GtkHButtonBox + hbuttonbox25 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + True + True + - - GtkButton - button90 - True - True - - clicked - destroy_passed_object - placeEditor - Thu, 18 Jan 2001 02:52:48 GMT - - GNOME_STOCK_BUTTON_CANCEL + + GtkButton + button126 + True + True + + clicked + on_apply_clicked + placeEditor + Sat, 18 Aug 2001 17:26:41 GMT + + GNOME_STOCK_BUTTON_OK + GTK_RELIEF_NORMAL + + + + GtkButton + button127 + True + True + + clicked + destroy_passed_object + placeEditor + Thu, 18 Jan 2001 02:52:48 GMT + + GNOME_STOCK_BUTTON_CANCEL + GTK_RELIEF_NORMAL + GtkVBox - vbox26 + vbox36 False 0 @@ -98,7 +106,7 @@ GtkLabel - placeEditorTitle + label262 clicked on_lupdatesource_clicked @@ -120,7 +128,7 @@ GtkHSeparator - hseparator12 + hseparator13 0 True @@ -130,7 +138,7 @@ GtkNotebook - notebook2 + notebook3 450 350 True @@ -155,7 +163,7 @@ GtkTable - table17 + table19 8 3 False @@ -164,7 +172,7 @@ GtkLabel - label165 + label244 GTK_JUSTIFY_CENTER False @@ -190,7 +198,7 @@ GtkLabel - label166 + label245 GTK_JUSTIFY_CENTER False @@ -216,7 +224,7 @@ GtkLabel - label167 + label246 GTK_JUSTIFY_CENTER False @@ -242,7 +250,7 @@ GtkLabel - label232 + label247 GTK_JUSTIFY_CENTER False @@ -268,7 +276,7 @@ GtkLabel - label233 + label248 GTK_JUSTIFY_CENTER False @@ -294,7 +302,7 @@ GtkLabel - label234 + label249 GTK_JUSTIFY_CENTER False @@ -320,7 +328,7 @@ GtkLabel - label235 + label250 GTK_JUSTIFY_CENTER False @@ -346,7 +354,7 @@ GtkLabel - label236 + label251 GTK_JUSTIFY_CENTER False @@ -372,7 +380,7 @@ GtkEntry - entry5 + entry6 True False True @@ -564,7 +572,7 @@ GtkButton - button114 + button119 False True @@ -589,7 +597,7 @@ GtkLabel Notebook:tab - label204 + label252 GTK_JUSTIFY_CENTER False @@ -601,7 +609,7 @@ GtkScrolledWindow - scrolledwindow23 + scrolledwindow27 GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC GTK_UPDATE_CONTINUOUS @@ -610,6 +618,7 @@ GtkText place_note + 500 True True @@ -619,7 +628,7 @@ GtkLabel Notebook:tab - label205 + label253 GTK_JUSTIFY_CENTER False @@ -631,7 +640,7 @@ GtkScrolledWindow - scrolledwindow25 + scrolledwindow28 GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC GTK_UPDATE_CONTINUOUS @@ -639,18 +648,18 @@ GtkViewport - viewport1 + viewport2 GTK_SHADOW_IN GtkVBox - vbox34 + vbox37 False 0 GnomeIconList - photolist + photo_list True select_icon @@ -680,7 +689,7 @@ GtkHButtonBox - hbuttonbox21 + hbuttonbox23 GTK_BUTTONBOX_SPREAD 30 85 @@ -695,13 +704,13 @@ GtkButton - add_photo + button120 True True clicked on_addphoto_clicked - sourceEditor + placeEditor Thu, 31 May 2001 14:39:32 GMT @@ -710,13 +719,13 @@ GtkButton - delete_photo + button121 True True clicked on_deletephoto_clicked - sourceEditor + placeEditor Thu, 31 May 2001 14:39:16 GMT @@ -730,7 +739,7 @@ GtkLabel Notebook:tab - label206 + label254 GTK_JUSTIFY_CENTER False @@ -739,6 +748,303 @@ 0 0 + + + GtkVBox + vbox38 + False + 0 + + + GtkFrame + frame2 + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 5 + False + False + + + + GtkTable + table20 + 2 + 2 + False + 0 + 0 + + + GtkLabel + label255 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label256 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label257 + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkHBox + hbox2 + False + 0 + + 1 + 2 + 0 + 1 + 3 + 3 + True + False + False + False + True + True + + + + GtkLabel + label258 + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 0 + True + True + + + + + GtkButton + button122 + True + + clicked + on_browse_clicked + url_addr + Tue, 24 Apr 2001 14:16:09 GMT + + + GTK_RELIEF_NORMAL + + 5 + False + False + + + + + + + + GtkScrolledWindow + scrolledwindow29 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkCList + web_list + 500 + True + + select_row + on_web_list_select_row + Tue, 24 Apr 2001 14:12:50 GMT + + 2 + 273,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN + + + GtkLabel + CList:title + label259 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label260 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + GtkHButtonBox + hbuttonbox24 + GTK_BUTTONBOX_SPREAD + 30 + 85 + 27 + 7 + 0 + + 0 + False + True + + + + GtkButton + button123 + True + True + + clicked + on_add_url_clicked + web_list + Tue, 24 Apr 2001 13:49:05 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + button124 + True + True + + clicked + on_update_url_clicked + web_list + Tue, 24 Apr 2001 13:49:14 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + button125 + True + True + + clicked + on_delete_url_clicked + web_list + Tue, 24 Apr 2001 13:55:39 GMT + + + GTK_RELIEF_NORMAL + + + + + + GtkLabel + Notebook:tab + label261 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + diff --git a/gramps/src/plugins/AncestorChart.py b/gramps/src/plugins/AncestorChart.py index bf8471143..c16538825 100644 --- a/gramps/src/plugins/AncestorChart.py +++ b/gramps/src/plugins/AncestorChart.py @@ -102,8 +102,8 @@ class AncestorReport: N = person.getPrimaryName().getName() b = person.getBirth().getDate() d = person.getDeath().getDate() - B = person.getBirth().getPlace() - D = person.getDeath().getPlace() + B = person.getBirth().getPlace().get_title() + D = person.getDeath().getPlace().get_title() i = "%s" % person.getId() A = Config.attr_name a = "" diff --git a/gramps/src/plugins/AncestorReport.py b/gramps/src/plugins/AncestorReport.py index f05c30c0d..28af41090 100644 --- a/gramps/src/plugins/AncestorReport.py +++ b/gramps/src/plugins/AncestorReport.py @@ -170,7 +170,7 @@ class AncestorReport: birth = person.getBirth() if birth: date = birth.getDateObj().get_start_date() - place = birth.getPlace() + place = birth.getPlace().get_title() if place[-1:] == '.': place = place[:-1] if date.getDate() != "" or place != "": @@ -199,7 +199,7 @@ class AncestorReport: if death: date = death.getDateObj().get_start_date() - place = death.getPlace() + place = death.getPlace().get_title() if place[-1:] == '.': place = place[:-1] if date.getDate() != "" or place != "": @@ -240,7 +240,7 @@ class AncestorReport: if buried: date = buried.getDateObj().get_start_date() - place = buried.getPlace() + place = buried.getPlace().get_title() if place[-1:] == '.': place = place[:-1] if date.getDate() != "" or place != "": diff --git a/gramps/src/plugins/EventCmp.py b/gramps/src/plugins/EventCmp.py index 1a27c2708..c767f62b1 100644 --- a/gramps/src/plugins/EventCmp.py +++ b/gramps/src/plugins/EventCmp.py @@ -295,7 +295,7 @@ class EventComparison: added = 0 if first: tlist = [name,birth.getDate(),death.getDate()] - blist = ["",birth.getPlace(),death.getPlace()] + blist = ["",birth.getPlace().get_title(),death.getPlace().get_title()] else: tlist = ["","",""] blist = ["","",""] @@ -305,7 +305,7 @@ class EventComparison: event = mylist[0] del mylist[0] tlist.append(event.getDate()) - blist.append(event.getPlace()) + blist.append(event.getPlace().get_title()) added = 1 else: tlist.append("") @@ -396,8 +396,8 @@ class EventComparison: while done == 0: added = 0 if first: - tlist = [name,birth.getDate(),death.getDate()] - blist = ["",birth.getPlace(),death.getPlace()] + tlist = [name,birth.getDate(),death.getDate().get_title()] + blist = ["",birth.getPlace(),death.getPlace().get_title()] else: tlist = ["","",""] blist = ["","",""] @@ -407,7 +407,7 @@ class EventComparison: event = mylist[0] del mylist[0] tlist.append(event.getDate()) - blist.append(event.getPlace()) + blist.append(event.getPlace().get_title()) added = 1 else: tlist.append("") diff --git a/gramps/src/plugins/FamilyGroup.py b/gramps/src/plugins/FamilyGroup.py index fc43dd6a2..72445ad78 100644 --- a/gramps/src/plugins/FamilyGroup.py +++ b/gramps/src/plugins/FamilyGroup.py @@ -164,7 +164,7 @@ class FamilyGroup: self.doc.end_cell() self.doc.start_cell("TextContentsEnd") self.doc.start_paragraph('Normal') - self.doc.write_text(birth.getPlace()) + self.doc.write_text(birth.getPlace().get_title()) self.doc.end_paragraph() self.doc.end_cell() self.doc.end_row() @@ -182,7 +182,7 @@ class FamilyGroup: self.doc.end_cell() self.doc.start_cell("TextContentsEnd") self.doc.start_paragraph('Normal') - self.doc.write_text(death.getPlace()) + self.doc.write_text(death.getPlace().get_title()) self.doc.end_paragraph() self.doc.end_cell() self.doc.end_row() @@ -228,7 +228,7 @@ class FamilyGroup: def dump_child_event(self,text,name,event): if event: date = event.getDate() - place = event.getPlace() + place = event.getPlace().get_title() else: date = "" place = "" diff --git a/gramps/src/plugins/HtmlReport.py b/gramps/src/plugins/HtmlReport.py index 057827aeb..73e5ab9eb 100644 --- a/gramps/src/plugins/HtmlReport.py +++ b/gramps/src/plugins/HtmlReport.py @@ -348,7 +348,7 @@ def print_event(html,name,event): return date = event.getDate() - place = event.getPlace() + place = event.getPlace().get_title() if date != "" or place != "": html.write("

%s

\n" % name) @@ -465,7 +465,7 @@ def dump_person(person,prefix,templateTop,templateBottom,targetDir): marriage = family.getMarriage() if marriage and not alive and not spouse_alive: - place = marriage.getPlace() + place = marriage.getPlace().get_title() date = marriage.getDate() if place: txt = _("Marriage place") diff --git a/gramps/src/plugins/IndivSummary.py b/gramps/src/plugins/IndivSummary.py index 819d76d8c..6da9c66a6 100644 --- a/gramps/src/plugins/IndivSummary.py +++ b/gramps/src/plugins/IndivSummary.py @@ -113,7 +113,7 @@ class IndivSummary: return name = event.getName() date = event.getDate() - place = event.getPlace() + place = event.getPlace().get_title() description = event.getDescription() if date == "": if place == "": diff --git a/gramps/src/plugins/Merge.py b/gramps/src/plugins/Merge.py index ec088b3a9..fe2788f51 100644 --- a/gramps/src/plugins/Merge.py +++ b/gramps/src/plugins/Merge.py @@ -479,15 +479,15 @@ class Merge: name1 = person1.getPrimaryName().getName() death1 = person1.getDeath().getDate() - dplace1 = person1.getDeath().getPlace() + dplace1 = person1.getDeath().getPlace().get_title() birth1 = person1.getBirth().getDate() - bplace1 = person1.getBirth().getPlace() + bplace1 = person1.getBirth().getPlace().get_title() name2 = person2.getPrimaryName().getName() death2 = person2.getDeath().getDate() - dplace2 = person2.getDeath().getPlace() + dplace2 = person2.getDeath().getPlace().get_title() birth2 = person2.getBirth().getDate() - bplace2 = person2.getBirth().getPlace() + bplace2 = person2.getBirth().getPlace().get_title() if f2 and not f1: self.topDialog.get_widget("bfather2").set_active(1) diff --git a/gramps/src/plugins/ReadGedcom.py b/gramps/src/plugins/ReadGedcom.py index 6a27367b2..53e92b041 100644 --- a/gramps/src/plugins/ReadGedcom.py +++ b/gramps/src/plugins/ReadGedcom.py @@ -616,7 +616,7 @@ class GedcomParser: elif matches[1] == "BIRT": event = Event() if self.person.getBirth().getDate() != "" or \ - self.person.getBirth().getPlace() != "": + self.person.getBirth().getPlace().get_title() != "": event.setName("Alternate Birth") self.person.addEvent(event) else: @@ -631,7 +631,7 @@ class GedcomParser: elif matches[1] == "DEAT": event = Event() if self.person.getDeath().getDate() != "" or \ - self.person.getDeath().getPlace() != "": + self.person.getDeath().getPlace().get_title() != "": event.setName("Alternate Death") self.person.addEvent(event) else: diff --git a/gramps/src/plugins/WebPage.py b/gramps/src/plugins/WebPage.py index b0827019f..c928b7729 100644 --- a/gramps/src/plugins/WebPage.py +++ b/gramps/src/plugins/WebPage.py @@ -300,7 +300,7 @@ class IndividualPage: continue name = _(event.getName()) date = event.getDate() - place = event.getPlace() + place = event.getPlace().get_title() description = event.getDescription() if date == "": if place == "": @@ -346,7 +346,7 @@ class IndividualPage: return name = event.getName() date = event.getDate() - place = event.getPlace() + place = event.getPlace().get_title() description = event.getDescription() if date == "": if place == "": diff --git a/gramps/src/plugins/WriteGedcom.py b/gramps/src/plugins/WriteGedcom.py index 941553d81..376e567fa 100644 --- a/gramps/src/plugins/WriteGedcom.py +++ b/gramps/src/plugins/WriteGedcom.py @@ -262,8 +262,8 @@ def write_long_text(g,tag,level,note): def dump_event_stats(g,event): if event.getSaveDate() != "": g.write("2 DATE %s\n" % cnvtxt(event.getSaveDate())) - if event.getPlace() != "": - g.write("2 PLAC %s\n" % cnvtxt(event.getPlace())) + if event.getPlace().get_title() != "": + g.write("2 PLAC %s\n" % cnvtxt(event.getPlace().get_title())) if event.getNote() != "": write_long_text(g,"NOTE",2,event.getNote()) if event.getSourceRef() != None: @@ -368,13 +368,13 @@ def write_person(g,person): birth = person.getBirth() if not (private and birth.getPrivacy()): - if birth.getSaveDate() != "" or birth.getPlace() != "": + if birth.getSaveDate() != "" or birth.getPlace().get_title() != "": g.write("1 BIRT\n") dump_event_stats(g,birth) death = person.getDeath() if not (private and death.getPrivacy()): - if death.getSaveDate() != "" or death.getPlace() != "": + if death.getSaveDate() != "" or death.getPlace().get_title() != "": g.write("1 DEAT\n") dump_event_stats(g,death)