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

* src/plugins/Verify.py: Allow the Verify Results window to be reused if

Browse Source 
it is already instantiated. Bug #1532

2008-01-04  Gary Burton <gary.burton@zen.co.uk>


svn: r9708
This commit is contained in:
Gary Burton 2008-01-04 23:24:51 +00:00
parent 8cf173b898
commit d999733c22
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-01-04 Gary Burton <gary.burton@zen.co.uk>
* src/plugins/Verify.py: Allow the Verify Results window to be reused if
it is already instantiated. Bug #1532
2008-01-04 Gary Burton <gary.burton@zen.co.uk> 2008-01-04 Gary Burton <gary.burton@zen.co.uk>
* src/GrampsDbUtils/_ReadXML.py: removed code that is adding the gramps * src/GrampsDbUtils/_ReadXML.py: removed code that is adding the gramps
ID onto the end of pre-existing place descriptions. Bug #1502 ID onto the end of pre-existing place descriptions. Bug #1502

16
src/plugins/Verify.py
View File

@ -233,6 +233,7 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
# Draw dialog and make it handle everything # Draw dialog and make it handle everything
base = os.path.dirname(__file__) base = os.path.dirname(__file__)
self.glade_file = base + os.sep + "verify.glade" self.glade_file = base + os.sep + "verify.glade"
self.vr = None
self.top = gtk.glade.XML(self.glade_file,"verify_settings","gramps") self.top = gtk.glade.XML(self.glade_file,"verify_settings","gramps")
self.top.signal_autoconnect({ self.top.signal_autoconnect({
@ -322,15 +323,18 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
self.top.get_widget( self.top.get_widget(
"estimate").get_active() "estimate").get_active()
vr = VerifyResults(self.dbstate, self.uistate, self.track) try:
self.add_results = vr.add_results self.vr = VerifyResults(self.dbstate, self.uistate, self.track)
vr.load_ignored(self.db.full_name) self.add_results = self.vr.add_results
self.vr.load_ignored(self.db.full_name)
except Errors.WindowActiveError:
pass
self.uistate.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) self.uistate.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
self.uistate.progress.show() self.uistate.progress.show()
self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
try: try:
vr.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) self.vr.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
except AttributeError: except AttributeError:
pass pass
@ -340,7 +344,7 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
self.uistate.window.window.set_cursor(None) self.uistate.window.window.set_cursor(None)
self.window.window.set_cursor(None) self.window.window.set_cursor(None)
try: try:
vr.window.window.set_cursor(None) self.vr.window.window.set_cursor(None)
except AttributeError: except AttributeError:
pass pass
self.reset() self.reset()
@ -368,6 +372,7 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
oldunm = self.options.handler.options_dict['oldunm'] oldunm = self.options.handler.options_dict['oldunm']
estimate_age = self.options.handler.options_dict['estimate_age'] estimate_age = self.options.handler.options_dict['estimate_age']
self.vr.real_model.clear()
self.set_total(self.db.get_number_of_people() + self.set_total(self.db.get_number_of_people() +
self.db.get_number_of_families()) self.db.get_number_of_families())
@ -578,6 +583,7 @@ class VerifyResults(ManagedWindow):
return new_ignores return new_ignores
def close(self,*obj): def close(self,*obj):
self.vr = None
new_ignores = self.get_new_marking() new_ignores = self.get_new_marking()
self.save_ignored(new_ignores) self.save_ignored(new_ignores)