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

* src/plugins/Merge.py: Rename, because Merge module shadows this

Browse Source 
plugin module.
	* src/plugins/FindDupes.py: New module, to replace Merge.py;
	(ShowMatches.on_do_merge_clicked): Use new Merge component.


svn: r7096
This commit is contained in:
Alex Roitman 2006-07-30 21:29:25 +00:00
parent b396db04c6
commit ada625adff
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,4 +1,8 @@
2006-07-30 Alex Roitman <shura@gramps-project.org> 2006-07-30 Alex Roitman <shura@gramps-project.org>
* src/plugins/Merge.py: Rename, because Merge module shadows this
plugin module.
* src/plugins/FindDupes.py: New module, to replace Merge.py;
(ShowMatches.on_do_merge_clicked): Use new Merge component.
* src/ViewManager.py (ViewManager.do_load_plugins): Catch exception; * src/ViewManager.py (ViewManager.do_load_plugins): Catch exception;
(ViewManager.plugin_status): Catch exception. (ViewManager.plugin_status): Catch exception.

4
gramps2/src/plugins/Merge.py → gramps2/src/plugins/FindDupes.py
View File

@ -48,7 +48,7 @@ import Utils
import soundex import soundex
import NameDisplay import NameDisplay
import ListModel import ListModel
import MergePeople from Merge import PersonCompare
import GrampsDisplay import GrampsDisplay
import ManagedWindow import ManagedWindow
from PluginUtils import Tool, register_tool from PluginUtils import Tool, register_tool
@ -609,7 +609,7 @@ class ShowMatches(ManagedWindow.ManagedWindow):
pn1 = self.db.get_person_from_handle(self.p1) pn1 = self.db.get_person_from_handle(self.p1)
pn2 = self.db.get_person_from_handle(self.p2) pn2 = self.db.get_person_from_handle(self.p2)
MergePeople.Compare(self.dbstate,self.uistate,pn1,pn2,self.on_update) PersonCompare(self.dbstate,self.uistate,pn1,pn2,self.on_update)
def on_update(self): def on_update(self):
self.dellist[self.p2] = self.p1 self.dellist[self.p2] = self.p1