Signal and callback fixes for find duplicates tool. GTK3 issues still to be fixed when merging people
svn: r20141
This commit is contained in:
parent
192e9080c5
commit
d0a1cdfb25
@ -127,6 +127,9 @@ class Merge(tool.Tool,ManagedWindow):
|
|||||||
_('Find Possible Duplicate People'))
|
_('Find Possible Duplicate People'))
|
||||||
|
|
||||||
top.connect_signals({
|
top.connect_signals({
|
||||||
|
"on_do_merge_clicked" : self.__dummy,
|
||||||
|
"on_help_show_clicked" : self.__dummy,
|
||||||
|
"on_delete_show_event" : self.__dummy,
|
||||||
"on_merge_ok_clicked" : self.on_merge_ok_clicked,
|
"on_merge_ok_clicked" : self.on_merge_ok_clicked,
|
||||||
"destroy_passed_object" : self.close,
|
"destroy_passed_object" : self.close,
|
||||||
"on_help_clicked" : self.on_help_clicked,
|
"on_help_clicked" : self.on_help_clicked,
|
||||||
@ -524,6 +527,12 @@ class Merge(tool.Tool,ManagedWindow):
|
|||||||
value += 0.25
|
value += 0.25
|
||||||
return min(value,1) if value else -1
|
return min(value,1) if value else -1
|
||||||
|
|
||||||
|
def __dummy(self, obj):
|
||||||
|
"""dummy callback, needed because a shared glade file is used for
|
||||||
|
both toplevel windows and all signals must be handled.
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ShowMatches(ManagedWindow):
|
class ShowMatches(ManagedWindow):
|
||||||
|
|
||||||
@ -551,6 +560,10 @@ class ShowMatches(ManagedWindow):
|
|||||||
"on_do_merge_clicked" : self.on_do_merge_clicked,
|
"on_do_merge_clicked" : self.on_do_merge_clicked,
|
||||||
"on_help_show_clicked" : self.on_help_clicked,
|
"on_help_show_clicked" : self.on_help_clicked,
|
||||||
"on_delete_show_event" : self.close,
|
"on_delete_show_event" : self.close,
|
||||||
|
"on_merge_ok_clicked" : self.__dummy,
|
||||||
|
"on_help_clicked" : self.__dummy,
|
||||||
|
"on_delete_merge_event" : self.__dummy,
|
||||||
|
"on_delete_event" : self.__dummy,
|
||||||
})
|
})
|
||||||
|
|
||||||
mtitles = [
|
mtitles = [
|
||||||
@ -622,6 +635,12 @@ class ShowMatches(ManagedWindow):
|
|||||||
self.update(1)
|
self.update(1)
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
|
def __dummy(self, obj):
|
||||||
|
"""dummy callback, needed because a shared glade file is used for
|
||||||
|
both toplevel windows and all signals must be handled.
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user