From e1f34d3ebee792759942d06316246564cc250d19 Mon Sep 17 00:00:00 2001
From: Nick Hall <nick__hall@hotmail.com>
Date: Fri, 30 Jul 2010 18:13:06 +0000
Subject: [PATCH] Add new merge functionality to tree views (see r15645)

svn: r15668
---
 src/gui/viewmanager.py             | 1 -
 src/plugins/view/persontreeview.py | 9 ++++-----
 src/plugins/view/placetreeview.py  | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py
index 0e63f48b9..59b05ad7f 100644
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -117,7 +117,6 @@ UIDEFAULT = '''<ui>
     <placeholder name="CommonEdit"/>
     <separator/>
     <menuitem action="ScratchPad"/>
-    <placeholder name="Merge"/>
     <separator/>
     <menuitem action="Preferences"/>
   </menu>
diff --git a/src/plugins/view/persontreeview.py b/src/plugins/view/persontreeview.py
index ab9f3e48c..92b9fea3d 100644
--- a/src/plugins/view/persontreeview.py
+++ b/src/plugins/view/persontreeview.py
@@ -115,13 +115,10 @@ class PersonTreeView(BasePersonView):
                 <menuitem action="Add"/>
                 <menuitem action="Edit"/>
                 <menuitem action="Remove"/>
-              </placeholder>
+                <menuitem action="Merge"/>
+             </placeholder>
               <menuitem action="SetActive"/>
               <menuitem action="FilterEdit"/>
-              <placeholder name="Merge">
-                <menuitem action="CmpMerge"/>
-                <menuitem action="FastMerge"/>
-              </placeholder>
             </menu>
           </menubar>
           <toolbar name="ToolBar">
@@ -134,6 +131,7 @@ class PersonTreeView(BasePersonView):
               <toolitem action="Add"/>
               <toolitem action="Edit"/>
               <toolitem action="Remove"/>
+              <toolitem action="Merge"/>
             </placeholder>
           </toolbar>
           <popup name="Popup">
@@ -147,6 +145,7 @@ class PersonTreeView(BasePersonView):
             <menuitem action="Add"/>
             <menuitem action="Edit"/>
             <menuitem action="Remove"/>
+            <menuitem action="Merge"/>
             <separator/>
             <menu name="QuickReport" action="QuickReport">
               <menuitem action="Dummy"/>
diff --git a/src/plugins/view/placetreeview.py b/src/plugins/view/placetreeview.py
index 785b3ddf7..02307e567 100644
--- a/src/plugins/view/placetreeview.py
+++ b/src/plugins/view/placetreeview.py
@@ -152,11 +152,9 @@ class PlaceTreeView(PlaceBaseView):
                 <menuitem action="Add"/>
                 <menuitem action="Edit"/>
                 <menuitem action="Remove"/>
+                <menuitem action="Merge"/>
               </placeholder>
               <menuitem action="FilterEdit"/>
-              <placeholder name="Merge">
-                <menuitem action="FastMerge"/>
-              </placeholder>
             </menu>
           </menubar>
           <toolbar name="ToolBar">
@@ -168,6 +166,7 @@ class PlaceTreeView(PlaceBaseView):
               <toolitem action="Add"/>
               <toolitem action="Edit"/>
               <toolitem action="Remove"/>
+              <toolitem action="Merge"/>
               <separator/>
               <toolitem action="MapsList"/>
             </placeholder>
@@ -181,6 +180,7 @@ class PlaceTreeView(PlaceBaseView):
             <menuitem action="Add"/>
             <menuitem action="Edit"/>
             <menuitem action="Remove"/>
+            <menuitem action="Merge"/>
             <separator/>
             <menu name="QuickReport" action="QuickReport">
               <menuitem action="Dummy"/>