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

Merged trunk r17888 through r18397 into geps023.

Browse Source 
Conflicts resolved in:
    /data/grampsxml.dtd
    /data/grampsxml.rng
    /src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
    /src/plugins/import/ImportXml.py
(Various property conflicts also resolved)

svn: r18405
This commit is contained in:
Tim G L Lyons
2011-11-05 19:07:58 +00:00
parent 4169661302 886e89cd30
commit 3adb1b7ffa
431 changed files with 150048 additions and 89561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Merge/mergeevent.py
View File

@@ -185,8 +185,9 @@ class MergeEvents(ManagedWindow.ManagedWindow):
query = MergeEventQuery(self.dbstate, phoenix, titanic)
query.execute()
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.uistate.set_busy_cursor(False)
self.close()

5
src/Merge/mergefamily.py
View File

@@ -221,8 +221,9 @@ class MergeFamilies(ManagedWindow.ManagedWindow):
query.execute()
except MergeError, err:
ErrorDialog( _("Cannot merge people"), str(err))
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.uistate.set_busy_cursor(False)
self.close()

5
src/Merge/mergemedia.py
View File

@@ -165,8 +165,9 @@ class MergeMediaObjects(ManagedWindow.ManagedWindow):
query = MergeMediaQuery(self.dbstate, phoenix, titanic)
query.execute()
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.close()
class MergeMediaQuery(object):

5
src/Merge/mergenote.py
View File

@@ -175,8 +175,9 @@ class MergeNotes(ManagedWindow.ManagedWindow):
query = MergeNoteQuery(self.dbstate, phoenix, titanic)
query.execute()
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.close()
#-------------------------------------------------------------------------

5
src/Merge/mergeperson.py
View File

@@ -325,8 +325,9 @@ class MergePeople(ManagedWindow.ManagedWindow):
query.execute()
except MergeError, err:
ErrorDialog( _("Cannot merge people"), str(err))
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.uistate.set_busy_cursor(False)
self.close()
if self.update:

5
src/Merge/mergeplace.py
View File

@@ -190,8 +190,9 @@ class MergePlaces(ManagedWindow.ManagedWindow):
query = MergePlaceQuery(self.dbstate, phoenix, titanic)
query.execute()
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.uistate.set_busy_cursor(False)
self.close()

5
src/Merge/mergerepository.py
View File

@@ -151,8 +151,9 @@ class MergeRepositories(ManagedWindow.ManagedWindow):
query = MergeRepoQuery(self.dbstate, phoenix, titanic)
query.execute()
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.uistate.set_busy_cursor(False)
self.close()

5
src/Merge/mergesource.py
View File

@@ -179,8 +179,9 @@ class MergeSources(ManagedWindow.ManagedWindow):
query = MergeSourceQuery(self.dbstate, phoenix, titanic)
query.execute()
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
if self.uistate.viewmanager.active_page.selection:
self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path)
self.uistate.set_busy_cursor(False)
self.close()