2007-02-12 Don Allingham <don@gramps-project.org>

* src/plugins/FindDupes.py: catch window already open message



svn: r8091
This commit is contained in:
Don Allingham 2007-02-12 17:24:43 +00:00
parent bfa8c94aeb
commit 0ef5063e69
3 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,6 @@
2007-02-12 Don Allingham <don@gramps-project.org>
* src/plugins/FindDupes.py: catch window already open message
2007-02-11 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on
add_source_reference

View File

@ -6826,7 +6826,7 @@
project, to ensure compatibility or import/export options to your
new format of a project.</para>
<para>If, however, you would like the GRAMPS project to to adopt
<para>If, however, you would like the GRAMPS project to adopt
your strategy, you would need to convince GRAMPS developers that
your strategy is good for GRAMPS and superior to the present
development strategy.</para>
@ -7943,7 +7943,7 @@
may type:</term>
<listitem>
<para><command>gramps -i<filename>file1.ged</filename> -i
<para><command>gramps -i <filename>file1.ged</filename> -i
<filename>file2.gpkg</filename> -i
<filename>~/db3.gramps</filename> -i
<filename>file4.wft</filename> -a

View File

@ -48,6 +48,7 @@ import Utils
import soundex
import NameDisplay
import ListModel
import Errors
from Merge import PersonCompare
import GrampsDisplay
import ManagedWindow
@ -173,8 +174,11 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
_("No matches found"),
_("No potential duplicate people were found"))
else:
ShowMatches(self.dbstate,self.uistate,self.track,
self.list,self.map,self.update)
try:
ShowMatches(self.dbstate,self.uistate,self.track,
self.list,self.map,self.update)
except Errors.WindowActiveError:
pass
def find_potentials(self,thresh):
self.progress = Utils.ProgressMeter(_('Find duplicates'),