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

Add new merge functionality to tree views (see r15645)

Browse Source 
svn: r15668
This commit is contained in:
Nick Hall 2010-07-30 18:13:06 +00:00
parent 0c6b7405c2
commit e1f34d3ebe
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/viewmanager.py
View File

@ -117,7 +117,6 @@ UIDEFAULT = '''<ui>
<placeholder name="CommonEdit"/> <placeholder name="CommonEdit"/>
<separator/> <separator/>
<menuitem action="ScratchPad"/> <menuitem action="ScratchPad"/>
<placeholder name="Merge"/>
<separator/> <separator/>
<menuitem action="Preferences"/> <menuitem action="Preferences"/>
</menu> </menu>

7
src/plugins/view/persontreeview.py
View File

@ -115,13 +115,10 @@ class PersonTreeView(BasePersonView):
<menuitem action="Add"/> <menuitem action="Add"/>
<menuitem action="Edit"/> <menuitem action="Edit"/>
<menuitem action="Remove"/> <menuitem action="Remove"/>
<menuitem action="Merge"/>
</placeholder> </placeholder>
<menuitem action="SetActive"/> <menuitem action="SetActive"/>
<menuitem action="FilterEdit"/> <menuitem action="FilterEdit"/>
<placeholder name="Merge">
<menuitem action="CmpMerge"/>
<menuitem action="FastMerge"/>
</placeholder>
</menu> </menu>
</menubar> </menubar>
<toolbar name="ToolBar"> <toolbar name="ToolBar">
@ -134,6 +131,7 @@ class PersonTreeView(BasePersonView):
<toolitem action="Add"/> <toolitem action="Add"/>
<toolitem action="Edit"/> <toolitem action="Edit"/>
<toolitem action="Remove"/> <toolitem action="Remove"/>
<toolitem action="Merge"/>
</placeholder> </placeholder>
</toolbar> </toolbar>
<popup name="Popup"> <popup name="Popup">
@ -147,6 +145,7 @@ class PersonTreeView(BasePersonView):
<menuitem action="Add"/> <menuitem action="Add"/>
<menuitem action="Edit"/> <menuitem action="Edit"/>
<menuitem action="Remove"/> <menuitem action="Remove"/>
<menuitem action="Merge"/>
<separator/> <separator/>
<menu name="QuickReport" action="QuickReport"> <menu name="QuickReport" action="QuickReport">
<menuitem action="Dummy"/> <menuitem action="Dummy"/>

6
src/plugins/view/placetreeview.py
View File

@ -152,11 +152,9 @@ class PlaceTreeView(PlaceBaseView):
<menuitem action="Add"/> <menuitem action="Add"/>
<menuitem action="Edit"/> <menuitem action="Edit"/>
<menuitem action="Remove"/> <menuitem action="Remove"/>
<menuitem action="Merge"/>
</placeholder> </placeholder>
<menuitem action="FilterEdit"/> <menuitem action="FilterEdit"/>
<placeholder name="Merge">
<menuitem action="FastMerge"/>
</placeholder>
</menu> </menu>
</menubar> </menubar>
<toolbar name="ToolBar"> <toolbar name="ToolBar">
@ -168,6 +166,7 @@ class PlaceTreeView(PlaceBaseView):
<toolitem action="Add"/> <toolitem action="Add"/>
<toolitem action="Edit"/> <toolitem action="Edit"/>
<toolitem action="Remove"/> <toolitem action="Remove"/>
<toolitem action="Merge"/>
<separator/> <separator/>
<toolitem action="MapsList"/> <toolitem action="MapsList"/>
</placeholder> </placeholder>
@ -181,6 +180,7 @@ class PlaceTreeView(PlaceBaseView):
<menuitem action="Add"/> <menuitem action="Add"/>
<menuitem action="Edit"/> <menuitem action="Edit"/>
<menuitem action="Remove"/> <menuitem action="Remove"/>
<menuitem action="Merge"/>
<separator/> <separator/>
<menu name="QuickReport" action="QuickReport"> <menu name="QuickReport" action="QuickReport">
<menuitem action="Dummy"/> <menuitem action="Dummy"/>