Code

Adding axis detection to new input dialog
[inkscape.git] / src / verbs.cpp
index abf834c47f4fe180c62bfeff1fababd75f913f4c..b9dfec2711de70e7b0db06eaed3d85fff68c8f5b 100644 (file)
  */
 
 
-
-
-#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>
@@ -81,6 +81,7 @@
 #include "shape-editor.h"
 #include "draw-context.h"
 #include "gradient-drag.h"
+#include "sp-guide.h"
 
 
 /**
@@ -109,48 +110,6 @@ sp_action_get_title(SPAction const *action)
 
 namespace Inkscape {
 
-/// \todo !!!FIXME:: kill this, use DialogManager instead!!!
-
-class PanelDialog : public Inkscape::UI::Dialog::Dialog
-{
-public:
-    PanelDialog(char const *prefs_path, int const verb_num) :
-        Dialog(
-            (prefs_get_int_attribute_limited ("options.dialogtype", "value", UI::Dialog::DOCK, 0, 1) == UI::Dialog::FLOATING ?
-             &UI::Dialog::Behavior::FloatingBehavior::create :
-             &UI::Dialog::Behavior::DockBehavior::create),
-            prefs_path, verb_num) {}
-/*
-    virtual Glib::ustring getName() const {return "foo";}
-    virtual Glib::ustring getDesc() const {return "bar";}
-*/
-};
-
-/** \brief Utility function to get a panel displayed. */
-static void show_panel( Inkscape::UI::Widget::Panel &panel, char const *prefs_path, int const verb_num )
-{
-    Gtk::Container *container = panel.get_toplevel();
-    if ( &panel == container ) { // safe check?
-        //g_message("Creating new dialog to hold it");
-        PanelDialog *dia = new PanelDialog(prefs_path, verb_num);
-        Gtk::VBox *mainVBox = dia->get_vbox();
-        mainVBox->pack_start(panel);
-        dia->show_all_children();
-        dia->read_geometry();
-        dia->present();
-    } else {
-        PanelDialog *dia = dynamic_cast<PanelDialog*>(container);
-        if ( dia ) {
-            //g_message("Found an existing dialog");
-            dia->read_geometry();
-            dia->present();
-        } else {
-            g_message("Failed to find an existing dialog");
-        }
-    }
-}
-
-
 /** \brief A class to encompass all of the verbs which deal with
            file operations. */
 class FileVerb : public Verb {
@@ -408,7 +367,7 @@ Verb::~Verb(void)
     \return NULL to represent error (this function shouldn't ever be called)
 */
 SPAction *
-Verb::make_action(Inkscape::UI::View::View *view)
+Verb::make_action(Inkscape::UI::View::View */*view*/)
 {
     //std::cout << "make_action" << std::endl;
     return NULL;
@@ -654,7 +613,7 @@ Verb::sensitive(SPDocument *in_doc, bool in_sensitive)
         for (ActionTable::iterator cur_action = _actions->begin();
              cur_action != _actions->end();
              cur_action++) {
-                       if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
+            if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
                 sp_action_set_sensitive(cur_action->second, in_sensitive ? 1 : 0);
             }
         }
@@ -667,6 +626,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)
@@ -675,8 +640,8 @@ Verb::name(SPDocument *in_doc, Glib::ustring in_name)
         for (ActionTable::iterator cur_action = _actions->begin();
              cur_action != _actions->end();
              cur_action++) {
-                       if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
-                            sp_action_set_name(cur_action->second, in_name);
+            if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
+                sp_action_set_name(cur_action->second, in_name);
             }
         }
     }
@@ -787,7 +752,7 @@ Verb::getbyid(gchar const *id)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-FileVerb::perform(SPAction *action, void *data, void *pdata)
+FileVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
 #if 0
     /* These aren't used, but are here to remind people not to use
@@ -797,9 +762,9 @@ FileVerb::perform(SPAction *action, void *data, void *pdata)
 #endif
 
     SPDesktop *desktop = dynamic_cast<SPDesktop*>(sp_action_get_view(action));
-       g_assert(desktop != NULL);
-       Gtk::Window *parent = desktop->getToplevel();
-       g_assert(parent != NULL);
+    g_assert(desktop != NULL);
+    Gtk::Window *parent = desktop->getToplevel();
+    g_assert(parent != NULL);
 
     switch ((long) data) {
         case SP_VERB_FILE_NEW:
@@ -821,14 +786,11 @@ FileVerb::perform(SPAction *action, void *data, void *pdata)
             sp_file_save_a_copy(*parent, NULL, NULL);
             break;
         case SP_VERB_FILE_PRINT:
-            sp_file_print();
+            sp_file_print(*parent);
             break;
         case SP_VERB_FILE_VACUUM:
             sp_file_vacuum();
             break;
-        case SP_VERB_FILE_PRINT_DIRECT:
-            sp_file_print_direct();
-            break;
         case SP_VERB_FILE_PRINT_PREVIEW:
             sp_file_print_preview(NULL, NULL);
             break;
@@ -865,7 +827,7 @@ FileVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-EditVerb::perform(SPAction *action, void *data, void *pdata)
+EditVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     if (!dt)
@@ -915,6 +877,9 @@ EditVerb::perform(SPAction *action, void *data, void *pdata)
         case SP_VERB_EDIT_PASTE_LIVEPATHEFFECT:
             sp_selection_paste_livepatheffect();
             break;
+        case SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT:
+            sp_selection_remove_livepatheffect();
+            break;
         case SP_VERB_EDIT_DELETE:
             sp_selection_delete();
             break;
@@ -927,12 +892,15 @@ EditVerb::perform(SPAction *action, void *data, void *pdata)
         case SP_VERB_EDIT_UNLINK_CLONE:
             sp_selection_unlink();
             break;
-        case SP_VERB_EDIT_CLONE_ORIGINAL:
+        case SP_VERB_EDIT_CLONE_SELECT_ORIGINAL:
             sp_select_clone_original();
             break;
         case SP_VERB_EDIT_SELECTION_2_MARKER:
             sp_selection_to_marker();
             break;
+        case SP_VERB_EDIT_SELECTION_2_GUIDES:
+            sp_selection_to_guides();
+            break;
         case SP_VERB_EDIT_TILE:
             sp_selection_tile();
             break;
@@ -974,7 +942,7 @@ EditVerb::perform(SPAction *action, void *data, void *pdata)
         case SP_VERB_EDIT_SELECT_NEXT:
             if (tools_isactive(dt, TOOLS_NODES)) {
                 SP_NODE_CONTEXT(ec)->shape_editor->select_next();
-            } else if (tools_isactive(dt, TOOLS_GRADIENT) 
+            } else if (tools_isactive(dt, TOOLS_GRADIENT)
                        && ec->_grdrag->isNonEmpty()) {
                 sp_gradient_context_select_next (ec);
             } else {
@@ -999,6 +967,14 @@ EditVerb::perform(SPAction *action, void *data, void *pdata)
                 sp_desktop_selection(dt)->clear();
             }
             break;
+
+        case SP_VERB_EDIT_GUIDES_AROUND_PAGE:
+            sp_guide_create_guides_around_page(sp_desktop_document(dt));
+            break;
+
+        case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
+            sp_selection_next_patheffect_param(dt);
+            break;
         default:
             break;
     }
@@ -1007,7 +983,7 @@ EditVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-SelectionVerb::perform(SPAction *action, void *data, void *pdata)
+SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
 
@@ -1128,7 +1104,7 @@ SelectionVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-LayerVerb::perform(SPAction *action, void *data, void *pdata)
+LayerVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     unsigned int verb = reinterpret_cast<std::size_t>(data);
@@ -1278,7 +1254,7 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-ObjectVerb::perform( SPAction *action, void *data, void *pdata )
+ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ )
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     if (!dt)
@@ -1335,7 +1311,7 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata )
 
                     // ... flip the selected nodes about that node
                     SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X, active_node->pos);
-               } else {
+                } else {
 
                     // ... or else about the center of their bounding box.
                     SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X);
@@ -1367,12 +1343,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;
@@ -1384,7 +1366,7 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata )
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-ContextVerb::perform(SPAction *action, void *data, void *pdata)
+ContextVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt;
     sp_verb_t verb;
@@ -1538,7 +1520,7 @@ ContextVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-TextVerb::perform(SPAction *action, void *data, void *pdata)
+TextVerb::perform(SPAction *action, void */*data*/, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     if (!dt)
@@ -1552,7 +1534,7 @@ TextVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-ZoomVerb::perform(SPAction *action, void *data, void *pdata)
+ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     if (!dt)
@@ -1570,34 +1552,38 @@ ZoomVerb::perform(SPAction *action, void *data, void *pdata)
     switch (GPOINTER_TO_INT(data)) {
         case SP_VERB_ZOOM_IN:
         {
+            gint mul = 1 + gobble_key_events(
+                 GDK_KP_Add, 0); // with any mask
             // While drawing with the pen/pencil tool, zoom towards the end of the unfinished path
             if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
                 SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
                 if (sp_curve_last_bpath(rc)) {
                     NR::Point const zoom_to (sp_curve_last_point(rc));
-                    dt->zoom_relative_keep_point(zoom_to, zoom_inc);
+                    dt->zoom_relative_keep_point(zoom_to, mul*zoom_inc);
                     break;
                 }
             }
 
             NR::Rect const d = dt->get_display_area();
-            dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], zoom_inc);
+            dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], mul*zoom_inc);
             break;
         }
         case SP_VERB_ZOOM_OUT:
         {
+            gint mul = 1 + gobble_key_events(
+                 GDK_KP_Subtract, 0); // with any mask
             // While drawing with the pen/pencil tool, zoom away from the end of the unfinished path
             if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
                 SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
                 if (sp_curve_last_bpath(rc)) {
                     NR::Point const zoom_to (sp_curve_last_point(rc));
-                    dt->zoom_relative_keep_point(zoom_to, 1 / zoom_inc);
+                    dt->zoom_relative_keep_point(zoom_to, 1 / (mul*zoom_inc));
                     break;
                 }
             }
 
             NR::Rect const d = dt->get_display_area();
-            dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], 1 / zoom_inc );
+            dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], 1 / (mul*zoom_inc) );
             break;
         }
         case SP_VERB_ZOOM_1_1:
@@ -1645,8 +1631,11 @@ ZoomVerb::perform(SPAction *action, void *data, void *pdata)
         case SP_VERB_TOGGLE_GUIDES:
             sp_namedview_toggle_guides(doc, repr);
             break;
+        case SP_VERB_TOGGLE_SNAPPING:
+            dt->toggleSnapping();
+            break;        
         case SP_VERB_TOGGLE_GRID:
-            dt->toggleGrid();
+            dt->toggleGrids();
             break;
 #ifdef HAVE_GTK_WINDOW_FULLSCREEN
         case SP_VERB_FULLSCREEN:
@@ -1668,6 +1657,9 @@ ZoomVerb::perform(SPAction *action, void *data, void *pdata)
         case SP_VERB_VIEW_MODE_TOGGLE:
             dt->displayModeToggle();
             break;
+        case SP_VERB_VIEW_CMS_TOGGLE:
+            dt->toggleColorProfAdjust();
+            break;
         case SP_VERB_VIEW_ICON_PREVIEW:
             inkscape_dialogs_unhide();
             dt->_dlg_mgr->showDialog("IconPreviewPanel");
@@ -1682,7 +1674,7 @@ ZoomVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-DialogVerb::perform(SPAction *action, void *data, void *pdata)
+DialogVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     if (reinterpret_cast<std::size_t>(data) != SP_VERB_DIALOG_TOGGLE) {
         // unhide all when opening a new dialog
@@ -1709,8 +1701,8 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata)
             dt->_dlg_mgr->showDialog("FillAndStroke");
             break;
         case SP_VERB_DIALOG_SWATCHES:
-            show_panel( Inkscape::UI::Dialogs::SwatchesPanel::getInstance(), "dialogs.swatches", SP_VERB_DIALOG_SWATCHES);
-             break;
+            dt->_dlg_mgr->showDialog("Swatches");
+            break;
         case SP_VERB_DIALOG_TRANSFORM:
             dt->_dlg_mgr->showDialog("Transformation");
             break;
@@ -1748,14 +1740,17 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata)
             break;
 #ifdef WITH_INKBOARD
         case SP_VERB_XMPP_CLIENT:
-               {
+        {
             Inkscape::Whiteboard::SessionManager::showClient();
-                       break;
-               }
+            break;
+        }
 #endif
         case SP_VERB_DIALOG_INPUT:
             sp_input_dialog();
             break;
+        case SP_VERB_DIALOG_INPUT2:
+            dt->_dlg_mgr->showDialog("InputDevices");
+            break;
         case SP_VERB_DIALOG_EXTENSIONEDITOR:
             dt->_dlg_mgr->showDialog("ExtensionEditor");
             break;
@@ -1775,7 +1770,7 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-HelpVerb::perform(SPAction *action, void *data, void *pdata)
+HelpVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     g_assert(dt->_dlg_mgr != NULL);
@@ -1785,9 +1780,9 @@ HelpVerb::perform(SPAction *action, void *data, void *pdata)
             sp_help_about();
             break;
         case SP_VERB_HELP_ABOUT_EXTENSIONS: {
-            Inkscape::UI::Dialogs::ExtensionsPanel *panel = new Inkscape::UI::Dialogs::ExtensionsPanel();
-            panel->set_full(true);
-            show_panel( *panel, "dialogs.aboutextensions", SP_VERB_HELP_ABOUT_EXTENSIONS );
+            // Inkscape::UI::Dialogs::ExtensionsPanel *panel = new Inkscape::UI::Dialogs::ExtensionsPanel();
+            // panel->set_full(true);
+            // show_panel( *panel, "dialogs.aboutextensions", SP_VERB_HELP_ABOUT_EXTENSIONS );
             break;
         }
 
@@ -1809,7 +1804,7 @@ HelpVerb::perform(SPAction *action, void *data, void *pdata)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-TutorialVerb::perform(SPAction *action, void *data, void *pdata)
+TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/)
 {
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_TUTORIAL_BASIC:
@@ -1968,7 +1963,7 @@ EffectLastVerb::make_action(Inkscape::UI::View::View *view)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-EffectLastVerb::perform(SPAction *action, void *data, void *pdata)
+EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     /* These aren't used, but are here to remind people not to use
        the CURRENT_DOCUMENT macros unless they really have to. */
@@ -1981,9 +1976,8 @@ EffectLastVerb::perform(SPAction *action, void *data, void *pdata)
 
     switch ((long) data) {
         case SP_VERB_EFFECT_LAST_PREF:
-            if (!effect->prefs(current_view))
-                return;
-            /* Note: fall through */
+            effect->prefs(current_view);
+            break;
         case SP_VERB_EFFECT_LAST:
             effect->effect(current_view);
             break;
@@ -2038,7 +2032,7 @@ FitCanvasVerb::make_action(Inkscape::UI::View::View *view)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-FitCanvasVerb::perform(SPAction *action, void *data, void *pdata)
+FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     if (!dt) return;
@@ -2107,7 +2101,7 @@ LockAndHideVerb::make_action(Inkscape::UI::View::View *view)
 
 /** \brief  Decode the verb code and take appropriate action */
 void
-LockAndHideVerb::perform(SPAction *action, void *data, void *pdata)
+LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
     if (!dt) return;
@@ -2164,8 +2158,6 @@ Verb *Verb::_base_verbs[] = {
     // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions)
     new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the &lt;defs&gt; of the document"),
                  "file_vacuum" ),
-    new FileVerb(SP_VERB_FILE_PRINT_DIRECT, "FilePrintDirect", N_("Print _Direct"),
-                 N_("Print directly without prompting to a file or pipe"), NULL ),
     new FileVerb(SP_VERB_FILE_PRINT_PREVIEW, "FilePrintPreview", N_("Print Previe_w"),
                  N_("Preview document printout"), GTK_STOCK_PRINT_PREVIEW ),
     new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."),
@@ -2209,8 +2201,10 @@ Verb *Verb::_base_verbs[] = {
                  N_("Scale each selected object vertically to match the height of the copied object"), NULL),
     new EditVerb(SP_VERB_EDIT_PASTE_IN_PLACE, "EditPasteInPlace", N_("Paste _In Place"),
                  N_("Paste objects from clipboard to the original location"), "selection_paste_in_place"),
-    new EditVerb(SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, "EditPasteLivePathEffect", N_("Paste Path _Effect"),
+    new EditVerb(SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, "PasteLivePathEffect", N_("Paste Path _Effect"),
                  N_("Apply the path effect of the copied object to selection"), NULL),
+    new EditVerb(SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT, "RemoveLivePathEffect", N_("Remove Path _Effect"),
+                 N_("Remove any path effects from selected objects"), NULL),
     new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"),
                  N_("Delete selection"), GTK_STOCK_DELETE),
     new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"),
@@ -2219,11 +2213,14 @@ Verb *Verb::_base_verbs[] = {
                  N_("Create a clone (a copy linked to the original) of selected object"), "edit_clone"),
     new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"),
                  N_("Cut the selected clone's link to its original, turning it into a standalone object"), "edit_unlink_clone"),
-    new EditVerb(SP_VERB_EDIT_CLONE_ORIGINAL, "EditCloneOriginal", N_("Select _Original"),
+    new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"),
                  N_("Select the object to which the selected clone is linked"), "edit_select_original"),
     // TRANSLATORS: Convert selection to a line marker
     new EditVerb(SP_VERB_EDIT_SELECTION_2_MARKER, "ObjectsToMarker", N_("Objects to _Marker"),
                  N_("Convert selection to a line marker"), NULL),
+    // TRANSLATORS: Convert selection to a collection of guidelines
+    new EditVerb(SP_VERB_EDIT_SELECTION_2_GUIDES, "ObjectsToGuides", N_("Objects to Gu_ides"),
+                 N_("Convert selected objects to a collection of guidelines aligned with their edges"), NULL),
     // TRANSLATORS: Convert selection to a rectangle with tiled pattern fill
     new EditVerb(SP_VERB_EDIT_TILE, "ObjectsToPattern", N_("Objects to Patter_n"),
                  N_("Convert selection to a rectangle with tiled pattern fill"), NULL),
@@ -2246,6 +2243,10 @@ Verb *Verb::_base_verbs[] = {
                  N_("Select previous object or node"), NULL),
     new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"),
                  N_("Deselect any selected objects or nodes"), "selection_deselect"),
+    new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("_Guides around page"),
+                 N_("Create four guides aligned with the page borders"), NULL),
+    new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next Path Effect Parameter"),
+                 N_("Show next Path Effect parameter for editing"), "edit_next_parameter"),
 
     /* Selection */
     new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
@@ -2329,8 +2330,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"),
@@ -2382,10 +2383,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"), "nodeedit-mask"),
     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"), "nodeedit-clippath"),
     new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"),
                  N_("Remove clipping path from selection"), NULL),
 
@@ -2468,6 +2473,7 @@ Verb *Verb::_base_verbs[] = {
     new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), "scrollbars"),
     new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), "grid"),
     new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), "guides"),
+    new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapping", N_("Snap"), N_("Toggle snapping on or off"), NULL),
     new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"),
                  "zoom_next"),
     new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"),
@@ -2494,6 +2500,9 @@ 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 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"),
     new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"),
@@ -2545,6 +2554,8 @@ Verb *Verb::_base_verbs[] = {
 #endif
     new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."),
                    N_("Configure extended input devices, such as a graphics tablet"), "input_devices"),
+    new DialogVerb(SP_VERB_DIALOG_INPUT2, "DialogInput2", N_("_Input Devices (new)..."),
+                   N_("Configure extended input devices, such as a graphics tablet"), "input_devices"),
     new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."),
                    N_("Query information about extensions"), NULL),
     new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."),