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

* src/DataViews/_PersonView.py: merge functionality

Browse Source 
* src/ViewManager.py: merge functionality
	* src/MergePeople.py: fix merge (ui and birth/death events)
	* src/GrampsDb/_WriteXML.py: remove redundant birth/death entries


svn: r6773
This commit is contained in:
Don Allingham
2006-05-25 04:08:05 +00:00
parent 93cd3d0832
commit ba91817471
5 changed files with 93 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gramps2/src/ViewManager.py
View File

@ -115,9 +115,8 @@ uidefault = '''<ui>
<separator/>
<placeholder name="CommonEdit"/>
<separator/>
<menuitem action="ScratchPad"/>
<menuitem action="CmpMerge"/>
<menuitem action="FastMerge"/>
<menuitem action="ScratchPad"/>
<placeholder name="Merge"/>
<separator/>
<menuitem action="Preferences"/>
</menu>
@ -343,8 +342,6 @@ class ViewManager:
self.export_data),
('Abandon', gtk.STOCK_REVERT_TO_SAVED,
_('_Abandon changes and quit'), None, None, self.abort),
('CmpMerge', None, _('_Compare and merge')),
('FastMerge', None, _('_Fast merge')),
('ScratchPad', gtk.STOCK_PASTE, _('_ScratchPad'), "",
_("Open the ScratchPad dialog"), self.scratchpad),
('Import', gtk.STOCK_CONVERT, _('_Import'), "<control>i", None,