From 2a5ae67165a998300bd45764356d7c2b71ceb5aa Mon Sep 17 00:00:00 2001 From: Michiel Nauta Date: Wed, 9 Mar 2011 16:07:34 +0000 Subject: [PATCH] Add tooltip to mergebutton svn: r16789 --- src/gui/views/listview.py | 5 +++-- src/plugins/lib/libpersonview.py | 13 +++++++------ src/plugins/lib/libplaceview.py | 1 + src/plugins/view/eventview.py | 1 + src/plugins/view/familyview.py | 1 + src/plugins/view/mediaview.py | 1 + src/plugins/view/noteview.py | 1 + src/plugins/view/repoview.py | 1 + src/plugins/view/sourceview.py | 1 + 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py index 92183b9fa..f5fcfb3d2 100644 --- a/src/gui/views/listview.py +++ b/src/gui/views/listview.py @@ -89,6 +89,7 @@ class ListView(NavigationView): ADD_MSG = "" EDIT_MSG = "" DEL_MSG = "" + MERGE_MSG = "" FILTER_TYPE = None # Set in inheriting class QR_CATEGORY = -1 @@ -193,8 +194,8 @@ class ListView(NavigationView): self.ADD_MSG, self.add), ('Remove', gtk.STOCK_REMOVE, _("_Remove"), "Delete", self.DEL_MSG, self.remove), - ('Merge', 'gramps-merge', _('_Merge...'), None, None, - self.merge), + ('Merge', 'gramps-merge', _('_Merge...'), None, + self.MERGE_MSG, self.merge), ('ExportTab', None, _('Export View...'), None, None, self.export), ]) diff --git a/src/plugins/lib/libpersonview.py b/src/plugins/lib/libpersonview.py index 5f64fae53..65942ae2e 100644 --- a/src/plugins/lib/libpersonview.py +++ b/src/plugins/lib/libpersonview.py @@ -111,7 +111,8 @@ class BasePersonView(ListView): ) ADD_MSG = _("Add a new person") EDIT_MSG = _("Edit the selected person") - DEL_MSG = _("Delete the selected person") + DEL_MSG = _("Remove the selected person") + MERGE_MSG = _("Merge the selected persons") FILTER_TYPE = "Person" QR_CATEGORY = CATEGORY_QR_PERSON @@ -350,7 +351,7 @@ class BasePersonView(ListView): ('FilterEdit', None, _('Person Filter Editor'), None, None, self.filter_editor), ('Edit', gtk.STOCK_EDIT, _("action|_Edit..."), - "Return", _("Edit the selected person"), self.edit), + "Return", self.EDIT_MSG, self.edit), ('QuickReport', None, _("Quick View"), None, None, None), ('WebConnect', None, _("Web Connection"), None, None, None), ('Dummy', None, ' ', None, None, self.dummy_report), @@ -360,11 +361,11 @@ class BasePersonView(ListView): self.edit_action.add_actions( [ ('Add', gtk.STOCK_ADD, _("_Add..."), "Insert", - _("Add a new person"), self.add), + self.ADD_MSG, self.add), ('Remove', gtk.STOCK_REMOVE, _("_Remove"), "Delete", - _("Remove the Selected Person"), self.remove), - ('Merge', 'gramps-merge', _('_Merge...'), None, None, - self.merge), + self.DEL_MSG, self.remove), + ('Merge', 'gramps-merge', _('_Merge...'), None, + self.MERGE_MSG, self.merge), ('ExportTab', None, _('Export View...'), None, None, self.export), ]) diff --git a/src/plugins/lib/libplaceview.py b/src/plugins/lib/libplaceview.py index e38a383f2..158a6de2b 100644 --- a/src/plugins/lib/libplaceview.py +++ b/src/plugins/lib/libplaceview.py @@ -117,6 +117,7 @@ class PlaceBaseView(ListView): ADD_MSG = _("Add a new place") EDIT_MSG = _("Edit the selected place") DEL_MSG = _("Delete the selected place") + MERGE_MSG = _("Merge the selected places") FILTER_TYPE = "Place" QR_CATEGORY = CATEGORY_QR_PLACE diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py index 350388088..81d301051 100644 --- a/src/plugins/view/eventview.py +++ b/src/plugins/view/eventview.py @@ -97,6 +97,7 @@ class EventView(ListView): ADD_MSG = _("Add a new event") EDIT_MSG = _("Edit the selected event") DEL_MSG = _("Delete the selected event") + MERGE_MSG = _("Merge the selected events") FILTER_TYPE = "Event" QR_CATEGORY = CATEGORY_QR_EVENT diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py index 45a60981a..e522b6cc7 100644 --- a/src/plugins/view/familyview.py +++ b/src/plugins/view/familyview.py @@ -95,6 +95,7 @@ class FamilyView(ListView): ADD_MSG = _("Add a new family") EDIT_MSG = _("Edit the selected family") DEL_MSG = _("Delete the selected family") + MERGE_MSG = _("Merge the selected families") FILTER_TYPE = "Family" QR_CATEGORY = CATEGORY_QR_FAMILY diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py index 00c068502..e51c4e70f 100644 --- a/src/plugins/view/mediaview.py +++ b/src/plugins/view/mediaview.py @@ -109,6 +109,7 @@ class MediaView(ListView): ADD_MSG = _("Add a new media object") EDIT_MSG = _("Edit the selected media object") DEL_MSG = _("Delete the selected media object") + MERGE_MSG = _("Merge the selected media objects") FILTER_TYPE = 'MediaObject' QR_CATEGORY = CATEGORY_QR_MEDIA diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py index 2030160bc..2e45b5ac6 100644 --- a/src/plugins/view/noteview.py +++ b/src/plugins/view/noteview.py @@ -89,6 +89,7 @@ class NoteView(ListView): ADD_MSG = _("Add a new note") EDIT_MSG = _("Edit the selected note") DEL_MSG = _("Delete the selected note") + MERGE_MSG = _("Merge the selected notes") FILTER_TYPE = "Note" QR_CATEGORY = CATEGORY_QR_NOTE diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py index dfa11aa9c..4851e9203 100644 --- a/src/plugins/view/repoview.py +++ b/src/plugins/view/repoview.py @@ -106,6 +106,7 @@ class RepositoryView(ListView): ADD_MSG = _("Add a new repository") EDIT_MSG = _("Edit the selected repository") DEL_MSG = _("Delete the selected repository") + MERGE_MSG = _("Merge the selected repositories") FILTER_TYPE = "Repository" QR_CATEGORY = CATEGORY_QR_REPOSITORY diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py index 2987aaef7..edc2e0d03 100644 --- a/src/plugins/view/sourceview.py +++ b/src/plugins/view/sourceview.py @@ -90,6 +90,7 @@ class SourceView(ListView): ADD_MSG = _("Add a new source") EDIT_MSG = _("Edit the selected source") DEL_MSG = _("Delete the selected source") + MERGE_MSG = _("Merge the selected sources") FILTER_TYPE = "Source" QR_CATEGORY = CATEGORY_QR_SOURCE