This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository thunar-plugins/thunar-vcs-plugin.
commit fb825f306eb5188769fa62156878370ac7758051
Author: Andre Miranda <andre...@xfce.org>
Date: Tue Jun 26 23:33:52 2018 -0300
Add tooltips to menu items
Also remove unused translatable strings.
---
thunar-vcs-plugin/tvp-git-action.c | 61 +++++++++++++++-----------------------
thunar-vcs-plugin/tvp-svn-action.c | 61 +++++++++++++++-----------------------
2 files changed, 48 insertions(+), 74 deletions(-)
diff --git a/thunar-vcs-plugin/tvp-git-action.c
b/thunar-vcs-plugin/tvp-git-action.c
index 1df627f..e70d4af 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -211,19 +211,6 @@ add_subaction(ThunarxMenuItem *item, ThunarxMenu *menu,
const gchar *name, const
static void
-add_subaction_u (ThunarxMenu *menu, const gchar *name, const gchar *text,
const gchar *tooltip, const gchar *icon, gchar *arg)
-{
- /* keep the current behavior, only show menu items if they are implemented
*/
- /*ThunarxMenuItem *subitem;
- subitem = thunarx_menu_item_new (name, text, tooltip, icon);
- thunarx_menu_append_item (menu, subitem);
- g_object_set_qdata (G_OBJECT (subitem), tvp_action_arg_quark, arg);
- g_signal_connect_after (subitem, "activate", G_CALLBACK
(tvp_action_unimplemented), arg);
- g_object_unref (subitem);*/
-}
-
-
-static void
tvp_git_action_create_menu_item (ThunarxMenuItem *item)
{
ThunarxMenu *menu;
@@ -232,36 +219,36 @@ tvp_git_action_create_menu_item (ThunarxMenuItem *item)
menu = thunarx_menu_new ();
thunarx_menu_item_set_menu (item, menu);
- add_subaction (item, menu, "tvp::git::add", C_("Menu", "Add"), _("Add"),
"list-add", "--add");
- add_subaction_u(menu, "tvp::git::bisect", C_("Menu", "Bisect"),
_("Bisect"), NULL, _("Bisect"));
+ add_subaction (item, menu, "tvp::git::add", _("Add"), _("Add file contents
to the index"), "list-add", "--add");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::bisect",
_("Bisect"), _("Bisect"), NULL, _("Bisect"));*/
if (tvp_action->property.is_file)
- add_subaction (item, menu, "tvp::git::blame", C_("Menu", "Blame"),
_("Blame"), "gtk-index", "--blame");
+ add_subaction (item, menu, "tvp::git::blame", _("Blame"), _("Show what
revision and author last modified each line of a file"), "gtk-index",
"--blame");
if (tvp_action->property.is_parent)
- add_subaction (item, menu, "tvp::git::branch", C_("Menu", "Branch"),
_("Branch"), NULL, "--branch");
- add_subaction_u(menu, "tvp::git::checkout", C_("Menu", "Checkout"),
_("Checkout"), "gtk-connect", _("Checkout"));
- add_subaction (item, menu, "tvp::git::clean", C_("Menu", "Clean"),
_("Clean"), "edit-clear", "--clean");
+ add_subaction (item, menu, "tvp::git::branch", _("Branch"), _("List,
create or switch branches"), "media-playlist-shuffle", "--branch");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::checkout",
_("Checkout"), _("Checkout"), "gtk-connect", _("Checkout"));*/
+ add_subaction (item, menu, "tvp::git::clean", _("Clean"), _("Remove
untracked files from the working tree"), "edit-clear", "--clean");
if (tvp_action->property.is_parent)
- add_subaction (item, menu, "tvp::git::clone", C_("Menu", "Clone"),
_("Clone"), "edit-copy", "--clone");
- add_subaction_u(menu, "tvp::git::commit", C_("Menu", "Commit"),
_("Commit"), "gtk-apply", _("Commit"));
- add_subaction_u(menu, "tvp::git::diff", C_("Menu", "Diff"), _("Diff"),
"edit-find-replace", _("Diff"));
- add_subaction_u(menu, "tvp::git::fetch", C_("Menu", "Fetch"), _("Fetch"),
NULL, _("Fetch"));
- add_subaction_u(menu, "tvp::git::grep", C_("Menu", "Grep"), _("Grep"),
NULL, _("Grep"));
- add_subaction_u(menu, "tvp::git::init", C_("Menu", "Init"), _("Init"),
NULL, _("Init"));
- add_subaction (item, menu, "tvp::git::log", C_("Menu", "Log"), _("Log"),
"gtk-index", "--log");
- add_subaction_u(menu, "tvp::git::merge", C_("Menu", "Merge"), _("Merge"),
NULL, _("Merge"));
+ add_subaction (item, menu, "tvp::git::clone", _("Clone"), _("Clone a
repository into a new directory"), "edit-copy", "--clone");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::commit",
_("Commit"), _("Commit"), "gtk-apply", _("Commit"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::diff", _("Diff"),
_("Diff"), "edit-find-replace", _("Diff"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::fetch", _("Fetch"),
_("Fetch"), NULL, _("Fetch"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::grep", _("Grep"),
_("Grep"), NULL, _("Grep"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::init", _("Init"),
_("Init"), NULL, _("Init"));*/
+ add_subaction (item, menu, "tvp::git::log", _("Log"), _("Show commit
logs"), "gtk-index", "--log");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::merge", _("Merge"),
_("Merge"), NULL, _("Merge"));*/
if (!tvp_action->property.is_parent)
- add_subaction (item, menu, "tvp::git::move", C_("Menu", "Move"),
_("Move"), "gtk-dnd-multiple", "--move");
- add_subaction_u(menu, "tvp::git::pull", C_("Menu", "Pull"), _("Pull"),
NULL, _("Pull"));
- add_subaction_u(menu, "tvp::git::push", C_("Menu", "Push"), _("Push"),
NULL, _("Push"));
- add_subaction_u(menu, "tvp::git::rebase", C_("Menu", "Rebase"),
_("Rebase"), NULL, _("Rebase"));
- add_subaction (item, menu, "tvp::git::reset", C_("Menu", "Reset"),
_("Reset"), "edit-undo", "--reset");
- add_subaction_u(menu, "tvp::git::remove", C_("Menu", "Remove"),
_("Remove"), "edit-delete", _("Remove"));
- add_subaction_u(menu, "tvp::git::show", C_("Menu", "Show"), _("Show"),
NULL, _("Show"));
+ add_subaction (item, menu, "tvp::git::move", _("Move"), _("Move or
rename a file, a directory, or a symlink"), "gtk-dnd-multiple", "--move");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::pull", _("Pull"),
_("Pull"), NULL, _("Pull"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::push", _("Push"),
_("Push"), NULL, _("Push"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::rebase",
_("Rebase"), _("Rebase"), NULL, _("Rebase"));*/
+ add_subaction (item, menu, "tvp::git::reset", _("Reset"), _("Reset current
HEAD to the specified state"), "edit-undo", "--reset");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::remove",
_("Remove"), _("Remove"), "edit-delete", _("Remove"));*/
+ /* unimplemented: add_subaction(item, menu, "tvp::git::show", _("Show"),
_("Show"), NULL, _("Show"));*/
if (tvp_action->property.is_parent)
- add_subaction (item, menu, "tvp::git::stash", C_("Menu", "Stash"),
_("Stash"), "document-save", "--stash");
+ add_subaction (item, menu, "tvp::git::stash", _("Stash"), _("Stash the
changes in a dirty working directory away"), "document-save", "--stash");
if (tvp_action->property.is_parent)
- add_subaction (item, menu, "tvp::git::status", C_("Menu", "Status"),
_("Status"), "dialog-information", "--status");
- add_subaction_u(menu, "tvp::git::tag", C_("Menu", "Tag"), _("Tag"), NULL,
_("Tag"));
+ add_subaction (item, menu, "tvp::git::status", _("Status"), _("Show
the working tree status"), "dialog-information", "--status");
+ /* unimplemented: add_subaction(item, menu, "tvp::git::tag", _("Tag"),
_("Tag"), NULL, _("Tag"));*/
}
diff --git a/thunar-vcs-plugin/tvp-svn-action.c
b/thunar-vcs-plugin/tvp-svn-action.c
index 88fb561..30d4ebd 100644
--- a/thunar-vcs-plugin/tvp-svn-action.c
+++ b/thunar-vcs-plugin/tvp-svn-action.c
@@ -246,19 +246,6 @@ add_subaction(ThunarxMenuItem *item, ThunarxMenu *menu,
const gchar *name, const
static void
-add_subaction_u (ThunarxMenu *menu, const gchar *name, const gchar *text,
const gchar *tooltip, const gchar *icon, gchar *arg)
-{
- /* keep the current behavior, only show menu items if they are implemented
*/
- /*ThunarxMenuItem *subitem;
- subitem = thunarx_menu_item_new (name, text, tooltip, icon);
- thunarx_menu_append_item (menu, subitem);
- g_object_set_qdata (G_OBJECT (subitem), tvp_action_arg_quark, arg);
- g_signal_connect_after (subitem, "activate", G_CALLBACK
(tvp_action_unimplemented), arg);
- g_object_unref (subitem);*/
-}
-
-
-static void
tvp_svn_action_create_menu_item (ThunarxMenuItem *item)
{
ThunarxMenu *menu;
@@ -270,12 +257,12 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item)
/* No version control or version control (parent) */
if (tvp_action->property.parent_version_control &&
(tvp_action->property.is_parent ||
tvp_action->property.directory_no_version_control ||
tvp_action->property.file_no_version_control))
{
- add_subaction (item, menu, "tvp::add", C_("Menu", "Add"), _("Add"),
"list-add", "--add");
+ add_subaction (item, menu, "tvp::add", _("Add"), _("Add files,
directories, or symbolic links"), "list-add", "--add");
}
/* Version control (file) */
if (tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::blame", C_("Menu", "Blame"), _("Blame"),
"gtk-index", "--blame");
+ add_subaction (item, menu, "tvp::blame", _("Blame"), _("Show what revision
and author last modified each line of a file"), "gtk-index", "--blame");
}
/* No need
subitem = gtk_menu_item_new_with_label (_("Cat"));
@@ -287,52 +274,52 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item)
*//* Version control (file) */
if (tvp_action->property.file_version_control)
{
- add_subaction_u (menu, "tvp::changelist", C_("Menu", "Changelist"),
_("Changelist"), "gtk-index", _("Changelist"));
+ /* unimplemented: add_subaction_u (menu, "tvp::changelist",
_("Changelist"), _("Changelist"), "gtk-index", _("Changelist")); */
}
/* No version control (parent) */
if (tvp_action->property.is_parent &&
!tvp_action->property.parent_version_control)
{
- add_subaction (item, menu, "tvp::checkout", C_("Menu", "Checkout"),
_("Checkout"), "gtk-connect", "--checkout");
+ add_subaction (item, menu, "tvp::checkout", _("Checkout"), _("Check out a
working copy from a repository"), "gtk-connect", "--checkout");
}
/* Version control (parent) */
if (tvp_action->property.is_parent &&
tvp_action->property.parent_version_control)
{
- add_subaction (item, menu, "tvp::cleanup", C_("Menu", "Cleanup"),
_("Cleanup"), "edit-clear", "--cleanup");
+ add_subaction (item, menu, "tvp::cleanup", _("Cleanup"), _("Recursively
clean up the working copy"), "edit-clear", "--cleanup");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::commit", C_("Menu", "Commit"),
_("Commit"), "gtk-apply", "--commit");
+ add_subaction (item, menu, "tvp::commit", _("Commit"), _("Send changes
from your working copy to the repository"), "gtk-apply", "--commit");
}
/* Version control (no parent) */
if (!tvp_action->property.is_parent &&
tvp_action->property.parent_version_control &&
(tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control))
{
- add_subaction (item, menu, "tvp::copy", C_("Menu", "Copy"), _("Copy"),
"edit-copy", "--copy");
+ add_subaction (item, menu, "tvp::copy", _("Copy"), _("Copy a file or
directory in a working copy or in the repository"), "edit-copy", "--copy");
}
/* Version control (no parent) */
if (!tvp_action->property.is_parent &&
tvp_action->property.parent_version_control &&
(tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control))
{
- add_subaction (item, menu, "tvp::delete", C_("Menu", "Delete"),
_("Delete"), "edit-delete", "--delete");
+ add_subaction (item, menu, "tvp::delete", _("Delete"), _("Delete an item
from a working copy or the repository"), "edit-delete", "--delete");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::diff", C_("Menu", "Diff"), _("Diff"),
"gtk-convert", "--diff");
+ add_subaction (item, menu, "tvp::diff", _("Diff"), _("Display the
differences between two revisions or paths"), "gtk-convert", "--diff");
}
/* Version control and No version control (parent) */
if (tvp_action->property.is_parent ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::export", C_("Menu", "Export"),
_("Export"), "document-save", "--export");
+ add_subaction (item, menu, "tvp::export", _("Export"), _("Export a clean
directory tree"), "document-save", "--export");
}
/* No version control (all) */
if (!tvp_action->property.parent_version_control &&
(tvp_action->property.is_parent ||
tvp_action->property.directory_no_version_control ||
tvp_action->property.file_no_version_control))
{
- add_subaction (item, menu, "tvp::import", C_("Menu", "Import"),
_("Import"), "network-workgroup", "--import");
+ add_subaction (item, menu, "tvp::import", _("Import"), _("Commit an
unversioned file or tree into the repository"), "network-workgroup",
"--import");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction_u (menu, "tvp::info", C_("Menu", "Info"), _("Info"),
"dialog-information", _("Info"));
+ /* unimplemented: add_subaction_u (menu, "tvp::info", _("Info"),
_("Info"), "dialog-information", _("Info")); */
}
/* Ehmm...
subitem = gtk_menu_item_new_with_label (_("List"));
@@ -342,12 +329,12 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item)
*//* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::lock", C_("Menu", "Lock"), _("Lock"),
"dialog-password", "--lock");
+ add_subaction (item, menu, "tvp::lock", _("Lock"), _("Lock working copy
paths in the repository so that no other user can commit changes to them"),
"dialog-password", "--lock");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::log", C_("Menu", "Log"), _("Log"),
"gtk-index", "--log");
+ add_subaction (item, menu, "tvp::log", _("Log"), _("Show commit logs"),
"gtk-index", "--log");
}
/* Ehmm ...
subitem = gtk_menu_item_new_with_label (_("Merge"));
@@ -362,7 +349,7 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item)
*//* Version control (no parent) */
if (!tvp_action->property.is_parent &&
tvp_action->property.parent_version_control &&
(tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control))
{
- add_subaction (item, menu, "tvp::move", C_("Menu", "Move"), _("Move"),
"gtk-dnd-multiple", "--move");
+ add_subaction (item, menu, "tvp::move", _("Move"), _("Move a file or
directory"), "gtk-dnd-multiple", "--move");
}
/* Merged
subitem = gtk_menu_item_new_with_label (_("Delete Properties"));
@@ -373,48 +360,48 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item)
*//* Version control */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::properties", C_("Menu", "Edit
Properties"), _("Edit Properties"), "gtk-edit", "--properties");
+ add_subaction (item, menu, "tvp::properties", _("Edit Properties"),
_("Edit the property of one or more items"), "gtk-edit", "--properties");
}
/* Version control (parent) */
if (tvp_action->property.is_parent &&
tvp_action->property.parent_version_control)
{
- add_subaction (item, menu, "tvp::relocate", C_("Menu", "Relocate"),
_("Relocate"), "edit-find-replace", "--relocate");
+ add_subaction (item, menu, "tvp::relocate", _("Relocate"), _("Relocate the
working copy to point to a different repository root URL"),
"edit-find-replace", "--relocate");
}
/* Changed
subitem = gtk_menu_item_new_with_label (_("Mark Resolved"));
*/if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::resolved", C_("Menu", "Resolved"),
_("Resolved"), "gtk-yes", "--resolved");
+ add_subaction (item, menu, "tvp::resolved", _("Resolved"), _("Remove
\"conflicted\" state on working copy files or directories"), "gtk-yes",
"--resolved");
}/*
*//* Version control (file) */
if (tvp_action->property.file_version_control)
{
- add_subaction_u (menu, "tvp::resolve", C_("Menu", "Resolve"),
_("Resolve"), "gtk-yes", _("Resolve"));
+ /* unimplemented: add_subaction_u (menu, "tvp::resolve", _("Resolve"),
_("Resolve"), "gtk-yes", _("Resolve")); */
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::revert", C_("Menu", "Revert"),
_("Revert"), "edit-undo", "--revert");
+ add_subaction (item, menu, "tvp::revert", _("Revert"), _("Undo all local
edits"), "edit-undo", "--revert");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::status", C_("Menu", "Status"),
_("Status"), "dialog-information", "--status");
+ add_subaction (item, menu, "tvp::status", _("Status"), _("Show the working
tree status"), "dialog-information", "--status");
}
/* Version control (parent) */
if (tvp_action->property.is_parent &&
tvp_action->property.parent_version_control)
{
- add_subaction (item, menu, "tvp::switch", C_("Menu", "Switch"),
_("Switch"), "go-jump", "--switch");
+ add_subaction (item, menu, "tvp::switch", _("Switch"), _("Update working
copy to a different URL"), "go-jump", "--switch");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::unlock", C_("Menu", "Unlock"),
_("Unlock"), NULL, "--unlock");
+ add_subaction (item, menu, "tvp::unlock", _("Unlock"), _("Unlock working
copy paths"), NULL, "--unlock");
}
/* Version control (all) */
if ((tvp_action->property.is_parent &&
tvp_action->property.parent_version_control) ||
tvp_action->property.directory_version_control ||
tvp_action->property.file_version_control)
{
- add_subaction (item, menu, "tvp::update", C_("Menu", "Update"),
_("Update"), "view-refresh", "--update");
+ add_subaction (item, menu, "tvp::update", _("Update"), _("Update your
working copy"), "view-refresh", "--update");
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
