fixing to new trunk

(bzr r15142.1.38)

22 files changed, 789 insertions, 1385 deletions

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index c87fa1500..1184291f2 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -22,7 +22,6 @@ set(widgets_SRC
 	gradient-toolbar.cpp
 	gradient-vector.cpp
 	icon.cpp
-	image-menu-item.c
 	ink-action.cpp
 	ink-comboboxentry-action.cpp
 	ink-radio-action.cpp
@@ -80,7 +79,6 @@ set(widgets_SRC
 	gradient-toolbar.h
 	gradient-vector.h
 	icon.h
-	image-menu-item.h
 	ink-action.h
 	ink-comboboxentry-action.h
 	ink-radio-action.h
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 522705cec..05f3ab44c 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -174,11 +174,13 @@ void SPDashSelector::set_dash (int ndash, double *dash, double o)
     else  if(ndash==0) {
        pos = 0;
     }
-
     if(pos>=0){
        this->set_data("pattern", dashes[pos]);
        this->dash_combo.set_active(pos);
        this->offset->set_value(o);
+       if(pos == 10) {
+           this->offset->set_value(10.0);
+       }
     }
     else { // Hit a custom pattern in the SVG, write it into the combobox.
        count--;  // the one slot for custom patterns
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 4f5724ac2..cdab62f6a 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -325,13 +325,6 @@ static void canvas_tbl_size_allocate(GtkWidget    * widget,
 {
     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(data); 
     sp_desktop_widget_update_rulers(dtw);
-    
-    GtkWidget* parent = gtk_widget_get_parent(widget);
-    if(GTK_IS_PANED(parent)) {
-        GtkPaned *paned = GTK_PANED(parent);
-        // Could use gtk paned property 'max-position' here
-        gtk_paned_set_position(paned, 10000);
-    }
 }
 
 /**
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index 64aace4e7..7377cdc00 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -33,6 +33,8 @@
 #include "eraser-toolbar.h"
 #include "calligraphy-toolbar.h" // TODO: needed for update_presets_list
 
+#include <array>
+
 #include "desktop.h"
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 636d892f8..8946eb4b3 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -40,6 +40,7 @@
 #include "sp-mesh-gradient.h"
 #include "sp-pattern.h"
 #include "sp-radial-gradient.h"
+#include "sp-text.h"
 #include "style.h"
 #include "widgets/paint-selector.h"
 
@@ -279,34 +280,35 @@ void FillNStroke::performUpdate()
 
                 SPPaintServer *server = (kind == FILL) ? query.getFillPaintServer() : query.getStrokePaintServer();
 
-                if (server && SP_IS_GRADIENT(server) && SP_GRADIENT(server)->getVector()->isSwatch()) {
-                    SPGradient *vector = SP_GRADIENT(server)->getVector();
-                    psel->setSwatch( vector );
-                } else if (SP_IS_LINEARGRADIENT(server)) {
-                    SPGradient *vector = SP_GRADIENT(server)->getVector();
-                    psel->setGradientLinear( vector );
-
-                    SPLinearGradient *lg = SP_LINEARGRADIENT(server);
-                    psel->setGradientProperties( lg->getUnits(),
-                                                 lg->getSpread() );
-                } else if (SP_IS_RADIALGRADIENT(server)) {
-                    SPGradient *vector = SP_GRADIENT(server)->getVector();
-                    psel->setGradientRadial( vector );
-
-                    SPRadialGradient *rg = SP_RADIALGRADIENT(server);
-                    psel->setGradientProperties( rg->getUnits(),
-                                                 rg->getSpread() );
+                if (server) {
+                    if (SP_IS_GRADIENT(server) && SP_GRADIENT(server)->getVector()->isSwatch()) {
+                        SPGradient *vector = SP_GRADIENT(server)->getVector();
+                        psel->setSwatch( vector );
+                    } else if (SP_IS_LINEARGRADIENT(server)) {
+                        SPGradient *vector = SP_GRADIENT(server)->getVector();
+                        psel->setGradientLinear( vector );
+
+                        SPLinearGradient *lg = SP_LINEARGRADIENT(server);
+                        psel->setGradientProperties( lg->getUnits(),
+                                                     lg->getSpread() );
+                    } else if (SP_IS_RADIALGRADIENT(server)) {
+                        SPGradient *vector = SP_GRADIENT(server)->getVector();
+                        psel->setGradientRadial( vector );
+
+                        SPRadialGradient *rg = SP_RADIALGRADIENT(server);
+                        psel->setGradientProperties( rg->getUnits(),
+                                                     rg->getSpread() );
 #ifdef WITH_MESH
-                } else if (SP_IS_MESHGRADIENT(server)) {
-                    SPGradient *array = SP_MESHGRADIENT(server)->getArray();
-                    psel->setGradientMesh( array );
-
-                    SPMeshGradient *mg = SP_MESHGRADIENT(server);
-                    psel->setMeshProperties( mg->getUnits() );
+                    } else if (SP_IS_MESHGRADIENT(server)) {
+                        SPGradient *array = SP_GRADIENT(server)->getArray();
+                        psel->setGradientMesh( SP_MESHGRADIENT(array) );
+                        SPMeshGradient *mg = SP_MESHGRADIENT(server);
+                        psel->updateMeshList( SP_MESHGRADIENT( array ));
 #endif
-                } else if (SP_IS_PATTERN(server)) {
-                    SPPattern *pat = SP_PATTERN(server)->rootPattern();
-                    psel->updatePatternList( pat );
+                    } else if (SP_IS_PATTERN(server)) {
+                        SPPattern *pat = SP_PATTERN(server)->rootPattern();
+                        psel->updatePatternList( pat );
+                    }
                 }
             }
             break;
@@ -622,6 +624,107 @@ void FillNStroke::updateFromPaint()
             }
             break;
 
+#ifdef WITH_MESH
+        case SPPaintSelector::MODE_GRADIENT_MESH:
+
+            if (!items.empty()) {
+                SPGradientType const gradient_type = SP_GRADIENT_TYPE_MESH;
+
+                SPCSSAttr *css = 0;
+                if (kind == FILL) {
+                    // HACK: reset fill-opacity - that 0.75 is annoying; BUT remove this when we have an opacity slider for all tabs
+                    css = sp_repr_css_attr_new();
+                    sp_repr_css_set_property(css, "fill-opacity", "1.0");
+                }
+                
+                Inkscape::XML::Document *xml_doc = document->getReprDoc();
+                SPDefs *defs = document->getDefs();
+
+                SPMeshGradient * mesh = psel->getMeshGradient();
+
+                for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
+
+                    //FIXME: see above
+                    if (kind == FILL) {
+                        sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
+                    }
+
+                    // Check if object already has mesh.
+                    bool has_mesh = false;
+                    SPStyle *style = (*i)->style;
+                    if (style) {
+                        SPPaintServer *server =
+                            (kind==FILL) ? style->getFillPaintServer():style->getStrokePaintServer();
+                        if (server && SP_IS_MESHGRADIENT(server)) 
+                            has_mesh = true;
+                    }
+
+                    if (!mesh || !has_mesh) {
+                        // No mesh in document or object does not already have mesh ->
+                        // Create new mesh.
+
+                        // Create mesh element
+                        Inkscape::XML::Node *repr = xml_doc->createElement("svg:meshgradient");
+
+                        // privates are garbage-collectable
+                        repr->setAttribute("inkscape:collect", "always");
+
+                        // Attach to document
+                        defs->getRepr()->appendChild(repr);
+                        Inkscape::GC::release(repr);
+
+                        // Get corresponding object
+                        SPMeshGradient *mg = static_cast<SPMeshGradient *>(document->getObjectByRepr(repr));
+                        mg->array.create(mg, *i, (kind==FILL) ?
+                                         (*i)->geometricBounds() : (*i)->visualBounds());
+
+                        bool isText = SP_IS_TEXT(*i);
+                        sp_style_set_property_url (*i, ((kind == FILL) ? "fill":"stroke"),
+                                                   mg, isText);
+
+                        // (*i)->requestModified(SP_OBJECT_MODIFIED_FLAG|SP_OBJECT_STYLE_MODIFIED_FLAG);
+
+                    } else {
+                        // Using found mesh
+
+                        // Duplicate
+                        Inkscape::XML::Node *mesh_repr = mesh->getRepr();
+                        Inkscape::XML::Node *copy_repr = mesh_repr->duplicate(xml_doc);
+
+                        // privates are garbage-collectable
+                        copy_repr->setAttribute("inkscape:collect", "always");
+
+                        // Attach to document
+                        defs->getRepr()->appendChild(copy_repr);
+                        Inkscape::GC::release(copy_repr);
+
+                        // Get corresponding object
+                        SPMeshGradient *mg =
+                            static_cast<SPMeshGradient *>(document->getObjectByRepr(copy_repr));
+                        // std::cout << "  " << (mg->getId()?mg->getId():"null") << std::endl;
+                        mg->array.read(mg);
+
+                        Geom::OptRect item_bbox = (kind==FILL) ?
+                            (*i)->geometricBounds() : (*i)->visualBounds();
+                        mg->array.fill_box( item_bbox );
+
+                        bool isText = SP_IS_TEXT(*i);
+                        sp_style_set_property_url (*i, ((kind == FILL) ? "fill":"stroke"),
+                                                   mg, isText);
+                    }
+                }
+
+                if (css) {
+                    sp_repr_css_attr_unref(css);
+                    css = 0;
+                }
+
+                DocumentUndo::done(document, SP_VERB_DIALOG_FILL_STROKE,
+                                   (kind == FILL) ? _("Set mesh on fill") : _("Set mesh on stroke"));
+            }
+            break;
+#endif
+
         case SPPaintSelector::MODE_PATTERN:
 
             if (!items.empty()) {
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index f400de89c..819ac77b6 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -145,13 +145,6 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         gtk_widget_set_name( GTK_WIDGET(fsel->family_treeview), "font_selector_family" );
 
         auto css_provider = gtk_css_provider_new();
-        gtk_css_provider_load_from_data(css_provider,
-                                        "#font_selector_family {\n"
-                                        "  -GtkWidget-wide-separators:  true;\n"
-                                        "  -GtkWidget-separator-height: 6;\n"
-                                        "}\n",
-                                        -1, NULL);
-
         auto screen = gdk_screen_get_default();
         gtk_style_context_add_provider_for_screen(screen,
                                                   GTK_STYLE_PROVIDER(css_provider),
diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp
index bfb9c9071..2a71b5c08 100644
--- a/src/widgets/gimp/ruler.cpp
+++ b/src/widgets/gimp/ruler.cpp
@@ -12,7 +12,9 @@
  *  - We use a default font size of PANGO_SCALE_X_SMALL for labels,
  *    GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours).
  *
- *  - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k) 
+ *  - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k)
+ *
+ *  - GtkStateFlags are read from GtkStyleContext objects where appropriate
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
@@ -548,7 +550,7 @@ sp_ruler_size_allocate (GtkWidget     *widget,
   resized = (widget_allocation.width  != allocation->width ||
              widget_allocation.height != allocation->height);
 
-  gtk_widget_set_allocation(widget, allocation);
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
 
   if (gtk_widget_get_realized (widget))
     {
@@ -578,7 +580,9 @@ sp_ruler_size_request (GtkWidget      *widget,
   GtkStyleContext *context = gtk_widget_get_style_context (widget);
   GtkBorder        border;
 
-  gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border);
+  GtkStateFlags state_flags = gtk_style_context_get_state (context);
+
+  gtk_style_context_get_border (context, state_flags, &border);
   
   requisition->width  = border.left + border.right;
   requisition->height = border.top  + border.bottom;
@@ -725,7 +729,17 @@ sp_ruler_draw_pos (SPRuler *ruler,
       cairo_fill (cr);
     }
 
-  priv->last_pos_rect = pos_rect;
+  if (priv->last_pos_rect.width  != 0 &&
+      priv->last_pos_rect.height != 0)
+    {
+      gdk_rectangle_union (&priv->last_pos_rect,
+                           &pos_rect,
+                           &priv->last_pos_rect);
+    }
+  else
+    {
+      priv->last_pos_rect = pos_rect;
+    }
 }
 
 /**
@@ -999,6 +1013,12 @@ sp_ruler_set_position (SPRuler *ruler,
           (ABS (xdiff) > IMMEDIATE_REDRAW_THRESHOLD ||
            ABS (ydiff) > IMMEDIATE_REDRAW_THRESHOLD))
         {
+          if (priv->pos_redraw_idle_id)
+            {
+              g_source_remove (priv->pos_redraw_idle_id);
+              priv->pos_redraw_idle_id = 0;
+            }
+
           sp_ruler_queue_pos_redraw (ruler);
         }
       else if (! priv->pos_redraw_idle_id)
@@ -1072,7 +1092,9 @@ sp_ruler_draw_ticks (SPRuler *ruler)
 
     gtk_widget_get_allocation (widget, &allocation);
 
-    gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border);
+    GtkStateFlags state_flags = gtk_style_context_get_state (context);
+
+    gtk_style_context_get_border (context, state_flags, &border);
 
     layout = sp_ruler_get_layout (widget, "0123456789");
     pango_layout_get_extents (layout, &ink_rect, &logical_rect);
@@ -1284,7 +1306,9 @@ sp_ruler_get_pos_rect (SPRuler *ruler,
   GtkStyleContext *context = gtk_widget_get_style_context (widget);
   GtkBorder padding;
 
-  gtk_style_context_get_border(context, static_cast<GtkStateFlags>(0), &padding);
+  GtkStateFlags state_flags = gtk_style_context_get_state (context);
+
+  gtk_style_context_get_border(context, state_flags, &padding);
 
   xthickness = padding.left + padding.right;
   ythickness = padding.top + padding.bottom;
@@ -1351,15 +1375,16 @@ sp_ruler_queue_pos_redraw (SPRuler *ruler)
 
   gtk_widget_get_allocation (GTK_WIDGET(ruler), &allocation);
 
-  gtk_widget_queue_draw_area (GTK_WIDGET(ruler),
+  gtk_widget_queue_draw_area (GTK_WIDGET (ruler),
                               rect.x + allocation.x,
                               rect.y + allocation.y,
                               rect.width,
                               rect.height);
 
-  if (priv->last_pos_rect.width != 0 || priv->last_pos_rect.height != 0)
+  if (priv->last_pos_rect.width  != 0  &&
+      priv->last_pos_rect.height != 0)
     {
-      gtk_widget_queue_draw_area (GTK_WIDGET(ruler),
+      gtk_widget_queue_draw_area (GTK_WIDGET (ruler),
                                   priv->last_pos_rect.x + allocation.x,
                                   priv->last_pos_rect.y + allocation.y,
                                   priv->last_pos_rect.width,
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index 6b5d4ca60..e058c5112 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -50,9 +50,6 @@ struct SPGradientSelector {
     enum SelectorMode {
         MODE_LINEAR,
         MODE_RADIAL,
-#ifdef WITH_MESH
-        MODE_MESH,
-#endif
         MODE_SWATCH
     };
 
diff --git a/src/widgets/image-menu-item.c b/src/widgets/image-menu-item.c
deleted file mode 100644
index 2b9500ba0..000000000
--- a/src/widgets/image-menu-item.c
+++ /dev/null
@@ -1,1071 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.
- * Forked by . Icons in menus are important to us.
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include "widgets/image-menu-item.h"
-
-/**
- * SECTION:gtkimagemenuitem
- * @Short_description: A menu item with an icon
- * @Title: ImageMenuItem
- *
- * A ImageMenuItem is a menu item which has an icon next to the text label.
- *
- * Note that the user can disable display of menu icons, so make sure to still
- * fill in the text label.
- */
-
-
-struct _ImageMenuItemPrivate
-{
-  GtkWidget     *image;
-
-  gchar         *label;
-  guint          use_stock         : 1;
-  guint          toggle_size;
-};
-
-enum {
-  PROP_0,
-  PROP_IMAGE,
-  PROP_USE_STOCK,
-  PROP_ACCEL_GROUP,
-};
-
-static GtkActivatableIface *parent_activatable_iface;
-
-static void image_menu_item_destroy              (GtkWidget        *widget);
-static void image_menu_item_get_preferred_width  (GtkWidget        *widget,
-                                                      gint             *minimum,
-                                                      gint             *natural);
-static void image_menu_item_get_preferred_height (GtkWidget        *widget,
-                                                      gint             *minimum,
-                                                      gint             *natural);
-static void image_menu_item_get_preferred_height_for_width (GtkWidget *widget,
-                                                                gint       width,
-                                                                gint      *minimum,
-                                                                gint      *natural);
-static void image_menu_item_size_allocate        (GtkWidget        *widget,
-                                                      GtkAllocation    *allocation);
-static void image_menu_item_map                  (GtkWidget        *widget);
-static void image_menu_item_remove               (GtkContainer     *container,
-                                                      GtkWidget        *child);
-static void image_menu_item_toggle_size_request  (GtkMenuItem      *menu_item,
-                                                      gint             *requisition);
-static void image_menu_item_set_label            (GtkMenuItem      *menu_item,
-                                                      const gchar      *label);
-static const gchar * image_menu_item_get_label   (GtkMenuItem *menu_item);
-
-static void image_menu_item_forall               (GtkContainer    *container,
-                                                      gboolean         include_internals,
-                                                      GtkCallback      callback,
-                                                      gpointer         callback_data);
-
-static void image_menu_item_finalize             (GObject         *object);
-static void image_menu_item_set_property         (GObject         *object,
-                                                      guint            prop_id,
-                                                      const GValue    *value,
-                                                      GParamSpec      *pspec);
-static void image_menu_item_get_property         (GObject         *object,
-                                                      guint            prop_id,
-                                                      GValue          *value,
-                                                      GParamSpec      *pspec);
-static void image_menu_item_screen_changed       (GtkWidget       *widget,
-                                                      GdkScreen       *previous_screen);
-
-static void image_menu_item_recalculate          (ImageMenuItem *image_menu_item);
-
-static void image_menu_item_activatable_interface_init (GtkActivatableIface  *iface);
-static void image_menu_item_update                     (GtkActivatable       *activatable,
-                                                            GtkAction            *action,
-                                                            const gchar          *property_name);
-static void image_menu_item_sync_action_properties     (GtkActivatable       *activatable,
-                                                            GtkAction            *action);
-
-
-G_DEFINE_TYPE_WITH_CODE (ImageMenuItem, image_menu_item, GTK_TYPE_MENU_ITEM,
-                         G_ADD_PRIVATE (ImageMenuItem)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
-                             image_menu_item_activatable_interface_init))
-
-
-static void
-image_menu_item_class_init (ImageMenuItemClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass*) klass;
-  GtkWidgetClass *widget_class = (GtkWidgetClass*) klass;
-  GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass;
-  GtkContainerClass *container_class = (GtkContainerClass*) klass;
-
-  widget_class->destroy = image_menu_item_destroy;
-  widget_class->screen_changed = image_menu_item_screen_changed;
-  widget_class->get_preferred_width = image_menu_item_get_preferred_width;
-  widget_class->get_preferred_height = image_menu_item_get_preferred_height;
-  widget_class->get_preferred_height_for_width = image_menu_item_get_preferred_height_for_width;
-  widget_class->size_allocate = image_menu_item_size_allocate;
-  widget_class->map = image_menu_item_map;
-
-  container_class->forall = image_menu_item_forall;
-  container_class->remove = image_menu_item_remove;
-
-  menu_item_class->toggle_size_request = image_menu_item_toggle_size_request;
-  menu_item_class->set_label           = image_menu_item_set_label;
-  menu_item_class->get_label           = image_menu_item_get_label;
-
-  gobject_class->finalize     = image_menu_item_finalize;
-  gobject_class->set_property = image_menu_item_set_property;
-  gobject_class->get_property = image_menu_item_get_property;
-
-  /**
-   * ImageMenuItem:image:
-   *
-   * Child widget to appear next to the menu text.
-   *
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_IMAGE,
-                                   g_param_spec_object ("image",
-                                                        _("Image widget"),
-                                                        _("Child widget to appear next to the menu text"),
-                                                        GTK_TYPE_WIDGET,
-                                                        GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
-  /**
-   * ImageMenuItem:use-stock:
-   *
-   * If %TRUE, the label set in the menuitem is used as a
-   * stock id to select the stock item for the item.
-   *
-   * Since: 2.16
-   *
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_USE_STOCK,
-                                   g_param_spec_boolean ("use-stock",
-                                                         _("Use stock"),
-                                                         _("Whether to use the label text to create a stock menu item"),
-                                                         FALSE,
-                                                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED));
-
-  /**
-   * ImageMenuItem:accel-group:
-   *
-   * The Accel Group to use for stock accelerator keys
-   *
-   * Since: 2.16
-   *
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_ACCEL_GROUP,
-                                   g_param_spec_object ("accel-group",
-                                                        _("Accel Group"),
-                                                        _("The Accel Group to use for stock accelerator keys"),
-                                                        GTK_TYPE_ACCEL_GROUP,
-                                                        GTK_PARAM_WRITABLE | G_PARAM_DEPRECATED));
-
-}
-
-static void
-image_menu_item_init (ImageMenuItem *image_menu_item)
-{
-  ImageMenuItemPrivate *priv;
-
-  image_menu_item->priv = image_menu_item_get_instance_private (image_menu_item);
-  priv = image_menu_item->priv;
-
-  priv->image = NULL;
-  priv->use_stock = FALSE;
-  priv->label  = NULL;
-}
-
-static void
-image_menu_item_finalize (GObject *object)
-{
-  ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (object)->priv;
-
-  g_free (priv->label);
-  priv->label  = NULL;
-
-  G_OBJECT_CLASS (image_menu_item_parent_class)->finalize (object);
-}
-
-static void
-image_menu_item_set_property (GObject         *object,
-                                  guint            prop_id,
-                                  const GValue    *value,
-                                  GParamSpec      *pspec)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object);
-
-  switch (prop_id)
-    {
-    case PROP_IMAGE:
-      image_menu_item_set_image (image_menu_item, (GtkWidget *) g_value_get_object (value));
-      break;
-    case PROP_USE_STOCK:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      image_menu_item_set_use_stock (image_menu_item, g_value_get_boolean (value));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
-    case PROP_ACCEL_GROUP:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      image_menu_item_set_accel_group (image_menu_item, g_value_get_object (value));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-image_menu_item_get_property (GObject         *object,
-                                  guint            prop_id,
-                                  GValue          *value,
-                                  GParamSpec      *pspec)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object);
-
-  switch (prop_id)
-    {
-    case PROP_IMAGE:
-      g_value_set_object (value, image_menu_item_get_image (image_menu_item));
-      break;
-    case PROP_USE_STOCK:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      g_value_set_boolean (value, image_menu_item_get_use_stock (image_menu_item));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-image_menu_item_map (GtkWidget *widget)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->map (widget);
-
-  if (priv->image)
-    g_object_set (priv->image, "visible", TRUE, NULL);
-}
-
-static void
-image_menu_item_destroy (GtkWidget *widget)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  if (priv->image)
-    gtk_container_remove (GTK_CONTAINER (image_menu_item),
-                          priv->image);
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->destroy (widget);
-}
-
-static void
-image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
-                                         gint        *requisition)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (menu_item);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-  GtkWidget *widget = GTK_WIDGET (menu_item);
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  *requisition = 0;
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      GtkRequisition image_requisition;
-      guint toggle_spacing;
-
-      gtk_widget_get_preferred_size (priv->image, &image_requisition, NULL);
-
-      gtk_widget_style_get (GTK_WIDGET (menu_item),
-                            "toggle-spacing", &toggle_spacing,
-                            NULL);
-
-      if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL)
-        {
-          if (image_requisition.width > 0)
-            *requisition = image_requisition.width + toggle_spacing;
-        }
-      else
-        {
-          if (image_requisition.height > 0)
-            *requisition = image_requisition.height + toggle_spacing;
-        }
-    }
-}
-
-static void
-image_menu_item_recalculate (ImageMenuItem *image_menu_item)
-{
-  ImageMenuItemPrivate    *priv = image_menu_item->priv;
-  GtkStockItem             stock_item;
-  GtkWidget               *image;
-  const gchar             *resolved_label = priv->label;
-
-  if (priv->use_stock && priv->label)
-    {
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-      if (!priv->image)
-        {
-          image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU);
-          image_menu_item_set_image (image_menu_item, image);
-        }
-
-      if (gtk_stock_lookup (priv->label, &stock_item))
-          resolved_label = stock_item.label;
-
-      gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE);
-
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-    }
-
-  GTK_MENU_ITEM_CLASS
-    (image_menu_item_parent_class)->set_label (GTK_MENU_ITEM (image_menu_item), resolved_label);
-
-}
-
-static void
-image_menu_item_set_label (GtkMenuItem      *menu_item,
-                               const gchar      *label)
-{
-  ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv;
-
-  if (priv->label != label)
-    {
-      g_free (priv->label);
-      priv->label = g_strdup (label);
-
-      image_menu_item_recalculate (IMAGE_MENU_ITEM (menu_item));
-
-      g_object_notify (G_OBJECT (menu_item), "label");
-
-    }
-}
-
-static const gchar *
-image_menu_item_get_label (GtkMenuItem *menu_item)
-{
-  ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv;
-
-  return priv->label;
-}
-
-static void
-image_menu_item_get_preferred_width (GtkWidget        *widget,
-                                         gint             *minimum,
-                                         gint             *natural)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_width (widget, minimum, natural);
-
-  if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
-      priv->image &&
-      gtk_widget_get_visible (priv->image))
-    {
-      gint child_minimum, child_natural;
-
-      gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural);
-
-      *minimum = MAX (*minimum, child_minimum);
-      *natural = MAX (*natural, child_natural);
-    }
-}
-
-static void
-image_menu_item_get_preferred_height (GtkWidget        *widget,
-                                          gint             *minimum,
-                                          gint             *natural)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  gint child_height = 0;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      GtkRequisition child_requisition;
-
-      gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
-
-      child_height = child_requisition.height;
-    }
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_height (widget, minimum, natural);
-
-  if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR)
-    {
-      *minimum = MAX (*minimum, child_height);
-      *natural = MAX (*natural, child_height);
-    }
-}
-
-static void
-image_menu_item_get_preferred_height_for_width (GtkWidget        *widget,
-                                                    gint              width,
-                                                    gint             *minimum,
-                                                    gint             *natural)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  gint child_height = 0;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      GtkRequisition child_requisition;
-
-      gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
-
-      child_height = child_requisition.height;
-    }
-
-  GTK_WIDGET_CLASS
-    (image_menu_item_parent_class)->get_preferred_height_for_width (widget, width, minimum, natural);
-
-  if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR)
-    {
-      *minimum = MAX (*minimum, child_height);
-      *natural = MAX (*natural, child_height);
-    }
-}
-
-
-static void
-image_menu_item_size_allocate (GtkWidget     *widget,
-                                   GtkAllocation *allocation)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  GtkAllocation widget_allocation;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->size_allocate (widget, allocation);
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      gint x, y, offset;
-      GtkStyleContext *context;
-      GtkStateFlags state;
-      GtkBorder padding;
-      GtkRequisition child_requisition;
-      GtkAllocation child_allocation;
-      guint horizontal_padding, toggle_spacing;
-      gint toggle_size;
-
-      toggle_size = image_menu_item->priv->toggle_size;
-      gtk_widget_style_get (widget,
-                            "horizontal-padding", &horizontal_padding,
-                            "toggle-spacing", &toggle_spacing,
-                            NULL);
-
-      /* Man this is lame hardcoding action, but I can't
-       * come up with a solution that's really better.
-       */
-
-      gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
-
-      gtk_widget_get_allocation (widget, &widget_allocation);
-
-      context = gtk_widget_get_style_context (widget);
-      state = gtk_widget_get_state_flags (widget);
-      gtk_style_context_get_padding (context, state, &padding);
-      offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item));
-
-      if (pack_dir == GTK_PACK_DIRECTION_LTR ||
-          pack_dir == GTK_PACK_DIRECTION_RTL)
-        {
-          if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
-              (pack_dir == GTK_PACK_DIRECTION_LTR))
-            x = offset + horizontal_padding + padding.left +
-               (toggle_size - toggle_spacing - child_requisition.width) / 2;
-          else
-            x = widget_allocation.width - offset - horizontal_padding - padding.right -
-              toggle_size + toggle_spacing +
-              (toggle_size - toggle_spacing - child_requisition.width) / 2;
-
-          y = (widget_allocation.height - child_requisition.height) / 2;
-        }
-      else
-        {
-          if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
-              (pack_dir == GTK_PACK_DIRECTION_TTB))
-            y = offset + horizontal_padding + padding.top +
-              (toggle_size - toggle_spacing - child_requisition.height) / 2;
-          else
-            y = widget_allocation.height - offset - horizontal_padding - padding.bottom -
-              toggle_size + toggle_spacing +
-              (toggle_size - toggle_spacing - child_requisition.height) / 2;
-
-          x = (widget_allocation.width - child_requisition.width) / 2;
-        }
-
-      child_allocation.width = child_requisition.width;
-      child_allocation.height = child_requisition.height;
-      child_allocation.x = widget_allocation.x + MAX (x, 0);
-      child_allocation.y = widget_allocation.y + MAX (y, 0);
-
-      gtk_widget_size_allocate (priv->image, &child_allocation);
-    }
-}
-
-static void
-image_menu_item_forall (GtkContainer   *container,
-                            gboolean        include_internals,
-                            GtkCallback     callback,
-                            gpointer        callback_data)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  GTK_CONTAINER_CLASS (image_menu_item_parent_class)->forall (container,
-                                                                  include_internals,
-                                                                  callback,
-                                                                  callback_data);
-
-  if (include_internals && priv->image)
-    (* callback) (priv->image, callback_data);
-}
-
-
-static void
-image_menu_item_activatable_interface_init (GtkActivatableIface  *iface)
-{
-  parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = image_menu_item_update;
-  iface->sync_action_properties = image_menu_item_sync_action_properties;
-}
-
-static gboolean
-activatable_update_stock_id (ImageMenuItem *image_menu_item, GtkAction *action)
-{
-  GtkWidget   *image;
-  const gchar *stock_id  = gtk_action_get_stock_id (action);
-
-  image = image_menu_item_get_image (image_menu_item);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if (GTK_IS_IMAGE (image) &&
-      stock_id && gtk_icon_factory_lookup_default (stock_id))
-    {
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      gtk_image_set_from_stock (GTK_IMAGE (image), stock_id, GTK_ICON_SIZE_MENU);
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      return TRUE;
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return FALSE;
-}
-
-static gboolean
-activatable_update_gicon (ImageMenuItem *image_menu_item, GtkAction *action)
-{
-  GtkWidget   *image;
-  GIcon       *icon = gtk_action_get_gicon (action);
-  const gchar *stock_id;
-  gboolean     ret = FALSE;
-
-  stock_id = gtk_action_get_stock_id (action);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  image = image_menu_item_get_image (image_menu_item);
-
-  if (icon && GTK_IS_IMAGE (image) &&
-      !(stock_id && gtk_icon_factory_lookup_default (stock_id)))
-    {
-      gtk_image_set_from_gicon (GTK_IMAGE (image), icon, GTK_ICON_SIZE_MENU);
-      ret = TRUE;
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return ret;
-}
-
-static void
-activatable_update_icon_name (ImageMenuItem *image_menu_item, GtkAction *action)
-{
-  GtkWidget   *image;
-  const gchar *icon_name = gtk_action_get_icon_name (action);
-
-  image = image_menu_item_get_image (image_menu_item);
-
-  if (GTK_IS_IMAGE (image) &&
-      (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY ||
-       gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME))
-    {
-      gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_MENU);
-    }
-}
-
-static void
-image_menu_item_update (GtkActivatable *activatable,
-                            GtkAction      *action,
-                            const gchar    *property_name)
-{
-  ImageMenuItem *image_menu_item;
-  gboolean   use_appearance;
-
-  image_menu_item = IMAGE_MENU_ITEM (activatable);
-
-  parent_activatable_iface->update (activatable, action, property_name);
-
-  use_appearance = gtk_activatable_get_use_action_appearance (activatable);
-  if (!use_appearance)
-    return;
-
-  if (strcmp (property_name, "stock-id") == 0)
-    activatable_update_stock_id (image_menu_item, action);
-  else if (strcmp (property_name, "gicon") == 0)
-    activatable_update_gicon (image_menu_item, action);
-  else if (strcmp (property_name, "icon-name") == 0)
-    activatable_update_icon_name (image_menu_item, action);
-}
-
-static void
-image_menu_item_sync_action_properties (GtkActivatable *activatable,
-                                            GtkAction      *action)
-{
-  ImageMenuItem *image_menu_item;
-  GtkWidget *image;
-  gboolean   use_appearance;
-
-  image_menu_item = IMAGE_MENU_ITEM (activatable);
-
-  parent_activatable_iface->sync_action_properties (activatable, action);
-
-  if (!action)
-    return;
-
-  use_appearance = gtk_activatable_get_use_action_appearance (activatable);
-  if (!use_appearance)
-    return;
-
-  image = image_menu_item_get_image (image_menu_item);
-  if (image && !GTK_IS_IMAGE (image))
-    {
-      image_menu_item_set_image (image_menu_item, NULL);
-      image = NULL;
-    }
-
-  if (!image)
-    {
-      image = gtk_image_new ();
-      gtk_widget_show (image);
-      image_menu_item_set_image (IMAGE_MENU_ITEM (activatable),
-                                     image);
-    }
-
-  if (!activatable_update_stock_id (image_menu_item, action) &&
-      !activatable_update_gicon (image_menu_item, action))
-    activatable_update_icon_name (image_menu_item, action);
-
-}
-
-
-/**
- * image_menu_item_new:
- *
- * Creates a new #ImageMenuItem with an empty label.
- *
- * Returns: a new #ImageMenuItem
- *
- */
-GtkWidget*
-image_menu_item_new (void)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM, NULL);
-}
-
-/**
- * image_menu_item_new_with_label:
- * @label: the text of the menu item.
- *
- * Creates a new #ImageMenuItem containing a label.
- *
- * Returns: a new #ImageMenuItem.
- *
- */
-GtkWidget*
-image_menu_item_new_with_label (const gchar *label)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM,
-                       "label", label,
-                       NULL);
-}
-
-/**
- * image_menu_item_new_with_mnemonic:
- * @label: the text of the menu item, with an underscore in front of the
- *         mnemonic character
- *
- * Creates a new #ImageMenuItem containing a label. The label
- * will be created using gtk_label_new_with_mnemonic(), so underscores
- * in @label indicate the mnemonic for the menu item.
- *
- * Returns: a new #ImageMenuItem
- *
- */
-GtkWidget*
-image_menu_item_new_with_mnemonic (const gchar *label)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM,
-                       "use-underline", TRUE,
-                       "label", label,
-                       NULL);
-}
-
-/**
- * image_menu_item_new_from_stock:
- * @stock_id: the name of the stock item.
- * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items
- *   accelerator to, or %NULL.
- *
- * Creates a new #ImageMenuItem containing the image and text from a
- * stock item. Some stock ids have preprocessor macros like #STOCK_OK
- * and #STOCK_APPLY.
- *
- * If you want this menu item to have changeable accelerators, then pass in
- * %NULL for accel_group. Next call gtk_menu_item_set_accel_path() with an
- * appropriate path for the menu item, use gtk_stock_lookup() to look up the
- * standard accelerator for the stock item, and if one is found, call
- * gtk_accel_map_add_entry() to register it.
- *
- * Returns: a new #ImageMenuItem.
- *
- */
-GtkWidget*
-image_menu_item_new_from_stock (const gchar   *stock_id,
-                                    GtkAccelGroup *accel_group)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM,
-                       "label", stock_id,
-                       "use-stock", TRUE,
-                       "accel-group", accel_group,
-                       NULL);
-}
-
-/**
- * image_menu_item_set_use_stock:
- * @image_menu_item: a #ImageMenuItem
- * @use_stock: %TRUE if the menuitem should use a stock item
- *
- * If %TRUE, the label set in the menuitem is used as a
- * stock id to select the stock item for the item.
- *
- * Since: 2.16
- *
- */
-void
-image_menu_item_set_use_stock (ImageMenuItem *image_menu_item,
-                                   gboolean          use_stock)
-{
-  ImageMenuItemPrivate *priv;
-
-  g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item));
-
-  priv = image_menu_item->priv;
-
-  if (priv->use_stock != use_stock)
-    {
-      priv->use_stock = use_stock;
-
-      image_menu_item_recalculate (image_menu_item);
-
-      g_object_notify (G_OBJECT (image_menu_item), "use-stock");
-    }
-}
-
-/**
- * image_menu_item_get_use_stock:
- * @image_menu_item: a #ImageMenuItem
- *
- * Checks whether the label set in the menuitem is used as a
- * stock id to select the stock item for the item.
- *
- * Returns: %TRUE if the label set in the menuitem is used as a
- *     stock id to select the stock item for the item
- *
- * Since: 2.16
- *
- */
-gboolean
-image_menu_item_get_use_stock (ImageMenuItem *image_menu_item)
-{
-  g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), FALSE);
-
-  return image_menu_item->priv->use_stock;
-}
-
-/**
- * image_menu_item_set_accel_group:
- * @image_menu_item: a #ImageMenuItem
- * @accel_group: the #GtkAccelGroup
- *
- * Specifies an @accel_group to add the menu items accelerator to
- * (this only applies to stock items so a stock item must already
- * be set, make sure to call image_menu_item_set_use_stock()
- * and gtk_menu_item_set_label() with a valid stock item first).
- *
- * If you want this menu item to have changeable accelerators then
- * you shouldnt need this (see image_menu_item_new_from_stock()).
- *
- * Since: 2.16
- *
- */
-void
-image_menu_item_set_accel_group (ImageMenuItem *image_menu_item,
-                                     GtkAccelGroup    *accel_group)
-{
-  ImageMenuItemPrivate    *priv;
-  GtkStockItem             stock_item;
-
-  /* Silent return for the constructor */
-  if (!accel_group)
-    return;
-
-  g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item));
-  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
-
-  priv = image_menu_item->priv;
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if (priv->use_stock && priv->label && gtk_stock_lookup (priv->label, &stock_item))
-    if (stock_item.keyval)
-      {
-        gtk_widget_add_accelerator (GTK_WIDGET (image_menu_item),
-                                    "activate",
-                                    accel_group,
-                                    stock_item.keyval,
-                                    stock_item.modifier,
-                                    GTK_ACCEL_VISIBLE);
-
-        g_object_notify (G_OBJECT (image_menu_item), "accel-group");
-      }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-}
-
-/**
- * image_menu_item_set_image:
- * @image_menu_item: a #ImageMenuItem.
- * @image: (allow-none): a widget to set as the image for the menu item.
- *
- * Sets the image of @image_menu_item to the given widget.
- * Note that it depends on the show-menu-images setting whether
- * the image will be displayed or not.
- *
- */
-void
-image_menu_item_set_image (ImageMenuItem *image_menu_item,
-                               GtkWidget        *image)
-{
-  ImageMenuItemPrivate *priv;
-
-  g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item));
-
-  priv = image_menu_item->priv;
-
-  if (image == priv->image)
-    return;
-
-  if (priv->image)
-    gtk_container_remove (GTK_CONTAINER (image_menu_item),
-                          priv->image);
-
-  priv->image = image;
-
-  if (image == NULL)
-    return;
-
-  gtk_widget_set_parent (image, GTK_WIDGET (image_menu_item));
-  g_object_set (image, "visible", TRUE, "no-show-all", TRUE, NULL);
-
-  g_object_notify (G_OBJECT (image_menu_item), "image");
-}
-
-/**
- * image_menu_item_get_image:
- * @image_menu_item: a #ImageMenuItem
- *
- * Gets the widget that is currently set as the image of @image_menu_item.
- * See image_menu_item_set_image().
- *
- * Return value: (transfer none): the widget set as image of @image_menu_item
- *
- **/
-GtkWidget*
-image_menu_item_get_image (ImageMenuItem *image_menu_item)
-{
-  g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), NULL);
-
-  return image_menu_item->priv->image;
-}
-
-static void
-image_menu_item_remove (GtkContainer *container,
-                            GtkWidget    *child)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  if (child == priv->image)
-    {
-      gboolean widget_was_visible;
-
-      widget_was_visible = gtk_widget_get_visible (child);
-
-      gtk_widget_unparent (child);
-      priv->image = NULL;
-
-      if (widget_was_visible &&
-          gtk_widget_get_visible (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-
-      g_object_notify (G_OBJECT (image_menu_item), "image");
-    }
-  else
-    {
-      GTK_CONTAINER_CLASS (image_menu_item_parent_class)->remove (container, child);
-    }
-}
-
-static void
-show_image_change_notify (ImageMenuItem *image_menu_item)
-{
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  if (priv->image)
-    {
-        gtk_widget_show (priv->image);
-    }
-}
-
-static void
-traverse_container (GtkWidget *widget,
-                    gpointer   data)
-{
-  if (IS_IMAGE_MENU_ITEM (widget))
-    show_image_change_notify (IMAGE_MENU_ITEM (widget));
-  else if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);
-}
-
-static void
-image_menu_item_setting_changed (GtkSettings *settings)
-{
-  GList *list, *l;
-
-  list = gtk_window_list_toplevels ();
-
-  for (l = list; l; l = l->next)
-    gtk_container_forall (GTK_CONTAINER (l->data),
-                          traverse_container, NULL);
-
-  g_list_free (list);
-}
-
-static void
-image_menu_item_screen_changed (GtkWidget *widget,
-                                    GdkScreen *previous_screen)
-{
-  GtkSettings *settings;
-  gulong show_image_connection;
-
-  if (!gtk_widget_has_screen (widget))
-    return;
-
-  settings = gtk_widget_get_settings (widget);
-
-  show_image_connection =
-    g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0,
-                           NULL, image_menu_item_setting_changed, NULL);
-
-  if (show_image_connection)
-    return;
-
-  g_signal_connect (settings, "notify::gtk-menu-images",
-                    G_CALLBACK (image_menu_item_setting_changed), NULL);
-
-  show_image_change_notify (IMAGE_MENU_ITEM (widget));
-}
diff --git a/src/widgets/image-menu-item.h b/src/widgets/image-menu-item.h
deleted file mode 100644
index 61cc48f3a..000000000
--- a/src/widgets/image-menu-item.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.
- * Forked for , icons in menus are important to us.
- */
-
-#ifndef __IMAGE_MENU_ITEM_H__
-#define __IMAGE_MENU_ITEM_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-#define TYPE_IMAGE_MENU_ITEM            (image_menu_item_get_type ())
-#define IMAGE_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItem))
-#define IMAGE_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass))
-#define IS_IMAGE_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_MENU_ITEM))
-#define IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_MENU_ITEM))
-#define IMAGE_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass))
-
-typedef struct _ImageMenuItem              ImageMenuItem;
-typedef struct _ImageMenuItemPrivate       ImageMenuItemPrivate;
-typedef struct _ImageMenuItemClass         ImageMenuItemClass;
-
-struct _ImageMenuItem
-{
-  GtkMenuItem menu_item;
-
-  /*< private >*/
-  ImageMenuItemPrivate *priv;
-};
-
-struct _ImageMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType	   image_menu_item_get_type          (void) G_GNUC_CONST;
-GtkWidget* image_menu_item_new               (void);
-GtkWidget* image_menu_item_new_with_label    (const gchar      *label);
-GtkWidget* image_menu_item_new_with_mnemonic (const gchar      *label);
-GtkWidget* image_menu_item_new_from_stock    (const gchar      *stock_id,
-                                                  GtkAccelGroup    *accel_group);
-void       image_menu_item_set_image         (ImageMenuItem *image_menu_item,
-                                                  GtkWidget        *image);
-GtkWidget* image_menu_item_get_image         (ImageMenuItem *image_menu_item);
-void       image_menu_item_set_use_stock     (ImageMenuItem *image_menu_item,
-						  gboolean          use_stock);
-gboolean   image_menu_item_get_use_stock     (ImageMenuItem *image_menu_item);
-void       image_menu_item_set_accel_group   (ImageMenuItem *image_menu_item, 
-						  GtkAccelGroup    *accel_group);
-
-G_END_DECLS
-
-#endif /* __IMAGE_MENU_ITEM_H__ */
diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index 2f1bf94e4..8859306f1 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -1,8 +1,6 @@
 #include "ink-action.h"
 #include "widgets/icon.h"
 
-#include "widgets/image-menu-item.h"
-
 #include <gtk/gtk.h>
 
 static void ink_action_finalize( GObject* obj );
@@ -155,7 +153,7 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action )
     if ( act->private_data->iconId ) {
         gchar* label = 0;
         g_object_get( G_OBJECT(act), "label", &label, NULL );
-        item = image_menu_item_new_with_mnemonic( label );
+        item = gtk_image_menu_item_new_with_mnemonic( label );
 
         GtkWidget* child = sp_icon_new( Inkscape::ICON_SIZE_MENU, act->private_data->iconId );
         // TODO this work-around is until SPIcon will live properly inside of a popup menu
@@ -170,7 +168,7 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action )
             }
         }
         gtk_widget_show_all( child );
-        image_menu_item_set_image( IMAGE_MENU_ITEM(item), child );
+        gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(item), child );
 
         g_free( label );
         label = 0;
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index 5df5fde70..c714aba10 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -302,7 +302,7 @@ void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GO
             gtk_list_store_append( model, &iter );
             gtk_list_store_set( model, &iter,
                                 0, Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str(),
-                                1, Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str(),
+                                1, _(Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str()),
                                 2, lpesubtools[i].icon_name,
                                 -1 );
         }
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index a8c974bbc..066c3fbfa 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -326,7 +326,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
     {
         eact = create_adjustment_action( "MeasureOffsetAction",
                                          _("Offset"), _("Offset:"),
-                                         _("The offset size"),
+                                         _("Mark dimension offset"),
                                          "/tools/measure/offset", 5.0,
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0.0, 90000.0, 1.0, 4.0,
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index 898104ad3..7a37376db 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -18,6 +18,8 @@
 #include <config.h>
 #endif
 
+#include <gtkmm.h>
+
 // REVIEW THESE AT END OF REWRITE
 #include "ui/widget/color-preview.h"
 #include "toolbox.h"
@@ -66,76 +68,79 @@ static bool blocked = false;
 //##        Mesh        ##
 //########################
 
-/*
- * Get the current selection and dragger status from the desktop
- */
-void ms_read_selection( Inkscape::Selection *selection,
-                        SPMeshGradient *&ms_selected,
-                        bool &ms_selected_multi,
-                        SPMeshType &ms_type,
-                        bool &ms_type_multi )
+
+// Get a list of selected meshes taking into account fill/stroke toggles
+std::vector<SPMeshGradient *>  ms_get_dt_selected_gradients(Inkscape::Selection *selection)
 {
+    std::vector<SPMeshGradient *> ms_selected;
+
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool edit_fill   = prefs->getBool("/tools/mesh/edit_fill",   true);
+    bool edit_stroke = prefs->getBool("/tools/mesh/edit_stroke", true);
 
-    // Read desktop selection
-    bool first = true;
-    ms_type = SP_MESH_TYPE_COONS;
-    
     auto itemlist= selection->items();
     for(auto i=itemlist.begin();i!=itemlist.end();++i){
-        SPItem *item = *i;
+        SPItem *item = *i;// get the items gradient, not the getVector() version
         SPStyle *style = item->style;
 
-        if (style && (style->fill.isPaintserver())) {
-            SPPaintServer *server = item->style->getFillPaintServer();
-            if ( SP_IS_MESHGRADIENT(server) ) {
-
-                SPMeshGradient *gradient = SP_MESHGRADIENT(server); // ->getVector();
-                SPMeshType type = gradient->type;
+        if (style) {
 
-                if (gradient != ms_selected) {
-                    if (ms_selected) {
-                        ms_selected_multi = true;
-                    } else {
-                        ms_selected = gradient;
-                    }
+            
+            if (edit_fill   && style->fill.isPaintserver()) {
+                SPPaintServer *server = item->style->getFillPaintServer();
+                SPMeshGradient *mesh = dynamic_cast<SPMeshGradient *>(server);
+                if (mesh) {
+                    ms_selected.push_back(mesh);
                 }
-                if( type != ms_type ) {
-                    if (ms_type != SP_MESH_TYPE_COONS && !first) {
-                        ms_type_multi = true;
-                    } else {
-                        ms_type = type;
-                    }
+            }
+
+            if (edit_stroke && style->stroke.isPaintserver()) {
+                SPPaintServer *server = item->style->getStrokePaintServer();
+                SPMeshGradient *mesh = dynamic_cast<SPMeshGradient *>(server);
+                if (mesh) {
+                    ms_selected.push_back(mesh);
                 }
-                first = false;
             }
         }
 
-        if (style && (style->stroke.isPaintserver())) {
-            SPPaintServer *server = item->style->getStrokePaintServer();
-            if ( SP_IS_MESHGRADIENT(server) ) {
+    }
+    return ms_selected;
+}
 
-                SPMeshGradient *gradient = SP_MESHGRADIENT(server); // ->getVector();
-                SPMeshType type = gradient->type;
 
-                if (gradient != ms_selected) {
-                    if (ms_selected) {
-                        ms_selected_multi = true;
-                    } else {
-                        ms_selected = gradient;
-                    }
-                }
-                if( type != ms_type ) {
-                    if (ms_type != SP_MESH_TYPE_COONS && !first) {
-                        ms_type_multi = true;
-                    } else {
-                        ms_type = type;
-                    }
-                }
-                first = false;
+/*
+ * Get the current selection status from the desktop
+ */
+void ms_read_selection( Inkscape::Selection *selection,
+                        SPMeshGradient *&ms_selected,
+                        bool &ms_selected_multi,
+                        SPMeshType &ms_type,
+                        bool &ms_type_multi )
+{
+    ms_selected = NULL;
+    ms_selected_multi = false;
+    ms_type = SP_MESH_TYPE_COONS;
+    ms_type_multi = false;
+
+    bool first = true;
+
+    // Read desktop selection, taking into account fill/stroke toggles
+    std::vector<SPMeshGradient *> meshes = ms_get_dt_selected_gradients( selection );
+    for (auto i = meshes.begin(); i != meshes.end(); ++i) {
+        if (first) {
+            ms_selected = (*i);
+            ms_type = (*i)->type;
+            first = false;
+        } else {
+            if (ms_selected != (*i)) {
+                ms_selected_multi = true;
+            }
+            if (ms_type != (*i)->type) {
+                ms_type_multi = true;
             }
         }
     }
- }
+}
 
 /*
  * Core function, setup all the widgets whenever something changes on the desktop
@@ -172,7 +177,7 @@ static void ms_tb_selection_changed(Inkscape::Selection * /*selection*/, gpointe
         // std::cout << "   type: " << ms_type << std::endl;
         
         EgeSelectOneAction* type = (EgeSelectOneAction *) g_object_get_data(G_OBJECT(widget), "mesh_select_type_action");
-        gtk_action_set_sensitive( GTK_ACTION(type), (ms_selected && !ms_selected_multi) );
+        gtk_action_set_sensitive( GTK_ACTION(type), (ms_selected && !ms_type_multi) );
         if (ms_selected) {
             blocked = TRUE;
             ege_select_one_action_set_active( type, ms_type );
@@ -203,34 +208,6 @@ static void ms_defs_modified(SPObject * /*defs*/, guint /*flags*/, GObject *widg
     ms_tb_selection_changed(NULL, widget);
 }
 
-void ms_get_dt_selected_gradient(Inkscape::Selection *selection, SPMeshGradient *&ms_selected)
-{
-    SPMeshGradient *gradient = 0;
-
-    auto itemlist= selection->items();
-    for(auto i=itemlist.begin();i!=itemlist.end();++i){
-        SPItem *item = *i;// get the items gradient, not the getVector() version
-         SPStyle *style = item->style;
-         SPPaintServer *server = 0;
-
-         if (style && (style->fill.isPaintserver())) {
-             server = item->style->getFillPaintServer();
-         }
-         if (style && (style->stroke.isPaintserver())) {
-             server = item->style->getStrokePaintServer();
-         }
-
-         if ( SP_IS_MESHGRADIENT(server) ) {
-             gradient = SP_MESHGRADIENT(server);
-         }
-    }
-
-    if (gradient) {
-        ms_selected = gradient;
-    }
-}
-
-
 /*
  * Callback functions for user actions
  */
@@ -295,18 +272,17 @@ static void ms_type_changed(EgeSelectOneAction *act, GtkWidget *widget)
 
     SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data(G_OBJECT(widget), "desktop"));
     Inkscape::Selection *selection = desktop->getSelection();
-    SPMeshGradient *gradient = 0;
-    ms_get_dt_selected_gradient(selection, gradient);
+    std::vector<SPMeshGradient *> meshes = ms_get_dt_selected_gradients(selection);
 
-    if (gradient) {
-        SPMeshType type = (SPMeshType) ege_select_one_action_get_active(act);
+    SPMeshType type = (SPMeshType) ege_select_one_action_get_active(act);
+    for (auto i = meshes.begin(); i != meshes.end(); ++i) {
         // std::cout << "   type: " << type << std::endl;
-        gradient->type = type;
-        gradient->type_set = true;
-        gradient->updateRepr();
-
-        DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MESH,
-                   _("Set mesh type"));
+        (*i)->type = type;
+        (*i)->type_set = true;
+        (*i)->updateRepr();
+    }
+    if (!meshes.empty() ) {
+        DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MESH,_("Set mesh type"));
     }
 }
 
@@ -356,6 +332,41 @@ static void ms_fit_mesh(void)
     }
 }
 
+static void ms_toggle_handles(void)
+{
+    MeshTool *mt = get_mesh_tool();
+    if (mt) {
+        GrDrag *drag = mt->_grdrag;
+        drag->refreshDraggers();
+    }
+}
+
+static void ms_toggle_fill_stroke(InkToggleAction * /*act*/, gpointer data)
+{
+    MeshTool *mt = get_mesh_tool();
+    if (mt) {
+        GrDrag *drag = mt->_grdrag;
+        drag->updateDraggers();
+        drag->updateLines();
+        drag->updateLevels();
+        ms_tb_selection_changed(NULL, data); // Need to update Type widget
+    }
+}
+
+static void ms_warning_popup(void)
+{
+    char *msg = _("Mesh gradients are part of SVG 2:\n"
+                  "* Syntax may change.\n"
+                  "* Web browser implementation is not guaranteed.\n"
+                  "\n"
+                  "For web: convert to bitmap (Edit->Make bitmap copy).\n"
+                  "For print: export to PDF.");
+    Gtk::MessageDialog dialog(msg, false, Gtk::MESSAGE_WARNING,
+                              Gtk::BUTTONS_OK, true);
+    dialog.run();
+
+}
+
 static void mesh_toolbox_watch_ec(SPDesktop* dt, Inkscape::UI::Tools::ToolBase* ec, GObject* holder);
 
 /**
@@ -472,6 +483,7 @@ void sp_mesh_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, GObj
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/mesh/edit_fill");
         g_signal_connect( holder, "destroy", G_CALLBACK(delete_prefspusher), pusher);
+        g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(ms_toggle_fill_stroke), holder);
     }
 
     /* Edit stroke mesh */
@@ -484,18 +496,20 @@ void sp_mesh_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, GObj
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/mesh/edit_stroke");
         g_signal_connect( holder, "destroy", G_CALLBACK(delete_prefspusher), pusher);
+        g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(ms_toggle_fill_stroke), holder);
     }
 
     /* Show/hide side and tensor handles */
     {
         InkToggleAction* act = ink_toggle_action_new( "MeshShowHandlesAction",
                                                       _("Show Handles"),
-                                                      _("Show side and tensor handles"),
+                                                      _("Show handles"),
                                                       INKSCAPE_ICON("show-node-handles"),
                                                       secondarySize );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/mesh/show_handles");
         g_signal_connect( holder, "destroy", G_CALLBACK(delete_prefspusher), pusher);
+        g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(ms_toggle_handles), 0);
     }
 
     g_object_set_data(holder, "desktop", desktop);
@@ -504,9 +518,14 @@ void sp_mesh_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, GObj
 
     /* Warning */
     {
-        GtkAction* act = gtk_action_new( "MeshWarningAction",
-          _("WARNING: Mesh SVG Syntax Subject to Change"), NULL, NULL );
+        InkAction* act = ink_action_new( "MeshWarningAction",
+                                         _("WARNING: Mesh SVG Syntax Subject to Change"),
+                                         _("WARNING: Mesh SVG Syntax Subject to Change"),
+                                         INKSCAPE_ICON("dialog-warning"),
+                                         secondarySize );
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
+        g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(ms_warning_popup), holder );
+        gtk_action_set_sensitive( GTK_ACTION(act), TRUE );
     }
 
     /* Type */
@@ -520,6 +539,7 @@ void sp_mesh_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, GObj
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter, 0, _("Bicubic"), 1, SP_MESH_TYPE_BICUBIC, -1 );
 
+        // TRANSLATORS: Type of Smoothing. See https://en.wikipedia.org/wiki/Coons_patch
         EgeSelectOneAction* act = ege_select_one_action_new( "MeshSmoothAction", _("Coons"),
                _("Coons: no smoothing. Bicubic: smoothing across patch boundaries."),
                 NULL, GTK_TREE_MODEL(model) );
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 3e9f0687d..855371ddd 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -285,6 +285,11 @@ static void sp_paint_selector_dispose(GObject *object)
     // clean up our long-living pattern menu
     g_object_set_data(G_OBJECT(psel),"patternmenu",NULL);
 
+#ifdef WITH_MESH
+    // clean up our long-living mesh menu
+    g_object_set_data(G_OBJECT(psel),"meshmenu",NULL);
+#endif
+
     if (psel->selected_color) {
         delete psel->selected_color;
         psel->selected_color = NULL;
@@ -492,7 +497,7 @@ void SPPaintSelector::setGradientRadial(SPGradient *vector)
 }
 
 #ifdef WITH_MESH
-void SPPaintSelector::setGradientMesh(SPGradient *array)
+void SPPaintSelector::setGradientMesh(SPMeshGradient *array)
 {
 #ifdef SP_PS_VERBOSE
     g_print("PaintSelector set GRADIENT MESH\n");
@@ -524,24 +529,6 @@ void SPPaintSelector::getGradientProperties( SPGradientUnits &units, SPGradientS
     spread = gsel->getSpread();
 }
 
-#ifdef WITH_MESH
-void SPPaintSelector::setMeshProperties( SPGradientUnits units )
-{
-    g_return_if_fail(mode == MODE_GRADIENT_MESH);
-
-    // SPGradientSelector *gsel = getGradientFromData(this);
-    // gsel->setUnits(units);
-}
-
-void SPPaintSelector::getMeshProperties( SPGradientUnits &units) const
-{
-    g_return_if_fail(mode == MODE_GRADIENT_MESH);
-
-    // SPGradientSelector *gsel = getGradientFromData(this);
-    // units = gsel->getUnits();
-}
-#endif
-
 
 /**
  * \post (alpha == NULL) || (*alpha in [0.0, 1.0]).
@@ -788,7 +775,214 @@ static void sp_paint_selector_set_mode_gradient(SPPaintSelector *psel, SPPaintSe
 #endif
 }
 
+// ************************* MESH ************************
 #ifdef WITH_MESH
+static void sp_psel_mesh_destroy(GtkWidget *widget, SPPaintSelector * /*psel*/)
+{
+    // drop our reference to the mesh menu widget
+    g_object_unref( G_OBJECT(widget) );
+}
+
+static void sp_psel_mesh_change(GtkWidget * /*widget*/, SPPaintSelector *psel)
+{
+    g_signal_emit(G_OBJECT(psel), psel_signals[CHANGED], 0);
+}
+
+
+/**
+ *  Returns a list of meshes in the defs of the given source document as a GSList object
+ *  Returns NULL if there are no meshes in the document.
+ */
+static GSList *
+ink_mesh_list_get (SPDocument *source)
+{
+    if (source == NULL)
+        return NULL;
+
+    GSList *pl = NULL;
+    std::vector<SPObject *> meshes = source->getResourceList("gradient");
+    for (std::vector<SPObject *>::const_iterator it = meshes.begin(); it != meshes.end(); ++it) {
+        if (SP_IS_MESHGRADIENT(*it) &&
+            SP_GRADIENT(*it) == SP_GRADIENT(*it)->getArray()) {  // only if this is a root mesh
+            pl = g_slist_prepend(pl, *it);
+        }
+    }
+
+    pl = g_slist_reverse(pl);
+    return pl;
+}
+
+/**
+ * Adds menu items for mesh list.
+ */
+static void
+sp_mesh_menu_build (GtkWidget *combo, GSList *mesh_list, SPDocument */*source*/)
+{
+    GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo)));
+    GtkTreeIter iter;
+
+    for (; mesh_list != NULL; mesh_list = mesh_list->next) {
+
+        Inkscape::XML::Node *repr = reinterpret_cast<SPItem *>(mesh_list->data)->getRepr();
+
+        gchar const *meshid = repr->attribute("id");
+        gchar const *label  = meshid;
+
+        // Only relevant if we supply a set of canned meshes.
+        gboolean stockid = false;
+        if (repr->attribute("inkscape:stockid")) {
+            label = _(repr->attribute("inkscape:stockid"));
+            stockid = true;
+        }
+
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter,
+                COMBO_COL_LABEL, label, COMBO_COL_STOCK, stockid, COMBO_COL_MESH, meshid, COMBO_COL_SEP, FALSE, -1);
+
+    }
+}
+
+/**
+ * Pick up all meshes from source, except those that are in
+ * current_doc (if non-NULL), and add items to the mesh menu.
+ */
+static void sp_mesh_list_from_doc(GtkWidget *combo, SPDocument * /*current_doc*/, SPDocument *source, SPDocument * /*mesh_doc*/)
+{
+    GSList *pl = ink_mesh_list_get(source);
+    GSList *clean_pl = NULL;
+
+    for (; pl != NULL; pl = pl->next) {
+        if (!SP_IS_MESHGRADIENT(pl->data)) {
+            continue;
+        }
+        // Add to the list of meshes we really do wish to show
+        clean_pl = g_slist_prepend (clean_pl, pl->data);
+    }
+
+    sp_mesh_menu_build (combo, clean_pl, source);
+
+    g_slist_free (pl);
+    g_slist_free (clean_pl);
+}
+
+
+static void
+ink_mesh_menu_populate_menu(GtkWidget *combo, SPDocument *doc)
+{
+    static SPDocument *meshes_doc = NULL;
+
+    // If we ever add a list of canned mesh gradients, uncomment following:
+
+    // find and load meshes.svg
+    // if (meshes_doc == NULL) {
+    //     char *meshes_source = g_build_filename(INKSCAPE_MESHESDIR, "meshes.svg", NULL);
+    //     if (Inkscape::IO::file_test(meshes_source, G_FILE_TEST_IS_REGULAR)) {
+    //         meshes_doc = SPDocument::createNewDoc(meshes_source, FALSE);
+    //     }
+    //     g_free(meshes_source);
+    // }
+
+    // suck in from current doc
+    sp_mesh_list_from_doc ( combo, NULL, doc, meshes_doc );
+
+    // add separator
+    // {
+    //     GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo)));
+    //     GtkTreeIter iter;
+    //     gtk_list_store_append (store, &iter);
+    //     gtk_list_store_set(store, &iter,
+    //             COMBO_COL_LABEL, "", COMBO_COL_STOCK, false, COMBO_COL_MESH, "", COMBO_COL_SEP, true, -1);
+    // }
+
+    // suck in from meshes.svg
+    // if (meshes_doc) {
+    //     doc->ensureUpToDate();
+    //     sp_mesh_list_from_doc ( combo, doc, meshes_doc, NULL );
+    // }
+
+}
+
+
+static GtkWidget*
+ink_mesh_menu(GtkWidget *combo)
+{
+    SPDocument *doc = SP_ACTIVE_DOCUMENT;
+
+    GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo)));
+    GtkTreeIter iter;
+
+    if (!doc) {
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                COMBO_COL_LABEL, _("No document selected"), COMBO_COL_STOCK, false, COMBO_COL_MESH, "", COMBO_COL_SEP, false, -1);
+        gtk_widget_set_sensitive(combo, FALSE);
+
+    } else {
+
+        ink_mesh_menu_populate_menu(combo, doc);
+        gtk_widget_set_sensitive(combo, TRUE);
+
+    }
+
+    // Select the first item that is not a separator
+    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter)) {
+        gboolean sep = false;
+        gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, COMBO_COL_SEP, &sep, -1);
+        if (sep) {
+            gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+        }
+        gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
+    }
+
+    return combo;
+}
+
+
+/*update mesh list*/
+void SPPaintSelector::updateMeshList( SPMeshGradient *mesh )
+{
+    if (update) {
+        return;
+    }
+
+    GtkWidget *combo = GTK_WIDGET(g_object_get_data(G_OBJECT(this), "meshmenu"));
+    g_assert( combo != NULL );
+
+    /* Clear existing menu if any */
+    GtkTreeModel *store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+    gtk_list_store_clear(GTK_LIST_STORE(store));
+
+    ink_mesh_menu(combo);
+
+    /* Set history */
+
+    if (mesh && !g_object_get_data(G_OBJECT(combo), "update")) {
+
+        g_object_set_data(G_OBJECT(combo), "update", GINT_TO_POINTER(TRUE));
+        gchar const *meshname = mesh->getRepr()->attribute("id");
+
+        // Find this mesh and set it active in the combo_box
+        GtkTreeIter iter ;
+        gchar *meshid = NULL;
+        bool valid = gtk_tree_model_get_iter_first (store, &iter);
+        if (!valid) {
+            return;
+        }
+        gtk_tree_model_get (store, &iter, COMBO_COL_MESH, &meshid, -1);
+        while (valid && strcmp(meshid, meshname)  != 0) {
+            valid = gtk_tree_model_iter_next (store, &iter);
+            gtk_tree_model_get (store, &iter, COMBO_COL_MESH, &meshid, -1);
+        }
+
+        if (valid) {
+            gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
+        }
+
+        g_object_set_data(G_OBJECT(combo), "update", GINT_TO_POINTER(FALSE));
+    }
+}
+
 static void sp_paint_selector_set_mode_mesh(SPPaintSelector *psel, SPPaintSelector::Mode mode)
 {
     if (mode == SPPaintSelector::MODE_GRADIENT_MESH) {
@@ -799,23 +993,50 @@ static void sp_paint_selector_set_mode_mesh(SPPaintSelector *psel, SPPaintSelect
     GtkWidget *tbl = NULL;
 
     if (psel->mode == SPPaintSelector::MODE_GRADIENT_MESH) {
-        /* Already have mesh selector */
+        /* Already have mesh menu */
         tbl = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "mesh-selector"));
     } else {
         sp_paint_selector_clear_frame(psel);
 
-        /* We could create a new gradient selector once adapted for meshes.
-           But for the moment we just create an empty widget. */
         /* Create vbox */
         tbl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
         gtk_box_set_homogeneous(GTK_BOX(tbl), FALSE);
         gtk_widget_show(tbl);
 
         {
+            auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+            gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
+
+            /**
+             * Create a combo_box and store with 4 columns,
+             * The label, a pointer to the mesh, is stockid or not, is a separator or not.
+             */
+            GtkListStore *store = gtk_list_store_new (COMBO_N_COLS, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_BOOLEAN);
+            GtkWidget *combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
+            gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo), SPPaintSelector::isSeparator, NULL, NULL);
+
+            GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+            gtk_cell_renderer_set_padding (renderer, 2, 0);
+            gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+            gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", COMBO_COL_LABEL, NULL);
+
+            ink_mesh_menu(combo);
+            g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(sp_psel_mesh_change), psel);
+            g_signal_connect(G_OBJECT(combo), "destroy", G_CALLBACK(sp_psel_mesh_destroy), psel);
+            g_object_set_data(G_OBJECT(psel), "meshmenu", combo);
+            g_object_ref( G_OBJECT(combo));
+
+            gtk_container_add(GTK_CONTAINER(hb), combo);
+            gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
+
+            g_object_unref( G_OBJECT(store));
+        }
+
+        {
             auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
             gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
             auto l = gtk_label_new(NULL);
-            gtk_label_set_markup(GTK_LABEL(l), _("Use the <b>Mesh tool</b> to create new and edit existing meshes. Mesh selection and copying not yet implemented."));
+            gtk_label_set_markup(GTK_LABEL(l), _("Use the <b>Mesh tool</b> to modify the mesh."));
             gtk_label_set_line_wrap(GTK_LABEL(l), true);
             gtk_widget_set_size_request(l, 180, -1);
             gtk_box_pack_start(GTK_BOX(hb), l, TRUE, TRUE, AUX_BETWEEN_BUTTON_GROUPS);
@@ -828,11 +1049,66 @@ static void sp_paint_selector_set_mode_mesh(SPPaintSelector *psel, SPPaintSelect
         psel->selector = tbl;
         g_object_set_data(G_OBJECT(psel->selector), "mesh-selector", tbl);
 
-        gtk_label_set_markup(GTK_LABEL(psel->label), _("<b>Mesh gradient</b>"));
+        gtk_label_set_markup(GTK_LABEL(psel->label), _("<b>Mesh fill</b>"));
     }
+#ifdef SP_PS_VERBOSE
+    g_print("Mesh req\n");
+#endif
+}
+
+SPMeshGradient *SPPaintSelector::getMeshGradient()
+{
+    g_return_val_if_fail((mode == MODE_GRADIENT_MESH) , NULL);
+
+    GtkWidget *combo = GTK_WIDGET(g_object_get_data(G_OBJECT(this), "meshmenu"));
 
+    /* no mesh menu if we were just selected */
+    if ( combo == NULL ) {
+        return NULL;
+    }
+    GtkTreeModel *store = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+
+    /* Get the selected mesh */
+    GtkTreeIter  iter;
+    if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo), &iter) ||
+            !gtk_list_store_iter_is_valid(GTK_LIST_STORE(store), &iter)) {
+        return NULL;
+    }
+
+    gchar *meshid = NULL;
+    gboolean stockid = FALSE;
+    gchar *label = NULL;
+    gtk_tree_model_get (store, &iter, COMBO_COL_LABEL, &label, COMBO_COL_STOCK, &stockid, COMBO_COL_MESH, &meshid,  -1);
+    // std::cout << "  .. meshid: " << (meshid?meshid:"null") << "   label: " << (label?label:"null") << std::endl;
+    if (meshid == NULL) {
+        return NULL;
+    }
+
+    SPMeshGradient *mesh = 0;
+    if (strcmp(meshid, "none")){
+
+        gchar *mesh_name;
+        if (stockid) {
+            mesh_name = g_strconcat("urn:inkscape:mesh:", meshid, NULL);
+        } else {
+            mesh_name = g_strdup(meshid);
+        }
+
+        SPObject *mesh_obj = get_stock_item(mesh_name);
+        if (mesh_obj && SP_IS_MESHGRADIENT(mesh_obj)) {
+            mesh = SP_MESHGRADIENT(mesh_obj);
+        }
+        g_free(mesh_name);
+
+    } else {
+        std::cerr << "SPPaintSelector::getMeshGradient: Unexpected meshid value." << std::endl;
+    }
+
+    return mesh;
 }
+
 #endif
+// ************************ End Mesh ************************
 
 static void
 sp_paint_selector_set_style_buttons(SPPaintSelector *psel, GtkWidget *active)
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index 815a6da0b..3302632b8 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -26,6 +26,9 @@
 #include "ui/selected-color.h"
 
 class SPGradient;
+#ifdef WITH_MESH
+class SPMeshGradient;
+#endif
 class SPDesktop;
 class SPPattern;
 class SPStyle;
@@ -98,18 +101,21 @@ struct SPPaintSelector {
     void setGradientLinear( SPGradient *vector );
     void setGradientRadial( SPGradient *vector );
 #ifdef WITH_MESH
-    void setGradientMesh(SPGradient *array);
+    void setGradientMesh(SPMeshGradient *array);
 #endif
     void setSwatch( SPGradient *vector );
 
     void setGradientProperties( SPGradientUnits units, SPGradientSpread spread );
     void getGradientProperties( SPGradientUnits &units, SPGradientSpread &spread ) const;
 
-    void setMeshProperties( SPGradientUnits units );
-    void getMeshProperties( SPGradientUnits &units ) const;
-
     void pushAttrsToGradient( SPGradient *gr ) const;
     SPGradient *getGradientVector();
+
+#ifdef WITH_MESH
+    SPMeshGradient * getMeshGradient();
+    void updateMeshList( SPMeshGradient *pat );
+#endif
+
     SPPattern * getPattern();
     void updatePatternList( SPPattern *pat );
 
@@ -124,8 +130,14 @@ struct SPPaintSelector {
     void onSelectedColorChanged();
 };
 
-enum {COMBO_COL_LABEL=0, COMBO_COL_STOCK=1, COMBO_COL_PATTERN=2, COMBO_COL_SEP=3, COMBO_N_COLS=4};
-
+enum {
+    COMBO_COL_LABEL   = 0,
+    COMBO_COL_STOCK   = 1,
+    COMBO_COL_PATTERN = 2,
+    COMBO_COL_MESH    = COMBO_COL_PATTERN,
+    COMBO_COL_SEP     = 3,
+    COMBO_N_COLS      = 4
+};
 
 /// The SPPaintSelector vtable
 struct SPPaintSelectorClass {
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index 3d1565924..e2212b64f 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -192,7 +192,7 @@ void sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
              iterator != gap_list.end(); ++iterator ) {
             GtkTreeIter iter;
             gtk_list_store_append( model, &iter );
-            gtk_list_store_set( model, &iter, 0, _((*iterator).c_str()), 1, count, -1 );
+            gtk_list_store_set( model, &iter, 0, g_dpgettext2(NULL, "Flood autogap", (*iterator).c_str()), 1, count, -1 );
             count++;
         }
         EgeSelectOneAction* act2 = ege_select_one_action_new( "AutoGapAction", _("Close gaps"), (""), NULL, GTK_TREE_MODEL(model) );
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index c5ff713bd..2ac7447dd 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -550,14 +550,14 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     } else {
         g_warning("Unexpected holder type");
     }
-
     // "Transform with object" buttons
     {
+
     InkToggleAction* itact = ink_toggle_action_new( "transform_stroke",
                                                     _("Scale stroke width"),
                                                     _("When scaling objects, scale the stroke width by the same proportion"),
-                                                    INKSCAPE_ICON("transform-affect-stroke"),
-                                                    Inkscape::ICON_SIZE_DECORATION );
+                                                    "transform-affect-stroke",
+                                                    secondarySize );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/stroke", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_stroke), desktop) ;
     gtk_action_group_add_action( mainActions, GTK_ACTION(itact) );
@@ -567,8 +567,8 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_corners",
                                                     _("Scale rounded corners"),
                                                     _("When scaling rectangles, scale the radii of rounded corners"),
-                                                    INKSCAPE_ICON("transform-affect-rounded-corners"),
-                                                  Inkscape::ICON_SIZE_DECORATION );
+                                                    "transform-affect-rounded-corners",
+                                                    secondarySize );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/rectcorners", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_corners), desktop) ;
     gtk_action_group_add_action( mainActions, GTK_ACTION(itact) );
@@ -578,8 +578,8 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_gradient",
                                                     _("Move gradients"),
                                                     _("Move gradients (in fill or stroke) along with the objects"),
-                                                    INKSCAPE_ICON("transform-affect-gradient"),
-                                                  Inkscape::ICON_SIZE_DECORATION );
+                                                    "transform-affect-gradient",
+                                                    secondarySize );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/gradient", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_gradient), desktop) ;
     gtk_action_group_add_action( mainActions, GTK_ACTION(itact) );
@@ -589,8 +589,8 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_pattern",
                                                     _("Move patterns"),
                                                     _("Move patterns (in fill or stroke) along with the objects"),
-                                                    INKSCAPE_ICON("transform-affect-pattern"),
-                                                  Inkscape::ICON_SIZE_DECORATION );
+                                                    "transform-affect-pattern",
+                                                    secondarySize );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/pattern", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_pattern), desktop) ;
     gtk_action_group_add_action( mainActions, GTK_ACTION(itact) );
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 81a8e8115..de3e98297 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -940,7 +940,7 @@ StrokeStyle::updateLine()
     SPStyle * const style = object->style;
 
     /* Markers */
-    updateAllMarkers(objects); // FIXME: make this desktop query too
+    updateAllMarkers(objects, true); // FIXME: make this desktop query too
 
     /* Dash */
     setDashSelectorFromStyle(dashSelector, style); // FIXME: make this desktop query too
@@ -1192,7 +1192,7 @@ StrokeStyle::setPaintOrderButtons(Gtk::ToggleButton *active)
  * that marker.
  */
 void
-StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects)
+StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects, bool skip_undo)
 {
     struct { MarkerComboBox *key; int loc; } const keyloc[] = {
             { startMarkerCombo, SP_MARKER_LOC_START },
@@ -1246,9 +1246,11 @@ StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects)
             if (update) {
                 setMarkerColor(marker, combo->get_loc(), SP_ITEM(object));
 
-                SPDocument *document = desktop->getDocument();
-                DocumentUndo::done(document, SP_VERB_DIALOG_FILL_STROKE,
+                if (!skip_undo) {
+                    SPDocument *document = desktop->getDocument();
+                    DocumentUndo::maybeDone(document, "UaM", SP_VERB_DIALOG_FILL_STROKE,
                                    _("Set marker color"));
+                }
             }
 
         } else {
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 2d7e187a1..cdd825c7d 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -149,7 +149,7 @@ private:
     };
 
     void updateLine();
-    void updateAllMarkers(std::vector<SPItem*> const &objects);
+    void updateAllMarkers(std::vector<SPItem*> const &objects, bool skip_undo = false);
     void updateMarkerHist(SPMarkerLoc const which);
     void setDashSelectorFromStyle(SPDashSelector *dsel, SPStyle *style);
     void setJoinType (unsigned const jointype);
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 788ac4eb3..ba79517d2 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -117,6 +117,8 @@ static void       sp_print_fontstyle( SPStyle *query ) {
 }
 #endif
 
+static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/, GObject *tbl, bool subselection = false);
+
 // Font family
 static void sp_text_fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, GObject *tbl )
 {
@@ -225,8 +227,35 @@ static void sp_text_fontsize_value_changed( Ink_ComboBoxEntry_Action *act, GObje
     sp_repr_css_set_property (css, "font-size", osfs.str().c_str());
 
     // Apply font size to selected objects.
+    // Calling sp_desktop_set_style will result in a call to TextTool::_styleSet() which
+    // will set the style on selected text inside the <text> element. If we want to set
+    // the style on the outer <text> objects we need to bypass this call.
+    bool outer = prefs->getInt("/tools/text/outer_style", false);
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    sp_desktop_set_style (desktop, css, true, true);
+    if (outer) {
+        Inkscape::Selection *selection = desktop->getSelection();
+        auto itemlist= selection->items();
+        for(auto i=itemlist.begin();i!=itemlist.end(); ++i){
+            if (dynamic_cast<SPText *>(*i) || dynamic_cast<SPFlowtext *>(*i)) {
+                SPItem *item = *i;
+
+                // Scale by inverse of accumulated parent transform
+                SPCSSAttr *css_set = sp_repr_css_attr_new();
+                sp_repr_css_merge(css_set, css);
+                Geom::Affine const local(item->i2doc_affine());
+                double const ex(local.descrim());
+                if ( (ex != 0.0) && (ex != 1.0) ) {
+                    sp_css_attr_scale(css_set, 1/ex);
+                }
+
+                item->changeCSS(css_set,"style");
+
+                sp_repr_css_attr_unref(css_set);
+            }
+        }
+    } else {
+        sp_desktop_set_style (desktop, css, true, true);
+    }
 
     // If no selected objects, set default.
     SPStyle query(SP_ACTIVE_DOCUMENT);
@@ -281,6 +310,40 @@ static void sp_text_fontstyle_value_changed( Ink_ComboBoxEntry_Action *act, GObj
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
 }
 
+// Changes selection to only text outer elements.
+static void sp_text_outer_style_changed( InkToggleAction*act, GObject *tbl )
+{
+    bool outer = gtk_toggle_action_get_active( GTK_TOGGLE_ACTION(act) );
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setInt("/tools/text/outer_style", outer);
+
+    // Update widgets to reflect new state of Text Outer Style button.
+    sp_text_toolbox_selection_changed( NULL, tbl );
+}
+
+// Unset line height on selection's inner text objects (tspan, etc.).
+static void sp_text_lineheight_unset_changed( InkToggleAction*act, GObject *tbl )
+{
+    // quit if run by the _changed callbacks
+    if (g_object_get_data(G_OBJECT(tbl), "freeze")) {
+        return;
+    }
+    g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) );
+
+    SPCSSAttr *css = sp_repr_css_attr_new();
+    sp_repr_css_unset_property(css, "line-height");
+
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    sp_desktop_set_style (desktop, css);
+
+    sp_repr_css_attr_unref(css);
+
+    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_TEXT,
+                       _("Text: Unset line height."));
+
+    g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
+}
+
 // Handles both Superscripts and Subscripts
 static void sp_text_script_changed( InkToggleAction* act, GObject *tbl )
 {
@@ -508,7 +571,7 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl )
 static bool is_relative( Unit const *unit ) {
     return (unit->abbr == "" || unit->abbr == "em" || unit->abbr == "ex" || unit->abbr == "%");
 }
-   
+
 static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl )
 {
     // quit if run by the _changed callbacks
@@ -549,9 +612,34 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl )
     sp_repr_css_set_property (css, "line-height", osfs.str().c_str());
 
 
-    // Apply line-height to selected objects.
+    // Apply line-height to selected objects. See comment in font size function.
+    bool outer = prefs->getInt("/tools/text/outer_style", false);
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    sp_desktop_set_style (desktop, css, true, false);
+    if (outer) {
+        Inkscape::Selection *selection = desktop->getSelection();
+        auto itemlist= selection->items();
+        for(auto i=itemlist.begin();i!=itemlist.end(); ++i){
+            if (dynamic_cast<SPText *>(*i) || dynamic_cast<SPFlowtext *>(*i)) {
+                SPItem *item = *i;
+
+                // Scale by inverse of accumulated parent transform
+                SPCSSAttr *css_set = sp_repr_css_attr_new();
+                sp_repr_css_merge(css_set, css);
+                Geom::Affine const local(item->i2doc_affine());
+                double const ex(local.descrim());
+                if ( (ex != 0.0) && (ex != 1.0) ) {
+                    sp_css_attr_scale(css_set, 1/ex);
+                }
+
+                item->changeCSS(css_set,"style");
+
+                sp_repr_css_attr_unref(css_set);
+            }
+        }
+    } else {
+        sp_desktop_set_style (desktop, css, true, true);
+    }
+
 
 
     // Only need to save for undo if a text item has been changed.
@@ -652,7 +740,7 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl )
         double font_size = 0;
         int count = 0;
         for(auto i=itemlist.begin();i!=itemlist.end(); ++i){
-            if (SP_IS_TEXT (*i)) {
+            if (SP_IS_TEXT (*i) || SP_IS_FLOWTEXT(*i)) {
                 double doc_scale = Geom::Affine((*i)->i2dt_affine()).descrim();
                 font_size += (*i)->style->font_size.computed * doc_scale;
                 ++count;
@@ -681,7 +769,7 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl )
         double font_size = 0;
         int count = 0;
         for(auto i=itemlist.begin();i!=itemlist.end(); ++i){
-            if (SP_IS_TEXT (*i)) {
+            if (SP_IS_TEXT (*i) || SP_IS_FLOWTEXT (*i)) {
                 double doc_scale = Geom::Affine((*i)->i2dt_affine()).descrim();
                 font_size += (*i)->style->font_size.computed * doc_scale;
                 ++count;
@@ -1073,7 +1161,7 @@ static void sp_text_set_sizes(GtkListStore* model_size, int unit)
  * It is called whenever a text selection is changed, including stepping cursor
  * through text, or setting focus to text.
  */
-static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/, GObject *tbl, bool subselection = false) // don't bother to update font list if subsel changed
+static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/, GObject *tbl, bool subselection) // don't bother to update font list if subsel changed
 {
 #ifdef DEBUG_TEXT
     static int count = 0;
@@ -1082,12 +1170,11 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     std::cout << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << std::endl;
     std::cout << "sp_text_toolbox_selection_changed: start " << count << std::endl;
 
-    std::cout << "  Selected items:" << std::endl;
-    for (GSList const *items = SP_ACTIVE_DESKTOP->getSelection()->itemList();
-         items != NULL;
-         items = items->next)
-    {
-        const gchar* id = reinterpret_cast<SPItem *>(items->data)->getId();
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    Inkscape::Selection *selection = desktop->getSelection();
+    auto itemlist0= selection->items();
+    for(auto i=itemlist0.begin();i!=itemlist0.end(); ++i) {
+        const gchar* id = (*i)->getId();
         std::cout << "    " << id << std::endl;
     }
     Glib::ustring selected_text = sp_text_get_selected_text((SP_ACTIVE_DESKTOP)->event_context);
@@ -1129,8 +1216,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     gboolean isFlow = false;
     auto itemlist= SP_ACTIVE_DESKTOP->getSelection()->items();
     for(auto i=itemlist.begin();i!=itemlist.end(); ++i){
-        // const gchar* id = reinterpret_cast<SPItem *>(items->data)->getId();
-        // std::cout << "    " << id << std::endl;
+        // std::cout << "    " << ((*i)->getId()?(*i)->getId():"null") << std::endl;
         if( SP_IS_FLOWTEXT(*i)) {
             isFlow = true;
             // std::cout << "   Found flowed text" << std::endl;
@@ -1148,10 +1234,26 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     SPStyle query(SP_ACTIVE_DOCUMENT);
     int result_family   = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_FONTFAMILY);
     int result_style    = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_FONTSTYLE);
-    int result_numbers  = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_FONTNUMBERS);
     int result_baseline = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_BASELINES);
     int result_wmode    = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_WRITINGMODES);
 
+    // Calling sp_desktop_query_style will result in a call to TextTool::_styleQueried().
+    // This returns the style of the selected text inside the <text> element... which
+    // is often the style of one or more <tspan>s. If we want the style of the outer
+    // <text> objects then we need to bypass the call to TextTool::_styleQueried().
+    // The desktop selection never includes the elements inside the <text> element.
+    int result_numbers = 0;
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    SPDesktop   *desktop    = SP_ACTIVE_DESKTOP;
+    bool outer = prefs->getInt("/tools/text/outer_style", false);
+    if (outer) {
+        Inkscape::Selection *selection = desktop->getSelection();
+        std::vector<SPItem *> vec(selection->items().begin(), selection->items().end());
+        result_numbers = sp_desktop_query_style_from_list (vec, &query, QUERY_STYLE_PROPERTY_FONTNUMBERS);
+    } else {
+        result_numbers = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_FONTNUMBERS);
+    }
+
     /*
      * If no text in selection (querying returned nothing), read the style from
      * the /tools/text preferencess (default style for new texts). Return if
@@ -1326,7 +1428,13 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
         }
         // Save unit so we can do convertions between new/old units.
         g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(line_height_unit));
-        
+
+        // Enable and turn on only if selection includes an object with line height set.
+        InkToggleAction* lineHeightUnset =
+            INK_TOGGLE_ACTION( g_object_get_data( tbl, "TextLineHeightUnsetAction"));
+        gtk_action_set_sensitive(GTK_ACTION(lineHeightUnset), query.line_height.set );
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(lineHeightUnset), query.line_height.set );
+
         // Word spacing
         double wordSpacing;
         if (query.word_spacing.normal) wordSpacing = 0.0;
@@ -1573,10 +1681,6 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
         gtk_css_provider_load_from_data(css_provider,
                                         "#TextFontFamilyAction_combobox {\n"
                                         "  -GtkComboBox-appears-as-list: true;\n"
-                                        "}\n"
-                                        "combobox window.popup scrolledwindow treeview separator {\n"
-                                        "  -GtkWidget-wide-separators:  true;\n"
-                                        "  -GtkWidget-separator-height: 6;\n"
                                         "}\n",
                                         -1, NULL);
 
@@ -1602,7 +1706,7 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
                                                                       _(tooltip.c_str()),
                                                                       NULL,
                                                                       GTK_TREE_MODEL(model_size),
-                                                                      4,      // Width in characters
+                                                                      8,      // Width in characters
                                                                       0,      // Extra list width
                                                                       NULL,   // Cell layout
                                                                       NULL,   // Separator
@@ -2025,6 +2129,32 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
         g_object_set( G_OBJECT(eact), "iconId", "text_rotation", NULL );
     }
 
+    /* Text line height unset */
+    {
+        InkToggleAction* act = ink_toggle_action_new( "TextLineHeightUnsetAction",       // Name
+                                                      _("Unset line height"),            // Label
+                                                      _("If enabled, line height is set on part of selection. Click to unset."),
+                                                      INKSCAPE_ICON("paint-unknown"),
+                                                      secondarySize );                   // Icon size
+        gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_text_lineheight_unset_changed), holder );
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/text/line_height_unset", false) );
+        g_object_set_data( holder, "TextLineHeightUnsetAction", act );
+    }
+
+    /* Text outer style */
+    {
+        InkToggleAction* act = ink_toggle_action_new( "TextOuterStyleAction",            // Name
+                                                      _("Show outer style"),             // Label
+                                                      _("Show style of outermost text element. The 'font-size' and 'line-height' values of the outermost text element determine the minimum line spacing in the block."),
+                                                      INKSCAPE_ICON("text_outer_style"),
+                                                      secondarySize );                   // Icon size
+        gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_text_outer_style_changed), holder );
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/text/outer_style", false) );
+        g_object_set_data( holder, "TextOuterStyleAction", act );
+    }
+
     // Is this necessary to call? Shouldn't hurt.
     sp_text_toolbox_selection_changed(desktop->getSelection(), holder);
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index d3715cf4e..126eac9cd 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -362,8 +362,6 @@ static gchar const * ui_descr =
         "    <separator />"
         "    <toolitem action='MeasureScaleAction' />"
         "    <separator />"
-        "    <toolitem action='MeasureOffsetAction' />"
-        "    <separator />"
         "    <toolitem action='measure_units_label' />"
         "    <toolitem action='MeasureUnitsAction' />"
         "    <toolitem action='MeasureIgnore1stAndLast' />"
@@ -373,8 +371,9 @@ static gchar const * ui_descr =
         "    <toolitem action='MeasureReverse' />"
         "    <toolitem action='MeasureToPhantom' />"
         "    <toolitem action='MeasureToGuides' />"
-        "    <toolitem action='MeasureMarkDimension' />"
         "    <toolitem action='MeasureToItem' />"
+        "    <toolitem action='MeasureMarkDimension' />"
+        "    <toolitem action='MeasureOffsetAction' />"
         "  </toolbar>" 
 
         "  <toolbar name='StarToolbar'>"
@@ -508,18 +507,19 @@ static gchar const * ui_descr =
 
         "  <toolbar name='TextToolbar'>"
         "    <toolitem action='TextFontFamilyAction' />"
-        "    <toolitem action='TextFontSizeAction' />"
         "    <toolitem action='TextFontStyleAction' />"
-//        "    <toolitem action='TextBoldAction' />"
-//        "    <toolitem action='TextItalicAction' />"
+        "    <separator />"
+        "    <toolitem action='TextOuterStyleAction' />"
+        "    <toolitem action='TextFontSizeAction' />"
+        "    <toolitem action='TextLineHeightAction' />"
+        "    <toolitem action='TextLineHeightUnitsAction' />"
+        "    <toolitem action='TextLineHeightUnsetAction' />"
         "    <separator />"
         "    <toolitem action='TextAlignAction' />"
         "    <separator />"
         "    <toolitem action='TextSuperscriptAction' />"
         "    <toolitem action='TextSubscriptAction' />"
         "    <separator />"
-        "    <toolitem action='TextLineHeightAction' />"
-        "    <toolitem action='TextLineHeightUnitsAction' />"
         "    <toolitem action='TextLetterSpacingAction' />"
         "    <toolitem action='TextWordSpacingAction' />"
         "    <toolitem action='TextDxAction' />"
@@ -574,7 +574,12 @@ static gchar const * ui_descr =
         "    <toolitem action='MeshPickColorsAction' />"
         "    <toolitem action='MeshFitInBoundingBoxAction' />"
         "    <separator />"
+        "    <toolitem action='MeshShowHandlesAction' />"
+        "    <toolitem action='MeshEditFillAction' />"
+        "    <toolitem action='MeshEditStrokeAction' />"
+        "    <separator />"
         "    <toolitem action='MeshWarningAction' />"
+        "    <separator />"
         "    <toolitem action='MeshSmoothAction' />"
         "  </toolbar>"
 
@@ -655,7 +660,7 @@ Glib::RefPtr<VerbAction> VerbAction::create(Inkscape::Verb* verb, Inkscape::Verb
 }
 
 VerbAction::VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view) :
-    Gtk::Action(Glib::ustring(verb->get_id()), Gtk::StockID(verb->get_image()), Glib::ustring(g_dpgettext2(NULL, "ContextVerb", verb->get_name())), Glib::ustring(_(verb->get_tip()))),
+    Gtk::Action(Glib::ustring(verb->get_id()), verb->get_image(), Glib::ustring(g_dpgettext2(NULL, "ContextVerb", verb->get_name())), Glib::ustring(_(verb->get_tip()))),
     verb(verb),
     verb2(verb2),
     view(view),
@@ -670,7 +675,7 @@ VerbAction::~VerbAction()
 Gtk::Widget* VerbAction::create_menu_item_vfunc()
 {
 // First call in to get the icon rendered if present in SVG
-    Gtk::Widget *widget = sp_icon_get_icon( property_stock_id().get_value().get_string(), Inkscape::ICON_SIZE_MENU );
+    Gtk::Widget *widget = sp_icon_get_icon( get_icon_name(), Inkscape::ICON_SIZE_MENU );
     delete widget;
     widget = 0;