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

Fix verify tool to close and save configs properly

Browse Source 
Fixes #10121

Signed-off-by: Paul Franklin <pf.98052@gmail.com>
This commit is contained in:
prculley
2017-07-06 17:24:12 -05:00
committed by Paul Franklin
parent 4feaa0b594
commit 213243ae3d
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/plugins/tool/verify.glade
View File

@@ -804,7 +804,6 @@
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="clicked" handler="destroy_passed_object" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

21
gramps/plugins/tool/verify.py
View File

@@ -365,7 +365,7 @@ class Verify(tool.Tool, ManagedWindow, UpdateCallback):
try: try:
self.v_r = VerifyResults(self.dbstate, self.uistate, self.track, self.v_r = VerifyResults(self.dbstate, self.uistate, self.track,
self.top) self.top, self.close)
self.add_results = self.v_r.add_results self.add_results = self.v_r.add_results
self.v_r.load_ignored(self.db.full_name) self.v_r.load_ignored(self.db.full_name)
except WindowActiveError: except WindowActiveError:
@@ -494,24 +494,22 @@ class VerifyResults(ManagedWindow):
TRUE_COL = 8 TRUE_COL = 8
SHOW_COL = 9 SHOW_COL = 9
def __init__(self, dbstate, uistate, track, glade): def __init__(self, dbstate, uistate, track, glade, closeall):
""" initialize things """ """ initialize things """
self.title = _('Data Verification Results') self.title = _('Data Verification Results')
ManagedWindow.__init__(self, uistate, track, self.__class__) ManagedWindow.__init__(self, uistate, track, self.__class__)
self.dbstate = dbstate self.dbstate = dbstate
self.closeall = closeall
self._set_filename() self._set_filename()
self.top = glade self.top = glade
window = self.top.get_object("verify_result") window = self.top.get_object("verify_result")
self.set_window(window, self.top.get_object('title2'), self.title) self.set_window(window, self.top.get_object('title2'), self.title)
self.setup_configs('interface.verifyresults', 500, 300) self.setup_configs('interface.verifyresults', 500, 300)
window.connect("close", self.close)
self.top.connect_signals({ close_btn = self.top.get_object("closebutton1")
"destroy_passed_object" : self.close, close_btn.connect("clicked", self.close)
"on_verify_ok_clicked" : self.__dummy,
"on_help_clicked" : self.__dummy,
})
self.warn_tree = self.top.get_object('warn_tree') self.warn_tree = self.top.get_object('warn_tree')
self.warn_tree.connect('button_press_event', self.double_click) self.warn_tree.connect('button_press_event', self.double_click)
@@ -584,12 +582,6 @@ class VerifyResults(ManagedWindow):
self.show() self.show()
self.window_shown = False self.window_shown = False
def __dummy(self, obj):
"""dummy callback, needed because VerifyResults is in same glade file
as Verify, so callbacks of Verify must be defined.
"""
pass
def _set_filename(self): def _set_filename(self):
""" set the file where people who will be ignored will be kept """ """ set the file where people who will be ignored will be kept """
db_filename = self.dbstate.db.get_save_path() db_filename = self.dbstate.db.get_save_path()
@@ -661,6 +653,7 @@ class VerifyResults(ManagedWindow):
self.save_ignored(new_ignores) self.save_ignored(new_ignores)
ManagedWindow.close(self, *obj) ManagedWindow.close(self, *obj)
self.closeall()
def hide_toggled(self, button): def hide_toggled(self, button):
if button.get_active(): if button.get_active():