* on-canvas clip and mask editing :) in the object menu you can find how to edit...

[inkscape.git] / src / verbs.cpp

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 40665953f8d8ead2c29d83d5c1130e7700198a96..08f1bb124241362ba928d87d0bb6dccf19ba22db 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -23,14 +23,14 @@
  */
 
 
-
-
-#include <gtk/gtkstock.h>
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+#include <gtk/gtkstock.h>
+
 #include "helper/action.h"
 
 #include <gtkmm/messagedialog.h>
@@ -625,6 +625,12 @@ Verb::sensitive(SPDocument *in_doc, bool in_sensitive)
     return;
 }
 
+/** \brief Accessor to get the tooltip for verb as localised string */ 
+gchar const *
+Verb::get_tip (void) 
+{
+       return _(_tip); 
+}
 
 void
 Verb::name(SPDocument *in_doc, Glib::ustring in_name)
@@ -1329,12 +1335,18 @@ ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ )
         case SP_VERB_OBJECT_SET_MASK:
             sp_selection_set_mask(false, false);
             break;
+        case SP_VERB_OBJECT_EDIT_MASK:
+            sp_selection_edit_clip_or_mask(dt, false);
+            break;
         case SP_VERB_OBJECT_UNSET_MASK:
             sp_selection_unset_mask(false);
             break;
         case SP_VERB_OBJECT_SET_CLIPPATH:
             sp_selection_set_mask(true, false);
             break;
+        case SP_VERB_OBJECT_EDIT_CLIPPATH:
+            sp_selection_edit_clip_or_mask(dt, true);
+            break;
         case SP_VERB_OBJECT_UNSET_CLIPPATH:
             sp_selection_unset_mask(true);
             break;
@@ -2304,8 +2316,8 @@ Verb *Verb::_base_verbs[] = {
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"),
                       N_("Break selected paths into subpaths"), "selection_break"),
-    new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Gri_d Arrange..."),
-                      N_("Arrange selected objects in a grid pattern"), "grid_arrange"),
+    new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Rows and Columns..."),
+                      N_("Arrange selected objects in a table"), "grid_arrange"),
     /* Layer */
     new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."),
                   N_("Create a new layer"), "new_layer"),
@@ -2357,10 +2369,14 @@ Verb *Verb::_base_verbs[] = {
                    "object_flip_ver"),
     new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"),
                  N_("Apply mask to selection (using the topmost object as mask)"), NULL),
+    new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"),
+                 N_("Edit mask"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"),
                  N_("Remove mask from selection"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_SET_CLIPPATH, "ObjectSetClipPath", N_("_Set"),
                  N_("Apply clipping path to selection (using the topmost object as clipping path)"), NULL),
+    new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"),
+                 N_("Edit clipping path"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"),
                  N_("Remove clipping path from selection"), NULL),
 
@@ -2470,8 +2486,8 @@ Verb *Verb::_base_verbs[] = {
     new ZoomVerb(SP_VERB_VIEW_MODE_TOGGLE, "ViewModeToggle", N_("_Toggle"),
                  N_("Toggle between normal and outline display modes"), NULL),
 
-    new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color managed view"),
-                 N_("Toggle color managed display adjustment for this document window"), "color_management"),
+    new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"),
+                 N_("Toggle color-managed display for this document window"), "color_management"),
 
     new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."),
                  N_("Open a window to preview objects at different icon resolutions"), "view_icon_preview"),