diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index f9aaee78e..4d6035595 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -20,6 +20,26 @@ * src/plugins/WriteCD.py (on_help_clicked): Add function. * src/Bookmarks.py (draw_window): Add Help button; (help_clicked): Add function. + * src/preferences.glade: Add Help button. + * src/GrampsCfg.py (on_propertybox_help): Add function. + * src/imagesel.glade: Add Help buttons. + * src/ImageSelect.py (ImageSelect.on_help_imagesel_clicked, + GlobalMediaProperties.on_help_clicked): Add functions. + * src/AddMedia.py (on_help_imagesel_clicked): Add function. + * doc/gramps-manual/C/usage.xml: Update. + * doc/gramps-manual/C/keybind.xml: Update. + * src/AddSpouse.py: Call yelp with sect2 argument. + * src/AddrEdit.py: Likewise. + * src/AttrEdit.py: Likewise. + * src/ChooseParents.py: Likewise. + * src/EditPerson.py: Likewise. + * src/EditPlace.py: Likewise. + * src/EditSource.py: Likewise. + * src/EventEdit.py: Likewise. + * src/Marriage.py: Likewise. + * src/NameEdit.py: Likewise. + * src/SelectChild.py: Likewise. + * src/Sources.py: Likewise. 2003-12-01 Tim Waugh * doc/xmldocs.make: Fix builds for $top_srcdir == $top_builddir (oops). diff --git a/gramps2/doc/gramps-manual/C/keybind.xml b/gramps2/doc/gramps-manual/C/keybind.xml index 190039907..864ca0fe7 100644 --- a/gramps2/doc/gramps-manual/C/keybind.xml +++ b/gramps2/doc/gramps-manual/C/keybind.xml @@ -69,8 +69,8 @@ Ctrl+Down or Ctrl+Right Swap the Active Person and the selected spouse. - Use Ctrl+Down in standard Family View and - Ctrl+Right in alternative Family + Use Ctrl+Down in standard Family View and + Ctrl+Right in alternative Family View. @@ -101,7 +101,7 @@ the selected spouse. - Shift+Enter + Shift+Enter Edit the personal information for the selected spouse. @@ -111,7 +111,7 @@ list. - Shift+Insert + Shift+Insert Add a new person to the database and to the spouse list. @@ -121,11 +121,11 @@ list. The spouse is not deleted from the database. - Ctrl+Up - or Ctrl+Left + Ctrl+Up + or Ctrl+Left Swap the selected spouse and the Active Person. - Use Ctrl+Down in standard Family View and - Ctrl+Right in alternative Family + Use Ctrl+Down in standard Family View and + Ctrl+Right in alternative Family View. @@ -162,7 +162,7 @@ list. - Shift+Insert + Shift+Insert Add a new set of parents to the database and to the list. @@ -172,11 +172,11 @@ The parents are not deleted from the database. - Ctrl+Right - or Ctrl+Down + Ctrl+Right + or Ctrl+Down Make the selected parents the active family. - Use Ctrl+Right in standard Family View and - Ctrl+Down in alternative Family + Use Ctrl+Right in standard Family View and + Ctrl+Down in alternative Family View. @@ -208,7 +208,7 @@ spouse). - Shift+Enter + Shift+Enter Edit the personal information for the selected child. @@ -218,7 +218,7 @@ list. - Shift+Insert + Shift+Insert Add a new person to the database and to the children list. @@ -228,11 +228,11 @@ The child is not deleted from the database. - Ctrl+Left - or Ctrl+Up + Ctrl+Left + or Ctrl+Up Make the selected child the Active Person. - Use Ctrl+Left in standard Family View and - Ctrl+Up in alternative Family + Use Ctrl+Left in standard Family View and + Ctrl+Up in alternative Family View. diff --git a/gramps2/doc/gramps-manual/C/usage.xml b/gramps2/doc/gramps-manual/C/usage.xml index e64a2fd56..86736932a 100644 --- a/gramps2/doc/gramps-manual/C/usage.xml +++ b/gramps2/doc/gramps-manual/C/usage.xml @@ -208,7 +208,9 @@ information concerning birth, death, addresses, various events, etc. will be omitted in the exported GEDCOM file. If this option is selected, you can further choose whether to use the word "Living" as first name, exclude - notes, and exclude sources for the living people. + notes, and exclude sources for the living people. Check Reference + images from path to tell &app; to use the specific path for your + images when writing image references in GEDCOM. Upon starting the export, &app; will diff --git a/gramps2/src/AddMedia.py b/gramps2/src/AddMedia.py index 89e9075c2..2e34c8e1a 100644 --- a/gramps2/src/AddMedia.py +++ b/gramps2/src/AddMedia.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + """ Provides the interface to allow a person to add a media object to the database. """ @@ -44,6 +46,7 @@ from gettext import gettext as _ #------------------------------------------------------------------------- from QuestionDialog import ErrorDialog import gtk.glade +import gnome #------------------------------------------------------------------------- # @@ -92,6 +95,10 @@ class AddMediaObject: self.window.show() + def on_help_imagesel_clicked(self): + """Display the relevant portion of GRAMPS manual""" + gnome.help_display('gramps-manual','gramps-edit-quick') + def on_savephoto_clicked(self): """ Callback function called with the save button is pressed. @@ -154,12 +161,15 @@ class AddMediaObject: self.image.set_from_pixbuf(image) def run(self): - val = self.window.run() + while 1: + val = self.window.run() - if val == gtk.RESPONSE_OK: - self.on_savephoto_clicked() - self.window.destroy() - return self.object - else: - self.window.destroy() - return None + if val == gtk.RESPONSE_OK: + self.on_savephoto_clicked() + self.window.destroy() + return self.object + elif val == gtk.RESPONSE_HELP: + self.on_help_imagesel_clicked() + else: + self.window.destroy() + return None diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py index be0d3ca8f..5feadb4d6 100644 --- a/gramps2/src/AddSpouse.py +++ b/gramps2/src/AddSpouse.py @@ -118,7 +118,7 @@ class AddSpouse: def on_spouse_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','gramps-spec-rel') + gnome.help_display('gramps-manual','gramps-edit-quick') def select_row(self,obj): """ diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py index 43a10920f..ae7afb447 100644 --- a/gramps2/src/AddrEdit.py +++ b/gramps2/src/AddrEdit.py @@ -131,7 +131,7 @@ class AddressEditor: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-ad') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.window.run() def ok_clicked(self): diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py index b6925c94b..24ba0cee1 100644 --- a/gramps2/src/AttrEdit.py +++ b/gramps2/src/AttrEdit.py @@ -132,7 +132,7 @@ class AttributeEditor: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-at') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.window.run() def add_source(self,obj): diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index 8049c1f96..c02d0a70e 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -150,7 +150,7 @@ class ChooseParents: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','gramps-spec-par') + gnome.help_display('gramps-manual','gramps-edit-quick') self.val = self.top.run() def redrawf(self): diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 8ce64c9a6..5b10151e2 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -393,7 +393,7 @@ class EditPerson: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-pers') + gnome.help_display('gramps-manual','gramps-edit-complete') def build_columns(self,tree,list): cnum = 0 diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index 19fb9dd4b..5499134e8 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -198,7 +198,7 @@ class EditPlace: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-plc') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.top.run() def build_columns(self,tree,list): diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index 014bc12d5..8805d7ef8 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -106,7 +106,7 @@ class EditSource: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-src') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.top.run() def close(self,obj): diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index f032e07d5..6f3c44aef 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -192,7 +192,7 @@ class EventEditor: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-ev') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.window.run() def add_source(self,obj): diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index 3dc48148a..552c81aed 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + #------------------------------------------------------------------------- # @@ -797,8 +799,7 @@ class GrampsPreferences: self.panel.set_current_page(self.imap[path]) def on_propertybox_help(self,obj): - import gnome.help - gnome.help.display('gramps-manual','prefs.html') + gnome.help_display('gramps-manual','gramps-prefs') def on_close_clicked(self,obj): Utils.destroy_passed_object(self.window) diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index f6f4216c6..3daabac0a 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -34,6 +34,7 @@ import urlparse # #------------------------------------------------------------------------- import gtk +import gnome import gnome.ui import gnome.canvas import gtk.glade @@ -96,7 +97,7 @@ class ImageSelect: return self.glade = gtk.glade.XML(const.imageselFile,"imageSelect","gramps") - window = self.glade.get_widget("imageSelect") + self.window = self.glade.get_widget("imageSelect") self.fname = self.glade.get_widget("fname") self.image = self.glade.get_widget("image") @@ -105,11 +106,12 @@ class ImageSelect: self.photosel = self.glade.get_widget("photosel") self.temp_name = "" - Utils.set_titles(window,self.glade.get_widget('title'), + Utils.set_titles(self.window,self.glade.get_widget('title'), _('Select a media object')) self.glade.signal_autoconnect({ "on_name_changed" : self.on_name_changed, + "on_help_imagesel_clicked" : self.on_help_imagesel_clicked, }) if os.path.isdir(_last_path): @@ -118,12 +120,17 @@ class ImageSelect: self.photosel.gtk_entry().set_position(len(_last_path)) if self.parent_window: - window.set_transient_for(self.parent_window) - window.show() - val = window.run() - if val == gtk.RESPONSE_OK: + self.window.set_transient_for(self.parent_window) + self.window.show() + self.val = self.window.run() + if self.val == gtk.RESPONSE_OK: self.on_savephoto_clicked() - window.destroy() + self.window.destroy() + + def on_help_imagesel_clicked(self,obj): + """Display the relevant portion of GRAMPS manual""" + gnome.help_display('gramps-manual','gramps-edit-quick') + self.val = self.window.run() def on_name_changed(self, obj): """The filename has changed. Verify it and load the picture.""" @@ -815,6 +822,7 @@ class GlobalMediaProperties: "on_make_local_clicked" : self.on_make_local_clicked, "on_delete_attr_clicked" : self.on_delete_attr_clicked, "on_update_attr_clicked" : self.on_update_attr_clicked, + "on_help_clicked" : self.on_help_clicked, }) self.redraw_attr_list() self.display_refs() @@ -932,10 +940,14 @@ class GlobalMediaProperties: if self.update != None: self.update() + def on_help_clicked(self, obj): + """Display the relevant portion of GRAMPS manual""" + gnome.help_display('gramps-manual','gramps-edit-complete') + def on_ok_clicked(self, obj): self.on_apply_clicked(obj) Utils.destroy_passed_object(obj) - + def on_attr_list_select_row(self,obj): store,iter = self.atree.get_selected() if iter: diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index e9a830b52..bb6f09321 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -243,7 +243,7 @@ class Marriage: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-rel') + gnome.help_display('gramps-manual','gramps-edit-complete') def ev_drag_begin(self, context, a): return diff --git a/gramps2/src/NameEdit.py b/gramps2/src/NameEdit.py index 2e4fc4cf2..29bb1e313 100644 --- a/gramps2/src/NameEdit.py +++ b/gramps2/src/NameEdit.py @@ -122,7 +122,7 @@ class NameEditor: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-an') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.window.run() def on_name_edit_ok_clicked(self): diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py index 1d7511636..4aae616f4 100644 --- a/gramps2/src/SelectChild.py +++ b/gramps2/src/SelectChild.py @@ -125,7 +125,7 @@ class SelectChild: def on_child_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','gramps-spec-ch') + gnome.help_display('gramps-manual','gramps-edit-quick') def close(self,obj): self.top.destroy() diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py index 1b961d2d3..a7c90788b 100644 --- a/gramps2/src/Sources.py +++ b/gramps2/src/Sources.py @@ -103,7 +103,7 @@ class SourceSelector: def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" - gnome.help_display('gramps-manual','adv-si') + gnome.help_display('gramps-manual','gramps-edit-complete') self.val = self.window.run() def selection_changed(self,obj): diff --git a/gramps2/src/imagesel.glade b/gramps2/src/imagesel.glade index 1be728ef6..0d68ebfac 100644 --- a/gramps2/src/imagesel.glade +++ b/gramps2/src/imagesel.glade @@ -51,6 +51,18 @@ -5 + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + -11 + + 0 @@ -1143,6 +1155,19 @@ + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + -11 + + + 0 diff --git a/gramps2/src/preferences.glade b/gramps2/src/preferences.glade index a01f8a12e..5363a6bf5 100644 --- a/gramps2/src/preferences.glade +++ b/gramps2/src/preferences.glade @@ -38,6 +38,19 @@ + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + -11 + + + 0