From 0774bb6e19a01519ec5fd3320f23ccacff53994f Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Tue, 3 May 2005 17:17:17 +0000 Subject: [PATCH] * 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 --- gramps2/ChangeLog | 7 + .../gramps-manual/C/figures/comp-people.png | Bin 0 -> 25282 bytes .../gramps-manual/C/figures/merge-people.png | Bin 0 -> 7195 bytes .../doc/gramps-manual/C/figures/merge-plc.png | Bin 0 -> 10377 bytes .../doc/gramps-manual/C/figures/merge-src.png | Bin 0 -> 11908 bytes gramps2/doc/gramps-manual/C/usage.xml | 212 +++++++++++++++--- gramps2/src/MergeData.py | 13 ++ gramps2/src/MergePeople.py | 26 ++- gramps2/src/mergedata.glade | 65 +++++- 9 files changed, 281 insertions(+), 42 deletions(-) create mode 100644 gramps2/doc/gramps-manual/C/figures/comp-people.png create mode 100644 gramps2/doc/gramps-manual/C/figures/merge-people.png create mode 100644 gramps2/doc/gramps-manual/C/figures/merge-plc.png create mode 100644 gramps2/doc/gramps-manual/C/figures/merge-src.png diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index e8a05f7a7..29e898470 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,10 @@ +2005-05-03 Alex Roitman + * 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. + 2005-05-03 Don Allingham * src/ReportUtils.py: fixed type (get-day() -> get_day()) diff --git a/gramps2/doc/gramps-manual/C/figures/comp-people.png b/gramps2/doc/gramps-manual/C/figures/comp-people.png new file mode 100644 index 0000000000000000000000000000000000000000..93dd197c0585b13629453e6b91a8ff158dfa78c6 GIT binary patch literal 25282 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 Avj6}9 literal 0 HcmV?d00001 diff --git a/gramps2/doc/gramps-manual/C/figures/merge-people.png b/gramps2/doc/gramps-manual/C/figures/merge-people.png new file mode 100644 index 0000000000000000000000000000000000000000..8bde127a9cce06d1b604b77816b3d4d76cc183ff GIT binary patch literal 7195 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 literal 0 HcmV?d00001 diff --git a/gramps2/doc/gramps-manual/C/figures/merge-plc.png b/gramps2/doc/gramps-manual/C/figures/merge-plc.png new file mode 100644 index 0000000000000000000000000000000000000000..2e4739f65424975ca8532a2ae1a260aaca7679ba GIT binary patch literal 10377 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 KSNql?{Qm$R0>H`u literal 0 HcmV?d00001 diff --git a/gramps2/doc/gramps-manual/C/figures/merge-src.png b/gramps2/doc/gramps-manual/C/figures/merge-src.png new file mode 100644 index 0000000000000000000000000000000000000000..566acf6ae3da73493ad9c6c66a54322ae6328091 GIT binary patch literal 11908 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 WxFB%Y=(TDVpzulMW39AV=>G%45*TX$ literal 0 HcmV?d00001 diff --git a/gramps2/doc/gramps-manual/C/usage.xml b/gramps2/doc/gramps-manual/C/usage.xml index 9d4e70c77..ff6fb3065 100644 --- a/gramps2/doc/gramps-manual/C/usage.xml +++ b/gramps2/doc/gramps-manual/C/usage.xml @@ -1567,6 +1567,28 @@ all changes are immediate. + + Data + + The Data tab displays Key/Value + pairs that may be associated with the source. These are similar + to the attributes used for other record types. The difference + from these Key/Value paris and the attributes is that the attributes + may have source references and notes, while the Key/Value + data may not. + + The central part shows the list of all Key/Value pairs, if any. + The buttons + and - + allow you to correspondingly add and remove pairs. To modify the + text of Key or Value, first select the desired entry (may be an + empty entry when new pair has just been added). Then click into + either Key or Value cell inside that entry and edit the text in place. + When you are done, click outside the cell to exit editing mode. + + + + + Gallery @@ -2408,46 +2430,168 @@ all changes are immediate. - - Merge People - Sometime two people entries in the database turn out to be - describing the same person. When this happens, merging people is + Merging records + + Sometime several records in the database turn out to be + describing the same object: same person, same place, or same source. + It could happen either when the data is entered twice by mistake, + or when new information reveals that the two entries refer to the same + person. It can also happen after importing GEDCOM obtained from a + relative, whose database overlaps with your existing data. + + Whenever you detect duplicate records, merging them a useful way of correcting the situation. - - To make a merge, exactly two people have to be selected in the - People View. This is accomplished by selecting one person and then + + To make a merge, exactly two records have to be selected + in the appropriate view (People View, Sources View, or Places View). + This is accomplished by selecting one entry and then selecting another person while holding down Ctrl key. - + + + Merge People + There are two ways of merging personal records: + Compare and Merge and + Fast Merge, both available from the + Edit menu. + - When exactly two people are selected, choose - EditMerge... - to evoke Merge People dialog. The dialog allows you to - retain the data from either person as the primary data for the new - (merged) person. The data from the other person can be kept as alternate - data if you so choose. If you would like to continue editing data of - a newly merged person, click the Merge and edit - button. - + + Merging people does not discard any information with either method. + The decisions you make during the merge only affect which data will + become primary and which will become secondary for the resulting + merged record. + + + + + Compare and Merge + + When exactly two people are selected, choose + EditCompare and + Merge... to evoke Compare + People dialog. + + +
+ Compare People dialog + + + Shows Compare People dialog. +
+ + + The dialog allows you to make a decision on whether or not + the selected records should be merged. If you decide that the records + should not be merged, despite similar names, you may click + Cancel to close the dialog without making + any changes. If you decide to proceed with merging, select the + appropriate Select radio button to specify + the record to be used as the source of primary data, + then click Merge and close. + + The data from the other record will be kept as alternate + data. Specifically, all names from the other record will become + alternate names of the merged record. Similarly, parents, spouses, + and children of the other record will become alternate parents, + spouses, and children of the merged record, and so on. +
+
+ + + Fast Merge + + When exactly two people are selected, choose + EditFast + Merge to evoke Merge + People dialog. + + +
+ Merge People dialog + + + Shows Merge People dialog. +
+ + + The dialog allows you to quickly merge two records, specifying + the record to be used as the source of primary data. + The data from the other record will be kept as alternate + data. Specifically, all names from the other record will become + alternate names of the merged record. Similarly, parents, spouses, + and children of the other record will become alternate parents, + spouses, and children of the merged record, and so on. + + + If you are not certain whether or not you need + to merge the records, or which record to specify as the source + of primary data, use Compare and Merge method + described above.. + + +
+
+ - + + Merge Sources + When exactly two sources are selected, choose + EditCompare and + Merge... to evoke Merge + Sources dialog. + + +
+ Merge Sources dialog + + + Shows Merge Sources dialog. +
+ + + The dialog allows you to make a decision on whether or not + the selected records should be merged. If you decide that the records + should not be merged, despite similar titles, you may click + Cancel to close the dialog without making + any changes. If you decide to proceed with merging, choose the + appropriate radio button to specify the title, author, abbreviated + title, publication information, and the ID to be used for the + merged record, then click OK. + +
+ + Merge Places - Sometime two place entries in the database turn out to be - describing the same place. When this happens, merging places is - a useful way of correcting the situation. - - To make a merge, exactly two places have to be selected in the - Places View. This is accomplished by selecting one place and then - selecting another place while holding down Ctrl key. - - - When exactly two places are selected, choose - EditMerge... - to evoke Merge Places dialog. The dialog allows - you to retain the data from either place as the primary data for - the new (merged) place. Alternatively, you may type in other data - for the new place, if you click Other radio - button. + + When exactly two places are selected, choose + EditCompare and + Merge... to evoke Select + title dialog. + + +
+ Merge Places dialog + + + Shows Select title dialog. +
+ + + The dialog allows you to make a decision on whether or not + the selected records should be merged. If you decide that the records + should not be merged, despite similar titles, you may click + Cancel to close the dialog without making + any changes. If you decide to proceed with merging, choose the + appropriate radio button to specify the title of the merged record, + or specify Other and enter new text, + then click OK. +
+
diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py index 822548d1f..b3b52bbff 100644 --- a/gramps2/src/MergeData.py +++ b/gramps2/src/MergeData.py @@ -33,6 +33,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- import gtk +from gnome import help_display #------------------------------------------------------------------------- # @@ -73,9 +74,14 @@ class MergePlaces: self.glade.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, "on_merge_places_clicked" : self.on_merge_places_clicked, + "on_help_places_clicked" : self.help, }) self.top.show() + def help(self,obj): + """Display the relevant portion of GRAMPS manual""" + help_display('gramps-manual','adv-merge-places') + def on_merge_places_clicked(self,obj): """ Performs the merge of the places when the merge button is clicked. @@ -175,6 +181,8 @@ class MergeSources: self.glade = gtk.glade.XML(const.mergeFile,"merge_sources","gramps") self.top = self.glade.get_widget("merge_sources") + Utils.set_titles(self.top,self.glade.get_widget('title'), + _("Merge Sources")) self.title1 = self.glade.get_widget("title1") self.title2 = self.glade.get_widget("title2") @@ -203,12 +211,17 @@ class MergeSources: self.glade.get_widget('ok').connect('clicked',self.merge) self.glade.get_widget('cancel').connect('clicked',self.close) + self.glade.get_widget('help').connect('clicked',self.help) self.trans = self.db.transaction_begin() self.top.show() def close(self,obj): self.top.destroy() + def help(self,obj): + """Display the relevant portion of GRAMPS manual""" + help_display('gramps-manual','adv-merge-sources') + def merge(self,obj): """ Performs the merge of the sources when the merge button is clicked. diff --git a/gramps2/src/MergePeople.py b/gramps2/src/MergePeople.py index 278296722..ede49806d 100644 --- a/gramps2/src/MergePeople.py +++ b/gramps2/src/MergePeople.py @@ -27,6 +27,15 @@ #------------------------------------------------------------------------- from gettext import gettext as _ +#------------------------------------------------------------------------- +# +# GTK/Gnome modules +# +#------------------------------------------------------------------------- +import gtk +import pango +from gnome import help_display + #------------------------------------------------------------------------- # # GRAMPS modules @@ -37,8 +46,6 @@ import ReportUtils import Utils import NameDisplay import const -import gtk -import pango sex = ( _("female"), _("male"), _("unknown")) @@ -62,10 +69,15 @@ class Compare: self.glade.get_widget('cancel').connect('clicked',self.cancel) self.glade.get_widget('close').connect('clicked',self.merge) + self.glade.get_widget('help').connect('clicked',self.help) def cancel(self,obj): self.top.destroy() + def help(self,obj): + """Display the relevant portion of GRAMPS manual""" + help_display('gramps-manual','adv-merge-people') + def merge(self,obj): if self.glade.get_widget('select1').get_active(): merge = MergePeople(self.db,self.p1,self.p2) @@ -219,8 +231,11 @@ class MergePeopleUI: p1.set_label(n1) p2.set_label(n2) Utils.set_titles(top,glade.get_widget('title'),_("Merge People")) + glade.get_widget('help').connect('clicked',self.help) - ret = top.run() + ret = gtk.RESPONSE_HELP + while ret == gtk.RESPONSE_HELP: + ret = top.run() if ret == gtk.RESPONSE_OK: if p1.get_active(): @@ -231,6 +246,11 @@ class MergePeopleUI: update() top.destroy() + def help(self,obj): + """Display the relevant portion of GRAMPS manual""" + help_display('gramps-manual','adv-merge-people') + + def name_of(p): if not p: return "" diff --git a/gramps2/src/mergedata.glade b/gramps2/src/mergedata.glade index 98e4e87a6..b766f0e84 100644 --- a/gramps2/src/mergedata.glade +++ b/gramps2/src/mergedata.glade @@ -58,6 +58,20 @@ + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + -11 + + + 0 @@ -100,12 +114,13 @@ + 6 True 3 2 False 0 - 0 + 6 @@ -347,6 +362,20 @@ + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + -11 + + + 0 @@ -482,7 +511,6 @@ False False True - select1 1 @@ -505,6 +533,7 @@ True False True + select2 0 @@ -539,9 +568,9 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - 620 True False + gramps.png True False False @@ -586,6 +615,19 @@ -5 + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + -11 + + 0 @@ -606,9 +648,9 @@ 6 - + True - <span weight="bold" size="larger">Merge Sources</span> + False True GTK_JUSTIFY_LEFT @@ -1189,6 +1231,19 @@ + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + -11 + + 0