From ff9b6287b507d69ac24d775abecd84f5681c608c Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 1 Dec 2003 04:22:15 +0000 Subject: [PATCH] * NEWS: Update. * src/FamilyView.py (on_child_list_button_press): Add edit person callback on Shift+click; (sp_key_press, child_key_press): Replace Ctrl+Insert with Shift+Insert for adding new people. * src/PedView.py (on_show_child_menu): Markup children with children. * doc/gramps-manual/C/keybind.xml: Update. * doc/gramps-manual/C/faq.xml: Update. * doc/gramps-manual/C/filtref.xml: Update. svn: r2412 --- gramps2/ChangeLog | 10 + gramps2/NEWS | 5 +- gramps2/doc/gramps-manual/C/faq.xml | 59 ++++-- gramps2/doc/gramps-manual/C/filtref.xml | 29 +++ gramps2/doc/gramps-manual/C/keybind.xml | 252 ++++++++++++++++++++---- gramps2/src/FamilyView.py | 8 +- gramps2/src/PedView.py | 4 +- 7 files changed, 310 insertions(+), 57 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index f50f34dbc..e6964f516 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,13 @@ +2003-11-30 Alex Roitman + * NEWS: Update. + * src/FamilyView.py (on_child_list_button_press): Add edit person + callback on Shift+click; (sp_key_press, child_key_press): Replace + Ctrl+Insert with Shift+Insert for adding new people. + * src/PedView.py (on_show_child_menu): Markup children with children. + * doc/gramps-manual/C/keybind.xml: Update. + * doc/gramps-manual/C/faq.xml: Update. + * doc/gramps-manual/C/filtref.xml: Update. + 2003-11-29 Don Allingham * src/PedView.py (PedigreeView.find_children): used italics instead of '*' to indicate children in popup menu diff --git a/gramps2/NEWS b/gramps2/NEWS index 436f7681f..2bc69b508 100644 --- a/gramps2/NEWS +++ b/gramps2/NEWS @@ -1,4 +1,4 @@ -Version 0.98.0 +Version 0.98.0 -- the "Round me off" release * More compliance with GNOME HIG. * New BookReport dialog layout. * Person View uses a tree format instead of list format. @@ -19,6 +19,9 @@ Version 0.98.0 appear in post-1.0 releases. * Tab labels in tabbed dialogs reflect the presence of data (bold). * Help button available in most dialogs. +* Keyboard navigation and functionality in Family View. +* In Pedigree View, children are marked up differently in popup menus + depending on whether they have children. * Bugfixes. Version 0.9.5 -- the "Fix me up" release diff --git a/gramps2/doc/gramps-manual/C/faq.xml b/gramps2/doc/gramps-manual/C/faq.xml index 793967fa8..af1e6a6d8 100644 --- a/gramps2/doc/gramps-manual/C/faq.xml +++ b/gramps2/doc/gramps-manual/C/faq.xml @@ -1,12 +1,15 @@ + + Frequently Asked Questions This appendix contains the list of questions that frequently come up in mailing list discussions and forums. This list is by no means complete. If you would like to add questions/answers to this list, - please email your suggestions to gramps-devel@lists.sf.net + please email your suggestions to gramps-devel@lists.sf.net @@ -183,7 +186,8 @@ This will be addressed in the next stable release following version 1.0. Temporarily, adding more memory could make a huge difference, but we realize that this is a poor way of treating the problem. If you would like to help with the implementation of the real database backend, please don't hesitate -to email us at gramps-devel@lists.sf.net +to email us at gramps-devel@lists.sf.net @@ -226,23 +230,46 @@ ability to add/remove/edit sortable columns. What do I do? The best thing you can do is to fix the bug and send the patch to -gramps-devel@lists.sf.net :-) +gramps-devel@lists.sf.net :-) The next best thing would be to submit a good bug report. This can be done in -one of the two ways: (1) send your report to gramps-bugs@lists.sf.net +one of the two ways: (1) send your report to +gramps-bugs@lists.sf.net or (2) file your report with the bug tracker system at -http://sf.net/tracker/?group_id=25770&atid=385137 (this function is also -available by selecting "Help->Report a bug" from gramps main menu). + +http://sf.net/tracker/?group_id=25770&atid=385137 +(this function is also available by selecting +HelpReport a +bug from gramps main menu). A good bug report would include: - (1) Version of gramps you were using when you encountered the bug - (available through Help->About menu item) - (2) Language under which gramps was run - (available by executing "echo $LANG" in your terminal) - (3) Symptoms indicating that this is indeed a bug - (4) Any Traceback messages, error messages, warnings, etc, that showed up - in your terminal or a in separate traceback window + + + + +1. Version of gramps you were using when you encountered the bug +(available through Help +About menu item). + + + +2. Language under which gramps was run +(available by executing echo $LANG in your terminal). + + + +3. Symptoms indicating that this is indeed a bug. + + + +4. Any Traceback messages, error messages, warnings, etc, +that showed up in your terminal or a in separate traceback window. + + + Most problems can be fixed quickly provided there is enough information. To ensure this, please follow up on your bug reports. In particular, if you @@ -252,8 +279,10 @@ of contacting you should we need more information. If you choose to file your report anonymously, at least check every so often whether your report page has something new posted, as it probably would. -If the above explanations seem vague, please follow this link -http://www.chiark.greenend.org.uk/~sgtatham/bugs.html +If the above explanations seem vague, please follow + +this link. + diff --git a/gramps2/doc/gramps-manual/C/filtref.xml b/gramps2/doc/gramps-manual/C/filtref.xml index 0caca2032..0581d9d6b 100644 --- a/gramps2/doc/gramps-manual/C/filtref.xml +++ b/gramps2/doc/gramps-manual/C/filtref.xml @@ -1,4 +1,7 @@ + + + Filter rules reference @@ -307,6 +310,32 @@ + + + Relationship filters + This category includes the following rules that match people + based on their mutual relationship: + + + Relationship path between two people + This rule matches all ancestors of both people + back to their common ancestors (if exist). This produces the + "relationship path" between these two people, through + their common ancestors. + + + You can either enter the ID of each person into the + appropriate text entry fields, or select people from the list by + clicking their Select... buttons. In the + latter case, the ID will appear in the text field after the + selection was made. + + + + + + + Miscellaneous filters diff --git a/gramps2/doc/gramps-manual/C/keybind.xml b/gramps2/doc/gramps-manual/C/keybind.xml index e67e4d0ec..cc75d724a 100644 --- a/gramps2/doc/gramps-manual/C/keybind.xml +++ b/gramps2/doc/gramps-manual/C/keybind.xml @@ -1,5 +1,7 @@ + + Keybindings reference @@ -12,16 +14,25 @@ People View The following bindings are available in the People View: - - - ENTER - Invoke Edit Person dialog - with the selected person. - - - - - + + + + + + + Key + Function + + + + + Enter + Invoke Edit Person dialog + with the selected person. + + + + @@ -29,44 +40,211 @@ Family View - The following bindings are available in the 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. - ENTER - When focus is on the active person, invoke - Edit Person dialog with the active person. - When focus is in the Spouse box, edit the - relationship between the active person and the selected spouse. - When focus is in the parents' box, edit relationship between the - selected parents and the active person/selected spouse. When focus - is in the children box, edit relationship between the selected - child and his/her parents (active person and selected spouse). - - In all cases, pressing ENTER somewhere is - equivalent to double-clicking on the appropriate selection. - - - + 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. + + + + - Shift+ENTER - When focus is on the Spouse - box, invoke Edit Person dialog with the - selected spouse. When focus is in the children box, - invoke Edit Person dialog with the the selected - child. - - In all cases, pressing Shift+ENTER - somewhere is equivalent to shift-clicking on the appropriate - selection. - + 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+Down in standard Family View and + Ctrl+Right 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. + + + + + + + + diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index 36bcc43bf..e6028e3b1 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -239,7 +239,7 @@ class FamilyView: elif event.keyval == gtk.gdk.keyval_from_name("Insert") and not event.state: self.select_spouse(obj) elif event.keyval == gtk.gdk.keyval_from_name("Insert") \ - and event.state == gtk.gdk.CONTROL_MASK: + and event.state == gtk.gdk.SHIFT_MASK: self.add_spouse(obj) def ap_par_key_press(self,obj,event): @@ -286,7 +286,7 @@ class FamilyView: elif event.keyval == gtk.gdk.keyval_from_name("Insert") and not event.state: self.select_child_clicked(obj) elif event.keyval == gtk.gdk.keyval_from_name("Insert") \ - and event.state == gtk.gdk.CONTROL_MASK: + and event.state == gtk.gdk.SHIFT_MASK: self.add_child_clicked(obj) def build_ap_menu(self,event): @@ -387,6 +387,10 @@ class FamilyView: id = self.child_model.get_value(iter,2) if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: self.child_rel_by_id(id) + elif event.state == gtk.gdk.SHIFT_MASK and \ + event.type == gtk.gdk.BUTTON_PRESS and \ + event.button == 1: + self.edit_child_callback(obj) elif event.type == gtk.gdk.BUTTON_PRESS and event.button == 3: self.build_child_menu(id,event) diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index 130ebe67e..40668adb5 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -314,12 +314,12 @@ class PedigreeView: cname = GrampsCfg.nameof(child) menuitem = gtk.MenuItem(None) if find_children(child): - label = gtk.Label('%s' % cname) + label = gtk.Label('%s' % cname) else: label = gtk.Label(cname) label.set_use_markup(gtk.TRUE) label.show() - label.set_justify(gtk.JUSTIFY_LEFT) + label.set_alignment(0,0) menuitem.add(label) myMenu.append(menuitem) menuitem.set_data(_PERSON,child)