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 000000000..93dd197c0 Binary files /dev/null and b/gramps2/doc/gramps-manual/C/figures/comp-people.png differ 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 000000000..8bde127a9 Binary files /dev/null and b/gramps2/doc/gramps-manual/C/figures/merge-people.png differ 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 000000000..2e4739f65 Binary files /dev/null and b/gramps2/doc/gramps-manual/C/figures/merge-plc.png differ 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 000000000..566acf6ae Binary files /dev/null and b/gramps2/doc/gramps-manual/C/figures/merge-src.png differ 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