From 2038fb4997715ffb85e212aba233fd3b4598e72c Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 25 Aug 2003 18:33:52 +0000 Subject: [PATCH] * src/gramps.glade: Add Alternative Family View tab. svn: r2043 --- ChangeLog | 1 + src/PlaceView.py | 4 +- src/gramps.glade | 738 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 741 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f3a8c709..60993fb21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 2003-08-25 Alex Roitman + * src/gramps.glade: Add Alternative Family View tab. * src/PedView.py (PedigreeView.__init__): Add parent argument to the constructor. Connect to the handling function on button press over the canvas to enable context menu; diff --git a/src/PlaceView.py b/src/PlaceView.py index a6d55ee4a..e9dbfc84e 100644 --- a/src/PlaceView.py +++ b/src/PlaceView.py @@ -147,7 +147,9 @@ class PlaceView: if len(mlist) != 2: msg = _("Cannot merge places.") - msg2 = _("Exactly two places must be selected to perform a merge.") + msg2 = _("Exactly two places must be selected to perform a merge. " + "A second place can be selected by holding down the " + "control key while clicking on a the desired place.") ErrorDialog(msg,msg2) else: import MergeData diff --git a/src/gramps.glade b/src/gramps.glade index fe2e843da..96e987c6c 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -727,7 +727,7 @@ True GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH_HORIZ + GTK_TOOLBAR_BOTH True @@ -2820,6 +2820,742 @@ tab + + + + 6 + True + 8 + 6 + False + 6 + 12 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + Double-click to edit the relationship information, Shift-click to edit the person + True + False + True + False + False + + + + + 4 + 5 + 4 + 5 + fill + + + + + + True + <b>Children</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 6 + 6 + 7 + fill + + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + 5 + True + True + True + True + False + False + + + + + 1 + 5 + 7 + 8 + fill + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + Double-click to edit the relationship to the selected parents + True + False + True + False + False + + + + + 4 + 5 + 1 + 2 + fill + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + Double-click to edit the relationship to the selected parents + True + False + True + False + False + + + + + 1 + 2 + 1 + 2 + fill + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + Double-click to edit the active person + True + False + True + False + False + + + + + 1 + 2 + 4 + 5 + fill + + + + + + True + False + 6 + + + + True + Make the selected child the active person + True + GTK_RELIEF_NORMAL + + + + True + gtk-go-up + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Adds a new child to the database and to the current family + True + GTK_RELIEF_NORMAL + + + + True + gtk-new + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Selects an existing person from the database and adds as a child to the current family + True + GTK_RELIEF_NORMAL + + + + True + gtk-index + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Deletes the selected child from the selected family + True + GTK_RELIEF_NORMAL + + + + True + gtk-remove + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 5 + 6 + 7 + 8 + fill + fill + + + + + + True + <b>Spouse's parents</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 6 + 0 + 1 + fill + + + + + + + True + False + 6 + + + + True + Make the selected spouse's family the active family + True + GTK_RELIEF_NORMAL + + + + True + gtk-go-down + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Adds a new set of parents to the selected spouse + True + GTK_RELIEF_NORMAL + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Deletes the selected parents from the selected spouse + True + GTK_RELIEF_NORMAL + + + + True + gtk-remove + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 5 + 6 + 1 + 2 + fill + fill + + + + + + True + <b>Relationship</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 6 + 3 + 4 + fill + + + + + + + True + True + 6 + + + + True + Adds a new person to the database and to a new relationship + True + GTK_RELIEF_NORMAL + + + + True + gtk-new + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Selects an existing person from the database and adds to a new relationship + True + GTK_RELIEF_NORMAL + + + + True + gtk-index + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Removes the currently selected spouse + True + GTK_RELIEF_NORMAL + + + + True + gtk-remove + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 5 + 6 + 4 + 5 + fill + fill + + + + + + True + <b>Active person</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 3 + 3 + 4 + fill + + + + + + + True + <b>Active person's parents</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 3 + 0 + 1 + fill + + + + + + + True + False + 6 + + + + True + Make the active person's family the active family + True + GTK_RELIEF_NORMAL + + + + True + gtk-go-down + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Adds a new set of parents to the active person + True + GTK_RELIEF_NORMAL + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Deletes the selected parents from the active person + True + GTK_RELIEF_NORMAL + + + + True + gtk-remove + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 2 + 3 + 1 + 2 + fill + fill + + + + + + True + Exchange the current spouse with the active person + True + GTK_RELIEF_NORMAL + + + + True + gtk-go-back + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 2 + 3 + 4 + 5 + fill + + + + + + False + True + + + + + + True + <b>Family</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + 0