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

Changed Religious Parish to Church Parish, double click to merge plugin

Browse Source 
svn: r542
This commit is contained in:
Don Allingham 2001-11-04 00:14:50 +00:00
parent f16d36e9ee
commit b48cddf5f8
4 changed files with 997 additions and 905 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/src/dialog.glade
View File

@ -1247,7 +1247,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label184</name> <name>label184</name>
<label>Religious Parish</label> <label>Church Parish</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>

4
gramps/src/places.glade
View File

@ -594,7 +594,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label279</name> <name>label279</name>
<label>Religious Parish</label> <label>Church Parish</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>
@ -998,7 +998,7 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label280</name> <name>label280</name>
<label>Religious Parish</label> <label>Church Parish</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>1</xalign> <xalign>1</xalign>

10
gramps/src/plugins/Merge.py
View File

@ -212,6 +212,7 @@ class Merge:
"destroy_passed_object" : utils.destroy_passed_object, "destroy_passed_object" : utils.destroy_passed_object,
"on_do_merge_clicked" : self.on_do_merge_clicked, "on_do_merge_clicked" : self.on_do_merge_clicked,
}) })
self.mlist.connect('button-press-event',self.button_press_event)
self.redraw() self.redraw()
def redraw(self): def redraw(self):
@ -238,6 +239,15 @@ class Merge:
index = index + 1 index = index + 1
self.mlist.thaw() self.mlist.thaw()
def button_press_event(self,obj,event):
if event.button != 1 or event.type != GDK._2BUTTON_PRESS:
return
if len(self.mlist.selection) <= 0:
return
row = self.mlist.selection[0]
(p1,p2) = self.mlist.get_row_data(row)
MergeData.MergePeople(self.db,p1,p2,self.on_update)
def on_do_merge_clicked(self,obj): def on_do_merge_clicked(self,obj):
if len(self.mlist.selection) != 1: if len(self.mlist.selection) != 1:
return return

1886
gramps/src/po/template.po
View File

File diff suppressed because it is too large Load Diff