From e7ca43f996230e342b5fe4d671d3712ebdab755f Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 5 Apr 2014 19:08:30 +0100 Subject: [PATCH] 7584: Fix update of active object after merge --- src/Merge/mergecitation.py | 3 +-- src/Merge/mergeevent.py | 3 +-- src/Merge/mergefamily.py | 3 +-- src/Merge/mergemedia.py | 3 +-- src/Merge/mergenote.py | 3 +-- src/Merge/mergeperson.py | 3 +-- src/Merge/mergeplace.py | 4 +--- src/Merge/mergerepository.py | 3 +-- src/Merge/mergesource.py | 3 +-- 9 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/Merge/mergecitation.py b/src/Merge/mergecitation.py index 68b81085c..71b71c934 100644 --- a/src/Merge/mergecitation.py +++ b/src/Merge/mergecitation.py @@ -156,8 +156,7 @@ class MergeCitations(ManagedWindow.ManagedWindow): titanic = self.citation1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Citation') if self.get_widget("page_btn1").get_active() ^ use_handle1: phoenix.set_page(titanic.get_page()) diff --git a/src/Merge/mergeevent.py b/src/Merge/mergeevent.py index 98a15718f..be7327d84 100644 --- a/src/Merge/mergeevent.py +++ b/src/Merge/mergeevent.py @@ -170,8 +170,7 @@ class MergeEvents(ManagedWindow.ManagedWindow): titanic = self.ev1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Event') if self.get_widget("type_btn1").get_active() ^ use_handle1: phoenix.set_type(titanic.get_type()) diff --git a/src/Merge/mergefamily.py b/src/Merge/mergefamily.py index bf07afeb3..4ca0667b7 100644 --- a/src/Merge/mergefamily.py +++ b/src/Merge/mergefamily.py @@ -202,8 +202,7 @@ class MergeFamilies(ManagedWindow.ManagedWindow): titanic = self.fy1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Family') phoenix_fh = phoenix.get_father_handle() phoenix_mh = phoenix.get_mother_handle() diff --git a/src/Merge/mergemedia.py b/src/Merge/mergemedia.py index 63991154f..820f79267 100644 --- a/src/Merge/mergemedia.py +++ b/src/Merge/mergemedia.py @@ -152,8 +152,7 @@ class MergeMediaObjects(ManagedWindow.ManagedWindow): titanic = self.mo1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Media') if self.get_widget("path_btn1").get_active() ^ use_handle1: phoenix.set_path(titanic.get_path()) diff --git a/src/Merge/mergenote.py b/src/Merge/mergenote.py index 4531605e7..99f13d876 100644 --- a/src/Merge/mergenote.py +++ b/src/Merge/mergenote.py @@ -165,8 +165,7 @@ class MergeNotes(ManagedWindow.ManagedWindow): titanic = self.no1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Note') if self.get_widget("text_btn1").get_active() ^ use_handle1: phoenix.set_styledtext(titanic.get_styledtext()) diff --git a/src/Merge/mergeperson.py b/src/Merge/mergeperson.py index 4a51b4ad4..a0067dba4 100644 --- a/src/Merge/mergeperson.py +++ b/src/Merge/mergeperson.py @@ -313,8 +313,7 @@ class MergePeople(ManagedWindow.ManagedWindow): titanic = self.pr1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Person') if self.get_widget("name_btn1").get_active() ^ use_handle1: swapname = phoenix.get_primary_name() diff --git a/src/Merge/mergeplace.py b/src/Merge/mergeplace.py index 08f614f2b..be040c9a8 100644 --- a/src/Merge/mergeplace.py +++ b/src/Merge/mergeplace.py @@ -174,9 +174,7 @@ class MergePlaces(ManagedWindow.ManagedWindow): titanic = self.pl1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) - + self.uistate.set_active(phoenix.get_handle(), 'Place') if self.get_widget("title_btn1").get_active() ^ use_handle1: phoenix.set_title(titanic.get_title()) diff --git a/src/Merge/mergerepository.py b/src/Merge/mergerepository.py index 48ddcbc85..f0042c06a 100644 --- a/src/Merge/mergerepository.py +++ b/src/Merge/mergerepository.py @@ -141,8 +141,7 @@ class MergeRepositories(ManagedWindow.ManagedWindow): titanic = self.rp1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Repository') if self.get_widget("name_btn1").get_active() ^ use_handle1: phoenix.set_name(titanic.get_name()) diff --git a/src/Merge/mergesource.py b/src/Merge/mergesource.py index d06b69ccc..3f9d96c37 100644 --- a/src/Merge/mergesource.py +++ b/src/Merge/mergesource.py @@ -165,8 +165,7 @@ class MergeSources(ManagedWindow.ManagedWindow): titanic = self.src1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Source') if self.get_widget("title_btn1").get_active() ^ use_handle1: phoenix.set_title(titanic.get_title())