16 Commits

Author SHA1 Message Date
Don Allingham
ee20b5d115 * src/MergePeople.py: correctly handle selection of first person
svn: r5088
2005-08-16 22:29:37 +00:00
Alex Roitman
5374ed4b64 * NEWS: Update.
* src/MergePeople.py: Typos.
* src/plugins/NavWebPage.py: Typos.
* src/po/template.po: Update for upcoming 2.0.6.


svn: r5013
2005-08-04 16:18:24 +00:00
Don Allingham
f031f80287 privacy information
svn: r4978
2005-07-29 20:32:46 +00:00
Don Allingham
478f90b8e8 * src/MergePeople.py: prevent attempts to merge a person and his/her
spouse, prevent merging of child and parent.


svn: r4975
2005-07-29 04:27:14 +00:00
Don Allingham
e09a5741b7 * src/MergePeople.py: clean up and refactoring of code.
svn: r4663
2005-05-24 02:45:48 +00:00
Don Allingham
a109d25c0b * src/MergePeople.py: merge improvements, merge data not merged before.
svn: r4656
2005-05-23 04:08:41 +00:00
Don Allingham
2281e7246f * src/ChooseParents.py: handle the addition of a person correctly.
Warn if the person just added is suppressed by the filter.
* src/MergePeople.py: use __debug__ for print statements

* src/MergePeople.py: fixed name merging, incorporate Martin's
patches.


svn: r4653
2005-05-22 03:47:00 +00:00
Alex Roitman
2f6c93d5d9 * src/MergePeople.py (merge_family_pair): Properly use handles.
svn: r4630
2005-05-19 15:33:49 +00:00
Alex Roitman
0774bb6e19 * doc/gramps-manual/C/usage.xml: Update.
* doc/gramps-manual/C/figures/*.png: Add new figures.
* src/MergePeople.py: Minor cleanups; Help buttons.
* src/MergeData.py: Minor cleanups; Help buttons.
* src/mergedata.glade: Minor cleanups; Help buttons.


svn: r4472
2005-05-03 17:17:17 +00:00
Martin Hawlisch
4e155a5e7b * src/MergePeople.py: Corrected gender display (closes #1190203)
svn: r4428
2005-04-26 12:42:00 +00:00
Don Allingham
4736f4ece9 * src/ChooseParents.py: pychecker changes
* src/DdTargets.py: pychecker changes
* src/FamilyView.py: pychecker changes
* src/GrampsCfg.py: pychecker changes
* src/MergeData.py: pychecker changes
* src/MergePeople.py: pychecker changes
* src/NameEdit.py: pychecker changes
* src/NoteEdit.py: pychecker changes
* src/RelLib.py: pychecker changes
* src/gramps_main.py: pychecker changes


svn: r4327
2005-04-09 03:11:03 +00:00
Don Allingham
3555a567a3 * src/MergePeople.py: provide more date in compare window, fix event
merging for families. Copy alternate names.


svn: r4260
2005-03-31 03:54:17 +00:00
Don Allingham
deed870ac6 update
svn: r4259
2005-03-31 03:33:27 +00:00
Don Allingham
547379eadf * src/MergePeople.py: provide more date in compare window, fix event
merging for families.


svn: r4258
2005-03-31 03:30:16 +00:00
Don Allingham
94d4aa7288 update
svn: r4255
2005-03-30 03:50:25 +00:00
Don Allingham
9d2dffcc9d * src/ReadXML.py: handle date object on names
* src/gramps.glade: add menu items for merging
* src/MergePeople.py: new person merge
* src/gramps_main.py: merge handling callbacks
* src/mergedata.glade: updated interface for merging

* src/SourceView.py: connect SourceView.merge into the multiple
selection mechanism


svn: r4254
2005-03-30 01:45:14 +00:00