Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/preferences.glade: Add Help button.

Browse Source 
* 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.


svn: r2420
This commit is contained in:
Alex Roitman 2003-12-02 04:27:23 +00:00
parent a2d49b7d6b
commit b1a31deb0f
20 changed files with 133 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -20,6 +20,26 @@
* src/plugins/WriteCD.py (on_help_clicked): Add function. * src/plugins/WriteCD.py (on_help_clicked): Add function.
* src/Bookmarks.py (draw_window): Add Help button; * src/Bookmarks.py (draw_window): Add Help button;
(help_clicked): Add function. (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 <twaugh@redhat.com> 2003-12-01 Tim Waugh <twaugh@redhat.com>
* doc/xmldocs.make: Fix builds for $top_srcdir == $top_builddir (oops). * doc/xmldocs.make: Fix builds for $top_srcdir == $top_builddir (oops).

38
doc/gramps-manual/C/keybind.xml
View File

@ -69,8 +69,8 @@
<entry><para><keycap>Ctrl</keycap>+<keycap>Down</keycap> <entry><para><keycap>Ctrl</keycap>+<keycap>Down</keycap>
or <keycap>Ctrl</keycap>+<keycap>Right</keycap></para></entry> or <keycap>Ctrl</keycap>+<keycap>Right</keycap></para></entry>
<entry><para>Swap the Active Person and the selected spouse. <entry><para>Swap the Active Person and the selected spouse.
Use <keycap>Ctrl+Down</keycap> in standard Family View and Use <keycap>Ctrl</keycap>+<keycap>Down</keycap> in standard Family View and
<keycap>Ctrl+Right</keycap> in alternative Family <keycap>Ctrl</keycap>+<keycap>Right</keycap> in alternative Family
View.</para></entry> View.</para></entry>
</row> </row>
</tbody> </tbody>
@ -101,7 +101,7 @@
the selected spouse.</para></entry> the selected spouse.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Shift+Enter</keycap></para></entry> <entry><para><keycap>Shift</keycap>+<keycap>Enter</keycap></para></entry>
<entry><para>Edit the personal information for the selected <entry><para>Edit the personal information for the selected
spouse.</para></entry> spouse.</para></entry>
</row> </row>
@ -111,7 +111,7 @@
list.</para></entry> list.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Shift+Insert</keycap></para></entry> <entry><para><keycap>Shift</keycap>+<keycap>Insert</keycap></para></entry>
<entry><para>Add a new person to the database and to the spouse <entry><para>Add a new person to the database and to the spouse
list.</para></entry> list.</para></entry>
</row> </row>
@ -121,11 +121,11 @@
list. The spouse is not deleted from the database.</para></entry> list. The spouse is not deleted from the database.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Ctrl+Up</keycap> <entry><para><keycap>Ctrl</keycap>+<keycap>Up</keycap>
or <keycap>Ctrl+Left</keycap></para></entry> or <keycap>Ctrl</keycap>+<keycap>Left</keycap></para></entry>
<entry><para>Swap the selected spouse and the Active Person. <entry><para>Swap the selected spouse and the Active Person.
Use <keycap>Ctrl+Down</keycap> in standard Family View and Use <keycap>Ctrl</keycap>+<keycap>Down</keycap> in standard Family View and
<keycap>Ctrl+Right</keycap> in alternative Family <keycap>Ctrl</keycap>+<keycap>Right</keycap> in alternative Family
View.</para></entry> View.</para></entry>
</row> </row>
</tbody> </tbody>
@ -162,7 +162,7 @@
list.</para></entry> list.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Shift+Insert</keycap></para></entry> <entry><para><keycap>Shift</keycap>+<keycap>Insert</keycap></para></entry>
<entry><para>Add a new set of parents to the database and to the <entry><para>Add a new set of parents to the database and to the
list.</para></entry> list.</para></entry>
</row> </row>
@ -172,11 +172,11 @@
The parents are not deleted from the database.</para></entry> The parents are not deleted from the database.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Ctrl+Right</keycap> <entry><para><keycap>Ctrl</keycap>+<keycap>Right</keycap>
or <keycap>Ctrl+Down</keycap></para></entry> or <keycap>Ctrl</keycap>+<keycap>Down</keycap></para></entry>
<entry><para>Make the selected parents the active family. <entry><para>Make the selected parents the active family.
Use <keycap>Ctrl+Right</keycap> in standard Family View and Use <keycap>Ctrl</keycap>+<keycap>Right</keycap> in standard Family View and
<keycap>Ctrl+Down</keycap> in alternative Family <keycap>Ctrl</keycap>+<keycap>Down</keycap> in alternative Family
View.</para></entry> View.</para></entry>
</row> </row>
</tbody> </tbody>
@ -208,7 +208,7 @@
spouse).</para></entry> spouse).</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Shift+Enter</keycap></para></entry> <entry><para><keycap>Shift</keycap>+<keycap>Enter</keycap></para></entry>
<entry><para>Edit the personal information for the selected <entry><para>Edit the personal information for the selected
child.</para></entry> child.</para></entry>
</row> </row>
@ -218,7 +218,7 @@
list.</para></entry> list.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Shift+Insert</keycap></para></entry> <entry><para><keycap>Shift</keycap>+<keycap>Insert</keycap></para></entry>
<entry><para>Add a new person to the database and to the children <entry><para>Add a new person to the database and to the children
list.</para></entry> list.</para></entry>
</row> </row>
@ -228,11 +228,11 @@
The child is not deleted from the database.</para></entry> The child is not deleted from the database.</para></entry>
</row> </row>
<row valign="top"> <row valign="top">
<entry><para><keycap>Ctrl+Left</keycap> <entry><para><keycap>Ctrl</keycap>+<keycap>Left</keycap>
or <keycap>Ctrl+Up</keycap></para></entry> or <keycap>Ctrl</keycap>+<keycap>Up</keycap></para></entry>
<entry><para>Make the selected child the Active Person. <entry><para>Make the selected child the Active Person.
Use <keycap>Ctrl+Left</keycap> in standard Family View and Use <keycap>Ctrl</keycap>+<keycap>Left</keycap> in standard Family View and
<keycap>Ctrl+Up</keycap> in alternative Family <keycap>Ctrl</keycap>+<keycap>Up</keycap> in alternative Family
View.</para></entry> View.</para></entry>
</row> </row>
</tbody> </tbody>

4
doc/gramps-manual/C/usage.xml
View File

@ -208,7 +208,9 @@
information concerning birth, death, addresses, various events, information concerning birth, death, addresses, various events,
etc. will be omitted in the exported GEDCOM file. If this option is selected, 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 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 <guilabel>Reference
images from path</guilabel> to tell &app; to use the specific path for your
images when writing image references in GEDCOM.
</para> </para>
<para>Upon starting the export, &app; will <para>Upon starting the export, &app; will

26
src/AddMedia.py
View File

@ -18,6 +18,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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. 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 from QuestionDialog import ErrorDialog
import gtk.glade import gtk.glade
import gnome
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -92,6 +95,10 @@ class AddMediaObject:
self.window.show() 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): def on_savephoto_clicked(self):
""" """
Callback function called with the save button is pressed. Callback function called with the save button is pressed.
@ -154,12 +161,15 @@ class AddMediaObject:
self.image.set_from_pixbuf(image) self.image.set_from_pixbuf(image)
def run(self): def run(self):
val = self.window.run() while 1:
val = self.window.run()
if val == gtk.RESPONSE_OK: if val == gtk.RESPONSE_OK:
self.on_savephoto_clicked() self.on_savephoto_clicked()
self.window.destroy() self.window.destroy()
return self.object return self.object
else: elif val == gtk.RESPONSE_HELP:
self.window.destroy() self.on_help_imagesel_clicked()
return None else:
self.window.destroy()
return None

2
src/AddSpouse.py
View File

@ -118,7 +118,7 @@ class AddSpouse:
def on_spouse_help_clicked(self,obj): def on_spouse_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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): def select_row(self,obj):
""" """

2
src/AddrEdit.py
View File

@ -131,7 +131,7 @@ class AddressEditor:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.window.run()
def ok_clicked(self): def ok_clicked(self):

2
src/AttrEdit.py
View File

@ -132,7 +132,7 @@ class AttributeEditor:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.window.run()
def add_source(self,obj): def add_source(self,obj):

2
src/ChooseParents.py
View File

@ -150,7 +150,7 @@ class ChooseParents:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.top.run()
def redrawf(self): def redrawf(self):

2
src/EditPerson.py
View File

@ -393,7 +393,7 @@ class EditPerson:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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): def build_columns(self,tree,list):
cnum = 0 cnum = 0

2
src/EditPlace.py
View File

@ -198,7 +198,7 @@ class EditPlace:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.top.run()
def build_columns(self,tree,list): def build_columns(self,tree,list):

2
src/EditSource.py
View File

@ -106,7 +106,7 @@ class EditSource:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.top.run()
def close(self,obj): def close(self,obj):

2
src/EventEdit.py
View File

@ -192,7 +192,7 @@ class EventEditor:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.window.run()
def add_source(self,obj): def add_source(self,obj):

5
src/GrampsCfg.py
View File

@ -18,6 +18,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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]) self.panel.set_current_page(self.imap[path])
def on_propertybox_help(self,obj): def on_propertybox_help(self,obj):
import gnome.help gnome.help_display('gramps-manual','gramps-prefs')
gnome.help.display('gramps-manual','prefs.html')
def on_close_clicked(self,obj): def on_close_clicked(self,obj):
Utils.destroy_passed_object(self.window) Utils.destroy_passed_object(self.window)

28
src/ImageSelect.py
View File

@ -34,6 +34,7 @@ import urlparse
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
import gnome
import gnome.ui import gnome.ui
import gnome.canvas import gnome.canvas
import gtk.glade import gtk.glade
@ -96,7 +97,7 @@ class ImageSelect:
return return
self.glade = gtk.glade.XML(const.imageselFile,"imageSelect","gramps") 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.fname = self.glade.get_widget("fname")
self.image = self.glade.get_widget("image") self.image = self.glade.get_widget("image")
@ -105,11 +106,12 @@ class ImageSelect:
self.photosel = self.glade.get_widget("photosel") self.photosel = self.glade.get_widget("photosel")
self.temp_name = "" 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')) _('Select a media object'))
self.glade.signal_autoconnect({ self.glade.signal_autoconnect({
"on_name_changed" : self.on_name_changed, "on_name_changed" : self.on_name_changed,
"on_help_imagesel_clicked" : self.on_help_imagesel_clicked,
}) })
if os.path.isdir(_last_path): if os.path.isdir(_last_path):
@ -118,12 +120,17 @@ class ImageSelect:
self.photosel.gtk_entry().set_position(len(_last_path)) self.photosel.gtk_entry().set_position(len(_last_path))
if self.parent_window: if self.parent_window:
window.set_transient_for(self.parent_window) self.window.set_transient_for(self.parent_window)
window.show() self.window.show()
val = window.run() self.val = self.window.run()
if val == gtk.RESPONSE_OK: if self.val == gtk.RESPONSE_OK:
self.on_savephoto_clicked() 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): def on_name_changed(self, obj):
"""The filename has changed. Verify it and load the picture.""" """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_make_local_clicked" : self.on_make_local_clicked,
"on_delete_attr_clicked" : self.on_delete_attr_clicked, "on_delete_attr_clicked" : self.on_delete_attr_clicked,
"on_update_attr_clicked" : self.on_update_attr_clicked, "on_update_attr_clicked" : self.on_update_attr_clicked,
"on_help_clicked" : self.on_help_clicked,
}) })
self.redraw_attr_list() self.redraw_attr_list()
self.display_refs() self.display_refs()
@ -932,10 +940,14 @@ class GlobalMediaProperties:
if self.update != None: if self.update != None:
self.update() 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): def on_ok_clicked(self, obj):
self.on_apply_clicked(obj) self.on_apply_clicked(obj)
Utils.destroy_passed_object(obj) Utils.destroy_passed_object(obj)
def on_attr_list_select_row(self,obj): def on_attr_list_select_row(self,obj):
store,iter = self.atree.get_selected() store,iter = self.atree.get_selected()
if iter: if iter:

2
src/Marriage.py
View File

@ -243,7 +243,7 @@ class Marriage:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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): def ev_drag_begin(self, context, a):
return return

2
src/NameEdit.py
View File

@ -122,7 +122,7 @@ class NameEditor:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.window.run()
def on_name_edit_ok_clicked(self): def on_name_edit_ok_clicked(self):

2
src/SelectChild.py
View File

@ -125,7 +125,7 @@ class SelectChild:
def on_child_help_clicked(self,obj): def on_child_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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): def close(self,obj):
self.top.destroy() self.top.destroy()

2
src/Sources.py
View File

@ -103,7 +103,7 @@ class SourceSelector:
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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() self.val = self.window.run()
def selection_changed(self,obj): def selection_changed(self,obj):

25
src/imagesel.glade
View File

@ -51,6 +51,18 @@
<property name="response_id">-5</property> <property name="response_id">-5</property>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkButton" id="button103">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-11</property>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -1143,6 +1155,19 @@
<signal name="clicked" handler="on_ok_clicked" object="change_global"/> <signal name="clicked" handler="on_ok_clicked" object="change_global"/>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkButton" id="button102">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_clicked" last_modification_time="Tue, 02 Dec 2003 03:38:43 GMT"/>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>

13
src/preferences.glade
View File

@ -38,6 +38,19 @@
<signal name="clicked" handler="on_close_clicked"/> <signal name="clicked" handler="on_close_clicked"/>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkButton" id="button7">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_clicked" last_modification_time="Tue, 02 Dec 2003 03:23:46 GMT"/>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>