2006-08-23 Alex Roitman <shura@gramps-project.org>
* src/Merge/_MergePerson.py (MergePeopleUI.__init__): Properly close managed window. * src/glade/mergedata.glade: Remove unneeded signal connections. svn: r7246
This commit is contained in:
parent
4f07ceb949
commit
cb82d7c7c0
@ -1,3 +1,8 @@
|
|||||||
|
2006-08-23 Alex Roitman <shura@gramps-project.org>
|
||||||
|
* src/Merge/_MergePerson.py (MergePeopleUI.__init__): Properly
|
||||||
|
close managed window.
|
||||||
|
* src/glade/mergedata.glade: Remove unneeded signal connections.
|
||||||
|
|
||||||
2006-08-22 Alex Roitman <shura@gramps-project.org>
|
2006-08-22 Alex Roitman <shura@gramps-project.org>
|
||||||
* src/plugins/EventCmp.py: Add proper date sorting.
|
* src/plugins/EventCmp.py: Add proper date sorting.
|
||||||
|
|
||||||
|
@ -280,7 +280,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
|
|||||||
|
|
||||||
ret = gtk.RESPONSE_HELP
|
ret = gtk.RESPONSE_HELP
|
||||||
while ret == gtk.RESPONSE_HELP:
|
while ret == gtk.RESPONSE_HELP:
|
||||||
ret = window.run()
|
ret = self.window.run()
|
||||||
|
|
||||||
if ret == gtk.RESPONSE_OK:
|
if ret == gtk.RESPONSE_OK:
|
||||||
|
|
||||||
@ -303,7 +303,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
|
|||||||
merge.merge()
|
merge.merge()
|
||||||
if update:
|
if update:
|
||||||
update()
|
update()
|
||||||
window.destroy()
|
self.close()
|
||||||
|
|
||||||
def build_menu_names(self,obj):
|
def build_menu_names(self,obj):
|
||||||
return (_('Merge People'),None)
|
return (_('Merge People'),None)
|
||||||
|
@ -1421,7 +1421,6 @@
|
|||||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||||
<property name="focus_on_click">True</property>
|
<property name="focus_on_click">True</property>
|
||||||
<property name="response_id">-6</property>
|
<property name="response_id">-6</property>
|
||||||
<signal name="clicked" handler="destroy_passed_object" object="merge_places"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
@ -1435,7 +1434,6 @@
|
|||||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||||
<property name="focus_on_click">True</property>
|
<property name="focus_on_click">True</property>
|
||||||
<property name="response_id">-5</property>
|
<property name="response_id">-5</property>
|
||||||
<signal name="clicked" handler="on_merge_places_clicked" object="merge_places"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user