[meld] Update tooltips for VC actions to be more useful (bgo#698517)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update tooltips for VC actions to be more useful (bgo#698517)
- Date: Tue, 23 Apr 2013 21:59:52 +0000 (UTC)
commit b3d97510461a1adeafceb93856701d66fcf87b5d
Author: Kai Willadsen <kai willadsen gmail com>
Date: Wed Apr 24 07:53:50 2013 +1000
Update tooltips for VC actions to be more useful (bgo#698517)
meld/vcview.py | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index f60439b..0e1caea 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -158,25 +158,52 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
def __init__(self, prefs):
melddoc.MeldDoc.__init__(self, prefs)
- gnomeglade.Component.__init__(self, paths.ui_dir("vcview.ui"), "vcview")
+ gnomeglade.Component.__init__(self, paths.ui_dir("vcview.ui"),
+ "vcview")
actions = (
- ("VcCompare", gtk.STOCK_DIALOG_INFO, _("_Compare"), None, _("Compare selected"),
self.on_button_diff_clicked),
- ("VcCommit", "vc-commit-24", _("Co_mmit..."), None, _("Commit"),
self.on_button_commit_clicked),
- ("VcUpdate", "vc-update-24", _("_Update"), None, _("Update"),
self.on_button_update_clicked),
- ("VcAdd", "vc-add-24", _("_Add"), None, _("Add to VC"),
self.on_button_add_clicked),
- ("VcRemove", "vc-remove-24", _("_Remove"), None, _("Remove from VC"),
self.on_button_remove_clicked),
- ("VcResolved", "vc-resolve-24", _("_Resolved"), None, _("Mark as resolved
for VC"), self.on_button_resolved_clicked),
- ("VcRevert", gtk.STOCK_REVERT_TO_SAVED, None, None, _("Revert to
original"), self.on_button_revert_clicked),
- ("VcDeleteLocally", gtk.STOCK_DELETE, None, None, _("Delete locally"),
self.on_button_delete_clicked),
+ ("VcCompare", gtk.STOCK_DIALOG_INFO, _("_Compare"), None,
+ _("Compare selected files"),
+ self.on_button_diff_clicked),
+ ("VcCommit", "vc-commit-24", _("Co_mmit..."), None,
+ _("Commit changes to version control"),
+ self.on_button_commit_clicked),
+ ("VcUpdate", "vc-update-24", _("_Update"), None,
+ _("Update working copy from version control"),
+ self.on_button_update_clicked),
+ ("VcAdd", "vc-add-24", _("_Add"), None,
+ _("Add to version control"),
+ self.on_button_add_clicked),
+ ("VcRemove", "vc-remove-24", _("_Remove"), None,
+ _("Remove from version control"),
+ self.on_button_remove_clicked),
+ ("VcResolved", "vc-resolve-24", _("_Resolved"), None,
+ _("Mark as resolved in version control"),
+ self.on_button_resolved_clicked),
+ ("VcRevert", gtk.STOCK_REVERT_TO_SAVED, None, None,
+ _("Revert working copy to original state"),
+ self.on_button_revert_clicked),
+ ("VcDeleteLocally", gtk.STOCK_DELETE, None, None,
+ _("Delete from working copy"),
+ self.on_button_delete_clicked),
)
toggleactions = (
- ("VcFlatten", gtk.STOCK_GOTO_BOTTOM, _("_Flatten"), None, _("Flatten directories"),
self.on_button_flatten_toggled, False),
- ("VcShowModified","filter-modified-24", _("_Modified"), None, _("Show modified"),
self.on_filter_state_toggled, False),
- ("VcShowNormal", "filter-normal-24", _("_Normal"), None, _("Show normal"),
self.on_filter_state_toggled, False),
- ("VcShowNonVC", "filter-nonvc-24", _("Non _VC"), None, _("Show unversioned files"),
self.on_filter_state_toggled, False),
- ("VcShowIgnored", "filter-ignored-24", _("Ignored"), None, _("Show ignored files"),
self.on_filter_state_toggled, False),
+ ("VcFlatten", gtk.STOCK_GOTO_BOTTOM, _("_Flatten"), None,
+ _("Flatten directories"),
+ self.on_button_flatten_toggled, False),
+ ("VcShowModified", "filter-modified-24", _("_Modified"), None,
+ _("Show modified"),
+ self.on_filter_state_toggled, False),
+ ("VcShowNormal", "filter-normal-24", _("_Normal"), None,
+ _("Show normal"),
+ self.on_filter_state_toggled, False),
+ ("VcShowNonVC", "filter-nonvc-24", _("Un_versioned"), None,
+ _("Show unversioned files"),
+ self.on_filter_state_toggled, False),
+ ("VcShowIgnored", "filter-ignored-24", _("Ignored"), None,
+ _("Show ignored files"),
+ self.on_filter_state_toggled, False),
)
self.ui_file = paths.ui_dir("vcview-ui.xml")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]