From cd028353b327113183906eb4b788a994e59dbda4 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Tue, 30 Sep 2003 04:19:35 +0000 Subject: [PATCH] * src/Plugins.py: Fix label for the tools dialog. * src/gramps.glade: Add accelerators to filter controls. * src/places.glade: Fix accelerator in Edit Plase dialog. * src/gramps_main.py: Typo. * src/PlaceView.py: Likewise. * src/GenericFilter.py: Likewise. * src/gramps_main.py: fixed delete person problem. svn: r2187 --- gramps2/ChangeLog | 12 +++++++++--- gramps2/TODO | 1 + gramps2/src/GenericFilter.py | 2 +- gramps2/src/PlaceView.py | 2 +- gramps2/src/Plugins.py | 7 +++++-- gramps2/src/gramps.glade | 10 ++++++---- gramps2/src/gramps_main.py | 2 +- gramps2/src/places.glade | 2 +- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 31de46de3..5e26eea29 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,9 +1,15 @@ -2003-09-29 Don Allingham - * src/gramps_main.py: fixed delete person problem. - 2003-09-29 Alex Roitman * TODO: Update the list with the postponed todo items. * configure.in: Increment release number. + * src/Plugins.py: Fix label for the tools dialog. + * src/gramps.glade: Add accelerators to filter controls. + * src/places.glade: Fix accelerator in Edit Plase dialog. + * src/gramps_main.py: Typo. + * src/PlaceView.py: Likewise. + * src/GenericFilter.py: Likewise. + +2003-09-29 Don Allingham + * src/gramps_main.py: fixed delete person problem. 2003-09-28 Don Allingham * Version 0.9.4: the "This used to bug me..." release. diff --git a/gramps2/TODO b/gramps2/TODO index f6eaab0a7..8c3e455e5 100644 --- a/gramps2/TODO +++ b/gramps2/TODO @@ -29,4 +29,5 @@ * Replace ListModel with the TreeModel * Work out BookReport dialog so that resize is not necessary * Work out name capitalization options +* Make Date parsing locale dependent, like relationship calculator * And a whole lot more.... diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index a2700cf65..4907a8544 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -519,7 +519,7 @@ class IsAncestorOfFilterMatch(IsAncestorOf): def description(self): return _("Matches people that are ancestors " - "of of someone matched by a filter") + "of someone matched by a filter") def category(self): return _("Ancestral filters") diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index e9dbfc84e..70c538b35 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/src/PlaceView.py @@ -149,7 +149,7 @@ class PlaceView: msg = _("Cannot merge places.") 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.") + "control key while clicking on the desired place.") ErrorDialog(msg,msg2) else: import MergeData diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 96cab0104..c3045b90a 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -116,7 +116,7 @@ class PluginDialog: """Displays the dialog box that allows the user to select the report that is desired.""" - def __init__(self,db,active,list,msg): + def __init__(self,db,active,list,msg,label=None): """Display the dialog box, and build up the list of available reports. This is used to build the selection tree on the left hand side of the dailog box.""" @@ -148,6 +148,8 @@ class PluginDialog: self.img = self.dialog.get_widget("image") self.description = self.dialog.get_widget("description") + if label: + self.description.set_text(label) self.status = self.dialog.get_widget("report_status") Utils.set_title_label(self.dialog,msg) @@ -275,7 +277,8 @@ class ToolPlugins(PluginDialog): reports. This is used to build the selection tree on the left hand side of the dailog box.""" - PluginDialog.__init__(self,db,active,_tools,_("Tool Selection")) + PluginDialog.__init__(self,db,active,_tools,_("Tool Selection"), + _("Select a tool from those available on the left.")) self.update = update #------------------------------------------------------------------------- diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index f2d4302b0..737816abe 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -1199,8 +1199,8 @@ True - Filter: - False + Fi_lter: + True False GTK_JUSTIFY_CENTER False @@ -1209,6 +1209,7 @@ 0.5 5 0 + filter_list 4 @@ -1253,7 +1254,7 @@ Qualifier: - False + True False GTK_JUSTIFY_CENTER False @@ -1262,6 +1263,7 @@ 0.5 5 0 + filter 3 @@ -1307,7 +1309,7 @@ True Show people that do not match the filtering rule True - Invert + _Invert True GTK_RELIEF_NORMAL False diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index c64922562..4ef15e1bf 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -736,7 +736,7 @@ class Gramps: msg = _("Cannot merge people.") msg2 = _("Exactly two people must be selected to perform a merge. " "A second person can be selected by holding down the " - "control key while clicking on a the desired person.") + "control key while clicking on the desired person.") ErrorDialog(msg,msg2) else: import MergeData diff --git a/gramps2/src/places.glade b/gramps2/src/places.glade index 9560ac5cc..c511b29f1 100644 --- a/gramps2/src/places.glade +++ b/gramps2/src/places.glade @@ -143,7 +143,7 @@ True - _City: + C_ity: True False GTK_JUSTIFY_CENTER