From b362afd1280503e7042a79e9d32e1bc5fccbd42a Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 19 Nov 2003 02:29:41 +0000 Subject: [PATCH] * src/NameEdit.py (on_help_clicked): Add function. * src/UrlEdit.py (on_help_clicked): Add function. * src/gramps.glade: Add hot keys to the family view list labels. svn: r2348 --- ChangeLog | 5 +++++ src/NameEdit.py | 11 +++++++++-- src/UrlEdit.py | 18 ++++++++++++++--- src/gramps.glade | 50 +++++++++++++++++++++++++++++------------------- 4 files changed, 59 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c60c049c..9a3802a1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-11-12 Alex Roitman + * src/NameEdit.py (on_help_clicked): Add function. + * src/UrlEdit.py (on_help_clicked): Add function. + * src/gramps.glade: Add hot keys to the family view list labels. + 2003-11-17 Alex Roitman * src/gramps.glade: Add Help buttons to dialogs. * src/AddSpouse.py (on_spouse_help_clicked): Add function. diff --git a/src/NameEdit.py b/src/NameEdit.py index 5945111dd..2e4fc4cf2 100644 --- a/src/NameEdit.py +++ b/src/NameEdit.py @@ -26,6 +26,7 @@ # #------------------------------------------------------------------------- import gtk.glade +import gnome #------------------------------------------------------------------------- # @@ -97,6 +98,7 @@ class NameEditor: self.note_buffer = self.note_field.get_buffer() self.top.signal_autoconnect({ + "on_help_name_clicked" : self.on_help_clicked, "on_switch_page" : self.on_switch_page }) @@ -113,11 +115,16 @@ class NameEditor: if parent_window: self.window.set_transient_for(parent_window) - val = self.window.run() - if val == gtk.RESPONSE_OK: + self.val = self.window.run() + if self.val == gtk.RESPONSE_OK: self.on_name_edit_ok_clicked() self.window.destroy() + def on_help_clicked(self,obj): + """Display the relevant portion of GRAMPS manual""" + gnome.help_display('gramps-manual','adv-an') + self.val = self.window.run() + def on_name_edit_ok_clicked(self): first = self.given_field.get_text() last = self.surname_field.get_text() diff --git a/src/UrlEdit.py b/src/UrlEdit.py index 2da59a373..9ebe721fe 100644 --- a/src/UrlEdit.py +++ b/src/UrlEdit.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000 Donald N. Allingham +# Copyright (C) 2000-2003 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,12 +18,15 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + #------------------------------------------------------------------------- # # GTK/Gnome modules # #------------------------------------------------------------------------- import gtk.glade +import gnome #------------------------------------------------------------------------- # @@ -66,13 +69,22 @@ class UrlEditor: self.addr.set_text(url.get_path()) self.priv.set_active(url.getPrivacy()) + self.top.signal_autoconnect({ + "on_help_url_clicked" : self.on_help_clicked, + }) + if parent_window: self.window.set_transient_for(parent_window) - val = self.window.run() - if val == gtk.RESPONSE_OK: + self.val = self.window.run() + if self.val == gtk.RESPONSE_OK: self.on_url_edit_ok_clicked() self.window.destroy() + def on_help_clicked(self,obj): + """Display the relevant portion of GRAMPS manual""" + gnome.help_display('gramps-manual','gramps-edit-complete') + self.val = self.window.run() + def on_url_edit_ok_clicked(self): des = self.des.get_text() addr = self.addr.get_text() diff --git a/src/gramps.glade b/src/gramps.glade index 265a76f85..ebb01cc70 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -1870,8 +1870,8 @@ True - <b>Children</b> - False + <b>_Children</b> + True True GTK_JUSTIFY_LEFT False @@ -1880,6 +1880,7 @@ 0.5 0 0 + chlist 0 @@ -1894,8 +1895,8 @@ True - <b>Active person</b> - False + <b>_Active person</b> + True True GTK_JUSTIFY_LEFT False @@ -1904,6 +1905,7 @@ 0.5 0 0 + ap_data 0 @@ -1918,8 +1920,8 @@ True - <b>Active person's parents</b> - False + <b>Active person's _parents</b> + True True GTK_JUSTIFY_LEFT False @@ -1928,6 +1930,7 @@ 0.5 0 0 + ap_parents 3 @@ -1942,8 +1945,8 @@ True - <b>Relationship</b> - False + <b>Relati_onship</b> + True True GTK_JUSTIFY_LEFT False @@ -1952,6 +1955,7 @@ 0.5 0 0 + sp_list 0 @@ -1966,8 +1970,8 @@ True - <b>Spouse's parents</b> - False + <b>Spo_use's parents</b> + True True GTK_JUSTIFY_LEFT False @@ -1976,6 +1980,7 @@ 0.5 0 0 + sp_parents 3 @@ -2295,8 +2300,8 @@ True - <b>Children</b> - False + <b>_Children</b> + True True GTK_JUSTIFY_LEFT False @@ -2305,6 +2310,7 @@ 0.5 0 0 + chlist2 0 @@ -2559,8 +2565,8 @@ True - <b>Spouse's parents</b> - False + <b>Spo_use's parents</b> + True True GTK_JUSTIFY_LEFT False @@ -2569,6 +2575,7 @@ 0.5 0 0 + sp_parents2 3 @@ -2677,8 +2684,8 @@ True - <b>Relationship</b> - False + <b>Relati_onship</b> + True True GTK_JUSTIFY_LEFT False @@ -2687,6 +2694,7 @@ 0.5 0 0 + sp_list2 3 @@ -2795,8 +2803,8 @@ True - <b>Active person</b> - False + <b>_Active person</b> + True True GTK_JUSTIFY_LEFT False @@ -2805,6 +2813,7 @@ 0.5 0 0 + ap_data2 0 @@ -2819,8 +2828,8 @@ True - <b>Active person's parents</b> - False + <b>Active person's _parents</b> + True True GTK_JUSTIFY_LEFT False @@ -2829,6 +2838,7 @@ 0.5 0 0 + ap_parents2 0