updated to latest trunk

(bzr r14876.2.4)

1 files changed, 275 insertions, 99 deletions

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 299cfe8e7..22ded60b3 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -26,7 +26,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include <cstring>
@@ -37,19 +37,17 @@
 // If this is not done, then errors will be generate relating to Glib::Threads being undefined
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
 #include "display/curve.h"
+#include "display/sp-canvas.h"
 #include "document.h"
 #include "ui/tools/freehand-base.h"
 #include "extension/effect.h"
-#include "ui/tools/tool-base.h"
 #include "file.h"
 #include "gradient-drag.h"
 #include "helper/action.h"
-#include "helper/action-context.h"
 #include "help.h"
 #include "inkscape.h"
 #include "ui/interface.h"
@@ -57,7 +55,6 @@
 #include "layer-manager.h"
 #include "message-stack.h"
 #include "path-chemistry.h"
-#include "preferences.h"
 #include "ui/tools/select-tool.h"
 #include "selection-chemistry.h"
 #include "seltrans.h"
@@ -87,9 +84,6 @@
 #include "ui/dialog/spellcheck.h"
 #include "ui/icon-names.h"
 #include "ui/tools/node-tool.h"
-#include "selection.h"
-
-#include <gtk/gtk.h>
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::Dialog::ActionAlign;
@@ -823,7 +817,7 @@ Verb *Verb::get_search(unsigned int code)
  *
  * @param  id  Which id to search for.
  */
-Verb *Verb::getbyid(gchar const *id)
+Verb *Verb::getbyid(gchar const *id, bool verbose)
 {
     Verb *verb = NULL;
     VerbIDTable::iterator verb_found = _verb_ids.find(id);
@@ -839,8 +833,10 @@ Verb *Verb::getbyid(gchar const *id)
                 && strcmp(id, "SelectionTrace")   != 0
                 && strcmp(id, "PaintBucketPrefs") != 0
 #endif
-            )
-        printf("Unable to find: %s\n", id);
+            ) {
+        if (verbose)
+            printf("Unable to find: %s\n", id);
+    }
 
     return verb;
 }
@@ -960,85 +956,88 @@ void EditVerb::perform(SPAction *action, void *data)
             sp_redo(dt, dt->getDocument());
             break;
         case SP_VERB_EDIT_CUT:
-            sp_selection_cut(dt);
+            dt->selection->cut();
             break;
         case SP_VERB_EDIT_COPY:
-            sp_selection_copy(dt);
+            dt->selection->copy();
             break;
         case SP_VERB_EDIT_PASTE:
             sp_selection_paste(dt, false);
             break;
         case SP_VERB_EDIT_PASTE_STYLE:
-            sp_selection_paste_style(dt);
+            dt->selection->pasteStyle();
             break;
         case SP_VERB_EDIT_PASTE_SIZE:
-            sp_selection_paste_size(dt, true, true);
+            dt->selection->pasteSize(true,true);
             break;
         case SP_VERB_EDIT_PASTE_SIZE_X:
-            sp_selection_paste_size(dt, true, false);
+            dt->selection->pasteSize(true, false);
             break;
         case SP_VERB_EDIT_PASTE_SIZE_Y:
-            sp_selection_paste_size(dt, false, true);
+            dt->selection->pasteSize(false, true);
             break;
         case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY:
-            sp_selection_paste_size_separately(dt, true, true);
+            dt->selection->pasteSizeSeparately(true, true);
             break;
         case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_X:
-            sp_selection_paste_size_separately(dt, true, false);
+            dt->selection->pasteSizeSeparately(true, false);
             break;
         case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_Y:
-            sp_selection_paste_size_separately(dt, false, true);
+            dt->selection->pasteSizeSeparately(false, true);
             break;
         case SP_VERB_EDIT_PASTE_IN_PLACE:
             sp_selection_paste(dt, true);
             break;
         case SP_VERB_EDIT_PASTE_LIVEPATHEFFECT:
-            sp_selection_paste_livepatheffect(dt);
+            dt->selection->pastePathEffect();
             break;
         case SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT:
-            sp_selection_remove_livepatheffect(dt);
+            dt->selection->removeLPE();
             break;
         case SP_VERB_EDIT_REMOVE_FILTER:
-            sp_selection_remove_filter(dt);
+            dt->selection->removeFilter();
             break;
         case SP_VERB_EDIT_DELETE:
-            sp_selection_delete(dt);
+            dt->selection->deleteItems();
             break;
         case SP_VERB_EDIT_DUPLICATE:
-            sp_selection_duplicate(dt);
+            dt->selection->duplicate();
             break;
         case SP_VERB_EDIT_CLONE:
-            sp_selection_clone(dt);
+            dt->selection->clone();
             break;
         case SP_VERB_EDIT_UNLINK_CLONE:
-            sp_selection_unlink(dt);
+            dt->selection->unlink();
+            break;
+        case SP_VERB_EDIT_UNLINK_CLONE_RECURSIVE:
+            dt->selection->unlinkRecursive();
             break;
         case SP_VERB_EDIT_RELINK_CLONE:
-            sp_selection_relink(dt);
+            dt->selection->relink();
             break;
         case SP_VERB_EDIT_CLONE_SELECT_ORIGINAL:
-            sp_select_clone_original(dt);
+            dt->selection->cloneOriginal();
             break;
         case SP_VERB_EDIT_CLONE_ORIGINAL_PATH_LPE:
-            sp_selection_clone_original_path_lpe(dt);
+            dt->selection->cloneOriginalPathLPE();
             break;
         case SP_VERB_EDIT_SELECTION_2_MARKER:
-            sp_selection_to_marker(dt);
+            dt->selection->toMarker();
             break;
         case SP_VERB_EDIT_SELECTION_2_GUIDES:
-            sp_selection_to_guides(dt);
+            dt->selection->toGuides();
             break;
         case SP_VERB_EDIT_TILE:
-            sp_selection_tile(dt);
+            dt->selection->tile();
             break;
         case SP_VERB_EDIT_UNTILE:
-            sp_selection_untile(dt);
+            dt->selection->untile();
             break;
         case SP_VERB_EDIT_SYMBOL:
-            sp_selection_symbol(dt);
+            dt->selection->toSymbol();
             break;
         case SP_VERB_EDIT_UNSYMBOL:
-            sp_selection_unsymbol(dt);
+            dt->selection->unSymbol();
             break;
         case SP_VERB_EDIT_SELECT_ALL:
             SelectionHelper::selectAll(dt);
@@ -1088,6 +1087,9 @@ void EditVerb::perform(SPAction *action, void *data)
         case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
             sp_selection_next_patheffect_param(dt);
             break;
+        case SP_VERB_EDIT_SWAP_FILL_STROKE:
+            dt->selection->swapFillStroke();
+            break;
         case SP_VERB_EDIT_LINK_COLOR_PROFILE:
             break;
         case SP_VERB_EDIT_REMOVE_COLOR_PROFILE:
@@ -1105,6 +1107,7 @@ void SelectionVerb::perform(SPAction *action, void *data)
 {
     Inkscape::Selection *selection = sp_action_get_selection(action);
     SPDesktop *dt = sp_action_get_desktop(action);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     // Some of these operations have been modified so they work in command-line mode!
     // In this case, all we need is a selection
@@ -1115,43 +1118,81 @@ void SelectionVerb::perform(SPAction *action, void *data)
     bool handled = true;
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_SELECTION_UNION:
-            sp_selected_path_union(selection, dt);
+            selection->pathUnion();
             break;
         case SP_VERB_SELECTION_INTERSECT:
-            sp_selected_path_intersect(selection, dt);
+            selection->pathIntersect();
             break;
         case SP_VERB_SELECTION_DIFF:
-            sp_selected_path_diff(selection, dt);
+            selection->pathDiff();
             break;
         case SP_VERB_SELECTION_SYMDIFF:
-            sp_selected_path_symdiff(selection, dt);
+            selection->pathSymDiff();
             break;
         case SP_VERB_SELECTION_CUT:
-            sp_selected_path_cut(selection, dt);
+            selection->pathCut();
             break;
         case SP_VERB_SELECTION_SLICE:
-            sp_selected_path_slice(selection, dt);
+            selection->pathSlice();
+            break;
+        case SP_VERB_SELECTION_GROW:
+        {
+            // FIXME these and the other grow/shrink they should use gobble_key_events.
+            // the problem is how to get access to which key, if any, to gobble.
+            selection->scale(prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000));
+            break;
+        }
+        case SP_VERB_SELECTION_GROW_SCREEN:
+        {
+            selection->scaleScreen(2);
+            break;
+        }
+        case SP_VERB_SELECTION_GROW_DOUBLE:
+        {
+            selection->scaleTimes(2);
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK:
+        {
+            selection->scale(-prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000));
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK_SCREEN:
+        {
+            selection->scaleScreen(-2);
             break;
+        }
+        case SP_VERB_SELECTION_SHRINK_HALVE:
+        {
+            selection->scaleTimes(0.5);
+            break;
+        }
         case SP_VERB_SELECTION_TO_FRONT:
-            sp_selection_raise_to_top(selection, dt);
+            selection->raiseToTop();
             break;
         case SP_VERB_SELECTION_TO_BACK:
-            sp_selection_lower_to_bottom(selection, dt);
+            selection->lowerToBottom();
             break;
         case SP_VERB_SELECTION_RAISE:
-            sp_selection_raise(selection, dt);
+            selection->raise();
             break;
         case SP_VERB_SELECTION_LOWER:
-            sp_selection_lower(selection, dt);
+            selection->lower();
+            break;
+        case SP_VERB_SELECTION_STACK_UP:
+            selection->stackUp();
+            break;
+        case SP_VERB_SELECTION_STACK_DOWN:
+            selection->stackDown();
             break;
         case SP_VERB_SELECTION_GROUP:
-            sp_selection_group(selection, dt);
+            selection->group();
             break;
         case SP_VERB_SELECTION_UNGROUP:
-            sp_selection_ungroup(selection, dt);
+            selection->ungroup();
             break;
         case SP_VERB_SELECTION_UNGROUP_POP_SELECTION:
-            sp_selection_ungroup_pop_selection(selection, dt);
+        selection->popFromGroup();
             break;
         default:
             handled = false;
@@ -1207,6 +1248,9 @@ void SelectionVerb::perform(SPAction *action, void *data)
         case SP_VERB_SELECTION_OUTLINE:
             sp_selected_path_outline(dt);
             break;
+        case SP_VERB_SELECTION_OUTLINE_LEGACY:
+            sp_selected_path_outline(dt, true);
+            break;
         case SP_VERB_SELECTION_SIMPLIFY:
             sp_selected_path_simplify(dt);
             break;
@@ -1226,14 +1270,14 @@ void SelectionVerb::perform(SPAction *action, void *data)
             dt->_dlg_mgr->showDialog("PixelArt");
             break;
         case SP_VERB_SELECTION_CREATE_BITMAP:
-            sp_selection_create_bitmap_copy(dt);
+            dt->selection->createBitmapCopy();
             break;
 
         case SP_VERB_SELECTION_COMBINE:
-            sp_selected_path_combine(dt);
+            selection->combine();
             break;
         case SP_VERB_SELECTION_BREAK_APART:
-            sp_selected_path_break_apart(dt);
+            selection->breakApart();
             break;
         case SP_VERB_SELECTION_ARRANGE:
             INKSCAPE.dialogs_unhide();
@@ -1292,11 +1336,11 @@ void LayerVerb::perform(SPAction *action, void *data)
             break;
         }
         case SP_VERB_LAYER_MOVE_TO_NEXT: {
-            sp_selection_to_next_layer(dt);
+            dt->selection->toNextLayer();
             break;
         }
         case SP_VERB_LAYER_MOVE_TO_PREV: {
-            sp_selection_to_prev_layer(dt);
+            dt->selection->toPrevLayer();
             break;
         }
         case SP_VERB_LAYER_MOVE_TO: {
@@ -1367,7 +1411,7 @@ void LayerVerb::perform(SPAction *action, void *data)
         case SP_VERB_LAYER_DUPLICATE: {
             if ( dt->currentLayer() != dt->currentRoot() ) {
 
-            	sp_selection_duplicate(dt, true, true);
+                dt->selection->duplicate(true,true);
 
                 DocumentUndo::done(dt->getDocument(), SP_VERB_LAYER_DUPLICATE,
                                    _("Duplicate layer"));
@@ -1483,7 +1527,7 @@ void ObjectVerb::perform( SPAction *action, void *data)
     bool handled = true;
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_OBJECT_TO_CURVE:
-            sp_selected_path_to_curves(sel, dt);
+            sel->toCurves();
             break;
         default:
             handled = false;
@@ -1514,13 +1558,13 @@ void ObjectVerb::perform( SPAction *action, void *data)
 
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_OBJECT_ROTATE_90_CW:
-            sp_selection_rotate_90(dt, false);
+            sel->rotate90(false);
             break;
         case SP_VERB_OBJECT_ROTATE_90_CCW:
-            sp_selection_rotate_90(dt, true);
+            sel->rotate90(true);
             break;
         case SP_VERB_OBJECT_FLATTEN:
-            sp_selection_remove_transform(dt);
+            sel->removeTransform();
             break;
         case SP_VERB_OBJECT_FLOW_TEXT:
             text_flow_into_shape();
@@ -1532,35 +1576,35 @@ void ObjectVerb::perform( SPAction *action, void *data)
             flowtext_to_text();
             break;
         case SP_VERB_OBJECT_FLIP_HORIZONTAL:
-            sp_selection_scale_relative(sel, center, Geom::Scale(-1.0, 1.0));
+            sel->setScaleRelative(center, Geom::Scale(-1.0, 1.0));
             DocumentUndo::done(dt->getDocument(), SP_VERB_OBJECT_FLIP_HORIZONTAL,
                                _("Flip horizontally"));
             break;
         case SP_VERB_OBJECT_FLIP_VERTICAL:
-            sp_selection_scale_relative(sel, center, Geom::Scale(1.0, -1.0));
+            sel->setScaleRelative(center, Geom::Scale(1.0, -1.0));
             DocumentUndo::done(dt->getDocument(), SP_VERB_OBJECT_FLIP_VERTICAL,
                                _("Flip vertically"));
             break;
         case SP_VERB_OBJECT_SET_MASK:
-            sp_selection_set_mask(dt, false, false);
+            sel->setMask(false, false);
             break;
         case SP_VERB_OBJECT_EDIT_MASK:
-            sp_selection_edit_clip_or_mask(dt, false);
+            sel->editMask(false);
             break;
         case SP_VERB_OBJECT_UNSET_MASK:
-            sp_selection_unset_mask(dt, false);
+            sel->unsetMask(false);
             break;
         case SP_VERB_OBJECT_SET_CLIPPATH:
-            sp_selection_set_mask(dt, true, false);
+            sel->setMask(true, false);
             break;
         case SP_VERB_OBJECT_CREATE_CLIP_GROUP:
-            sp_selection_set_clipgroup(dt);
+            sel->setClipGroup();
             break;
         case SP_VERB_OBJECT_EDIT_CLIPPATH:
-            sp_selection_edit_clip_or_mask(dt, true);
+            sel->editMask(true);
             break;
         case SP_VERB_OBJECT_UNSET_CLIPPATH:
-            sp_selection_unset_mask(dt, true);
+            sel->unsetMask(true);
             break;
         default:
             break;
@@ -1844,8 +1888,11 @@ void ZoomVerb::perform(SPAction *action, void *data)
     Inkscape::XML::Node *repr = dt->namedview->getRepr();
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    gdouble zoom_inc =
-        prefs->getDoubleLimited( "/options/zoomincrement/value", 1.414213562, 1.01, 10 );
+    gdouble zoom_inc   =
+        prefs->getDoubleLimited( "/options/zoomincrement/value",  M_SQRT2, 1.01, 10 );
+    gdouble rotate_inc =
+        prefs->getDoubleLimited( "/options/rotateincrement/value", 15, 1, 90, "°" );
+    rotate_inc *= M_PI/180.0;
 
     double zcorr = 1.0;
     Glib::ustring abbr = prefs->getString("/options/zoomcorrection/unit");
@@ -1853,12 +1900,16 @@ void ZoomVerb::perform(SPAction *action, void *data)
         zcorr = prefs->getDouble("/options/zoomcorrection/value", 1.0);
 
     Geom::Rect const d = dt->get_display_area();
-            
+
+    Geom::Rect const d_canvas = dt->getCanvas()->getViewbox(); // Not SVG 'viewBox'
+    Geom::Point midpoint = dt->w2d(d_canvas.midpoint()); // Midpoint of drawing on canvas.
+
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_ZOOM_IN:
         {
             gint mul = 1 + Inkscape::UI::Tools::gobble_key_events(
                  GDK_KEY_KP_Add, 0); // with any mask
+            // FIXME what if zoom out is bound to something other than subtract?
             // 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;
@@ -1869,7 +1920,7 @@ void ZoomVerb::perform(SPAction *action, void *data)
                 }
             }
 
-            dt->zoom_relative( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], mul*zoom_inc);
+            dt->zoom_relative_center_point( midpoint, mul*zoom_inc);
             break;
         }
         case SP_VERB_ZOOM_OUT:
@@ -1886,17 +1937,17 @@ void ZoomVerb::perform(SPAction *action, void *data)
                 }
             }
 
-            dt->zoom_relative( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 1 / (mul*zoom_inc) );
+            dt->zoom_relative_center_point( midpoint, 1 / (mul*zoom_inc) );
             break;
         }
         case SP_VERB_ZOOM_1_1:
-            dt->zoom_absolute( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 1.0 * zcorr );
+            dt->zoom_absolute_center_point( midpoint, 1.0 * zcorr );
             break;
         case SP_VERB_ZOOM_1_2:
-            dt->zoom_absolute( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 0.5 * zcorr );
+            dt->zoom_absolute_center_point( midpoint, 0.5 * zcorr );
             break;
         case SP_VERB_ZOOM_2_1:
-            dt->zoom_absolute( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 2.0 * zcorr );
+            dt->zoom_absolute_center_point( midpoint, 2.0 * zcorr );
             break;
         case SP_VERB_ZOOM_PAGE:
             dt->zoom_page();
@@ -1911,10 +1962,79 @@ void ZoomVerb::perform(SPAction *action, void *data)
             dt->zoom_selection();
             break;
         case SP_VERB_ZOOM_NEXT:
-            dt->next_zoom();
+            dt->next_transform();
             break;
         case SP_VERB_ZOOM_PREV:
-            dt->prev_zoom();
+            dt->prev_transform();
+            break;
+        case SP_VERB_ROTATE_CW:
+        {
+            gint mul = 1 + Inkscape::UI::Tools::gobble_key_events( GDK_KEY_parenleft, 0);
+            // While drawing with the pen/pencil tool, rotate 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 (!rc->is_empty()) {
+                    Geom::Point const rotate_to (*rc->last_point());
+                    dt->rotate_relative_keep_point(rotate_to, -mul*rotate_inc);
+                    break;
+                }
+            }
+
+            dt->rotate_relative_center_point( midpoint, -mul*rotate_inc);
+            break;
+        }
+        case SP_VERB_ROTATE_CCW:
+        {
+            gint mul = 1 + Inkscape::UI::Tools::gobble_key_events( GDK_KEY_parenright, 0);
+            // While drawing with the pen/pencil tool, rotate 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 (!rc->is_empty()) {
+                    Geom::Point const rotate_to (*rc->last_point());
+                    dt->rotate_relative_keep_point(rotate_to, mul*rotate_inc);
+                    break;
+                }
+            }
+
+            dt->rotate_relative_center_point( midpoint, mul*rotate_inc);
+            break;
+        }
+        case SP_VERB_ROTATE_ZERO:
+            dt->rotate_absolute_center_point( midpoint, 0.0 );
+            break;
+        case SP_VERB_FLIP_HORIZONTAL:
+        {
+            // While drawing with the pen/pencil tool, flip 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 (!rc->is_empty()) {
+                    Geom::Point const flip_to (*rc->last_point());
+                    dt->flip_relative_keep_point(flip_to, SPDesktop::FLIP_HORIZONTAL);
+                    break;
+                }
+            }
+
+            dt->flip_relative_center_point( midpoint, SPDesktop::FLIP_HORIZONTAL);
+            break;
+        }
+        case SP_VERB_FLIP_VERTICAL:
+        {
+            gint mul = 1 + Inkscape::UI::Tools::gobble_key_events( GDK_KEY_parenright, 0);
+            // While drawing with the pen/pencil tool, flip 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 (!rc->is_empty()) {
+                    Geom::Point const flip_to (*rc->last_point());
+                    dt->flip_relative_keep_point(flip_to, SPDesktop::FLIP_VERTICAL);
+                    break;
+                }
+            }
+
+            dt->flip_relative_center_point( midpoint, SPDesktop::FLIP_VERTICAL);
+            break;
+        }
+        case SP_VERB_FLIP_NONE:
+            dt->flip_absolute_center_point( midpoint, SPDesktop::FLIP_NONE);
             break;
         case SP_VERB_TOGGLE_RULERS:
             dt->toggleRulers();
@@ -2020,6 +2140,9 @@ void DialogVerb::perform(SPAction *action, void *data)
     g_assert(dt->_dlg_mgr != NULL);
 
     switch (reinterpret_cast<std::size_t>(data)) {
+        case SP_VERB_DIALOG_PROTOTYPE:
+            dt->_dlg_mgr->showDialog("Prototype");
+           break;
         case SP_VERB_DIALOG_DISPLAY:
             //sp_display_dialog();
             dt->_dlg_mgr->showDialog("InkscapePreferences");
@@ -2119,6 +2242,12 @@ void DialogVerb::perform(SPAction *action, void *data)
         case SP_VERB_DIALOG_PRINT_COLORS_PREVIEW:
             dt->_dlg_mgr->showDialog("PrintColorsPreviewDialog");
             break;
+        case SP_VERB_DIALOG_STYLE:
+            dt->_dlg_mgr->showDialog("StyleDialog");
+           break;
+        case SP_VERB_DIALOG_CSS:
+            dt->_dlg_mgr->showDialog("CssDialog");
+            break;
 
         default:
             break;
@@ -2326,7 +2455,7 @@ void FitCanvasVerb::perform(SPAction *action, void *data)
 
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_FIT_CANVAS_TO_SELECTION:
-            verb_fit_canvas_to_selection(dt);
+            dt->selection->fitCanvas(true);
             break;
         case SP_VERB_FIT_CANVAS_TO_DRAWING:
             verb_fit_canvas_to_drawing(dt);
@@ -2497,6 +2626,8 @@ Verb *Verb::_base_verbs[] = {
                  N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON("edit-clone")),
     new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"),
                  N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON("edit-clone-unlink")),
+    new EditVerb(SP_VERB_EDIT_UNLINK_CLONE_RECURSIVE, "EditUnlinkCloneRecursive", N_("Unlink Clones _recursively"),
+                 N_("Unlink all clones in the selection, even if they are in groups."), INKSCAPE_ICON("edit-clone-unlink")),
     new EditVerb(SP_VERB_EDIT_RELINK_CLONE, "EditRelinkClone", N_("Relink to Copied"),
                  N_("Relink the selected clones to the object currently on the clipboard"), NULL),
     new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"),
@@ -2548,6 +2679,8 @@ Verb *Verb::_base_verbs[] = {
                  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 editable path effect parameter"), INKSCAPE_ICON("path-effect-parameter-next")),
+    new EditVerb(SP_VERB_EDIT_SWAP_FILL_STROKE, "EditSwapFillStroke", N_("Swap fill and stroke"),
+                 N_("Swap fill and stroke of an object"), NULL),
 
     // Selection
     new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
@@ -2558,6 +2691,14 @@ Verb *Verb::_base_verbs[] = {
                       N_("Raise selection one step"), INKSCAPE_ICON("selection-raise")),
     new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"),
                       N_("Lower selection one step"), INKSCAPE_ICON("selection-lower")),
+
+
+    new SelectionVerb(SP_VERB_SELECTION_STACK_UP, "SelectionStackUp", N_("_Stack up"),
+                      N_("Stack selection one step up"), INKSCAPE_ICON("layer-raise")),
+    new SelectionVerb(SP_VERB_SELECTION_STACK_DOWN, "SelectionStackDown", N_("_Stack down"),
+                      N_("Stack selection one step down"), INKSCAPE_ICON("layer-lower")),
+
+
     new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"),
                       N_("Group selected objects"), INKSCAPE_ICON("object-group")),
     new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"),
@@ -2588,6 +2729,18 @@ Verb *Verb::_base_verbs[] = {
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"),
                       N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON("path-cut")),
+    new SelectionVerb(SP_VERB_SELECTION_GROW, "SelectionGrow", N_("_Grow"),
+                      N_("Make selected objects bigger"), INKSCAPE_ICON("selection-grow")),
+    new SelectionVerb(SP_VERB_SELECTION_GROW_SCREEN, "SelectionGrowScreen", N_("_Grow on screen"),
+                      N_("Make selected objects bigger relative to screen"), INKSCAPE_ICON("selection-grow-screen")),
+    new SelectionVerb(SP_VERB_SELECTION_GROW_DOUBLE, "SelectionGrowDouble", N_("_Double size"),
+                      N_("Double the size of selected objects"), INKSCAPE_ICON("selection-grow-double")),
+    new SelectionVerb(SP_VERB_SELECTION_SHRINK, "SelectionShrink", N_("_Shrink"),
+                      N_("Make selected objects smaller"), INKSCAPE_ICON("selection-shrink")),
+    new SelectionVerb(SP_VERB_SELECTION_SHRINK_SCREEN, "SelectionShrinkScreen", N_("_Shrink on screen"),
+                      N_("Make selected objects smaller relative to screen"), INKSCAPE_ICON("selection-shrink-screen")),
+    new SelectionVerb(SP_VERB_SELECTION_SHRINK_HALVE, "SelectionShrinkHalve", N_("_Halve size"),
+                      N_("Halve the size of selected objects"), INKSCAPE_ICON("selection-shrink-halve")),
     // TRANSLATORS: "outset": expand a shape by offsetting the object's path,
     // i.e. by displacing it perpendicular to the path in each point.
     // See also the Advanced Tutorial for explanation.
@@ -2618,6 +2771,8 @@ Verb *Verb::_base_verbs[] = {
                       INKSCAPE_ICON("path-offset-linked")),
     new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"),
                       N_("Convert selected object's stroke to paths"), INKSCAPE_ICON("stroke-to-path")),
+    new SelectionVerb(SP_VERB_SELECTION_OUTLINE_LEGACY, "StrokeToPathLegacy", N_("_Stroke to Path Legacy"),
+                      N_("Convert selected object's stroke to paths legacy mode"), INKSCAPE_ICON("stroke-to-path")),
     new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"),
                       N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON("path-simplify")),
     new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"),
@@ -2827,9 +2982,41 @@ Verb *Verb::_base_verbs[] = {
                     N_("Open Preferences for the Eraser tool"), NULL),
     new ContextVerb(SP_VERB_CONTEXT_LPETOOL_PREFS, "LPEToolPrefs", N_("LPE Tool Preferences"),
                     N_("Open Preferences for the LPETool tool"), NULL),
-    // Zoom/View
+
+    // Zoom
     new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), INKSCAPE_ICON("zoom-in")),
     new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON("zoom-out")),
+    new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"),
+                 INKSCAPE_ICON("zoom-next")),
+    new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"),
+                 INKSCAPE_ICON("zoom-previous")),
+    new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"),
+                 INKSCAPE_ICON("zoom-original")),
+    new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"),
+                 INKSCAPE_ICON("zoom-half-size")),
+    new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"),
+                 INKSCAPE_ICON("zoom-double-size")),
+    new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"),
+                 N_("Zoom to fit page in window"), INKSCAPE_ICON("zoom-fit-page")),
+    new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"),
+                 N_("Zoom to fit page width in window"), INKSCAPE_ICON("zoom-fit-width")),
+    new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"),
+                 N_("Zoom to fit drawing in window"), INKSCAPE_ICON("zoom-fit-drawing")),
+    new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"),
+                 N_("Zoom to fit selection in window"), INKSCAPE_ICON("zoom-fit-selection")),
+
+    new ZoomVerb(SP_VERB_ROTATE_CW,   "RotateClockwise",        N_("Rotate Clockwise"),         N_("Rotate canvas clockwise"),         NULL),
+    new ZoomVerb(SP_VERB_ROTATE_CCW,  "RotateCounterClockwise", N_("Rotate Counter-Clockwise"), N_("Rotate canvas counter-clockwise"), NULL),
+    new ZoomVerb(SP_VERB_ROTATE_ZERO, "RotateZero",             N_("Rotate Zero"),              N_("Reset canvas rotation to zero"),   NULL),
+
+    new ZoomVerb(SP_VERB_FLIP_HORIZONTAL, "FlipHorizontal",     N_("Flip Horizontal"), N_("Flip canvas horizontally"), INKSCAPE_ICON("object-flip-horizontal")),
+    new ZoomVerb(SP_VERB_FLIP_VERTICAL,   "FlipVertical",       N_("Flip Vertical"),   N_("Flip canvas vertically"),   INKSCAPE_ICON("object-flip-vertical")),
+    new ZoomVerb(SP_VERB_FLIP_NONE,       "FlipNone",           N_("Flip None"),       N_("Undo any flip"),            NULL),
+
+
+// WHY ARE THE FOLLOWING ZoomVerbs???
+
+    // View
     new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), NULL),
     new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), NULL),
     new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("Page _Grid"), N_("Show or hide the page grid"), INKSCAPE_ICON("show-grid")),
@@ -2841,16 +3028,7 @@ Verb *Verb::_base_verbs[] = {
     new ZoomVerb(SP_VERB_TOGGLE_TOOLBOX, "ToggleToolbox", N_("_Toolbox"), N_("Show or hide the main toolbox (on the left)"), NULL),
     new ZoomVerb(SP_VERB_TOGGLE_PALETTE, "TogglePalette", N_("_Palette"), N_("Show or hide the color palette"), NULL),
     new ZoomVerb(SP_VERB_TOGGLE_STATUSBAR, "ToggleStatusbar", N_("_Statusbar"), N_("Show or hide the statusbar (at the bottom of the window)"), NULL),
-    new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"),
-                 INKSCAPE_ICON("zoom-next")),
-    new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"),
-                 INKSCAPE_ICON("zoom-previous")),
-    new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"),
-                 INKSCAPE_ICON("zoom-original")),
-    new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"),
-                 INKSCAPE_ICON("zoom-half-size")),
-    new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"),
-                 INKSCAPE_ICON("zoom-double-size")),
+
     new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"),
                  INKSCAPE_ICON("view-fullscreen")),
     new ZoomVerb(SP_VERB_FULLSCREENFOCUS, "FullScreenFocus", N_("Fullscreen & Focus Mode"), N_("Stretch this document window to full screen"),
@@ -2884,18 +3062,12 @@ Verb *Verb::_base_verbs[] = {
 
     new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."),
                  N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON("dialog-icon-preview")),
-    new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"),
-                 N_("Zoom to fit page in window"), INKSCAPE_ICON("zoom-fit-page")),
-    new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"),
-                 N_("Zoom to fit page width in window"), INKSCAPE_ICON("zoom-fit-width")),
-    new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"),
-                 N_("Zoom to fit drawing in window"), INKSCAPE_ICON("zoom-fit-drawing")),
-    new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"),
-                 N_("Zoom to fit selection in window"), INKSCAPE_ICON("zoom-fit-selection")),
 
     // Dialogs
+    new DialogVerb(SP_VERB_DIALOG_PROTOTYPE, "DialogPrototype", N_("Prototype..."),
+                   N_("Prototype Dialog"), INKSCAPE_ICON("gtk-preferences")),
     new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("P_references..."),
-                   N_("Edit global Inkscape preferences"), INKSCAPE_ICON("preferences-system")),
+                   N_("Edit global Inkscape preferences"), INKSCAPE_ICON("gtk-preferences")),
     new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogDocumentProperties", N_("_Document Properties..."),
                    N_("Edit properties of this document (to be saved with the document)"), INKSCAPE_ICON("document-properties")),
     new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("Document _Metadata..."),
@@ -2949,6 +3121,10 @@ Verb *Verb::_base_verbs[] = {
                    N_("View Objects"), INKSCAPE_ICON("dialog-layers")),
     new DialogVerb(SP_VERB_DIALOG_TAGS, "DialogTags", N_("Selection se_ts..."),
                    N_("View Tags"), INKSCAPE_ICON("edit-select-all-layers")),
+    new DialogVerb(SP_VERB_DIALOG_STYLE, "DialogStyle", N_("Style Dialog..."),
+                   N_("View Style Dialog"), NULL),
+    new DialogVerb(SP_VERB_DIALOG_CSS, "DialogCss", N_("Css Dialog..."),
+                   N_("View Css Dialog"), NULL),
     new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffects ..."),
                    N_("Manage, edit, and apply path effects"), INKSCAPE_ICON("dialog-path-effects")),
     new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter _Editor..."),