From 2e1d56c9412a1db13c153c752be2b5d4288b6573 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 14 Oct 2004 01:55:50 +0000 Subject: [PATCH] * src/rule.glade: Clean up the filter definition dialog. svn: r3629 --- gramps2/ChangeLog | 1 + gramps2/src/rule.glade | 790 ++++++++++++++--------------------------- 2 files changed, 264 insertions(+), 527 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 43a3faa6c..2d23e2e5b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,5 +1,6 @@ 2004-10-13 Alex Roitman * src/plugins/Makefile.am: Ship rel_es.py plugin. + * src/rule.glade: Clean up the filter definition dialog. 2004-10-13 Julio Sanchez * src/plugins/rel_es.py: Add to CVS. diff --git a/gramps2/src/rule.glade b/gramps2/src/rule.glade index 40c943bfc..1fb07eee7 100644 --- a/gramps2/src/rule.glade +++ b/gramps2/src/rule.glade @@ -10,8 +10,6 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - 600 - 500 True False gramps.png @@ -102,12 +100,139 @@ 12 True - 10 - 3 + 11 + 4 False 6 12 + + + True + False + 6 + + + + True + Add another rule to the filter + True + True + _Add... + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + False + Edit the selected rule + True + True + _Edit... + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + False + Delete the selected rule + True + True + _Delete + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + + + + 3 + 4 + 4 + 5 + shrink + fill + + + + + + True + <b>Rule options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 5 + 6 + fill + + + + + + + True + <b>Rule list</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 3 + 4 + fill + + + + True @@ -124,7 +249,7 @@ 0 - 3 + 4 0 1 fill @@ -132,176 +257,13 @@ - - - True - <b>Rule List</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 8 - 9 - fill - - - - - - - True - False - 6 - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - True - _Add... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - False - True - True - _Edit... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - False - True - True - _Delete - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - - - - 0 - False - True - - - - - 1 - 3 - 9 - 10 - fill - - - - - - True - _Name: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - filter_name - - - 1 - 2 - 1 - 2 - fill - - - - True - _Comment: + Co_mment: True False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0 @@ -320,6 +282,126 @@ + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 1 + 3 + 4 + 5 + + + + + + True + True + All _rules must apply + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 1 + 3 + 6 + 7 + fill + + + + + + + True + True + At lea_st one rule must apply + True + GTK_RELIEF_NORMAL + True + False + False + True + logical_and + + + 1 + 3 + 7 + 8 + fill + + + + + + + True + True + E_xactly one rule must apply + True + GTK_RELIEF_NORMAL + True + False + False + True + logical_and + + + 1 + 3 + 8 + 9 + fill + + + + + + + True + _Name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + filter_name + + + 1 + 2 + 1 + 2 + shrink|fill + + + + True @@ -338,6 +420,7 @@ 3 1 2 + expand|shrink|fill @@ -363,103 +446,11 @@ - - - True - True - All _rules must apply - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - True - At least _one rule must apply - True - GTK_RELIEF_NORMAL - True - False - False - True - logical_and - - - 2 - 3 - 4 - 5 - fill - - - - - - - True - True - E_xactly one rule must apply - True - GTK_RELIEF_NORMAL - True - False - False - True - logical_and - - - 2 - 3 - 5 - 6 - fill - - - - - - - True - Rule operations: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 3 - 4 - fill - - - - True True - _Return values that do not match the filter rules (invert) + Return values that do no_t match the filter rules True GTK_RELIEF_NORMAL True @@ -470,258 +461,17 @@ 1 3 - 6 - 7 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 400 - 300 - True - False - gramps.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_CENTER - False - - - - True - False - 8 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - 0 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 5 - False - False - - - - - - 12 - True - 4 - 3 - False - 6 - 8 - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 1 - 2 + 10 + 11 fill - + True - True - False - False - True - False - - - - True - True - False - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - True - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - - - - - - - 2 - 3 - 1 - 2 - - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - - - - - True - <b>Values</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - 3 - 3 - 4 - fill - - - - - - True - <b>Rule</b> + <b>Filter inversion</b> False True GTK_JUSTIFY_LEFT @@ -729,14 +479,14 @@ False 0 0.5 - 4 + 0 0 0 - 3 - 0 - 1 + 4 + 9 + 10 fill @@ -919,6 +669,7 @@ True + Test the selected filter True _Test... True @@ -970,19 +721,6 @@ True - - - - True - GTK_BUTTONBOX_SPREAD - 30 - - - 0 - False - True - - 0 @@ -1111,8 +849,6 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - 640 - 500 True False True