From 2d84e78dbc223859825fcc47b81c30ab9e3eaa23 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 31 Dec 2006 05:50:40 +0000 Subject: [PATCH] In .: 2006-12-30 Don Allingham * src/GrampsDb/_ReadGedcom.py: Map to existing places if possible * src/Merge/_MergePerson.py: Merge identical names * src/ViewManager.py: bind N and P to next and previous view In help: 2006-12-30 Don Allingham * C/gramps.xml: start the rework of the key binding sections svn: r7861 --- gramps2/ChangeLog | 5 + gramps2/help/C/gramps.xml | 357 ++++++------------------------------- gramps2/help/ChangeLog | 4 + gramps2/src/ViewManager.py | 10 ++ 4 files changed, 77 insertions(+), 299 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 8c0030e35..076ca0ecf 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-12-30 Don Allingham + * src/GrampsDb/_ReadGedcom.py: Map to existing places if possible + * src/Merge/_MergePerson.py: Merge identical names + * src/ViewManager.py: bind N and P to next and previous view + 2006-12-30 Martin Hawlisch * src/DataViews/_RelationView.py: removed change_page(): Do not set the toolbar buttons to a possibly wrong state, these are set by diff --git a/gramps2/help/C/gramps.xml b/gramps2/help/C/gramps.xml index 21c1b501d..459408de7 100644 --- a/gramps2/help/C/gramps.xml +++ b/gramps2/help/C/gramps.xml @@ -6849,305 +6849,64 @@ List Views - The following bindings are available in all list views: People - View, Sources View, Places View, and Media View. - - - - - - - - - - Key - - Function - - - - - - Enter - - Invoke Edit Person dialog with - the Active Person. - - - - - - - - Family View - - The bindings available in the Family View depend on where the - focus is. The following tables list the bindings for all focus - targets. - - - - Focus on the Active Person - - - - - - - - - - - Key - - Function - - - - - - Enter - - Invoke Edit Person - dialog with the Active Person. - - - - 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 View. - - - - - - - - - Focus on the Spouse box - - - - - - - - - - - Key - - Function - - - - - - Enter - - Edit relationship between the Active Person - and the selected spouse. - - - - Shift+Enter - - Edit the personal information for the - selected spouse. - - - - Insert - - Add a person from the database to the spouse - list. - - - - Shift+Insert - - Add a new person to the database and to the - spouse list. - - - - Delete - - Delete the selected spouse from the spouse - list. The spouse is not deleted from the - database. - - - - Ctrl+Up or - Ctrl+Left - - Swap the selected spouse and the Active - Person. Use Ctrl+Up in - standard Family View and - Ctrl+Left in alternative - Family View. - - - - - - - - - Focus on the Parents box - - - - - - - - - - - Key - - Function - - - - - - Enter - - Edit relationship between the parents and - their child (either the Active Person or the selected - spouse, depending which parents box the focus is - in). - - - - Insert - - Add a new set of parents from the database to - the list. - - - - Shift+Insert - - Add a new set of parents to the database and - to the list. - - - - Delete - - Delete the selected parents from the list. - The parents are not deleted from the - database. - - - - 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 View. - - - - - - - - - Focus on the Children box - - - - - - - - - - - Key - - Function - - - - - - Enter - - Edit relationship between the child and - his/her parents (the Active Person and the selected - spouse). - - - - Shift+Enter - - Edit the personal information for the - selected child. - - - - Insert - - Add a new person from the database to the - children list. - - - - Shift+Insert - - Add a new person to the database and to the - children list. - - - - Delete - - Delete the selected child from the list. The - child is not deleted from the database. - - - - 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 View. - - - - - - - + + Common bindings + The following bindings are available in all list views: People + View, Sources View, Places View, and Media View. + + + + + + + + Key + + Function + + + + + + <Alt>N + Changes the view to the next view + + + <Alt>P + Changes the view to the previous view + + + + + + + People View bindings + + + + + + + Key + Function + + + + + + F2 + Set the active person to the default person + + + F3 + Edit the active person + + + + + diff --git a/gramps2/help/ChangeLog b/gramps2/help/ChangeLog index 9c5dae45e..f5e8cbdb2 100644 --- a/gramps2/help/ChangeLog +++ b/gramps2/help/ChangeLog @@ -1,3 +1,7 @@ +2006-12-30 Don Allingham + + * C/gramps.xml: start the rework of the key binding sections + 2006-12-21 Lubo Vasko * sk/sk.po: Translation update. * sk/figures/reorder.png: Add figure. diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py index b7a21e9a9..bca95dde2 100644 --- a/gramps2/src/ViewManager.py +++ b/gramps2/src/ViewManager.py @@ -146,6 +146,7 @@ uidefault = ''' + @@ -338,6 +339,7 @@ class ViewManager: ('PluginStatus', None,_('_Plugin status'), None, None, self.plugin_status), ('FAQ', None, _('_FAQ'), None, None, self.faq_activate), + ('KeyBindings', None, _('_Key Bindings'), None, None, self.key_bindings), ('UserManual', gtk.STOCK_HELP, _('_User Manual'), 'F1', None, self.manual_activate), ('TipOfDay', None, _('Tip of the day'), None, None, @@ -617,6 +619,14 @@ class ViewManager: except gobject.GError, msg: QuestionDialog.ErrorDialog(_("Could not open help"), str(msg)) + def key_bindings(self, obj): + """Display FAQ""" + try: + import GrampsDisplay + GrampsDisplay.help('keybind-lists') + except gobject.GError, msg: + QuestionDialog.ErrorDialog(_("Could not open help"), str(msg)) + def tip_of_day_activate(self, obj): """Display Tip of the day""" TipOfDay.TipOfDay(self.uistate)