2006-12-30  Don Allingham  <don@gramps-project.org>
	* src/GrampsDb/_ReadGedcom.py: Map to existing places if possible
	* src/Merge/_MergePerson.py: Merge identical names
	* src/ViewManager.py: bind <Alt>N and <Alt>P to next and previous view

In help:
2006-12-30  Don Allingham  <don@gramps-project.org>

	* C/gramps.xml: start the rework of the key binding sections



svn: r7861
This commit is contained in:
Don Allingham 2006-12-31 05:50:40 +00:00
parent 91c6c4b923
commit 2d84e78dbc
4 changed files with 77 additions and 299 deletions

View File

@ -1,3 +1,8 @@
2006-12-30 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: Map to existing places if possible
* src/Merge/_MergePerson.py: Merge identical names
* src/ViewManager.py: bind <Alt>N and <Alt>P to next and previous view
2006-12-30 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2006-12-30 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/DataViews/_RelationView.py: removed change_page(): Do not set * src/DataViews/_RelationView.py: removed change_page(): Do not set
the toolbar buttons to a possibly wrong state, these are set by the toolbar buttons to a possibly wrong state, these are set by

View File

@ -6849,305 +6849,64 @@
<sect1 id="keybind-lists"> <sect1 id="keybind-lists">
<title>List Views</title> <title>List Views</title>
<para>The following bindings are available in all list views: People <sect2>
View, Sources View, Places View, and Media View.</para> <title>Common bindings</title>
<para>The following bindings are available in all list views: People
<informaltable frame="topbot"> View, Sources View, Places View, and Media View.</para>
<tgroup cols="2">
<colspec colname="col1" /> <informaltable frame="topbot">
<tgroup cols="2">
<colspec colname="col2" /> <colspec colname="col1" />
<colspec colname="col2" />
<thead> <thead>
<row valign="top"> <row valign="top">
<entry colname="col1" colsep="0" <entry colname="col1" colsep="0"
valign="top"><para>Key</para></entry> valign="top"><para>Key</para></entry>
<entry colname="col2" valign="top"><para>Function</para></entry> <entry colname="col2" valign="top"><para>Function</para></entry>
</row> </row>
</thead> </thead>
<tbody> <tbody>
<row valign="top"> <row valign="top">
<entry><para><keycap>Enter</keycap></para></entry> <entry><para><keycap>&lt;Alt&gt;N</keycap></para></entry>
<entry>Changes the view to the next view</entry>
<entry><para>Invoke <guilabel>Edit Person</guilabel> dialog with </row>
the Active Person.</para></entry> <row valign="top">
</row> <entry><para><keycap>&lt;Alt&gt;P</keycap></para></entry>
</tbody> <entry>Changes the view to the previous view</entry>
</tgroup> </row>
</informaltable> </tbody>
</sect1> </tgroup>
</informaltable>
<sect1 id="keybind-family"> </sect2>
<title>Family View</title> <sect2>
<title>People View bindings</title>
<para>The bindings available in the Family View depend on where the <informaltable frame="topbot">
focus is. The following tables list the bindings for all focus <tgroup cols="2">
targets.</para> <colspec colname="col1" />
<colspec colname="col2" />
<variablelist> <thead>
<varlistentry> <row valign="top">
<term>Focus on the Active Person</term> <entry colname="col1" colsep="0"
valign="top"><para>Key</para></entry>
<listitem> <entry colname="col2" valign="top"><para>Function</para></entry>
<informaltable frame="topbot"> </row>
<tgroup cols="2"> </thead>
<colspec colname="col1" />
<tbody>
<colspec colname="col2" /> <row valign="top">
<entry><para><keycap>F2</keycap></para></entry>
<thead> <entry><para>Set the active person to the default person</para></entry>
<row valign="top"> </row>
<entry colname="col1" colsep="0" <row valign="top">
valign="top"><para>Key</para></entry> <entry><para><keycap>F3</keycap></para></entry>
<entry>Edit the active person</entry>
<entry colname="col2" </row>
valign="top"><para>Function</para></entry> </tbody>
</row> </tgroup>
</thead> </informaltable>
</sect2>
<tbody>
<row valign="top">
<entry><para><keycap>Enter</keycap></para></entry>
<entry><para>Invoke <guilabel>Edit Person</guilabel>
dialog with the Active Person.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Ctrl</keycap>+<keycap>Down</keycap>
or
<keycap>Ctrl</keycap>+<keycap>Right</keycap></para></entry>
<entry><para>Swap the Active Person and the selected
spouse. Use <keycap>Ctrl</keycap>+<keycap>Down</keycap> in
standard Family View and
<keycap>Ctrl</keycap>+<keycap>Right</keycap> in
alternative Family View.</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
</listitem>
</varlistentry>
<varlistentry>
<term>Focus on the Spouse box</term>
<listitem>
<informaltable frame="topbot">
<tgroup cols="2">
<colspec colname="col1" />
<colspec colname="col2" />
<thead>
<row valign="top">
<entry colname="col1" colsep="0"
valign="top"><para>Key</para></entry>
<entry colname="col2"
valign="top"><para>Function</para></entry>
</row>
</thead>
<tbody>
<row valign="top">
<entry><para><keycap>Enter</keycap></para></entry>
<entry><para>Edit relationship between the Active Person
and the selected spouse.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Shift</keycap>+<keycap>Enter</keycap></para></entry>
<entry><para>Edit the personal information for the
selected spouse.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Insert</keycap></para></entry>
<entry><para>Add a person from the database to the spouse
list.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Shift</keycap>+<keycap>Insert</keycap></para></entry>
<entry><para>Add a new person to the database and to the
spouse list.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Delete</keycap></para></entry>
<entry><para>Delete the selected spouse from the spouse
list. The spouse is not deleted from the
database.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Ctrl</keycap>+<keycap>Up</keycap> or
<keycap>Ctrl</keycap>+<keycap>Left</keycap></para></entry>
<entry><para>Swap the selected spouse and the Active
Person. Use <keycap>Ctrl</keycap>+<keycap>Up</keycap> in
standard Family View and
<keycap>Ctrl</keycap>+<keycap>Left</keycap> in alternative
Family View.</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
</listitem>
</varlistentry>
<varlistentry>
<term>Focus on the Parents box</term>
<listitem>
<informaltable frame="topbot">
<tgroup cols="2">
<colspec colname="col1" />
<colspec colname="col2" />
<thead>
<row valign="top">
<entry colname="col1" colsep="0"
valign="top"><para>Key</para></entry>
<entry colname="col2"
valign="top"><para>Function</para></entry>
</row>
</thead>
<tbody>
<row valign="top">
<entry><para><keycap>Enter</keycap></para></entry>
<entry><para>Edit relationship between the parents and
their child (either the Active Person or the selected
spouse, depending which parents box the focus is
in).</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Insert</keycap></para></entry>
<entry><para>Add a new set of parents from the database to
the list.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Shift</keycap>+<keycap>Insert</keycap></para></entry>
<entry><para>Add a new set of parents to the database and
to the list.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Delete</keycap></para></entry>
<entry><para>Delete the selected parents from the list.
The parents are not deleted from the
database.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Ctrl</keycap>+<keycap>Right</keycap>
or
<keycap>Ctrl</keycap>+<keycap>Down</keycap></para></entry>
<entry><para>Make the selected parents the active family.
Use <keycap>Ctrl</keycap>+<keycap>Right</keycap> in
standard Family View and
<keycap>Ctrl</keycap>+<keycap>Down</keycap> in alternative
Family View.</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
</listitem>
</varlistentry>
<varlistentry>
<term>Focus on the Children box</term>
<listitem>
<informaltable frame="topbot">
<tgroup cols="2">
<colspec colname="col1" />
<colspec colname="col2" />
<thead>
<row valign="top">
<entry colname="col1" colsep="0"
valign="top"><para>Key</para></entry>
<entry colname="col2"
valign="top"><para>Function</para></entry>
</row>
</thead>
<tbody>
<row valign="top">
<entry><para><keycap>Enter</keycap></para></entry>
<entry><para>Edit relationship between the child and
his/her parents (the Active Person and the selected
spouse).</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Shift</keycap>+<keycap>Enter</keycap></para></entry>
<entry><para>Edit the personal information for the
selected child.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Insert</keycap></para></entry>
<entry><para>Add a new person from the database to the
children list.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Shift</keycap>+<keycap>Insert</keycap></para></entry>
<entry><para>Add a new person to the database and to the
children list.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Delete</keycap></para></entry>
<entry><para>Delete the selected child from the list. The
child is not deleted from the database.</para></entry>
</row>
<row valign="top">
<entry><para><keycap>Ctrl</keycap>+<keycap>Left</keycap>
or
<keycap>Ctrl</keycap>+<keycap>Up</keycap></para></entry>
<entry><para>Make the selected child the Active Person.
Use <keycap>Ctrl</keycap>+<keycap>Left</keycap> in
standard Family View and
<keycap>Ctrl</keycap>+<keycap>Up</keycap> in alternative
Family View.</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
</listitem>
</varlistentry>
</variablelist>
</sect1> </sect1>
</appendix> </appendix>

View File

@ -1,3 +1,7 @@
2006-12-30 Don Allingham <don@gramps-project.org>
* C/gramps.xml: start the rework of the key binding sections
2006-12-21 Lubo Vasko <pgval@inMail.sk> 2006-12-21 Lubo Vasko <pgval@inMail.sk>
* sk/sk.po: Translation update. * sk/sk.po: Translation update.
* sk/figures/reorder.png: Add figure. * sk/figures/reorder.png: Add figure.

View File

@ -146,6 +146,7 @@ uidefault = '''<ui>
<menu action="HelpMenu"> <menu action="HelpMenu">
<menuitem action="UserManual"/> <menuitem action="UserManual"/>
<menuitem action="FAQ"/> <menuitem action="FAQ"/>
<menuitem action="KeyBindings"/>
<menuitem action="TipOfDay"/> <menuitem action="TipOfDay"/>
<menuitem action="PluginStatus"/> <menuitem action="PluginStatus"/>
<separator/> <separator/>
@ -338,6 +339,7 @@ class ViewManager:
('PluginStatus', None,_('_Plugin status'), None, None, ('PluginStatus', None,_('_Plugin status'), None, None,
self.plugin_status), self.plugin_status),
('FAQ', None, _('_FAQ'), None, None, self.faq_activate), ('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, ('UserManual', gtk.STOCK_HELP, _('_User Manual'), 'F1', None,
self.manual_activate), self.manual_activate),
('TipOfDay', None, _('Tip of the day'), None, None, ('TipOfDay', None, _('Tip of the day'), None, None,
@ -617,6 +619,14 @@ class ViewManager:
except gobject.GError, msg: except gobject.GError, msg:
QuestionDialog.ErrorDialog(_("Could not open help"), str(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): def tip_of_day_activate(self, obj):
"""Display Tip of the day""" """Display Tip of the day"""
TipOfDay.TipOfDay(self.uistate) TipOfDay.TipOfDay(self.uistate)