Merge fixes, option to display relationship to the home person in the

status bar.


svn: r1380

src/plugins/Check.py

@@ -209,7 +209,8 @@ class CheckIntegrity:
         title = _("Check Integrity")
         top = topDialog.get_widget("summary")
         textwindow = topDialog.get_widget("textwindow")
-        topDialog.get_widget("summaryTitle").set_text(title)
+
+        Utils.set_titles(top,topDialog.get_widget("title"),title)
         textwindow.get_buffer().set_text(text)
         top.show()
 

src/plugins/Merge.py

@@ -258,11 +258,11 @@ class Merge:
         pn2 = self.db.getPerson(p2)
         MergeData.MergePeople(self.db,pn1,pn2,self.on_update)
 
-    def on_update(self,p1,p2):
-        self.dellist[p2] = p1
+    def on_update(self,p1,p2,old_id):
+        self.dellist[p2.getId()] = p1.getId()
         for key in self.dellist.keys():
-            if self.dellist[key] == p2:
-                self.dellist[key] = p1
+            if self.dellist[key] == p2.getId():
+                self.dellist[key] = p1.getId()
         self.redraw()
         
     def update_and_destroy(self,obj):

src/plugins/relcalc.glade

@@ -132,7 +132,7 @@
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
+	      <property name="expand">False</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>

src/plugins/soundex.glade

@@ -24,20 +24,6 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Calculate SoundEx code for the name</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="on_apply_clicked" object="name"/>
-	    </widget>
-	  </child>
-
 	  <child>
 	    <widget class="GtkButton" id="button3">
 	      <property name="visible">True</property>

src/plugins/soundgen.py

@@ -49,7 +49,6 @@ class SoundGen:
         self.glade = gtk.glade.XML(glade_file,"soundEx")
         self.glade.signal_autoconnect({
             "destroy_passed_object" : Utils.destroy_passed_object,
-            "on_apply_clicked"      : self.on_apply_clicked,
         })
 
         Utils.set_titles(self.glade.get_widget('soundEx'),
@@ -58,6 +57,9 @@ class SoundGen:
 
         self.value = self.glade.get_widget("value")
         self.name = self.glade.get_widget("name")
+
+        self.name.connect('changed',self.on_apply_clicked)
+
         names = []
         for person in self.db.getPersonMap().values():
             lastname = person.getPrimaryName().getSurname()