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

svn: r542

gramps/src/dialog.glade

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

gramps/src/places.glade

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

gramps/src/plugins/Merge.py

@@ -212,6 +212,7 @@ class Merge:
             "destroy_passed_object" : utils.destroy_passed_object,
             "on_do_merge_clicked" : self.on_do_merge_clicked,
             })
+        self.mlist.connect('button-press-event',self.button_press_event)
         self.redraw()
 
     def redraw(self):
@@ -238,6 +239,15 @@ class Merge:
             index = index + 1
         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):
         if len(self.mlist.selection) != 1:
             return