Merge branch 'master' into powerpencilII

61 files changed, 869 insertions, 2645 deletions

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index ef254f623..93b940732 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -274,6 +274,7 @@ Effect::effect (Inkscape::UI::View::View * doc)
 
 
     ExecutionEnv executionEnv(this, doc);
+    execution_env = &executionEnv;
     timer->lock();
     executionEnv.run();
     if (executionEnv.wait()) {
@@ -352,6 +353,12 @@ Effect::get_info_widget(void)
     return Extension::get_info_widget();
 }
 
+PrefDialog *
+Effect::get_pref_dialog (void)
+{
+    return _prefDialog;
+}
+
 void
 Effect::set_pref_dialog (PrefDialog * prefdialog)
 {
diff --git a/src/extension/effect.h b/src/extension/effect.h
index a14cc6e7d..143243a2e 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -125,6 +125,7 @@ public:
     bool no_doc; // if true, the effect does not process SVG document at all, so no need to save, read, and watch for errors
     bool no_live_preview; // if true, the effect does not need "live preview" checkbox in its dialog
 
+    PrefDialog *get_pref_dialog (void);
     void        set_pref_dialog (PrefDialog * prefdialog);
 private:
     static gchar *   remove_ (gchar * instr);
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index f75b06937..588543a76 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -12,7 +12,8 @@
 #include <config.h>
 #endif
 
-#include "gtkmm/messagedialog.h"
+#include <gtkmm/dialog.h>
+#include <gtkmm/messagedialog.h>
 
 #include "execution-env.h"
 #include "prefdialog.h"
@@ -141,7 +142,15 @@ ExecutionEnv::createWorkingDialog (void) {
     g_free(dlgmessage);
 
     if (!_effect->is_silent()){
-        _visibleDialog->show();
+        Gtk::Dialog *dlg = _effect->get_pref_dialog();
+        if (dlg) {
+            _visibleDialog->set_transient_for(*dlg);
+        } else {
+            // ToDo: Do we need to make the window transient for the main window here?
+            //       Currently imossible to test because of GUI freezing during save,
+            //       see https://bugs.launchpad.net/inkscape/+bug/967416
+        }
+        _visibleDialog->show_now();
     }
 
     return;
diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h
index a57c7b8c9..b1a3a8ea2 100644
--- a/src/extension/execution-env.h
+++ b/src/extension/execution-env.h
@@ -98,15 +98,13 @@ public:
     /** \brief Wait for the effect to complete if it hasn't. */
     bool wait (void);
 
+    /** \brief Return reference to working dialog (if any) */
+    Gtk::Dialog *get_working_dialog (void) { return _visibleDialog; };
+
 private:
     void runComplete (void);
-    void createPrefsDialog (Gtk::Widget * controls);
     void createWorkingDialog (void);
     void workingCanceled (const int resp);
-    void processingCancel (void);
-    void processingComplete(void);
-    void documentCancel (void);
-    void documentCommit (void);
     void reselect (void);
     void genDocCache (void);
     void killDocCache (void);
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 240d28a59..49ae0075c 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -57,6 +57,7 @@ Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementat
     : _help(NULL)
     , silent(false)
     , _gui(true)
+    , execution_env(NULL)
 {
     repr = in_repr;
     Inkscape::GC::anchor(in_repr);
diff --git a/src/extension/extension.h b/src/extension/extension.h
index 9ccc9869b..a00eca21f 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -71,6 +71,7 @@ class SPDocument;
 namespace Inkscape {
 namespace Extension {
 
+class ExecutionEnv;
 class Dependency;
 class ExpirationTimer;
 class ExpirationTimer;
@@ -109,6 +110,7 @@ private:
 protected:
     Inkscape::XML::Node *repr;            /**< The XML description of the Extension */
     Implementation::Implementation * imp; /**< An object that holds all the functions for making this work */
+    ExecutionEnv * execution_env;         /**< Execution environment of the extension (currently only used by Effects) */
     ExpirationTimer * timer;              /**< Timeout to unload after a given time */
 
 public:
@@ -130,6 +132,8 @@ public:
     bool          deactivated  (void);
     void          printFailure (Glib::ustring reason);
     Implementation::Implementation * get_imp (void) { return imp; };
+    void          set_execution_env (ExecutionEnv * env) { execution_env = env; };
+    ExecutionEnv *get_execution_env (void) { return execution_env; };
 
 /* Parameter Stuff */
 private:
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 0f0a79bfb..260204cb0 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -28,6 +28,7 @@
 #include "desktop.h"
 #include "ui/dialog-events.h"
 #include "extension/effect.h"
+#include "extension/execution-env.h"
 #include "extension/output.h"
 #include "extension/input.h"
 #include "extension/db.h"
@@ -145,9 +146,10 @@ std::string Script::resolveInterpreterExecutable(const Glib::ustring &interpName
    officially in the load function.  This allows for less allocation
    of memory in the unloaded state.
 */
-Script::Script() :
-    Implementation(),
-    _canceled(false)
+Script::Script()
+    : Implementation()
+    , _canceled(false)
+    , parent_window(NULL)
 {
 }
 
@@ -652,6 +654,8 @@ void Script::effect(Inkscape::Extension::Effect *module,
     std::list<std::string> params;
     module->paramListString(params);
 
+    parent_window = module->get_execution_env()->get_working_dialog();
+
     if (module->no_doc) {
         // this is a no-doc extension, e.g. a Help menu command;
         // just run the command without any files, ignoring errors
@@ -741,7 +745,7 @@ void Script::effect(Inkscape::Extension::Effect *module,
             Gtk::MessageDialog warning(
                     _("The output from the extension could not be parsed."),
                     false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true);
-            warning.set_transient_for( *(INKSCAPE.active_desktop()->getToplevel()) );
+            warning.set_transient_for( parent_window ? *parent_window : *(INKSCAPE.active_desktop()->getToplevel()) );
             warning.run();
         }
     } // data_read
@@ -932,7 +936,11 @@ void Script::checkStderr (const Glib::ustring &data,
     Gtk::MessageDialog warning(message, false, type, Gtk::BUTTONS_OK, true);
     warning.set_resizable(true);
     GtkWidget *dlg = GTK_WIDGET(warning.gobj());
-    sp_transientize(dlg);
+    if (parent_window) {
+        warning.set_transient_for(*parent_window);
+    } else {
+        sp_transientize(dlg);
+    }
 
     auto vbox = warning.get_content_area();
 
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 684719895..c6ae117c7 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -15,6 +15,7 @@
 
 #include "implementation.h"
 #include <gtkmm/enums.h>
+#include <gtkmm/window.h>
 #include <glibmm/main.h>
 #include <glibmm/spawn.h>
 #include <glibmm/fileutils.h>
@@ -66,6 +67,14 @@ private:
       */
     Glib::ustring helper_extension;
 
+     /**
+      * The window which should be considered as "parent window" of the script execution,
+      * e.g. when showin warning messages
+      *
+      * If set to NULL the main window of the currently active document is used.
+      */
+    Gtk::Window *parent_window;
+
     std::string solve_reldir(Inkscape::XML::Node *repr_in);
     bool check_existence (std::string const& command);
     void copy_doc(Inkscape::XML::Node * olddoc, Inkscape::XML::Node * newdoc);
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index e8f47e79e..57169ed45 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -76,6 +76,9 @@ ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int l
     if (exportId && strcmp(exportId, "")) {
         // we want to export the given item only
         base = SP_ITEM(doc->getObjectById(exportId));
+        if (!base) {
+            throw Inkscape::Extension::Output::export_id_not_found(exportId);
+        }
         pageBoundingBox = exportCanvas;
     }
     else {
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 5576676b2..865de1a07 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -71,6 +71,9 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
     if (exportId && strcmp(exportId, "")) {
         // we want to export the given item only
         base = SP_ITEM(doc->getObjectById(exportId));
+        if (!base) {
+            throw Inkscape::Extension::Output::export_id_not_found(exportId);
+        }
         pageBoundingBox = exportCanvas;
     }
     else {
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 7a1cacbf2..960aec7a9 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -41,6 +41,7 @@
 
 #include "util/units.h"
 
+#include "extension/output.h"
 #include "extension/system.h"
 
 #include "inkscape-version.h"
@@ -68,7 +69,9 @@ latex_render_document_text_to_file( SPDocument *doc, gchar const *filename,
     if (exportId && strcmp(exportId, "")) {
         // we want to export the given item only
         base = dynamic_cast<SPItem *>(doc->getObjectById(exportId));
-        g_assert(base != NULL);
+        if (!base) {
+            throw Inkscape::Extension::Output::export_id_not_found(exportId);
+        }
         pageBoundingBox = exportCanvas;
     }
     else {
diff --git a/src/extension/output.cpp b/src/extension/output.cpp
index 83f0fed2f..ccfee2c14 100644
--- a/src/extension/output.cpp
+++ b/src/extension/output.cpp
@@ -213,12 +213,7 @@ Output::prefs (void)
 void
 Output::save(SPDocument *doc, gchar const *filename)
 {
-        try {
-            imp->save(this, doc, filename);
-        }
-        catch (...) {
-            throw Inkscape::Extension::Output::save_failed();
-        }
+    imp->save(this, doc, filename);
 
 	return;
 }
diff --git a/src/extension/output.h b/src/extension/output.h
index 44a731ca0..420eb9245 100644
--- a/src/extension/output.h
+++ b/src/extension/output.h
@@ -31,6 +31,11 @@ public:
     class save_cancelled {};     /**< Saving was cancelled */
     class no_extension_found {}; /**< Failed because we couldn't find an extension to match the filename */
     class file_read_only {};     /**< The existing file can not be opened for writing */
+    class export_id_not_found {  /**< The object ID requested for export could not be found in the document */
+        public:
+            const gchar * const id;
+            export_id_not_found(const gchar * const id = NULL) : id{id} {};
+    };
 
                  Output (Inkscape::XML::Node * in_repr,
                          Implementation::Implementation * in_imp);
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 69283a572..1dd3f073b 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -178,7 +178,10 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod
 
     if (_mode == FULL) {
 
-        UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_text, fadjust, _precision);
+        Glib::ustring text;
+        if (_text != NULL)
+            text = _text;
+        UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(text, fadjust, _precision);
         scale->set_size_request(400, -1);
         scale->show();
         hbox->pack_start(*scale, true, true);
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index 357f98590..9ad9b591c 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -159,7 +159,10 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal
 
     if (_mode == FULL) {
 
-        UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_text, fadjust, 0);
+        Glib::ustring text;
+        if (_text != NULL)
+            text = _text;
+        UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(text, fadjust, 0);
         scale->set_size_request(400, -1);
         scale->show();
         hbox->pack_start(*scale, true, true);
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 92ddd3050..0247e18e9 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -131,6 +131,7 @@ PrefDialog::~PrefDialog ( )
         _exEnv->cancel();
         delete _exEnv;
         _exEnv = NULL;
+        _effect->set_execution_env(_exEnv);
     }
 
     if (_effect != NULL) {
@@ -173,6 +174,7 @@ PrefDialog::preview_toggle (void) {
         set_modal(true);
         if (_exEnv == NULL) {
             _exEnv = new ExecutionEnv(_effect, SP_ACTIVE_DESKTOP, NULL, false, false);
+            _effect->set_execution_env(_exEnv);
             _exEnv->run();
         }
     } else {
@@ -182,6 +184,7 @@ PrefDialog::preview_toggle (void) {
             _exEnv->undo();
             delete _exEnv;
             _exEnv = NULL;
+            _effect->set_execution_env(_exEnv);
         }
     }
 }
@@ -230,6 +233,7 @@ PrefDialog::on_response (int signal) {
             }
             delete _exEnv;
             _exEnv = NULL;
+            _effect->set_execution_env(_exEnv);
         }
     }
 
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index e5b83cd20..888a1076a 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -330,7 +330,7 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension,
 
         g_free(fileName);
 
-        throw Inkscape::Extension::Output::save_failed();
+        throw;
     }
 
     // If it is an unofficial save, set the modified attributes back to what they were.
diff --git a/src/file.cpp b/src/file.cpp
index e5caaaca0..9cf0448e1 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -658,6 +658,13 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri,
         SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved."));
         doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save ));
         return false;
+    } catch (Inkscape::Extension::Output::export_id_not_found &e) {
+        gchar *text = g_strdup_printf(_("File could not be saved:\nNo object with ID '%s' found."), e.id);
+        SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved."));
+        sp_ui_error_dialog(text);
+        g_free(text);
+        doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save ));
+        return false;
     } catch (Inkscape::Extension::Output::no_overwrite &e) {
         return sp_file_save_dialog(parentWindow, doc, save_method);
     } catch (...) {
diff --git a/src/helper/sp-marshal.list b/src/helper/sp-marshal.list
index 6014c820d..35f7858e2 100644
--- a/src/helper/sp-marshal.list
+++ b/src/helper/sp-marshal.list
@@ -1,5 +1,5 @@
 # marshallers for sodipodi
-NONE:POINTER,UINT
+VOID:POINTER,UINT
 BOOLEAN:POINTER
 BOOLEAN:POINTER,UINT
 BOOLEAN:POINTER,POINTER
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index 435c91c2d..4ec760e41 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -227,7 +227,7 @@ LPEPerspectivePath::newWidget()
     }
     Gtk::HBox * perspectiveId = Gtk::manage(new Gtk::HBox(true,0));
 
-#if WITH_GTKMM_3_10
+#if GTKMM_CHECK_VERSION(3,10,0)
     Gtk::Label* labelPerspective = Gtk::manage(new Gtk::Label("Perspective ID:", Gtk::ALIGN_START, Gtk::ALIGN_START));
 #else
     Gtk::Label* labelPerspective = Gtk::manage(new Gtk::Label("Perspective ID:", 0., 0.));
@@ -241,7 +241,7 @@ LPEPerspectivePath::newWidget()
     vbox->pack_start(*perspectiveId, true, true, 2);
     Gtk::Button* apply3D = Gtk::manage(new Gtk::Button());
 
-#if WITH_GTKMM_3_10
+#if GTKMM_CHECK_VERSION(3,10,0)
     Gtk::Label *apply3DLabel = Gtk::manage(new Gtk::Label(_("Refresh perspective"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER));
 #else
     Gtk::Label *apply3DLabel = Gtk::manage(new Gtk::Label(_("Refresh perspective"), 0.0, 0.5));
diff --git a/src/path-prefix.h b/src/path-prefix.h
index b69ad3753..a557ca340 100644
--- a/src/path-prefix.h
+++ b/src/path-prefix.h
@@ -35,6 +35,7 @@ char *append_inkscape_datadir(const char *relative_path);
 #  define INKSCAPE_APPICONDIR     BR_DATADIR( INKSCAPE_LIBPREFIX "/share/pixmaps" )
 #  define INKSCAPE_ATTRRELDIR     BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/attributes" )
 #  define INKSCAPE_BINDDIR        BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/bind" )
+#  define INKSCAPE_DOCDIR         BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/doc" )
 #  define INKSCAPE_EXAMPLESDIR    BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/examples" )
 #  define INKSCAPE_EXTENSIONDIR   BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/extensions" )
 #  define INKSCAPE_FILTERDIR      BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/filters" )
@@ -60,6 +61,7 @@ char *append_inkscape_datadir(const char *relative_path);
 #    define INKSCAPE_APPICONDIR   append_inkscape_datadir("pixmaps")
 #    define INKSCAPE_ATTRRELDIR   append_inkscape_datadir("attributes")
 #    define INKSCAPE_BINDDIR      append_inkscape_datadir("bind")
+#    define INKSCAPE_DOCDIR       append_inkscape_datadir("doc")
 #    define INKSCAPE_EXAMPLESDIR  append_inkscape_datadir("examples")
 #    define INKSCAPE_EXTENSIONDIR append_inkscape_datadir("extensions")
 #    define INKSCAPE_FILTERDIR    append_inkscape_datadir("filters")
@@ -84,6 +86,7 @@ char *append_inkscape_datadir(const char *relative_path);
 #    define INKSCAPE_APPICONDIR   "Contents/Resources/share/pixmaps"
 #    define INKSCAPE_ATTRRELDIR   "Contents/Resources/share/inkscape/attributes"
 #    define INKSCAPE_BINDDIR      "Contents/Resources/share/inkscape/bind"
+#    define INKSCAPE_DOCDIR       "Contents/Resources/share/inkscape/doc"
 #    define INKSCAPE_EXAMPLESDIR  "Contents/Resources/share/inkscape/examples"
 #    define INKSCAPE_EXTENSIONDIR "Contents/Resources/share/inkscape/extensions"
 #    define INKSCAPE_FILTERDIR    "Contents/Resources/share/inkscape/filters"
@@ -108,6 +111,7 @@ char *append_inkscape_datadir(const char *relative_path);
 #    define INKSCAPE_APPICONDIR   append_inkscape_datadir("pixmaps")
 #    define INKSCAPE_ATTRRELDIR   append_inkscape_datadir("inkscape/attributes")
 #    define INKSCAPE_BINDDIR      append_inkscape_datadir("inkscape/bind")
+#    define INKSCAPE_DOCDIR       append_inkscape_datadir("inkscape/doc")
 #    define INKSCAPE_EXAMPLESDIR  append_inkscape_datadir("inkscape/examples")
 #    define INKSCAPE_EXTENSIONDIR append_inkscape_datadir("inkscape/extensions")
 #    define INKSCAPE_FILTERDIR    append_inkscape_datadir("inkscape/filters")
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index ef22eca2d..99cc6fbfc 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -37,7 +37,7 @@
 #include "sp-root.h"
 #include <gtkmm/window.h>
 
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
 # include <gdkmm/monitor.h>
 #else
 # include <gdkmm/screen.h>
@@ -745,7 +745,7 @@ gdouble const NEWDOC_Y_SCALE = NEWDOC_X_SCALE;
 Geom::Point calcAnchorPoint(gint const x, gint const y,
                             gint const w, gint const h, gint const minOnscreen)
 {
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
     Gdk::Rectangle screen_geometry;
 
     auto const display = Gdk::Display::get_default();
@@ -798,7 +798,7 @@ void sp_namedview_window_from_document(SPDesktop *desktop)
         // TODO: account for multi-monitor setups (i.e. on which monitor do we want to display Inkscape?)
         Gdk::Rectangle monitor_geometry;
 
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
         auto const display = Gdk::Display::get_default();
         auto const monitor = display->get_primary_monitor();
 
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index be13d9b1b..fecb14a91 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -140,6 +140,8 @@ set(ui_SRC
 	widget/highlight-picker.cpp
 	widget/imageicon.cpp
 	widget/imagetoggler.cpp
+	widget/ink-select-one-action.cpp
+	widget/ink-spinscale.cpp
 	widget/insertordericon.cpp
 	widget/labelled.cpp
 	widget/layer-selector.cpp
@@ -147,7 +149,6 @@ set(ui_SRC
 	widget/licensor.cpp
 	widget/notebook-page.cpp
 	widget/object-composite-settings.cpp
-	widget/ink-select-one-action.cpp
 	widget/page-sizer.cpp
 	widget/panel.cpp
 	widget/point.cpp
@@ -333,13 +334,14 @@ set(ui_SRC
 	widget/insertordericon.h
 	widget/imageicon.h
 	widget/imagetoggler.h
+	widget/ink-select-one-action.h
+	widget/ink-spinscale.h
 	widget/labelled.h
 	widget/layer-selector.h
 	widget/layertypeicon.h
 	widget/licensor.h
 	widget/notebook-page.h
 	widget/object-composite-settings.h
-	widget/ink-select-one-action.h
 	widget/page-sizer.h
 	widget/panel.h
 	widget/point.h
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 9b99dde6b..4f094f876 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -22,9 +22,13 @@
 #endif
 
 #include "ui/dialog/aboutbox.h"
+
+#include <fstream>
+
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
-#include <gtkmm/notebook.h>
-#include <gtkmm/scrolledwindow.h>
+#include <glibmm/miscutils.h>
+
 #include <gtkmm/aspectframe.h>
 #include <gtkmm/textview.h>
 
@@ -33,6 +37,7 @@
 #include "svg-view-widget.h"
 #include "sp-text.h"
 #include "text-editing.h"
+#include "ui/icon-names.h"
 #include "util/units.h"
 
 #include "inkscape-version.h"
@@ -42,417 +47,133 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-
-
-static Gtk::Widget *build_splash_widget();
-
-
-
-static Gtk::ScrolledWindow 
-  *make_scrolled_text(const Glib::ustring &contents);
-
-
-
 static AboutBox *window=NULL;
 
-
-
 void AboutBox::show_about() {
     if (!window)
         window = new AboutBox();
     window->show();
 }
 
-
-
 void AboutBox::hide_about() {
     if (window)
         window->hide();
 }
 
-
 /**
  * Constructor
  */ 
-AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
-
+AboutBox::AboutBox()
+    : _splash_widget(nullptr)
+{
     // call this first
     initStrings();
 
-    Gtk::Notebook *tabs=new Gtk::Notebook();
-
-    tabs->set_scrollable();
-
-    Gtk::Widget *splash=build_splash_widget();
-    if (splash) {
-        tabs->append_page(*manage(splash), _("_Splash"), true);
+    // Insert the Splash widget.  This is placed directly into the
+    // content area of the dialog, whereas everything else is placed
+    // automatically by the Gtk::AboutDialog parent class
+    build_splash_widget();
+    if (_splash_widget) {
+        get_content_area()->pack_end(*manage(_splash_widget), true, true);
+        _splash_widget->show_all();
     }
 
-    tabs->append_page(*manage(
-        make_scrolled_text(authors_text)), _("_Authors"), true);
-    tabs->append_page(*manage(
-        make_scrolled_text(translators_text)), _("_Translators"), true);
-    tabs->append_page(*manage(
-        make_scrolled_text(license_text)), _("_License"), true);
-
-    get_content_area()->pack_end(*manage(tabs), true, true);
-
-    tabs->show_all();
-
-    add_button(_("_Close"), Gtk::RESPONSE_CLOSE);
-    set_default_response(Gtk::RESPONSE_CLOSE);
-
-    Gtk::Label *label=new Gtk::Label();
-    gchar *label_text = 
-        g_strdup_printf("<small>Inkscape %s</small>",
-              Inkscape::version_string);
-    label->set_markup(label_text);
-
-#if WITH_GTKMM_3_10
-    label->set_halign(Gtk::ALIGN_END);
-    label->set_valign(Gtk::ALIGN_CENTER);
-#else
-    label->set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
-#endif
-
-#if WITH_GTKMM_3_12
-    label->set_margin_start(5);
-    label->set_margin_end(5);
-#else
-    label->set_padding(5,0);
-#endif
-
-    g_free(label_text);
-    label->set_selectable(true);
-    label->show();
-
-    Gtk::Label *link = new Gtk::Label();
-    const gchar *website_link =
-        "<a href=\"https://www.inkscape.org\">https://www.inkscape.org</a>";
-
-    link->set_markup(website_link);
-
-#if WITH_GTKMM_3_10
-    link->set_halign(Gtk::ALIGN_END);
-#else
-    link->set_alignment(Gtk::ALIGN_END);
-#endif
-
-#if WITH_GTKMM_3_12
-    label->set_margin_start(5);
-    label->set_margin_end(5);
-    label->set_margin_top(5);
-    label->set_margin_bottom(5);
-#else
-    link->set_padding(5,5);
-#endif
-
-    link->set_selectable(true);
-    link->show();
-
-    get_content_area()->pack_start(*manage(label), false, false);
-    get_content_area()->pack_start(*manage(link), false, false);
-
-    Gtk::Requisition minimum_size;
-    Gtk::Requisition natural_size;
-    get_preferred_size(minimum_size, natural_size);
-    
-    // allow window to shrink
-    set_size_request(0, 0);
-    set_default_size(minimum_size.width, minimum_size.height);
-}
-
-
-
-
-void AboutBox::on_response(int response_id) {
-    if ( response_id == Gtk::RESPONSE_CLOSE ) {
-        AboutBox::hide_about();
-    }
+    // Set Application metadata, which will be automatically
+    // inserted into text widgets by the Gtk::AboutDialog parent class
+    set_program_name  (  "Inkscape");
+    set_version       (  Inkscape::version_string);
+    set_logo_icon_name(  INKSCAPE_ICON("inkscape"));
+    set_website       (  "https://www.inkscape.org");
+    set_website_label (_("Inkscape website"));
+    set_license_type    (Gtk::LICENSE_GPL_3_0);
+    set_copyright     (_("© 2017 Inkscape Developers"));
+    set_comments      (_("Open Source Scalable Vector Graphics Editor\n"
+                         "Draw Freely."));
 }
 
-
-
-
-Gtk::Widget *build_splash_widget() {
+/**
+ * @brief Create a Gtk::AspectFrame containing the splash image
+ */
+void AboutBox::build_splash_widget() {
     /* TRANSLATORS: This is the filename of the `About Inkscape' picture in
        the `screens' directory.  Thus the translation of "about.svg" should be
        the filename of its translated version, e.g. about.zh.svg for Chinese.
 
        Please don't translate the filename unless the translated picture exists. */
 
+    // Try to get the translated version of the 'About Inkscape' file first.  If the
+    // translation fails, or if the file does not exist, then fall-back to the
+    // default untranslated "about.svg" file
+    //
     // FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the
     // native filename encoding... and the filename passed to sp_document_new
     // should be in UTF-*8..
-
-    char *about=g_build_filename(INKSCAPE_SCREENSDIR, _("about.svg"), NULL);
-    if (!g_file_test (about, G_FILE_TEST_EXISTS)) {
-        about=g_build_filename(INKSCAPE_SCREENSDIR, "about.svg", NULL);
+    auto about = Glib::build_filename(INKSCAPE_SCREENSDIR, _("about.svg"));
+    if (!Glib::file_test (about, Glib::FILE_TEST_EXISTS)) {
+        about = Glib::build_filename(INKSCAPE_SCREENSDIR, "about.svg");
     }
-    SPDocument *doc=SPDocument::createNewDoc (about, TRUE);
-    g_free(about);
-    g_return_val_if_fail(doc != NULL, NULL);
 
-    SPObject *version = doc->getObjectById("version");
-    if ( version && SP_IS_TEXT(version) ) {
-        sp_te_set_repr_text_multiline (SP_TEXT (version), Inkscape::version_string);
-    }
-    doc->ensureUpToDate();
+    // Create an Inkscape document from the 'About Inkscape' picture
+    SPDocument *doc=SPDocument::createNewDoc (about.c_str(), TRUE);
 
-    GtkWidget *v=sp_svg_view_widget_new(doc);
+    // Leave _splash_widget as a nullptr if there is no document
+    if(doc) {
+        SPObject *version = doc->getObjectById("version");
+        if ( version && SP_IS_TEXT(version) ) {
+            sp_te_set_repr_text_multiline (SP_TEXT (version), Inkscape::version_string);
+        }
+        doc->ensureUpToDate();
 
-    double width=doc->getWidth().value("px");
-    double height=doc->getHeight().value("px");
-    
-    doc->doUnref();
+        GtkWidget *v=sp_svg_view_widget_new(doc);
 
-    SP_SVG_VIEW_WIDGET(v)->setResize(false, static_cast<int>(width), static_cast<int>(height));
+        // temporary hack: halve the dimensions so the dialog will fit
+        double width=doc->getWidth().value("px") / 2;
+        double height=doc->getHeight().value("px") / 2;
 
-    Gtk::AspectFrame *frame=new Gtk::AspectFrame();
-    frame->unset_label();
-    frame->set_shadow_type(Gtk::SHADOW_NONE);
-    frame->property_ratio() = width / height;
-    frame->add(*manage(Glib::wrap(v)));
+        doc->doUnref();
 
-    return frame;
-}
+        SP_SVG_VIEW_WIDGET(v)->setResize(false, static_cast<int>(width), static_cast<int>(height));
 
-
-
-
-/**
- *  This attempts to emulate the AboutDialog child dialog settings as
- *  closely as possible.  Mostly, that's margin widths and shadows.  Size
- *  is probably set in some other way, but this looked close enough.
- */
-static Gtk::ScrolledWindow *make_scrolled_text(const Glib::ustring &contents) {
-    Gtk::ScrolledWindow *scrolled=new Gtk::ScrolledWindow(); 
-
-    scrolled->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-    scrolled->set_shadow_type(Gtk::SHADOW_IN);
-
-    Gtk::TextView *textview=manage(new Gtk::TextView());
-    textview->set_editable(false);
-    textview->set_left_margin(10);
-    textview->set_right_margin(10);
-    textview->get_buffer()->set_text(contents);
-    scrolled->add(*textview);
-
-    return scrolled;
+        _splash_widget = new Gtk::AspectFrame();
+        _splash_widget->unset_label();
+        _splash_widget->set_shadow_type(Gtk::SHADOW_NONE);
+        _splash_widget->property_ratio() = width / height;
+        _splash_widget->add(*manage(Glib::wrap(v)));
+    }
 }
 
-
-
-
 /**
- * This method must be called before any of the texts are
- * used for making widgets
+ * @brief Read the author and translator credits from file
  */  
 void AboutBox::initStrings() {
-
     //##############################
     //# A U T H O R S
     //##############################
-    
-    /* This text is copied from the AUTHORS file.
-     * To update it, execute this snippet of sed magic in the toplevel
-     * source directory:
-     *
-     * sed -e 's/^\(.*\) \([^ ]*\)*$/\2_ \1/' AUTHORS
-           | sort
-           | sed -e 's/^\([^_]*\)_ \(.*\)$/\2 \1/;s/^.*$/"\0\\n"/;$s/\\n//'
-           | zenity --text-info
-     *
-     * and paste the result from the combo box here.
-     */ 
-    authors_text =
-"Maximilian Albert\n"
-"Joshua A. Andler\n"
-"Tavmjong Bah\n"
-"Pierre Barbry-Blot\n"
-"Jean-François Barraud\n"
-"Campbell Barton\n"
-"Bill Baxter\n"
-"John Beard\n"
-"John Bintz\n"
-"Arpad Biro\n"
-"Nicholas Bishop\n"
-"Joshua L. Blocher\n"
-"Hanno Böck\n"
-"Tomasz Boczkowski\n"
-"Adrian Boguszewski\n"
-"Henrik Bohre\n"
-"Boldewyn\n"
-"Daniel Borgmann\n"
-"Bastien Bouclet\n"
-"Hans Breuer\n"
-"Gustav Broberg\n"
-"Christopher Brown\n"
-"Marcus Brubaker\n"
-"Luca Bruno\n"
-"Brynn (brynn@inkscapecommunity.com)\n"
-"Nicu Buculei\n"
-"Bulia Byak\n"
-"Pierre Caclin\n"
-"Ian Caldwell\n"
-"Gail Carmichael\n"
-"Ed Catmur\n"
-"Chema Celorio\n"
-"Jabiertxo Arraiza Cenoz\n"
-"Johan Ceuppens\n"
-"Zbigniew Chyla\n"
-"Alexander Clausen\n"
-"John Cliff\n"
-"Kees Cook\n"
-"Ben Cromwell\n"
-"Robert Crosbie\n"
-"Jon Cruz\n"
-"Aurélie De-Cooman\n"
-"Milosz Derezynski\n"
-"Daniel Díaz\n"
-"Bruno Dilly\n"
-"Larry Doolittle\n"
-"Nicolas Dufour\n"
-"Tim Dwyer\n"
-"Maxim V. Dziumanenko\n"
-"Moritz Eberl\n"
-"Johan Engelen\n"
-"Miklos Erdelyi\n"
-"Ulf Erikson\n"
-"Noé Falzon\n"
-"Sebastian Faubel\n"
-"Frank Felfe\n"
-"Andrew Fitzsimon\n"
-"Edward Flick\n"
-"Marcin Floryan\n"
-"Ben Fowler\n"
-"Fred\n"
-"Cedric Gemy\n"
-"Steren Giannini\n"
-"Olivier Gondouin\n"
-"Ted Gould\n"
-"Toine de Greef\n"
-"Michael Grosberg\n"
-"Kris De Gussem\n"
-"Bryce Harrington\n"
-"Dale Harvey\n"
-"Aurélio Adnauer Heckert\n"
-"Carl Hetherington\n"
-"Jos Hirth\n"
-"Hannes Hochreiner\n"
-"Thomas Holder\n"
-"Joel Holdsworth\n"
-"Christoffer Holmstedt\n"
-"Alan Horkan\n"
-"Karl Ove Hufthammer\n"
-"Richard Hughes\n"
-"Nathan Hurst\n"
-"inductiveload\n"
-"Thomas Ingham\n"
-"Jean-Olivier Irisson\n"
-"Bob Jamison\n"
-"Ted Janeczko\n"
-"Marc Jeanmougin\n"
-"jEsuSdA\n"
-"Fernando Lucchesi Bastos Jurema\n"
-"Lauris Kaplinski\n"
-"Lynn Kerby\n"
-"Niko Kiirala\n"
-"James Kilfiger\n"
-"Nikita Kitaev\n"
-"Jason Kivlighn\n"
-"Adrian Knoth\n"
-"Krzysztof Kosiński\n"
-"Petr Kovar\n"
-"Benoît Lavorata\n"
-"Alex Leone\n"
-"Julien Leray\n"
-"Raph Levien\n"
-"Diederik van Lierop\n"
-"Nicklas Lindgren\n"
-"Vitaly Lipatov\n"
-"Ivan Louette\n"
-"Pierre-Antoine Marc\n"
-"Aurel-Aimé Marmion\n"
-"Colin Marquardt\n"
-"Craig Marshall\n"
-"Ivan Masár\n"
-"Dmitry G. Mastrukov\n"
-"David Mathog\n"
-"Matiphas\n"
-"Michael Meeks\n"
-"Federico Mena\n"
-"MenTaLguY\n"
-"Aubanel Monnier\n"
-"Vincent Montagne\n"
-"Tim Mooney\n"
-"Derek P. Moore\n"
-"Chris Morgan\n"
-"Peter Moulder\n"
-"Jörg Müller\n"
-"Yukihiro Nakai\n"
-"Victor Navez\n"
-"Christian Neumair\n"
-"Nick\n"
-"Andreas Nilsson\n"
-"Mitsuru Oka\n"
-"Vinícius dos Santos Oliveira\n"
-"Martin Owens\n"
-"Alvin Penner\n"
-"Matthew Petroff\n"
-"Jon Phillips\n"
-"Zdenko Podobny\n"
-"Alexandre Prokoudine\n"
-"Jean-René Reinhard\n"
-"Alexey Remizov\n"
-"Frederic Rodrigo\n"
-"Hugo Rodrigues\n"
-"Juarez Rudsatz\n"
-"Xavier Conde Rueda\n"
-"Felipe Corrêa da Silva Sanches\n"
-"Christian Schaller\n"
-"Marco Scholten\n"
-"Tom von Schwerdtner\n"
-"Danilo Šegan\n"
-"Abhishek Sharma\n"
-"Shivaken\n"
-"Michael Sloan\n"
-"John Smith\n"
-"Sandra Snan\n"
-"Boštjan Špetič\n"
-"Aaron Spike\n"
-"Kaushik Sridharan\n"
-"Ralf Stephan\n"
-"Dariusz Stojek\n"
-"Martin Sucha\n"
-"~suv\n"
-"Pat Suwalski\n"
-"Adib Taraben\n"
-"Hugh Tebby\n"
-"Jonas Termeau\n"
-"David Turner\n"
-"Andre Twupack\n"
-"Aleksandar Urošević\n"
-"Alex Valavanis\n"
-"Joakim Verona\n"
-"Lucas Vieites\n"
-"Daniel Wagenaar\n"
-"Liam P. White\n"
-"Sebastian Wüst\n"
-"Michael Wybrow\n"
-"Gellule Xg\n"
-"Daniel Yacob\n"
-"Masatake Yamato\n"
-"David Yip"
-;
+
+    // Create an empty vector to store the list of authors
+    std::vector<Glib::ustring> authors;
+
+    // Try to copy the list of authors from the "AUTHORS" file, which
+    // should have been installed into the share/doc directory
+    auto authors_filename = Glib::build_filename(INKSCAPE_DOCDIR, "AUTHORS");
+    std::ifstream authors_filestream(authors_filename);
+    if(authors_filestream) {
+        std::string author_line;
+
+        while (std::getline(authors_filestream, author_line)) {
+            authors.push_back(author_line);
+        }
+    }
+
+    // Set the author credits in this dialog, using the author list
+    set_authors(authors);
 
     //##############################
     //# T R A N S L A T O R S
     //##############################
 
+    Glib::ustring translators_text;
 
-    translators_text = "";
-   
     // TRANSLATORS: Put here your name (and other national contributors')      
     // one per line in the form of: name surname (email). Use \n for newline.
     Glib::ustring thisTranslation = _("translator-credits");
@@ -472,867 +193,19 @@ void AboutBox::initStrings() {
         translators_text.append("\n\n\n");
     }
 
-    /* This text is copied from the TRANSLATORS file.
-     * To update it, execute this snippet of sed magic in the toplevel
-     * source directory:
-     *
-     * sed -e 's/^\(.*\) \([^ ]*\)*$/\2_ \1/' TRANSLATORS
-           | sed -e 's/^\([^_]*\)_ \(.*\)$/\2 \1/;s/^.*$/"\0\\n"/;$s/\\n//'
-           | zenity --text-info
-     *
-     * and paste the result from the combo box here.
-     */          
-    gchar const *allTranslators =
-"3ARRANO.com <3arrano@3arrano.com>, 2005.\n"
-"Adib Taraben <theadib@gmail.com>, 2004-2014.\n"
-"Alan Monfort <alan.monfort@free.fr>, 2009-2010.\n"
-"Alastair McKinstry <mckinstry@computer.org>, 2000.\n"
-"Aleksandar Marković <alleksandar.markovic@gmail.com>, 2015.\n"
-"Aleksandar Urošević <urke@users.sourceforge.net>, 2004-2009.\n"
-"Alessio Frusciante <algol@firenze.linux.it>, 2002, 2003.\n"
-"Alexander Shopov <ash@contact.bg>, 2006.\n"
-"Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2005, 2010-2014.\n"
-"Alexey Remizov <alexey@remizov.pp.ru>, 2004.\n"
-"Ali Ghanavatian <ghanvatian.ali@gmail.com>, 2010.\n"
-"Álvaro Lopes <alvieboy@alvie.com>, 2001, 2002.\n"
-"Andreas Hyden <a.hyden@cyberpoint.se>, 2000.\n"
-"Andrius Ramanauskas <knutux@gmail.com>, 2006.\n"
-"Antonio Codazzi <f_sophia@libero.it>, 2006, 2007.\n"
-"Antônio Cláudio (LedStyle) <ledstyle@gmail.com>, 2006.\n"
-"Amanpreet Singh Brar Alamwalia <apbrar@gmail.com>, 2005.\n"
-"Arman Aksoy <armish@linux-sevenler.de>, 2003.\n"
-"Arpad Biro <biro_arpad@yahoo.com>, 2004, 2005.\n"
-"Benedikt Roth <Benedikt.Roth@gmx.net>, 2000.\n"
-"Benjamin Weis <benjamin.weis@gmx.com>, 2014.\n"
-"Benno Schulenberg <benno@vertaalt.nl>,  2008.\n"
-"Boštjan Špetič <igzebedze@cyberpipe.org>, 2004, 2005.\n"
-"Brisa Francesco <fbrisa@yahoo.it>, 2000.\n"
-"Bruce Cowan <bruce@bcowan.me.uk>, 2010.\n"
-"bulia byak <buliabyak@users.sf.net>, 2004.\n"
-"Chris jia <Chrisjiasl@gmail.com>, 2006.\n"
-"Christian Meyer <chrisime@gnome.org>, 2000-2002.\n"
-"Christian Neumair <chris@gnome-de.org>, 2002, 2003.\n"
-"Christian Rose <menthos@menthos.com>, 2000-2003.\n"
-"Cristian Secară <cristi@secarica.ro>, 2010-2013.\n"
-"Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2000-2002.\n"
-"Clytie Siddall <clytie@riverland.net.au>, 2004-2008.\n"
-"Colin Marquardt <colin@marquardt-home.de>, 2004-2006.\n"
-"Cédric Gemy <radar.map35@free.fr>, 2006.\n"
-"Daniel Díaz <yosoy@danieldiaz.org>, 2004.\n"
-"Didier Conchaudron <conchaudron@free.fr>, 2003.\n"
-"Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2011-2015.\n"
-"Dorji Tashi <dorjee_doss@hotmail.com>, 2006.\n"
-"Duarte Loreto <happyguy_pt@hotmail.com> 2002, 2003 (Maintainer).\n"
-"Elias Norberg <elno0959 at student.su.se>, 2009.\n"
-"Equipe de Tradução Inkscape Brasil <www.inkscapebrasil.org>, 2007.\n"
-"Fatih Demir <kabalak@gtranslator.org>, 2000.\n"
-"Firas Hanife <FirasHanife@gmail.com>, 2014-2016.\n"
-"Foppe Benedictus <foppe.benedictus@gmail.com>, 2007-2009.\n"
-"Francesc Dorca <f.dorca@filnet.es>, 2003. Traducció sodipodi.\n"
-"Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.\n"
-"Francisco Xosé Vázquez Grandal <fxvazquez@arrakis.es>, 2001.\n"
-"Frederic Rodrigo <f.rodrigo free.fr>, 2004-2005.\n"
-"Ganesh Murmu <g_murmu_in@yahoo.com>, 2014.\n"
-"Ge'ez Frontier Foundation <locales@geez.org>, 2002.\n"
-"George Boukeas <boukeas@gmail.com>, 2011.\n"
-"Heiko Wöhrle <mail@heikowoehrle.de>, 2014.\n"
-"Hleb Valoshka <375gnu@gmail.com>, 2008-2009.\n"
-"Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.\n"
-"Ilia Penev <lichopicho@gmail.com>, 2006.\n"
-"Ivan Masár <helix84@centrum.sk>, 2006-2014. \n"
-"Ivan Řihošek <irihosek@seznam.cz>, 2014.\n"
-"Iñaki Larrañaga <dooteo@euskalgnu.org>, 2006.\n"
-"Jānis Eisaks <jancs@dv.lv>, 2012-2014.\n"
-"Jeffrey Steve Borbón Sanabria <jeff_kerokid@yahoo.com>, 2005.\n"
-"Jesper Öqvist <jesper@llbit.se>, 2010, 2011.\n"
-"Joaquim Perez i Noguer <noguer@gmail.com>, 2008-2009.\n"
-"Jörg Müller <jfm@ram-brand.de>, 2005.\n"
-"Jeroen van der Vegt <jvdvegt@gmail.com>, 2003, 2005, 2008.\n"
-"Jin-Hwan Jeong <yongdoria@gmail.com>, 2009.\n"
-"Jonathan Ernst <jernst@users.sourceforge.net>, 2006.\n"
-"Jordi Mas i Hernàndez <jmas@softcatala.org>, 2015.\n"
-"Jose Antonio Salgueiro Aquino <developer@telefonica.net>, 2003.\n"
-"Josef Vybiral <josef.vybiral@gmail.com>, 2005-2006.\n"
-"Juarez Rudsatz <juarez@correio.com>, 2004.\n"
-"Junichi Uekawa <dancer@debian.org>, 2002.\n"
-"Jurmey Rabgay <jur_gay@yahoo.com>, 2006.\n"
-"Kai Lahmann <kailahmann@01019freenet.de>, 2000.\n"
-"Karl Ove Hufthammer <karl@huftis.org>, 2004, 2005.\n"
-"KATSURAGAWA Naoki <naopon@private.email.ne.jp>, 2006.\n"
-"Keld Simonsen <keld@dkuug.dk>, 2000, 2001.\n"
-"Kenji Inoue <kenz@oct.zaq.ne.jp>, 2006-2007.\n"
-"Khandakar Mujahidul Islam <suzan@bengalinux.org>, 2006.\n"
-"Kingsley Turner <kingsley@maddogsbreakfast.com.au>, 2006.\n"
-"Kitae <bluetux@gmail.com>, 2006.\n"
-"Kjartan Maraas <kmaraas@gnome.org>, 2000-2002.\n"
-"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2015.\n"
-"Lauris Kaplinski <lauris@ariman.ee>, 2000.\n"
-"Leandro Regueiro <leandro.regueiro@gmail.com>, 2006-2008, 2010.\n"
-"Liu Xiaoqin <liuxqsmile@gmail.com>, 2008.\n"
-"Louni Kandulna <kandulna.louni@gmail.com>, 2014.\n"
-"Luca Bruno <luca.br@uno.it>, 2005.\n"
-"Lucas Vieites Fariña<lucas@codexion.com>, 2003-2013.\n"
-"Mahesh subedi <submanesh@hotmail.com>, 2006.\n"
-"Marcin Floryan <marcin.floryan+inkscape (at) gmail.com>, 2016.\n"
-"Maren Hachmann <marenhachmann@yahoo.com>, 2015-2016.\n"
-"Martin Srebotnjak, <miles@filmsi.net>, 2005, 2010.\n"
-"Masatake YAMATO <jet@gyve.org>, 2002.\n"
-"Masato Hashimoto <cabezon.hashimoto@gmail.com>, 2009-2014.\n"
-"Matiphas <matiphas _a_ free _point_ fr>, 2004-2006.\n"
-"Mattias Hultgren <mattias_hultgren@tele2.se>, 2005, 2006.\n"
-"Maxim Dziumanenko <mvd@mylinux.com.ua>, 2004.\n"
-"Mətin Əmirov <metin@karegen.com>, 2003.\n"
-"Mitsuru Oka <oka326@parkcity.ne.jp>, 2002.\n"
-"Morphix User <pchitrakar@gmail.com>, 2006.\n"
-"Mufit Eribol <meribol@ere.com.tr>, 2000.\n"
-"Muhammad Bashir Al-Noimi <mhdbnoimi@gmail.com>, 2008.\n"
-"Myckel Habets <myckel@sdf.lonestar.org>, 2008.\n"
-"Nasreen <nasreen_saifee@hotmail.com>, 2013.\n"
-"Nguyen Dinh Trung <nguyendinhtrung141@gmail.com>, 2007, 2008.\n"
-"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2016.\n"
-"Paresh prabhu <goa.paresh@Gmail.com>, 2013.\n"
-"Pawan Chitrakar <pchitrakar@gmail.com>, 2006.\n"
-"Przemysław Loesch <p_loesch@poczta.onet.pl>, 2005.\n"
-"Quico Llach <quico@softcatala.org>, 2000. Traducció sodipodi.\n"
-"Raymond Ostertag <raymond@linuxgraphic.org>, 2002, 2003.\n"
-"Riku Leino <tsoots@gmail.com>, 2006-2011.\n"
-"Rune Rønde Laursen <runerl@skjoldhoej.dk>, 2006.\n"
-"Ruud Steltenpool <svg@steltenpower.com>, 2006.\n"
-"Sangeeta <sk@gma.co>, 2011.\n"
-"Savitha <savithasprasad@yahoo.co.in>, 2013.\n"
-"Serdar Soytetir <sendirom@gmail.com>, 2005.\n"
-"shivaken <shivaken@owls-nest.net>, 2004.\n"
-"Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.\n"
-"Simos Xenitellis <simos@hellug.gr>, 2001, 2011.\n"
-"Spyros Blanas <cid_e@users.sourceforge.net>, 2006, 2011.\n"
-"Stefan Graubner <pflaumenmus92@gmx.net>, 2005.\n"
-"Supranee Thirawatthanasuk <supranee@opentle.org>, 2006.\n"
-"Sushma Joshi <shshma_joshi8266@vsnl.net>, 2011.\n"
-"Sveinn í Felli <sv1@fellsnet.is>, 2014-2015.\n"
-"Sylvain Chiron <chironsylvain@orange.fr>, 2016.\n"
-"Takeshi Aihana <aihana@muc.biglobe.ne.jp>, 2000, 2001.\n"
-"Tim Sheridan <tghs@tghs.net>, 2007-2016.\n"
-"Theppitak Karoonboonyanan <thep@linux.thai.net>, 2006.\n"
-"Thiago Pimentel <thiago.merces@gmail.com>, 2006.\n"
-"Toshifumi Sato <sato@centrosystem.com>, 2005.\n"
-"Jon South <striker@lunar-linux.org>, 2006. \n"
-"Uwe Schöler <oss@oss-marketplace.com>, 2006-2014.\n"
-"Valek Filippov <frob@df.ru>, 2000, 2003.\n"
-"Victor Dachev <vdachev@gmail.com>, 2006.\n"
-"Victor Westmann <victor.westmann@gmail.com>, 2011, 2014.\n"
-"Ville Pätsi, 2013.\n"
-"Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2003.\n"
-"Vital Khilko <dojlid@mova.org>, 2003.\n"
-"Vitaly Lipatov <lav@altlinux.ru>, 2002, 2004.\n"
-"vonHalenbach <vonHalenbach@users.sourceforge.net>, 2005.\n"
-"vrundeshw <vrundeshw@cdac.in>, 2012.\n"
-"Waluyo Adi Siswanto <was.uthm@gmail.com>, 2011.\n"
-"Wang Li <charlesw1234@163.com>, 2002.\n"
-"Wei-Lun Chao <william.chao@ossii.com.tw>, 2006.\n"
-"Wolfram Strempfer <wolfram@strempfer.de>, 2006.\n"
-"Xavier Conde Rueda <xavi.conde@gmail.com>, 2004-2008.\n"
-"Yaron Shahrabani <sh.yaron@gmail.com>, 2009.\n"
-"Yukihiro Nakai <nakai@gnome.gr.jp>, 2000, 2003.\n"
-"Yuri Beznos <zhiz0id@gmail.com>, 2006.\n"
-"Yuri Chornoivan <yurchor@ukr.net>, 2007-2014.\n"
-"Yuri Syrota <rasta@renome.rovno.ua>, 2000.\n"
-"Yves Guillou <yvesguillou@users.sourceforge.net>, 2004.\n"
-"Zdenko Podobný <zdpo@mailbox.sk>, 2003, 2004."
-    ;
-    
-    translators_text.append(allTranslators);
-
-
+    auto translators_filename = Glib::build_filename(INKSCAPE_DOCDIR, "TRANSLATORS");
 
-    //##############################
-    //# L I C E N S E
-    //##############################
-
-    /**
-     * This text is copied from the COPYING file
-     */         
-    license_text =
-    "                    GNU GENERAL PUBLIC LICENSE\n"
-    "                       Version 3, 29 June 2007\n"
-    "\n"
-    " Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n"
-    " Everyone is permitted to copy and distribute verbatim copies\n"
-    " of this license document, but changing it is not allowed.\n"
-    "\n"
-    "                            Preamble\n"
-    "\n"
-    "  The GNU General Public License is a free, copyleft license for\n"
-    "software and other kinds of works.\n"
-    "\n"
-    "  The licenses for most software and other practical works are designed\n"
-    "to take away your freedom to share and change the works.  By contrast,\n"
-    "the GNU General Public License is intended to guarantee your freedom to\n"
-    "share and change all versions of a program--to make sure it remains free\n"
-    "software for all its users.  We, the Free Software Foundation, use the\n"
-    "GNU General Public License for most of our software; it applies also to\n"
-    "any other work released this way by its authors.  You can apply it to\n"
-    "your programs, too.\n"
-    "\n"
-    "  When we speak of free software, we are referring to freedom, not\n"
-    "price.  Our General Public Licenses are designed to make sure that you\n"
-    "have the freedom to distribute copies of free software (and charge for\n"
-    "them if you wish), that you receive source code or can get it if you\n"
-    "want it, that you can change the software or use pieces of it in new\n"
-    "free programs, and that you know you can do these things.\n"
-    "\n"
-    "  To protect your rights, we need to prevent others from denying you\n"
-    "these rights or asking you to surrender the rights.  Therefore, you have\n"
-    "certain responsibilities if you distribute copies of the software, or if\n"
-    "you modify it: responsibilities to respect the freedom of others.\n"
-    "\n"
-    "  For example, if you distribute copies of such a program, whether\n"
-    "gratis or for a fee, you must pass on to the recipients the same\n"
-    "freedoms that you received.  You must make sure that they, too, receive\n"
-    "or can get the source code.  And you must show them these terms so they\n"
-    "know their rights.\n"
-    "\n"
-    "  Developers that use the GNU GPL protect your rights with two steps:\n"
-    "(1) assert copyright on the software, and (2) offer you this License\n"
-    "giving you legal permission to copy, distribute and/or modify it.\n"
-    "\n"
-    "  For the developers' and authors' protection, the GPL clearly explains\n"
-    "that there is no warranty for this free software.  For both users' and\n"
-    "authors' sake, the GPL requires that modified versions be marked as\n"
-    "changed, so that their problems will not be attributed erroneously to\n"
-    "authors of previous versions.\n"
-    "\n"
-    "  Some devices are designed to deny users access to install or run\n"
-    "modified versions of the software inside them, although the manufacturer\n"
-    "can do so.  This is fundamentally incompatible with the aim of\n"
-    "protecting users' freedom to change the software.  The systematic\n"
-    "pattern of such abuse occurs in the area of products for individuals to\n"
-    "use, which is precisely where it is most unacceptable.  Therefore, we\n"
-    "have designed this version of the GPL to prohibit the practice for those\n"
-    "products.  If such problems arise substantially in other domains, we\n"
-    "stand ready to extend this provision to those domains in future versions\n"
-    "of the GPL, as needed to protect the freedom of users.\n"
-    "\n"
-    "  Finally, every program is threatened constantly by software patents.\n"
-    "States should not allow patents to restrict development and use of\n"
-    "software on general-purpose computers, but in those that do, we wish to\n"
-    "avoid the special danger that patents applied to a free program could\n"
-    "make it effectively proprietary.  To prevent this, the GPL assures that\n"
-    "patents cannot be used to render the program non-free.\n"
-    "\n"
-    "  The precise terms and conditions for copying, distribution and\n"
-    "modification follow.\n"
-    "\n"
-    "                       TERMS AND CONDITIONS\n"
-    "\n"
-    "  0. Definitions.\n"
-    "\n"
-    "  \"This License\" refers to version 3 of the GNU General Public License.\n"
-    "\n"
-    "  \"Copyright\" also means copyright-like laws that apply to other kinds of\n"
-    "works, such as semiconductor masks.\n"
-    "\n"
-    "  \"The Program\" refers to any copyrightable work licensed under this\n"
-    "License.  Each licensee is addressed as \"you\".  \"Licensees\" and\n"
-    "\"recipients\" may be individuals or organizations.\n"
-    "\n"
-    "  To \"modify\" a work means to copy from or adapt all or part of the work\n"
-    "in a fashion requiring copyright permission, other than the making of an\n"
-    "exact copy.  The resulting work is called a \"modified version\" of the\n"
-    "earlier work or a work \"based on\" the earlier work.\n"
-    "\n"
-    "  A \"covered work\" means either the unmodified Program or a work based\n"
-    "on the Program.\n"
-    "\n"
-    "  To \"propagate\" a work means to do anything with it that, without\n"
-    "permission, would make you directly or secondarily liable for\n"
-    "infringement under applicable copyright law, except executing it on a\n"
-    "computer or modifying a private copy.  Propagation includes copying,\n"
-    "distribution (with or without modification), making available to the\n"
-    "public, and in some countries other activities as well.\n"
-    "\n"
-    "  To \"convey\" a work means any kind of propagation that enables other\n"
-    "parties to make or receive copies.  Mere interaction with a user through\n"
-    "a computer network, with no transfer of a copy, is not conveying.\n"
-    "\n"
-    "  An interactive user interface displays \"Appropriate Legal Notices\"\n"
-    "to the extent that it includes a convenient and prominently visible\n"
-    "feature that (1) displays an appropriate copyright notice, and (2)\n"
-    "tells the user that there is no warranty for the work (except to the\n"
-    "extent that warranties are provided), that licensees may convey the\n"
-    "work under this License, and how to view a copy of this License.  If\n"
-    "the interface presents a list of user commands or options, such as a\n"
-    "menu, a prominent item in the list meets this criterion.\n"
-    "\n"
-    "  1. Source Code.\n"
-    "\n"
-    "  The \"source code\" for a work means the preferred form of the work\n"
-    "for making modifications to it.  \"Object code\" means any non-source\n"
-    "form of a work.\n"
-    "\n"
-    "  A \"Standard Interface\" means an interface that either is an official\n"
-    "standard defined by a recognized standards body, or, in the case of\n"
-    "interfaces specified for a particular programming language, one that\n"
-    "is widely used among developers working in that language.\n"
-    "\n"
-    "  The \"System Libraries\" of an executable work include anything, other\n"
-    "than the work as a whole, that (a) is included in the normal form of\n"
-    "packaging a Major Component, but which is not part of that Major\n"
-    "Component, and (b) serves only to enable use of the work with that\n"
-    "Major Component, or to implement a Standard Interface for which an\n"
-    "implementation is available to the public in source code form.  A\n"
-    "\"Major Component\", in this context, means a major essential component\n"
-    "(kernel, window system, and so on) of the specific operating system\n"
-    "(if any) on which the executable work runs, or a compiler used to\n"
-    "produce the work, or an object code interpreter used to run it.\n"
-    "\n"
-    "  The \"Corresponding Source\" for a work in object code form means all\n"
-    "the source code needed to generate, install, and (for an executable\n"
-    "work) run the object code and to modify the work, including scripts to\n"
-    "control those activities.  However, it does not include the work's\n"
-    "System Libraries, or general-purpose tools or generally available free\n"
-    "programs which are used unmodified in performing those activities but\n"
-    "which are not part of the work.  For example, Corresponding Source\n"
-    "includes interface definition files associated with source files for\n"
-    "the work, and the source code for shared libraries and dynamically\n"
-    "linked subprograms that the work is specifically designed to require,\n"
-    "such as by intimate data communication or control flow between those\n"
-    "subprograms and other parts of the work.\n"
-    "\n"
-    "  The Corresponding Source need not include anything that users\n"
-    "can regenerate automatically from other parts of the Corresponding\n"
-    "Source.\n"
-    "\n"
-    "  The Corresponding Source for a work in source code form is that\n"
-    "same work.\n"
-    "\n"
-    "  2. Basic Permissions.\n"
-    "\n"
-    "  All rights granted under this License are granted for the term of\n"
-    "copyright on the Program, and are irrevocable provided the stated\n"
-    "conditions are met.  This License explicitly affirms your unlimited\n"
-    "permission to run the unmodified Program.  The output from running a\n"
-    "covered work is covered by this License only if the output, given its\n"
-    "content, constitutes a covered work.  This License acknowledges your\n"
-    "rights of fair use or other equivalent, as provided by copyright law.\n"
-    "\n"
-    "  You may make, run and propagate covered works that you do not\n"
-    "convey, without conditions so long as your license otherwise remains\n"
-    "in force.  You may convey covered works to others for the sole purpose\n"
-    "of having them make modifications exclusively for you, or provide you\n"
-    "with facilities for running those works, provided that you comply with\n"
-    "the terms of this License in conveying all material for which you do\n"
-    "not control copyright.  Those thus making or running the covered works\n"
-    "for you must do so exclusively on your behalf, under your direction\n"
-    "and control, on terms that prohibit them from making any copies of\n"
-    "your copyrighted material outside their relationship with you.\n"
-    "\n"
-    "  Conveying under any other circumstances is permitted solely under\n"
-    "the conditions stated below.  Sublicensing is not allowed; section 10\n"
-    "makes it unnecessary.\n"
-    "\n"
-    "  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n"
-    "\n"
-    "  No covered work shall be deemed part of an effective technological\n"
-    "measure under any applicable law fulfilling obligations under article\n"
-    "11 of the WIPO copyright treaty adopted on 20 December 1996, or\n"
-    "similar laws prohibiting or restricting circumvention of such\n"
-    "measures.\n"
-    "\n"
-    "  When you convey a covered work, you waive any legal power to forbid\n"
-    "circumvention of technological measures to the extent such circumvention\n"
-    "is effected by exercising rights under this License with respect to\n"
-    "the covered work, and you disclaim any intention to limit operation or\n"
-    "modification of the work as a means of enforcing, against the work's\n"
-    "users, your or third parties' legal rights to forbid circumvention of\n"
-    "technological measures.\n"
-    "\n"
-    "  4. Conveying Verbatim Copies.\n"
-    "\n"
-    "  You may convey verbatim copies of the Program's source code as you\n"
-    "receive it, in any medium, provided that you conspicuously and\n"
-    "appropriately publish on each copy an appropriate copyright notice;\n"
-    "keep intact all notices stating that this License and any\n"
-    "non-permissive terms added in accord with section 7 apply to the code;\n"
-    "keep intact all notices of the absence of any warranty; and give all\n"
-    "recipients a copy of this License along with the Program.\n"
-    "\n"
-    "  You may charge any price or no price for each copy that you convey,\n"
-    "and you may offer support or warranty protection for a fee.\n"
-    "\n"
-    "  5. Conveying Modified Source Versions.\n"
-    "\n"
-    "  You may convey a work based on the Program, or the modifications to\n"
-    "produce it from the Program, in the form of source code under the\n"
-    "terms of section 4, provided that you also meet all of these conditions:\n"
-    "\n"
-    "    a) The work must carry prominent notices stating that you modified\n"
-    "    it, and giving a relevant date.\n"
-    "\n"
-    "    b) The work must carry prominent notices stating that it is\n"
-    "    released under this License and any conditions added under section\n"
-    "    7.  This requirement modifies the requirement in section 4 to\n"
-    "    \"keep intact all notices\".\n"
-    "\n"
-    "    c) You must license the entire work, as a whole, under this\n"
-    "    License to anyone who comes into possession of a copy.  This\n"
-    "    License will therefore apply, along with any applicable section 7\n"
-    "    additional terms, to the whole of the work, and all its parts,\n"
-    "    regardless of how they are packaged.  This License gives no\n"
-    "    permission to license the work in any other way, but it does not\n"
-    "    invalidate such permission if you have separately received it.\n"
-    "\n"
-    "    d) If the work has interactive user interfaces, each must display\n"
-    "    Appropriate Legal Notices; however, if the Program has interactive\n"
-    "    interfaces that do not display Appropriate Legal Notices, your\n"
-    "    work need not make them do so.\n"
-    "\n"
-    "  A compilation of a covered work with other separate and independent\n"
-    "works, which are not by their nature extensions of the covered work,\n"
-    "and which are not combined with it such as to form a larger program,\n"
-    "in or on a volume of a storage or distribution medium, is called an\n"
-    "\"aggregate\" if the compilation and its resulting copyright are not\n"
-    "used to limit the access or legal rights of the compilation's users\n"
-    "beyond what the individual works permit.  Inclusion of a covered work\n"
-    "in an aggregate does not cause this License to apply to the other\n"
-    "parts of the aggregate.\n"
-    "\n"
-    "  6. Conveying Non-Source Forms.\n"
-    "\n"
-    "  You may convey a covered work in object code form under the terms\n"
-    "of sections 4 and 5, provided that you also convey the\n"
-    "machine-readable Corresponding Source under the terms of this License,\n"
-    "in one of these ways:\n"
-    "\n"
-    "    a) Convey the object code in, or embodied in, a physical product\n"
-    "    (including a physical distribution medium), accompanied by the\n"
-    "    Corresponding Source fixed on a durable physical medium\n"
-    "    customarily used for software interchange.\n"
-    "\n"
-    "    b) Convey the object code in, or embodied in, a physical product\n"
-    "    (including a physical distribution medium), accompanied by a\n"
-    "    written offer, valid for at least three years and valid for as\n"
-    "    long as you offer spare parts or customer support for that product\n"
-    "    model, to give anyone who possesses the object code either (1) a\n"
-    "    copy of the Corresponding Source for all the software in the\n"
-    "    product that is covered by this License, on a durable physical\n"
-    "    medium customarily used for software interchange, for a price no\n"
-    "    more than your reasonable cost of physically performing this\n"
-    "    conveying of source, or (2) access to copy the\n"
-    "    Corresponding Source from a network server at no charge.\n"
-    "\n"
-    "    c) Convey individual copies of the object code with a copy of the\n"
-    "    written offer to provide the Corresponding Source.  This\n"
-    "    alternative is allowed only occasionally and noncommercially, and\n"
-    "    only if you received the object code with such an offer, in accord\n"
-    "    with subsection 6b.\n"
-    "\n"
-    "    d) Convey the object code by offering access from a designated\n"
-    "    place (gratis or for a charge), and offer equivalent access to the\n"
-    "    Corresponding Source in the same way through the same place at no\n"
-    "    further charge.  You need not require recipients to copy the\n"
-    "    Corresponding Source along with the object code.  If the place to\n"
-    "    copy the object code is a network server, the Corresponding Source\n"
-    "    may be on a different server (operated by you or a third party)\n"
-    "    that supports equivalent copying facilities, provided you maintain\n"
-    "    clear directions next to the object code saying where to find the\n"
-    "    Corresponding Source.  Regardless of what server hosts the\n"
-    "    Corresponding Source, you remain obligated to ensure that it is\n"
-    "    available for as long as needed to satisfy these requirements.\n"
-    "\n"
-    "    e) Convey the object code using peer-to-peer transmission, provided\n"
-    "    you inform other peers where the object code and Corresponding\n"
-    "    Source of the work are being offered to the general public at no\n"
-    "    charge under subsection 6d.\n"
-    "\n"
-    "  A separable portion of the object code, whose source code is excluded\n"
-    "from the Corresponding Source as a System Library, need not be\n"
-    "included in conveying the object code work.\n"
-    "\n"
-    "  A \"User Product\" is either (1) a \"consumer product\", which means any\n"
-    "tangible personal property which is normally used for personal, family,\n"
-    "or household purposes, or (2) anything designed or sold for incorporation\n"
-    "into a dwelling.  In determining whether a product is a consumer product,\n"
-    "doubtful cases shall be resolved in favor of coverage.  For a particular\n"
-    "product received by a particular user, \"normally used\" refers to a\n"
-    "typical or common use of that class of product, regardless of the status\n"
-    "of the particular user or of the way in which the particular user\n"
-    "actually uses, or expects or is expected to use, the product.  A product\n"
-    "is a consumer product regardless of whether the product has substantial\n"
-    "commercial, industrial or non-consumer uses, unless such uses represent\n"
-    "the only significant mode of use of the product.\n"
-    "\n"
-    "  \"Installation Information\" for a User Product means any methods,\n"
-    "procedures, authorization keys, or other information required to install\n"
-    "and execute modified versions of a covered work in that User Product from\n"
-    "a modified version of its Corresponding Source.  The information must\n"
-    "suffice to ensure that the continued functioning of the modified object\n"
-    "code is in no case prevented or interfered with solely because\n"
-    "modification has been made.\n"
-    "\n"
-    "  If you convey an object code work under this section in, or with, or\n"
-    "specifically for use in, a User Product, and the conveying occurs as\n"
-    "part of a transaction in which the right of possession and use of the\n"
-    "User Product is transferred to the recipient in perpetuity or for a\n"
-    "fixed term (regardless of how the transaction is characterized), the\n"
-    "Corresponding Source conveyed under this section must be accompanied\n"
-    "by the Installation Information.  But this requirement does not apply\n"
-    "if neither you nor any third party retains the ability to install\n"
-    "modified object code on the User Product (for example, the work has\n"
-    "been installed in ROM).\n"
-    "\n"
-    "  The requirement to provide Installation Information does not include a\n"
-    "requirement to continue to provide support service, warranty, or updates\n"
-    "for a work that has been modified or installed by the recipient, or for\n"
-    "the User Product in which it has been modified or installed.  Access to a\n"
-    "network may be denied when the modification itself materially and\n"
-    "adversely affects the operation of the network or violates the rules and\n"
-    "protocols for communication across the network.\n"
-    "\n"
-    "  Corresponding Source conveyed, and Installation Information provided,\n"
-    "in accord with this section must be in a format that is publicly\n"
-    "documented (and with an implementation available to the public in\n"
-    "source code form), and must require no special password or key for\n"
-    "unpacking, reading or copying.\n"
-    "\n"
-    "  7. Additional Terms.\n"
-    "\n"
-    "  \"Additional permissions\" are terms that supplement the terms of this\n"
-    "License by making exceptions from one or more of its conditions.\n"
-    "Additional permissions that are applicable to the entire Program shall\n"
-    "be treated as though they were included in this License, to the extent\n"
-    "that they are valid under applicable law.  If additional permissions\n"
-    "apply only to part of the Program, that part may be used separately\n"
-    "under those permissions, but the entire Program remains governed by\n"
-    "this License without regard to the additional permissions.\n"
-    "\n"
-    "  When you convey a copy of a covered work, you may at your option\n"
-    "remove any additional permissions from that copy, or from any part of\n"
-    "it.  (Additional permissions may be written to require their own\n"
-    "removal in certain cases when you modify the work.)  You may place\n"
-    "additional permissions on material, added by you to a covered work,\n"
-    "for which you have or can give appropriate copyright permission.\n"
-    "\n"
-    "  Notwithstanding any other provision of this License, for material you\n"
-    "add to a covered work, you may (if authorized by the copyright holders of\n"
-    "that material) supplement the terms of this License with terms:\n"
-    "\n"
-    "    a) Disclaiming warranty or limiting liability differently from the\n"
-    "    terms of sections 15 and 16 of this License; or\n"
-    "\n"
-    "    b) Requiring preservation of specified reasonable legal notices or\n"
-    "    author attributions in that material or in the Appropriate Legal\n"
-    "    Notices displayed by works containing it; or\n"
-    "\n"
-    "    c) Prohibiting misrepresentation of the origin of that material, or\n"
-    "    requiring that modified versions of such material be marked in\n"
-    "    reasonable ways as different from the original version; or\n"
-    "\n"
-    "    d) Limiting the use for publicity purposes of names of licensors or\n"
-    "    authors of the material; or\n"
-    "\n"
-    "    e) Declining to grant rights under trademark law for use of some\n"
-    "    trade names, trademarks, or service marks; or\n"
-    "\n"
-    "    f) Requiring indemnification of licensors and authors of that\n"
-    "    material by anyone who conveys the material (or modified versions of\n"
-    "    it) with contractual assumptions of liability to the recipient, for\n"
-    "    any liability that these contractual assumptions directly impose on\n"
-    "    those licensors and authors.\n"
-    "\n"
-    "  All other non-permissive additional terms are considered \"further\n"
-    "restrictions\" within the meaning of section 10.  If the Program as you\n"
-    "received it, or any part of it, contains a notice stating that it is\n"
-    "governed by this License along with a term that is a further\n"
-    "restriction, you may remove that term.  If a license document contains\n"
-    "a further restriction but permits relicensing or conveying under this\n"
-    "License, you may add to a covered work material governed by the terms\n"
-    "of that license document, provided that the further restriction does\n"
-    "not survive such relicensing or conveying.\n"
-    "\n"
-    "  If you add terms to a covered work in accord with this section, you\n"
-    "must place, in the relevant source files, a statement of the\n"
-    "additional terms that apply to those files, or a notice indicating\n"
-    "where to find the applicable terms.\n"
-    "\n"
-    "  Additional terms, permissive or non-permissive, may be stated in the\n"
-    "form of a separately written license, or stated as exceptions;\n"
-    "the above requirements apply either way.\n"
-    "\n"
-    "  8. Termination.\n"
-    "\n"
-    "  You may not propagate or modify a covered work except as expressly\n"
-    "provided under this License.  Any attempt otherwise to propagate or\n"
-    "modify it is void, and will automatically terminate your rights under\n"
-    "this License (including any patent licenses granted under the third\n"
-    "paragraph of section 11).\n"
-    "\n"
-    "  However, if you cease all violation of this License, then your\n"
-    "license from a particular copyright holder is reinstated (a)\n"
-    "provisionally, unless and until the copyright holder explicitly and\n"
-    "finally terminates your license, and (b) permanently, if the copyright\n"
-    "holder fails to notify you of the violation by some reasonable means\n"
-    "prior to 60 days after the cessation.\n"
-    "\n"
-    "  Moreover, your license from a particular copyright holder is\n"
-    "reinstated permanently if the copyright holder notifies you of the\n"
-    "violation by some reasonable means, this is the first time you have\n"
-    "received notice of violation of this License (for any work) from that\n"
-    "copyright holder, and you cure the violation prior to 30 days after\n"
-    "your receipt of the notice.\n"
-    "\n"
-    "  Termination of your rights under this section does not terminate the\n"
-    "licenses of parties who have received copies or rights from you under\n"
-    "this License.  If your rights have been terminated and not permanently\n"
-    "reinstated, you do not qualify to receive new licenses for the same\n"
-    "material under section 10.\n"
-    "\n"
-    "  9. Acceptance Not Required for Having Copies.\n"
-    "\n"
-    "  You are not required to accept this License in order to receive or\n"
-    "run a copy of the Program.  Ancillary propagation of a covered work\n"
-    "occurring solely as a consequence of using peer-to-peer transmission\n"
-    "to receive a copy likewise does not require acceptance.  However,\n"
-    "nothing other than this License grants you permission to propagate or\n"
-    "modify any covered work.  These actions infringe copyright if you do\n"
-    "not accept this License.  Therefore, by modifying or propagating a\n"
-    "covered work, you indicate your acceptance of this License to do so.\n"
-    "\n"
-    "  10. Automatic Licensing of Downstream Recipients.\n"
-    "\n"
-    "  Each time you convey a covered work, the recipient automatically\n"
-    "receives a license from the original licensors, to run, modify and\n"
-    "propagate that work, subject to this License.  You are not responsible\n"
-    "for enforcing compliance by third parties with this License.\n"
-    "\n"
-    "  An \"entity transaction\" is a transaction transferring control of an\n"
-    "organization, or substantially all assets of one, or subdividing an\n"
-    "organization, or merging organizations.  If propagation of a covered\n"
-    "work results from an entity transaction, each party to that\n"
-    "transaction who receives a copy of the work also receives whatever\n"
-    "licenses to the work the party's predecessor in interest had or could\n"
-    "give under the previous paragraph, plus a right to possession of the\n"
-    "Corresponding Source of the work from the predecessor in interest, if\n"
-    "the predecessor has it or can get it with reasonable efforts.\n"
-    "\n"
-    "  You may not impose any further restrictions on the exercise of the\n"
-    "rights granted or affirmed under this License.  For example, you may\n"
-    "not impose a license fee, royalty, or other charge for exercise of\n"
-    "rights granted under this License, and you may not initiate litigation\n"
-    "(including a cross-claim or counterclaim in a lawsuit) alleging that\n"
-    "any patent claim is infringed by making, using, selling, offering for\n"
-    "sale, or importing the Program or any portion of it.\n"
-    "\n"
-    "  11. Patents.\n"
-    "\n"
-    "  A \"contributor\" is a copyright holder who authorizes use under this\n"
-    "License of the Program or a work on which the Program is based.  The\n"
-    "work thus licensed is called the contributor's \"contributor version\".\n"
-    "\n"
-    "  A contributor's \"essential patent claims\" are all patent claims\n"
-    "owned or controlled by the contributor, whether already acquired or\n"
-    "hereafter acquired, that would be infringed by some manner, permitted\n"
-    "by this License, of making, using, or selling its contributor version,\n"
-    "but do not include claims that would be infringed only as a\n"
-    "consequence of further modification of the contributor version.  For\n"
-    "purposes of this definition, \"control\" includes the right to grant\n"
-    "patent sublicenses in a manner consistent with the requirements of\n"
-    "this License.\n"
-    "\n"
-    "  Each contributor grants you a non-exclusive, worldwide, royalty-free\n"
-    "patent license under the contributor's essential patent claims, to\n"
-    "make, use, sell, offer for sale, import and otherwise run, modify and\n"
-    "propagate the contents of its contributor version.\n"
-    "\n"
-    "  In the following three paragraphs, a \"patent license\" is any express\n"
-    "agreement or commitment, however denominated, not to enforce a patent\n"
-    "(such as an express permission to practice a patent or covenant not to\n"
-    "sue for patent infringement).  To \"grant\" such a patent license to a\n"
-    "party means to make such an agreement or commitment not to enforce a\n"
-    "patent against the party.\n"
-    "\n"
-    "  If you convey a covered work, knowingly relying on a patent license,\n"
-    "and the Corresponding Source of the work is not available for anyone\n"
-    "to copy, free of charge and under the terms of this License, through a\n"
-    "publicly available network server or other readily accessible means,\n"
-    "then you must either (1) cause the Corresponding Source to be so\n"
-    "available, or (2) arrange to deprive yourself of the benefit of the\n"
-    "patent license for this particular work, or (3) arrange, in a manner\n"
-    "consistent with the requirements of this License, to extend the patent\n"
-    "license to downstream recipients.  \"Knowingly relying\" means you have\n"
-    "actual knowledge that, but for the patent license, your conveying the\n"
-    "covered work in a country, or your recipient's use of the covered work\n"
-    "in a country, would infringe one or more identifiable patents in that\n"
-    "country that you have reason to believe are valid.\n"
-    "\n"
-    "  If, pursuant to or in connection with a single transaction or\n"
-    "arrangement, you convey, or propagate by procuring conveyance of, a\n"
-    "covered work, and grant a patent license to some of the parties\n"
-    "receiving the covered work authorizing them to use, propagate, modify\n"
-    "or convey a specific copy of the covered work, then the patent license\n"
-    "you grant is automatically extended to all recipients of the covered\n"
-    "work and works based on it.\n"
-    "\n"
-    "  A patent license is \"discriminatory\" if it does not include within\n"
-    "the scope of its coverage, prohibits the exercise of, or is\n"
-    "conditioned on the non-exercise of one or more of the rights that are\n"
-    "specifically granted under this License.  You may not convey a covered\n"
-    "work if you are a party to an arrangement with a third party that is\n"
-    "in the business of distributing software, under which you make payment\n"
-    "to the third party based on the extent of your activity of conveying\n"
-    "the work, and under which the third party grants, to any of the\n"
-    "parties who would receive the covered work from you, a discriminatory\n"
-    "patent license (a) in connection with copies of the covered work\n"
-    "conveyed by you (or copies made from those copies), or (b) primarily\n"
-    "for and in connection with specific products or compilations that\n"
-    "contain the covered work, unless you entered into that arrangement,\n"
-    "or that patent license was granted, prior to 28 March 2007.\n"
-    "\n"
-    "  Nothing in this License shall be construed as excluding or limiting\n"
-    "any implied license or other defenses to infringement that may\n"
-    "otherwise be available to you under applicable patent law.\n"
-    "\n"
-    "  12. No Surrender of Others' Freedom.\n"
-    "\n"
-    "  If conditions are imposed on you (whether by court order, agreement or\n"
-    "otherwise) that contradict the conditions of this License, they do not\n"
-    "excuse you from the conditions of this License.  If you cannot convey a\n"
-    "covered work so as to satisfy simultaneously your obligations under this\n"
-    "License and any other pertinent obligations, then as a consequence you may\n"
-    "not convey it at all.  For example, if you agree to terms that obligate you\n"
-    "to collect a royalty for further conveying from those to whom you convey\n"
-    "the Program, the only way you could satisfy both those terms and this\n"
-    "License would be to refrain entirely from conveying the Program.\n"
-    "\n"
-    "  13. Use with the GNU Affero General Public License.\n"
-    "\n"
-    "  Notwithstanding any other provision of this License, you have\n"
-    "permission to link or combine any covered work with a work licensed\n"
-    "under version 3 of the GNU Affero General Public License into a single\n"
-    "combined work, and to convey the resulting work.  The terms of this\n"
-    "License will continue to apply to the part which is the covered work,\n"
-    "but the special requirements of the GNU Affero General Public License,\n"
-    "section 13, concerning interaction through a network will apply to the\n"
-    "combination as such.\n"
-    "\n"
-    "  14. Revised Versions of this License.\n"
-    "\n"
-    "  The Free Software Foundation may publish revised and/or new versions of\n"
-    "the GNU General Public License from time to time.  Such new versions will\n"
-    "be similar in spirit to the present version, but may differ in detail to\n"
-    "address new problems or concerns.\n"
-    "\n"
-    "  Each version is given a distinguishing version number.  If the\n"
-    "Program specifies that a certain numbered version of the GNU General\n"
-    "Public License \"or any later version\" applies to it, you have the\n"
-    "option of following the terms and conditions either of that numbered\n"
-    "version or of any later version published by the Free Software\n"
-    "Foundation.  If the Program does not specify a version number of the\n"
-    "GNU General Public License, you may choose any version ever published\n"
-    "by the Free Software Foundation.\n"
-    "\n"
-    "  If the Program specifies that a proxy can decide which future\n"
-    "versions of the GNU General Public License can be used, that proxy's\n"
-    "public statement of acceptance of a version permanently authorizes you\n"
-    "to choose that version for the Program.\n"
-    "\n"
-    "  Later license versions may give you additional or different\n"
-    "permissions.  However, no additional obligations are imposed on any\n"
-    "author or copyright holder as a result of your choosing to follow a\n"
-    "later version.\n"
-    "\n"
-    "  15. Disclaimer of Warranty.\n"
-    "\n"
-    "  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\n"
-    "APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\n"
-    "HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\n"
-    "OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\n"
-    "THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n"
-    "PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\n"
-    "IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\n"
-    "ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n"
-    "\n"
-    "  16. Limitation of Liability.\n"
-    "\n"
-    "  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-    "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\n"
-    "THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\n"
-    "GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\n"
-    "USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\n"
-    "DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\n"
-    "PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\n"
-    "EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\n"
-    "SUCH DAMAGES.\n"
-    "\n"
-    "  17. Interpretation of Sections 15 and 16.\n"
-    "\n"
-    "  If the disclaimer of warranty and limitation of liability provided\n"
-    "above cannot be given local legal effect according to their terms,\n"
-    "reviewing courts shall apply local law that most closely approximates\n"
-    "an absolute waiver of all civil liability in connection with the\n"
-    "Program, unless a warranty or assumption of liability accompanies a\n"
-    "copy of the Program in return for a fee.\n"
-    "\n"
-    "                     END OF TERMS AND CONDITIONS\n"
-    "\n"
-    "            How to Apply These Terms to Your New Programs\n"
-    "\n"
-    "  If you develop a new program, and you want it to be of the greatest\n"
-    "possible use to the public, the best way to achieve this is to make it\n"
-    "free software which everyone can redistribute and change under these terms.\n"
-    "\n"
-    "  To do so, attach the following notices to the program.  It is safest\n"
-    "to attach them to the start of each source file to most effectively\n"
-    "state the exclusion of warranty; and each file should have at least\n"
-    "the \"copyright\" line and a pointer to where the full notice is found.\n"
-    "\n"
-    "    <one line to give the program's name and a brief idea of what it does.>\n"
-    "    Copyright (C) <year>  <name of author>\n"
-    "\n"
-    "    This program is free software: you can redistribute it and/or modify\n"
-    "    it under the terms of the GNU General Public License as published by\n"
-    "    the Free Software Foundation, either version 3 of the License, or\n"
-    "    (at your option) any later version.\n"
-    "\n"
-    "    This program is distributed in the hope that it will be useful,\n"
-    "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-    "    GNU General Public License for more details.\n"
-    "\n"
-    "    You should have received a copy of the GNU General Public License\n"
-    "    along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
-    "\n"
-    "Also add information on how to contact you by electronic and paper mail.\n"
-    "\n"
-    "  If the program does terminal interaction, make it output a short\n"
-    "notice like this when it starts in an interactive mode:\n"
-    "\n"
-    "    <program>  Copyright (C) <year>  <name of author>\n"
-    "    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n"
-    "    This is free software, and you are welcome to redistribute it\n"
-    "    under certain conditions; type `show c' for details.\n"
-    "\n"
-    "The hypothetical commands `show w' and `show c' should show the appropriate\n"
-    "parts of the General Public License.  Of course, your program's commands\n"
-    "might be different; for a GUI interface, you would use an \"about box\".\n"
-    "\n"
-    "  You should also get your employer (if you work as a programmer) or school,\n"
-    "if any, to sign a \"copyright disclaimer\" for the program, if necessary.\n"
-    "For more information on this, and how to apply and follow the GNU GPL, see\n"
-    "<http://www.gnu.org/licenses/>.\n"
-    "\n"
-    "  The GNU General Public License does not permit incorporating your program\n"
-    "into proprietary programs.  If your program is a subroutine library, you\n"
-    "may consider it more useful to permit linking proprietary applications with\n"
-    "the library.  If this is what you want to do, use the GNU Lesser General\n"
-    "Public License instead of this License.  But first, please read\n"
-    "<http://www.gnu.org/philosophy/why-not-lgpl.html>."
-    ;
+    if (Glib::file_test (translators_filename, Glib::FILE_TEST_EXISTS)) {
+        auto all_translators = Glib::file_get_contents(translators_filename);
+        translators_text.append(all_translators);
+    }
 
+    set_translator_credits(translators_text);
 }
 
-
-
-
+void AboutBox::on_response(int response_id) {
+    hide();
+}
 } // namespace Dialog
 } // namespace UI
 } // namespace Inkscape
diff --git a/src/ui/dialog/aboutbox.h b/src/ui/dialog/aboutbox.h
index f3234b88d..54f8c3ebc 100644
--- a/src/ui/dialog/aboutbox.h
+++ b/src/ui/dialog/aboutbox.h
@@ -15,13 +15,17 @@
 #ifndef INKSCAPE_UI_DIALOG_ABOUTBOX_H
 #define INKSCAPE_UI_DIALOG_ABOUTBOX_H
 
-#include <gtkmm/dialog.h>
+#include <gtkmm/aboutdialog.h>
+
+namespace Gtk {
+class AspectFrame;
+}
 
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-class AboutBox : public Gtk::Dialog {
+class AboutBox : public Gtk::AboutDialog {
 
 public:
 
@@ -31,14 +35,16 @@ public:
 private:
 
     AboutBox();
+
+    /** A widget containing an SVG "splash screen"
+     *  image to display in the content area of the dialo
+     */
+    Gtk::AspectFrame *_splash_widget;
     
     void initStrings();
-    
-    Glib::ustring authors_text;
-    Glib::ustring translators_text;
-    Glib::ustring license_text;
+    void build_splash_widget();
 
-    virtual void on_response(int response_id);
+    void on_response(int response_id) override;
 };
 
 } // namespace Dialog
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index e50824c7b..3d949a8c9 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -20,7 +20,7 @@
 #include "dialog-manager.h"
 #include <gtkmm/dialog.h>
 
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
 # include <gdkmm/monitor.h>
 #endif
 
@@ -166,11 +166,16 @@ void Dialog::read_geometry()
         resize(w, h);
     }
 
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
     auto const display = Gdk::Display::get_default();
-    auto const monitor = display->get_primary_monitor();
+    auto monitor = display->get_primary_monitor();
+
+    // If user hasn't configured a primary monitor, nullptr is returned so try first monitor.
+    if (!monitor) {
+        std::cerr << "Dialog::read_geometry: no primary monitor configured!" << std::endl;
+        monitor = display->get_monitor(0);
+    }
 
-    // If user hasn't configured a primary monitor, nullptr is returned.
     Gdk::Rectangle screen_geometry;
     if (monitor) {
         monitor->get_geometry(screen_geometry);
@@ -179,7 +184,7 @@ void Dialog::read_geometry()
     auto const screen_height = screen_geometry.get_height();
 #else
     auto const screen_width  = gdk_screen_width();
-    auto const screen_height = gdk_screen_width();
+    auto const screen_height = gdk_screen_height();
 #endif
 
     // If there are stored values for where the dialog should be
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index baf70ea82..3d246f4cb 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -228,7 +228,7 @@ inline void attach_all(Gtk::Grid &table, Gtk::Widget *const arr[], unsigned cons
                     // this sets the padding for subordinate widgets on the "Page" page
                     if( indent && (i==(n-6) || i==(n-4) || i==(n-2)) ) {
                         arr[i+1]->set_hexpand();
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
                         arr[i+1]->set_margin_start(20);
                         arr[i+1]->set_margin_end(20);
 #else
@@ -703,7 +703,7 @@ void DocumentProperties::build_cms()
 
     _link_btn.set_halign(Gtk::ALIGN_CENTER);
     _link_btn.set_valign(Gtk::ALIGN_CENTER);
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
     _link_btn.set_margin_start(2);
     _link_btn.set_margin_end(2);
 #else
@@ -809,7 +809,7 @@ void DocumentProperties::build_scripting()
     _external_add_btn.set_halign(Gtk::ALIGN_CENTER);
     _external_add_btn.set_valign(Gtk::ALIGN_CENTER);
 
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
     _external_add_btn.set_margin_start(2);
     _external_add_btn.set_margin_end(2);
 #else
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index b271c951b..513cee752 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -42,7 +42,9 @@ FillAndStroke::FillAndStroke()
       _page_fill(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
       _page_stroke_paint(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
       _page_stroke_style(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
-      _composite_settings(SP_VERB_DIALOG_FILL_STROKE, "fillstroke", UI::Widget::SimpleFilterModifier::BLUR),
+      _composite_settings(SP_VERB_DIALOG_FILL_STROKE, "fillstroke",
+                          UI::Widget::SimpleFilterModifier::BLUR |
+                          UI::Widget::SimpleFilterModifier::OPACITY ),
       deskTrack(),
       targetDesktop(0),
       fillWdgt(0),
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index e60785f57..9764618ec 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -842,7 +842,10 @@ public:
     SpinScale* add_spinscale(double def, const SPAttributeEnum attr, const Glib::ustring& label,
                          const double lo, const double hi, const double step_inc, const double climb, const int digits, char* tip_text = NULL)
     {
-        SpinScale* spinslider = new SpinScale("", def, lo, hi, step_inc, climb, digits, attr, tip_text);
+        Glib::ustring tip_text2;
+        if (tip_text)
+            tip_text2 = tip_text;
+        SpinScale* spinslider = new SpinScale("", def, lo, hi, step_inc, climb, digits, attr, tip_text2);
         add_widget(spinslider, label);
         add_attr_widget(spinslider);
         return spinslider;
@@ -850,8 +853,10 @@ public:
 
     // DualSpinScale
     DualSpinScale* add_dualspinscale(const SPAttributeEnum attr, const Glib::ustring& label,
-                                       const double lo, const double hi, const double step_inc,
-                                       const double climb, const int digits, char* tip_text1 = NULL, char* tip_text2 = NULL)
+                                     const double lo, const double hi, const double step_inc,
+                                     const double climb, const int digits,
+                                     const Glib::ustring tip_text1 = "",
+                                     const Glib::ustring tip_text2 = "")
     {
         DualSpinScale* dss = new DualSpinScale("", "", lo, lo, hi, step_inc, climb, digits, attr, tip_text1, tip_text2);
         add_widget(dss, label);
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 6223bd627..ed2babf80 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -151,7 +151,7 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code
     }
 
     Gtk::Label *menu_label = Gtk::manage(new Gtk::Label(label, true));
-#if WITH_GTKMM_3_16
+#if GTKMM_CHECK_VERSION(3,16,0)
     menu_label->set_xalign(0.0);
 #else
     menu_label->set_alignment(0.0, 0.5);
@@ -799,7 +799,10 @@ LayersPanel::LayersPanel() :
     _model(0),
     _pending(0),
     _toggleEvent(0),
-    _compositeSettings(SP_VERB_DIALOG_LAYERS, "layers", UI::Widget::SimpleFilterModifier::BLEND),
+    _compositeSettings(SP_VERB_DIALOG_LAYERS, "layers",
+                       UI::Widget::SimpleFilterModifier::BLEND |
+                       UI::Widget::SimpleFilterModifier::OPACITY |
+                       UI::Widget::SimpleFilterModifier::BLUR),
     desktopChangeConn()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index f08089774..074a6a884 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -210,7 +210,7 @@ Memory::Memory()
     : UI::Widget::Panel ("", "/dialogs/memory", SP_VERB_HELP_MEMORY, _("Recalculate")),
       _private(*(new Memory::Private())) 
 {
-    _getContents()->add(_private.view);
+    _getContents()->pack_start(_private.view);
 
     _private.update();
 
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index ab46a55da..7e0c5b526 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -32,7 +32,7 @@ NewFromTemplate::NewFromTemplate()
     _create_template_button.set_halign(Gtk::ALIGN_END);
     _create_template_button.set_valign(Gtk::ALIGN_END);
 
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
     _create_template_button.set_margin_end(15);
 #else
     _create_template_button.set_margin_right(15);
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index b50d68239..2be1f115f 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -4,8 +4,10 @@
  * Authors:
  *   Theodore Janeczko
  *   Tweaked by Liam P White for use in Inkscape
+ *   Tavmjong Bah
  *
  * Copyright (C) Theodore Janeczko 2012 <flutterguy317@gmail.com>
+ *               Tavmjong Bah 2017
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -280,7 +282,7 @@ Gtk::MenuItem& ObjectsPanel::_addPopupItem( SPDesktop *desktop, unsigned int cod
     }
 
     Gtk::Label *menu_label = Gtk::manage(new Gtk::Label(label, true));
-#if WITH_GTKMM_3_16
+#if GTKMM_CHECK_VERSION(3,16,0)
     menu_label->set_xalign(0.0);
 #else
     menu_label->set_alignment(0.0, 0.5);
@@ -509,27 +511,30 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
  */
 void ObjectsPanel::_setCompositingValues(SPItem *item)
 {
-    //Block the connections to avoid interference
+    // Block the connections to avoid interference
     _opacityConnection.block();
     _blendConnection.block();
     _blurConnection.block();
 
-    //Set the opacity
-    _opacity_adjustment->set_value((item->style->opacity.set ? SP_SCALE24_TO_FLOAT(item->style->opacity.value) : 1) * _opacity_adjustment->get_upper());
+    // Set the opacity
+    double opacity = (item->style->opacity.set ? SP_SCALE24_TO_FLOAT(item->style->opacity.value) : 1);
+    opacity *= 100; // Display in percent.
+    _filter_modifier.set_opacity_value(opacity);
+
     SPFeBlend *spblend = NULL;
     SPGaussianBlur *spblur = NULL;
-    if (item->style->getFilter())
-    {
+    if (item->style->getFilter()) {
+
         for (auto& primitive_obj: item->style->getFilter()->children) {
             if (!SP_IS_FILTER_PRIMITIVE(&primitive_obj)) {
                 break;
             }
-            if(SP_IS_FEBLEND(&primitive_obj) && !spblend) {
+            if (SP_IS_FEBLEND(&primitive_obj) && !spblend) {
                 //Get the blend mode
                 spblend = SP_FEBLEND(&primitive_obj);
             }
 
-            if(SP_IS_GAUSSIANBLUR(&primitive_obj) && !spblur) {
+            if (SP_IS_GAUSSIANBLUR(&primitive_obj) && !spblur) {
                 //Get the blur value
                 spblur = SP_GAUSSIANBLUR(&primitive_obj);
             }
@@ -537,15 +542,15 @@ void ObjectsPanel::_setCompositingValues(SPItem *item)
     }
 
     //Set the blend mode
-    _fe_cb.set_blend_mode(spblend ? spblend->blend_mode : Inkscape::Filters::BLEND_NORMAL);
-    
+    _filter_modifier.set_blend_mode(spblend ? spblend->blend_mode : Inkscape::Filters::BLEND_NORMAL);
+
     //Set the blur value
     Geom::OptRect bbox = item->bounds(SPItem::GEOMETRIC_BBOX);
     if (bbox && spblur) {
         double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];   // fixme: this is only half the perimeter, is that correct?
-        _fe_blur.set_blur_value(spblur->stdDeviation.getNumber() * 400 / perimeter);
+        _filter_modifier.set_blur_value(spblur->stdDeviation.getNumber() * 400 / perimeter);
     } else {
-        _fe_blur.set_blur_value(0);
+        _filter_modifier.set_blur_value(0);
     }
     
     //Unblock connections
@@ -1494,7 +1499,7 @@ void ObjectsPanel::_opacityChangedIter(const Gtk::TreeIter& iter)
     if (item)
     {
         item->style->opacity.set = TRUE;
-        item->style->opacity.value = SP_SCALE24_FROM_FLOAT(_opacity_adjustment->get_value() / _opacity_adjustment->get_upper());
+        item->style->opacity.value = SP_SCALE24_FROM_FLOAT(_filter_modifier.get_opacity_value() / 100);
         item->updateRepr(SP_OBJECT_WRITE_NO_CHILDREN | SP_OBJECT_WRITE_EXT);
     }
 }
@@ -1505,7 +1510,7 @@ void ObjectsPanel::_opacityChangedIter(const Gtk::TreeIter& iter)
 void ObjectsPanel::_blendValueChanged()
 {
     _blockCompositeUpdate = true;
-    const Glib::ustring blendmode = _fe_cb.get_blend_mode();
+    const Glib::ustring blendmode = _filter_modifier.get_blend_mode();
 
     _tree.get_selection()->selected_foreach_iter(sigc::bind<Glib::ustring>(sigc::mem_fun(*this, &ObjectsPanel::_blendChangedIter), blendmode));
     DocumentUndo::done(_document, SP_VERB_DIALOG_OBJECTS, _("Set object blend mode"));
@@ -1534,11 +1539,12 @@ void ObjectsPanel::_blendChangedIter(const Gtk::TreeIter& iter, Glib::ustring bl
                     if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
                         break;
                     }
+                    // We should read in the current radius and use that!
                     if (SP_IS_GAUSSIANBLUR(&primitive)) {
                         Geom::OptRect bbox = item->bounds(SPItem::GEOMETRIC_BBOX);
                         if (bbox) {
                             double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];   // fixme: this is only half the perimeter, is that correct?
-                            radius =  _fe_blur.get_blur_value() * perimeter / 400;
+                            radius =  _filter_modifier.get_blur_value() * perimeter / 400;
                         }
                     }
                 }
@@ -1576,7 +1582,7 @@ void ObjectsPanel::_blendChangedIter(const Gtk::TreeIter& iter, Glib::ustring bl
 void ObjectsPanel::_blurValueChanged()
 {
     _blockCompositeUpdate = true;
-    _tree.get_selection()->selected_foreach_iter(sigc::bind<double>(sigc::mem_fun(*this, &ObjectsPanel::_blurChangedIter), _fe_blur.get_blur_value()));
+    _tree.get_selection()->selected_foreach_iter(sigc::bind<double>(sigc::mem_fun(*this, &ObjectsPanel::_blurChangedIter), _filter_modifier.get_blur_value()));
     DocumentUndo::maybeDone(_document, "blur", SP_VERB_DIALOG_OBJECTS, _("Set object blur"));    
     _blockCompositeUpdate = false;
 }
@@ -1649,17 +1655,9 @@ ObjectsPanel::ObjectsPanel() :
     _clipmaskHeader(C_("Clip and mask", "CM")),
     _highlightHeader(C_("Highlight", "HL")),
     _nameHeader(_("Label")),
-    _composite_vbox(Gtk::ORIENTATION_VERTICAL),
-    _opacity_vbox(Gtk::ORIENTATION_VERTICAL),
-    _opacity_label(_("Opacity:")),
-    _opacity_label_unit(_("%")),
-    _opacity_adjustment(Gtk::Adjustment::create(100.0, 0.0, 100.0, 1.0, 1.0, 0.0)),
-    _opacity_hscale(_opacity_adjustment),
-    _opacity_spin_button(_opacity_adjustment, 0.01, 1),
-    _fe_cb(UI::Widget::SimpleFilterModifier::BLEND),
-    _fe_vbox(Gtk::ORIENTATION_VERTICAL),
-    _fe_blur(UI::Widget::SimpleFilterModifier::BLUR),
-    _blur_vbox(Gtk::ORIENTATION_VERTICAL),
+    _filter_modifier( UI::Widget::SimpleFilterModifier::BLEND   |
+                      UI::Widget::SimpleFilterModifier::BLUR    |
+                      UI::Widget::SimpleFilterModifier::OPACITY ),
     _colorSelectorDialog("dialogs.colorpickerwindow")
 {
     //Create the tree model and store
@@ -1794,58 +1792,12 @@ ObjectsPanel::ObjectsPanel() :
     _page.pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
 
     //Set up the compositing items
-    //Blend mode filter effect
-    _composite_vbox.pack_start(_fe_vbox, false, false, 2);
-
-    _fe_cb.set_halign(Gtk::ALIGN_FILL);
-    _fe_cb.set_valign(Gtk::ALIGN_END);
-
-#if WITH_GTKMM_3_12
-    _fe_cb.set_margin_start(4);
-#else
-    _fe_cb.set_margin_left(4);
-#endif
-
-    _fe_vbox.pack_start(_fe_cb, false, false, 0);
-    _blendConnection = _fe_cb.signal_blend_blur_changed().connect(sigc::mem_fun(*this, &ObjectsPanel::_blendValueChanged));
-
-    //Blur filter effect
-    _composite_vbox.pack_start(_blur_vbox, false, false, 2);
-
-    _fe_blur.set_hexpand();
-    _fe_blur.set_halign(Gtk::ALIGN_FILL);
-    _fe_blur.set_valign(Gtk::ALIGN_END);
-    
-#if WITH_GTKMM_3_12
-    _fe_blur.set_margin_start(4);
-#else
-    _fe_blur.set_margin_left(4);
-#endif
-
-    _blur_vbox.pack_start(_fe_blur, false, false, 0);
-    _blurConnection = _fe_blur.signal_blend_blur_changed().connect(sigc::mem_fun(*this, &ObjectsPanel::_blurValueChanged));
-    
-    //Opacity
-    _composite_vbox.pack_start(_opacity_vbox, false, false, 2);
-    _opacity_label.set_halign(Gtk::ALIGN_END);
-    _opacity_label.set_valign(Gtk::ALIGN_CENTER);
-    _opacity_hbox.pack_start(_opacity_label, false, false, 3);
-    _opacity_vbox.pack_start(_opacity_hbox, false, false, 0);
-    _opacity_hbox.pack_start(_opacity_hscale, true, true, 0);
-    _opacity_hbox.pack_start(_opacity_spin_button, false, false, 0);
-    _opacity_hbox.pack_start(_opacity_label_unit, false, false, 3);
-    _opacity_hscale.set_draw_value(false);
-    _opacityConnection = _opacity_adjustment->signal_value_changed().connect(sigc::mem_fun(*this, &ObjectsPanel::_opacityValueChanged));
-    _opacity_label.set_mnemonic_widget(_opacity_hscale);
-    
-    //Keep the labels aligned
-    GtkSizeGroup *labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-    gtk_size_group_add_widget(labels, GTK_WIDGET(_opacity_label.gobj()));
-    gtk_size_group_add_widget(labels, GTK_WIDGET(_fe_cb.get_blur_label()->gobj()));
-    gtk_size_group_add_widget(labels, GTK_WIDGET(_fe_blur.get_blur_label()->gobj()));
+    _blendConnection   = _filter_modifier.signal_blend_changed().connect(sigc::mem_fun(*this, &ObjectsPanel::_blendValueChanged));
+    _blurConnection    = _filter_modifier.signal_blur_changed().connect(sigc::mem_fun(*this, &ObjectsPanel::_blurValueChanged));
+    _opacityConnection = _filter_modifier.signal_opacity_changed().connect(   sigc::mem_fun(*this, &ObjectsPanel::_opacityValueChanged));
 
     //Pack the compositing functions and the button row
-    _page.pack_end(_composite_vbox, Gtk::PACK_SHRINK);
+    _page.pack_end(_filter_modifier, Gtk::PACK_SHRINK);
     _page.pack_end(_buttonsRow, Gtk::PACK_SHRINK);
 
     //Pack into the panel contents
@@ -1914,7 +1866,7 @@ ObjectsPanel::ObjectsPanel() :
     _buttonsRow.pack_start(_buttonsSecondary, Gtk::PACK_EXPAND_WIDGET);
     _buttonsRow.pack_end(_buttonsPrimary, Gtk::PACK_EXPAND_WIDGET);
 
-    _watching.push_back(&_composite_vbox);
+    _watching.push_back(&_filter_modifier);
     
     //Set up the pop-up menu
     // -------------------------------------------------------
diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h
index 73a0f0643..439e3af2a 100644
--- a/src/ui/dialog/objects.h
+++ b/src/ui/dialog/objects.h
@@ -3,8 +3,10 @@
  *
  * Authors:
  *   Theodore Janeczko
+ *   Tavmjong Bah
  *
  * Copyright (C) Theodore Janeczko 2012 <flutterguy317@gmail.com>
+ *               Tavmjong Bah 2017
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -151,20 +153,8 @@ private:
     Gtk::Label _highlightHeader;
     Gtk::Label _nameHeader;
 
-    /* Composite Settings */
-    Gtk::Box        _composite_vbox;
-    Gtk::Box        _opacity_vbox;
-    Gtk::Box        _opacity_hbox;
-    Gtk::Label      _opacity_label;
-    Gtk::Label      _opacity_label_unit;
-    Glib::RefPtr<Gtk::Adjustment> _opacity_adjustment;
-    Gtk::Scale      _opacity_hscale;
-    Inkscape::UI::Widget::SpinButton _opacity_spin_button;
-    
-    Inkscape::UI::Widget::SimpleFilterModifier _fe_cb;
-    Gtk::Box        _fe_vbox;
-    Inkscape::UI::Widget::SimpleFilterModifier _fe_blur;
-    Gtk::Box        _blur_vbox;
+    /* Composite Settings (blend, blur, opacity). */
+    Inkscape::UI::Widget::SimpleFilterModifier _filter_modifier;
 
     Gtk::Dialog _colorSelectorDialog;
     std::unique_ptr<Inkscape::UI::SelectedColor> _selectedColor;
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 60c9b2b32..1642ff04c 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -192,7 +192,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   scroller->add(*Gtk::manage(icon_view));
   scroller->set_hexpand();
   scroller->set_vexpand();
-#if GTK_CHECK_VERSION(3,2,4)
+#if GTKMM_CHECK_VERSION(3,14,0)
   overlay = new Gtk::Overlay();
   overlay->set_hexpand();
   overlay->set_vexpand();
@@ -447,7 +447,7 @@ void SymbolsDialog::rebuild() {
   }
 }
 void SymbolsDialog::showOverlay() {
-#if GTK_CHECK_VERSION(3,2,4)
+#if GTKMM_CHECK_VERSION(3,14,0)
   Glib::ustring current = Glib::Markup::escape_text(symbol_set->get_active_text());
   overlay_icon->set_from_icon_name("none", iconsize);
   if (current == ALLDOCS && !l.size()) 
@@ -495,7 +495,7 @@ void SymbolsDialog::showOverlay() {
 }
 
 void SymbolsDialog::hideOverlay() {
-#if GTK_CHECK_VERSION(3,2,4)
+#if GTKMM_CHECK_VERSION(3,14,0)
     overlay_opacity->hide();
     overlay_icon->hide();
     overlay_title->hide();
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index 6e49939af..fc5c861ed 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -132,7 +132,7 @@ private:
     Gtk::Button* more;
     Gtk::Button* fewer;
     Gtk::HBox* tools;
-#if GTK_CHECK_VERSION(3,2,4)
+#if GTKMM_CHECK_VERSION(3,14,0)
     Gtk::Overlay* overlay;
 #endif
     Gtk::Image* overlay_icon;
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 4f1e5cd6f..826737c2c 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -30,7 +30,7 @@
 #include "file.h"
 #include <glibmm/miscutils.h>
 
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
 # include <gdkmm/monitor.h>
 #endif
 
@@ -175,7 +175,7 @@ sp_create_window(SPViewWidget *vw, bool editable)
             gint full = prefs->getBool("/desktop/geometry/fullscreen");
             gint maxed = prefs->getBool("/desktop/geometry/maximized");
             if (pw>0 && ph>0) {
-#if WITH_GTKMM_3_22
+#if GTKMM_CHECK_VERSION(3,22,0)
                 auto const display = Gdk::Display::get_default();
                 auto const monitor = display->get_primary_monitor();
 
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index bd4b21bdb..cda41bdb7 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -55,6 +55,8 @@ ColorNotebook::ColorNotebook(SelectedColor &color)
     : Gtk::Grid()
     , _selected_color(color)
 {
+    set_name("ColorNotebook");
+
     Page *page;
 
     page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_RGB), true);
@@ -321,9 +323,11 @@ void ColorNotebook::_addPage(Page &page)
 
         Glib::ustring mode_name = page.selector_factory->modeName();
         Gtk::Widget *tab_label = Gtk::manage(new Gtk::Label(mode_name));
+        tab_label->set_name("ColorModeLabel");
         gint page_num = gtk_notebook_append_page(GTK_NOTEBOOK(_book), selector_widget->gobj(), tab_label->gobj());
 
         _buttons[page_num] = gtk_radio_button_new_with_label(NULL, mode_name.c_str());
+        gtk_widget_set_name(_buttons[page_num], "ColorModeButton");
         gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(_buttons[page_num]), FALSE);
         if (page_num > 0) {
             auto g = Glib::wrap(GTK_RADIO_BUTTON(_buttons[0]))->get_group();
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 6bbb8e21d..ffdf173ba 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -31,6 +31,8 @@ ColorWheelSelector::ColorWheelSelector(SelectedColor &color)
     , _wheel(0)
     , _slider(0)
 {
+    set_name("ColorWheelSelector");
+
     _initUI();
     _color_changed_connection = color.signal_changed.connect(sigc::mem_fun(this, &ColorWheelSelector::_colorChanged));
     _color_dragged_connection = color.signal_dragged.connect(sigc::mem_fun(this, &ColorWheelSelector::_colorChanged));
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 4a06163e1..29f22977a 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -29,8 +29,7 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
     _x(0),
     _y(0),
     _grab_focus_on_realize(false),
-    _gdl_dock_item(0),
-    _dock_item_action_area(0)
+    _gdl_dock_item(0)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     GdlDockItemBehavior gdl_dock_behavior =
diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h
index b5f6c13af..31cdcf080 100644
--- a/src/ui/widget/dock-item.h
+++ b/src/ui/widget/dock-item.h
@@ -108,11 +108,10 @@ private:
     Glib::RefPtr<Gdk::Pixbuf> _icon_pixbuf;
 
     /** Interface widgets, will be packed like 
-     * gdl_dock_item -> _frame -> _dock_item_box -> (_dock_item_action_area) 
+     * gdl_dock_item -> _frame -> _dock_item_box
      */
     Gtk::Frame _frame;
     Gtk::VBox _dock_item_box;
-    Gtk::HButtonBox *_dock_item_action_area;
 
     /** Internal signal handlers */
     void _onHide();
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 20ec707d8..9c1f0f783 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -56,7 +56,8 @@ Dock::Dock(Gtk::Orientation orientation)
 #endif
       _scrolled_window (Gtk::manage(new Gtk::ScrolledWindow))
 {
-    _scrolled_window->set_name("Dock");
+    gtk_widget_set_name(_gdl_dock, "GdlDock");
+
 #if WITH_GDL_3_6
     gtk_orientable_set_orientation(GTK_ORIENTABLE(_gdl_dock_bar),
                                    static_cast<GtkOrientation>(orientation));
@@ -65,25 +66,22 @@ Dock::Dock(Gtk::Orientation orientation)
                                  static_cast<GtkOrientation>(orientation));
 #endif
 
-    switch(orientation) {
-        case Gtk::ORIENTATION_VERTICAL:
-            _dock_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-            break;
-        case Gtk::ORIENTATION_HORIZONTAL:
-            _dock_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
-    }
-    
-    _paned = Gtk::manage(new Gtk::Paned(orientation));
+    _filler.set_name("DockBoxFiller");
 
-    _scrolled_window->add(*_dock_box);
-    _scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
-    _paned->pack1(*Glib::wrap(GTK_WIDGET(_gdl_dock)), false, false);
-    _paned->pack2(_filler, true, false);
+    _paned = Gtk::manage(new Gtk::Paned(orientation));
+    _paned->set_name("DockBoxPane");
+    _paned->pack1(*Glib::wrap(GTK_WIDGET(_gdl_dock)), false,  false);
+    _paned->pack2(_filler,                            true,   false);
+    //                                                resize, shrink
 
+    _dock_box = Gtk::manage(new Gtk::Box(orientation));
+    _dock_box->set_name("DockBox");
     _dock_box->pack_start(*_paned, Gtk::PACK_EXPAND_WIDGET);
     _dock_box->pack_end(*Gtk::manage(Glib::wrap(GTK_WIDGET(_gdl_dock_bar))), Gtk::PACK_SHRINK);
 
+    _scrolled_window->set_name("DockScrolledWindow");
+    _scrolled_window->add(*_dock_box);
+    _scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
     _scrolled_window->set_size_request(0);
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -215,7 +213,6 @@ void Dock::toggleDockable(int width, int height)
         parent_paned->set_position(prev_horizontal_position);
         _paned->set_position(prev_vertical_position);
     }
-
 }
 
 void Dock::scrollToItem(DockItem& item)
diff --git a/src/ui/widget/dock.h b/src/ui/widget/dock.h
index 6258a06e3..efdb6fa39 100644
--- a/src/ui/widget/dock.h
+++ b/src/ui/widget/dock.h
@@ -70,7 +70,7 @@ protected:
     Gtk::Paned          *_paned;
     GtkWidget           *_gdl_dock;
     GdlDockBar          *_gdl_dock_bar;
-    Gtk::VBox            _filler;
+    Gtk::Box             _filler;
     Gtk::ScrolledWindow *_scrolled_window;
 
     /** Internal signal handlers */
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 7a9d512ac..c19aa037a 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -3,8 +3,9 @@
  *
  * Author:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
+ *   Tavmjong Bah
  *
- * Copyright (C) 2007 Authors
+ * Copyright (C) 2007, 2017 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -18,11 +19,11 @@ namespace UI {
 namespace Widget {
 
 SimpleFilterModifier::SimpleFilterModifier(int flags)
-    : _lb_blend(_("Blend mode:")),
-      _lb_blur(_("_Blur:")),
-      _lb_blur_unit(_("%")),
-      _blend(BlendModeConverter, SP_ATTR_INVALID, false),
-      _blur(_("Blur (%)"), 0, 0, 100, 1, 0.01, 1)
+    : _flags( flags )
+    , _lb_blend(_("Blend mode:"))
+    , _blend(BlendModeConverter, SP_ATTR_INVALID, false)
+    , _blur(   _("Blur (%)"   ), 0, 0, 100, 1, 1, 1)
+    , _opacity(_("Opacity (%)"), 0, 0, 100, 1, 1, 1)
 {
     set_name("SimpleFilterModifier");
 
@@ -30,25 +31,40 @@ SimpleFilterModifier::SimpleFilterModifier(int flags)
 
     if (flags & BLEND) {
         add(_hb_blend);
+        _lb_blend.set_use_underline();
+        _lb_blend.set_mnemonic_widget(_blend);
         _hb_blend.pack_start(_lb_blend, false, false, 0);
         _hb_blend.pack_start(_blend);
     }
+
     if (flags & BLUR) {
         add(_blur);
     }
 
+    if (flags & OPACITY) {
+        add(_opacity);
+    }
+
     show_all_children();
 
-    _hb_blend.set_spacing(12);
-    _lb_blend.set_use_underline();
-    _lb_blend.set_mnemonic_widget(_blend);
-    _blend.signal_changed().connect(signal_blend_blur_changed());
-    _blur.signal_value_changed().connect(signal_blend_blur_changed());
+    _blend.signal_changed().connect(signal_blend_changed());
+    _blur.signal_value_changed().connect(signal_blur_changed());
+    _opacity.signal_value_changed().connect(signal_opacity_changed());
+}
+
+sigc::signal<void>& SimpleFilterModifier::signal_blend_changed()
+{
+    return _signal_blend_changed;
+}
+
+sigc::signal<void>& SimpleFilterModifier::signal_blur_changed()
+{
+    return _signal_blur_changed;
 }
 
-sigc::signal<void>& SimpleFilterModifier::signal_blend_blur_changed()
+sigc::signal<void>& SimpleFilterModifier::signal_opacity_changed()
 {
-    return _signal_blend_blur_changed;
+    return _signal_opacity_changed;
 }
 
 const Glib::ustring SimpleFilterModifier::get_blend_mode()
@@ -75,9 +91,14 @@ void SimpleFilterModifier::set_blur_value(const double val)
     _blur.set_value(val);
 }
 
-void SimpleFilterModifier::set_blur_sensitive(const bool s)
+double SimpleFilterModifier::get_opacity_value() const
+{
+    return _opacity.get_value();
+}
+
+void SimpleFilterModifier::set_opacity_value(const double val)
 {
-    _blur.set_sensitive(s);
+    _opacity.set_value(val);
 }
 
 }
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 0bcf97433..148f44d04 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -6,8 +6,9 @@
  *
  * Author:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
+ *   Tavmjong Bah
  *
- * Copyright (C) 2007 Authors
+ * Copyright (C) 2007, 2017 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -23,40 +24,47 @@ namespace Inkscape {
 namespace UI {
 namespace Widget {
 
-/* Allows basic control over feBlend and feGaussianBlur effects,
-   with an option to use the full filter effect controls. */
+/* Allows basic control over feBlend and feGaussianBlur effects as well as opacity.
+ *  Common for Object, Layers, and Fill and Stroke dialogs.
+*/
 class SimpleFilterModifier : public Gtk::VBox
 {
 public:
     enum Flags {
-      NONE=0,
-      BLUR=1,
-      BLEND=2
+      NONE   = 0,
+      BLUR   = 1,
+      OPACITY= 2,
+      BLEND  = 4
     };
 
     SimpleFilterModifier(int flags);
 
-    sigc::signal<void>& signal_blend_blur_changed();
+    sigc::signal<void>& signal_blend_changed();
+    sigc::signal<void>& signal_blur_changed();
+    sigc::signal<void>& signal_opacity_changed();
 
     const Glib::ustring get_blend_mode();
     // Uses blend mode enum values, or -1 for a complex filter
     void set_blend_mode(const int);
 
     double get_blur_value() const;
-    void set_blur_value(const double);
-    void set_blur_sensitive(const bool);
-    Gtk::Label *get_blur_label() { return &_lb_blur; };
+    void   set_blur_value(const double);
+
+    double get_opacity_value() const;
+    void   set_opacity_value(const double);
 
 private:
     int _flags;
-    Gtk::HBox _hb_blend;
-    Gtk::HBox _hb_blur;
-    Gtk::Label _lb_blend, _lb_blur, _lb_blur_unit;
 
+    Gtk::HBox _hb_blend;
+    Gtk::Label _lb_blend;
     ComboBoxEnum<Inkscape::Filters::FilterBlendMode> _blend;
     SpinScale _blur;
+    SpinScale _opacity;
 
-    sigc::signal<void> _signal_blend_blur_changed;
+    sigc::signal<void> _signal_blend_changed;
+    sigc::signal<void> _signal_blur_changed;
+    sigc::signal<void> _signal_opacity_changed;
 };
 
 }
diff --git a/src/ui/widget/ink-select-one-action.cpp b/src/ui/widget/ink-select-one-action.cpp
index 40bafecc2..dedfb8894 100644
--- a/src/ui/widget/ink-select-one-action.cpp
+++ b/src/ui/widget/ink-select-one-action.cpp
@@ -31,22 +31,22 @@
 #include <gtkmm/image.h>
 
 InkSelectOneAction* InkSelectOneAction::create(const Glib::ustring &name,
-                                               const Glib::ustring &label,
+                                               const Glib::ustring &group_label,
                                                const Glib::ustring &tooltip,
                                                const Glib::ustring &stock_id,
                                                Glib::RefPtr<Gtk::ListStore> store ) {
 
-    return new InkSelectOneAction(name, label, tooltip, stock_id, store);
+    return new InkSelectOneAction(name, group_label, tooltip, stock_id, store);
 }
 
 InkSelectOneAction::InkSelectOneAction (const Glib::ustring &name,
-                                        const Glib::ustring &label,
+                                        const Glib::ustring &group_label,
                                         const Glib::ustring &tooltip,
                                         const Glib::ustring &stock_id,
                                         Glib::RefPtr<Gtk::ListStore> store ) :
-    Gtk::Action(name, stock_id, label, tooltip),
+    Gtk::Action(name, stock_id, group_label, tooltip),
     _name( name ),
-    _label( label ),
+    _group_label( group_label ),
     _tooltip( tooltip ),
     _stock_id( stock_id ),
     _store (store),
@@ -136,6 +136,11 @@ Gtk::Widget* InkSelectOneAction::create_tool_item_vfunc() {
         Gtk::Box* box = Gtk::manage(new Gtk::Box());
         tool_item->add (*box);  
 
+        if (_use_group_label) {
+            Gtk::Label *group_label = Gtk::manage (new Gtk::Label( _group_label + ": " ));
+            box->add( *group_label );
+        }
+
         Gtk::RadioAction::Group group;
         int index = 0;
         auto children = _store->children();
@@ -167,6 +172,10 @@ Gtk::Widget* InkSelectOneAction::create_tool_item_vfunc() {
             box->add (*item);
         }
 
+        if (_radioaction) {
+            _radioaction->set_current_value (_active);
+        }
+
         _radioaction->signal_changed().connect( sigc::mem_fun(*this, &InkSelectOneAction::on_changed_radioaction));
 
     } else {
diff --git a/src/ui/widget/ink-select-one-action.h b/src/ui/widget/ink-select-one-action.h
index 194ca8027..0b1b08de4 100644
--- a/src/ui/widget/ink-select-one-action.h
+++ b/src/ui/widget/ink-select-one-action.h
@@ -61,6 +61,7 @@ public:
     void use_radio( bool use_radio ) { _use_radio = use_radio; }
     void use_label( bool use_label ) { _use_label = use_label; }
     void use_icon(  bool use_icon  ) { _use_icon  = use_icon;  }
+    void use_group_label( bool use_group_label ) { _use_group_label = use_group_label; }
   
     gint get_active() { return _active; }
     void set_active( gint active );
@@ -81,7 +82,7 @@ protected:
 private:
 
     Glib::ustring _name;
-    Glib::ustring _label;
+    Glib::ustring _group_label;
     Glib::ustring _tooltip;
     Glib::ustring _stock_id;
     Glib::RefPtr<Gtk::ListStore> _store;
@@ -92,6 +93,7 @@ private:
     bool _use_radio;  // Applies to tool item only
     bool _use_label;
     bool _use_icon;   // Applies to menu item only
+    bool _use_group_label; // Applies to tool item only
     Gtk::BuiltinIconSize _icon_size;
 
     /* Combobox in tool */
@@ -109,7 +111,7 @@ private:
     void on_toggled_radiomenu(int n);
 
     InkSelectOneAction (const Glib::ustring &name,
-                        const Glib::ustring &label,
+                        const Glib::ustring &group_label,
                         const Glib::ustring &tooltip,
                         const Glib::ustring &stock_id,
                         Glib::RefPtr<Gtk::ListStore> store );
diff --git a/src/ui/widget/ink-spinscale.cpp b/src/ui/widget/ink-spinscale.cpp
new file mode 100644
index 000000000..ab7ceffc4
--- /dev/null
+++ b/src/ui/widget/ink-spinscale.cpp
@@ -0,0 +1,260 @@
+/*
+ * Authors:
+ *   Tavmjong Bah <tavmjong@free.fr>
+ *
+ * Copyright  (C) 2017 Tavmjong Bah
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+/** \file
+   A widget that allows entering a numerical value either by
+   clicking/dragging on a custom Gtk::Scale or by using a
+   Gtk::SpinButton. The custom Gtk::Scale differs from the stock
+   Gtk::Scale in that it includes a label to save space and has a
+   "slow dragging" mode triggered by the Alt key.
+*/
+
+#include "ink-spinscale.h"
+#include <gdkmm/general.h>
+#include <gdkmm/cursor.h>
+#include <gdkmm/event.h>
+
+#include <gtkmm/spinbutton.h>
+
+#include <gdk/gdk.h>
+
+#include <iostream>
+
+InkScale::InkScale(Glib::RefPtr<Gtk::Adjustment> adjustment, Gtk::SpinButton* spinbutton)
+  : Glib::ObjectBase("InkScale")
+  , Gtk::Scale(adjustment)
+  , _spinbutton(spinbutton)
+  , _dragging(false)
+  , _drag_start(0)
+  , _drag_offset(0)
+{
+  set_name("InkScale");
+  // std::cout << "GType name: " << G_OBJECT_TYPE_NAME(gobj()) << std::endl;
+}
+
+void
+InkScale::set_label(Glib::ustring label) {
+  _label = label;
+}
+
+bool
+InkScale::on_draw(const::Cairo::RefPtr<::Cairo::Context>& cr) {
+
+  Gtk::Range::on_draw(cr);
+
+  // Get SpinButton style info...
+  auto style_spin = _spinbutton->get_style_context();
+  auto state_spin = style_spin->get_state();
+  Gdk::RGBA text_color = style_spin->get_color( state_spin );
+
+  // Create Pango layout.
+  auto layout_label = create_pango_layout(_label);
+  layout_label->set_ellipsize( Pango::ELLIPSIZE_END );
+  layout_label->set_width(PANGO_SCALE * get_width());
+
+  // Get y location of SpinButton text (to match vertical position of SpinButton text).
+  int x, y;
+  _spinbutton->get_layout_offsets(x, y);
+
+  // Fill widget proportional to value.
+  double fraction = get_fraction();
+
+  // Get trough rectangle and clipping point for text.
+  Gdk::Rectangle slider_area = get_range_rect();
+  double clip_text_x = slider_area.get_x() + slider_area.get_width() * fraction;
+
+  // Render text in normal text color.
+  cr->save();
+  cr->rectangle(clip_text_x, 0, get_width(), get_height());
+  cr->clip();
+  Gdk::Cairo::set_source_rgba(cr, text_color);
+  //cr->set_source_rgba(0, 0, 0, 1);
+  cr->move_to(5, y );
+  layout_label->show_in_cairo_context(cr);
+  cr->restore();
+
+  // Render text, clipped, in white over bar (TODO: use same color as SpinButton progress bar).
+  cr->save();
+  cr->rectangle(0, 0, clip_text_x, get_height());
+  cr->clip();
+  cr->set_source_rgba(1, 1, 1, 1);
+  cr->move_to(5, y);
+  layout_label->show_in_cairo_context(cr);
+  cr->restore();
+
+  return true;
+}
+
+bool
+InkScale::on_button_press_event(GdkEventButton* button_event) {
+
+  if (! (button_event->state & GDK_MOD1_MASK) ) {
+    set_adjustment_value(button_event->x);
+  }
+
+  // Dragging must be initialized after any adjustment due to button press.
+  _dragging = true;
+  _drag_start  = button_event->x;
+  _drag_offset = get_width() * get_fraction(); 
+
+  return true;
+}
+
+bool
+InkScale::on_button_release_event(GdkEventButton* button_event) {
+
+  _dragging = false;
+  return true;
+}
+
+bool
+InkScale::on_motion_notify_event(GdkEventMotion* motion_event) {
+
+  double x = motion_event->x;
+  double y = motion_event->y;
+
+  if (_dragging) {
+
+    if (! (motion_event->state & GDK_MOD1_MASK) ) {
+      // Absolute change
+      set_adjustment_value(x);
+    } else {
+      // Relative change
+      double xx = (_drag_offset + (x - _drag_start) * 0.1);
+      set_adjustment_value(xx);
+    }
+    return true;
+  }
+
+  if (! (motion_event->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK))) {
+
+    auto display = get_display();
+    auto cursor = Gdk::Cursor::create(display, Gdk::SB_DOWN_ARROW);
+    // Get Gdk::window (not Gtk::window).. set cursor for entire window.
+    // Would need to unset with leave event.
+    // get_window()->set_cursor( cursor );
+
+    // Can't see how to do this the C++ way since GdkEventMotion
+    // is a structure with a C window member. There is a gdkmm
+    // wrapping function for Gdk::EventMotion but only in unstable.
+    gdk_window_set_cursor( motion_event->window, cursor->gobj() );
+  }
+
+  return false;
+}
+
+double
+InkScale::get_fraction() {
+
+  Glib::RefPtr<Gtk::Adjustment> adjustment = get_adjustment();
+  double upper = adjustment->get_upper();
+  double lower = adjustment->get_lower();
+  double value = adjustment->get_value();
+  double fraction = (value - lower)/(upper - lower);
+
+  return fraction;
+}
+
+void
+InkScale::set_adjustment_value(double x) {
+
+  Glib::RefPtr<Gtk::Adjustment> adjustment = get_adjustment();
+  double upper = adjustment->get_upper();
+  double lower = adjustment->get_lower();
+
+  Gdk::Rectangle slider_area = get_range_rect();
+  double fraction = (x - slider_area.get_x()) / (double)slider_area.get_width();
+  double value = fraction * (upper - lower) + lower;
+
+  adjustment->set_value( value );
+}
+
+/*******************************************************************/
+
+InkSpinScale::InkSpinScale(double value, double lower,
+                           double upper, double step_increment,
+                           double page_increment, double page_size)
+{
+  set_name("InkSpinScale");
+
+  g_assert (upper - lower > 0);
+
+  _adjustment = Gtk::Adjustment::create(value,
+                                        lower,
+                                        upper,
+                                        step_increment,
+                                        page_increment,
+                                        page_size);
+
+  _spinbutton  = Gtk::manage(new Gtk::SpinButton(_adjustment));
+  _spinbutton->set_numeric();
+  _spinbutton->signal_key_release_event().connect(sigc::mem_fun(*this,&InkSpinScale::on_key_release_event),false);
+
+  _scale       = Gtk::manage(new InkScale(_adjustment, _spinbutton));
+  _scale->set_draw_value(false);
+
+  pack_end( *_spinbutton,  Gtk::PACK_SHRINK );
+  pack_end( *_scale,       Gtk::PACK_EXPAND_WIDGET );
+}
+
+InkSpinScale::InkSpinScale(Glib::RefPtr<Gtk::Adjustment> adjustment)
+  : _adjustment(adjustment)
+{
+  set_name("InkSpinScale");
+
+  g_assert (_adjustment->get_upper() - _adjustment->get_lower() > 0);
+
+  _spinbutton  = Gtk::manage(new Gtk::SpinButton(_adjustment));
+  _spinbutton->set_numeric();
+
+  _scale       = Gtk::manage(new InkScale(_adjustment, _spinbutton));
+  _scale->set_draw_value(false);
+
+  pack_end( *_spinbutton,  Gtk::PACK_SHRINK );
+  pack_end( *_scale,       Gtk::PACK_EXPAND_WIDGET );
+}
+
+void
+InkSpinScale::set_label(Glib::ustring label) {
+  _scale->set_label(label);
+}
+
+void
+InkSpinScale::set_digits(int digits) {
+  _spinbutton->set_digits(digits);
+}
+
+int
+InkSpinScale::get_digits() const {
+  return _spinbutton->get_digits();
+}
+
+void
+InkSpinScale::set_focus_widget(GtkWidget * focus_widget) {
+  _focus_widget = focus_widget;
+}
+
+// Return focus to canvas.
+bool
+InkSpinScale::on_key_release_event(GdkEventKey* key_event) {
+
+  switch (key_event->keyval) {
+  case GDK_KEY_Escape:
+  case GDK_KEY_Return:
+  case GDK_KEY_KP_Enter:
+    {
+      if (_focus_widget) {
+        gtk_widget_grab_focus( _focus_widget );
+      }
+    }
+    break;
+  }
+
+  return false;
+}
diff --git a/src/ui/widget/ink-spinscale.h b/src/ui/widget/ink-spinscale.h
new file mode 100644
index 000000000..ff8ad352e
--- /dev/null
+++ b/src/ui/widget/ink-spinscale.h
@@ -0,0 +1,95 @@
+#ifndef INK_SPINSCALE_H
+#define INK_SPINSCALE_H
+
+/*
+ * Authors:
+ *   Tavmjong Bah <tavmjong@free.fr>
+ *
+ * Copyright  (C) 2017 Tavmjong Bah
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+/**
+   A widget that allows entering a numerical value either by
+   clicking/dragging on a custom Gtk::Scale or by using a
+   Gtk::SpinButton. The custom Gtk::Scale differs from the stock
+   Gtk::Scale in that it includes a label to save space and has a
+   "slow-dragging" mode triggered by the Alt key.
+*/
+
+#include <glibmm/ustring.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/scale.h>
+
+namespace Gtk {
+  class SpinButton;
+}
+
+class InkScale : public Gtk::Scale
+{
+ public:
+  InkScale(Glib::RefPtr<Gtk::Adjustment>, Gtk::SpinButton* spinbutton);
+  ~InkScale() {};
+
+  void set_label(Glib::ustring label);
+
+  bool on_draw(const::Cairo::RefPtr<::Cairo::Context>& cr) override;
+
+ protected:
+
+  bool on_button_press_event(GdkEventButton* button_event) override;
+  bool on_button_release_event(GdkEventButton* button_event) override;
+  bool on_motion_notify_event(GdkEventMotion* motion_event) override;
+
+ private:
+
+  double get_fraction();
+  void set_adjustment_value(double x);
+
+  Gtk::SpinButton * _spinbutton; // Needed to get placement/text color.
+  Glib::ustring _label;
+
+  bool   _dragging;
+  double _drag_start;
+  double _drag_offset;
+};
+
+class InkSpinScale : public Gtk::Box
+{
+ public:
+
+  // Create an InkSpinScale with a new adjustment.
+  InkSpinScale(double value,
+               double lower,
+               double upper,
+               double step_increment = 1,
+               double page_increment = 10,
+               double page_size = 0);
+
+  // Create an InkSpinScale with a preexisting adjustment.
+  InkSpinScale(Glib::RefPtr<Gtk::Adjustment>);
+
+  virtual ~InkSpinScale() {};
+
+  void set_label(Glib::ustring label);
+  void set_digits(int digits);
+  int  get_digits() const;
+  void set_focus_widget(GtkWidget *focus_widget);
+  Glib::RefPtr<Gtk::Adjustment> get_adjustment() { return _adjustment; };
+
+ protected:
+
+  InkScale*                      _scale;
+  Gtk::SpinButton*               _spinbutton;
+  Glib::RefPtr<Gtk::Adjustment>  _adjustment;
+  GtkWidget*                     _focus_widget;
+
+  bool on_key_release_event(GdkEventKey* key_event) override;
+
+ private:
+
+};
+
+#endif // INK_SPINSCALE_H
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index fa3f6e905..161f5ba4f 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -33,44 +33,24 @@ namespace Widget {
 
 ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char const *history_prefix, int flags)
 : _verb_code(verb_code),
+  _blend_tag(Glib::ustring(history_prefix) + ":blend"),
   _blur_tag(Glib::ustring(history_prefix) + ":blur"),
   _opacity_tag(Glib::ustring(history_prefix) + ":opacity"),
-  _opacity_vbox(false, 0),
-  _opacity_scale(_("Opacity (%)"), 100.0, 0.0, 100.0, 1.0, 1.0, 1),
-  _fe_cb(flags),
-  _fe_vbox(false, 0),
+  _filter_modifier(flags),
   _blocked(false)
 {
-    set_name( "CompositeSettings");
+    set_name( "ObjectCompositeSettings");
 
     // Filter Effects
-    pack_start(_fe_vbox, false, false, 2);
-    _fe_vbox.pack_start(_fe_cb, false, false, 0);
-    _fe_cb.signal_blend_blur_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_blendBlurValueChanged));
+    pack_start(_filter_modifier, false, false, 2);
 
-    // Opacity
-    pack_start(_opacity_vbox, false, false, 2);
-    _opacity_vbox.pack_start(_opacity_scale);
-
-    _opacity_scale.set_appearance("compact");
-
-    _opacity_scale.signal_value_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged));
+    _filter_modifier.signal_blend_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_blendBlurValueChanged));
+    _filter_modifier.signal_blur_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_blendBlurValueChanged));
+    _filter_modifier.signal_opacity_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged));
 
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    _opacity_scale.set_focuswidget(GTK_WIDGET(desktop->canvas));
-
-    /* SizeGroup keeps the blur and opacity labels aligned in Fill & Stroke dlg */
-/*
-    GtkSizeGroup *labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-    gtk_size_group_add_widget(labels, GTK_WIDGET(_opacity_label.gobj()));
-    gtk_size_group_add_widget(labels, GTK_WIDGET(_fe_cb.get_blur_label()->gobj()));
-*/
 
     show_all_children();
-
-    // These signals don't properly detect change in desktop, rely on owner dialog to call setSubject() from setTargetDesktop()
-    //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this );
-    //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_deactivate), this );
 }
 
 ObjectCompositeSettings::~ObjectCompositeSettings() {
@@ -86,6 +66,12 @@ void ObjectCompositeSettings::setSubject(StyleSubject *subject) {
     }
 }
 
+// We get away with sharing one callback for blend and blur as this is used by
+//  * the Layers dialog where only one layer can be selected at a time,
+//  * the Fill and Stroke dialog where only blur is used.
+// If both blend and blur are used in a dialog where more than one object can
+// be selected then this should be split into separate functions for blend and
+// blur (like in the Objects dialog).
 void
 ObjectCompositeSettings::_blendBlurValueChanged()
 {
@@ -110,12 +96,12 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     double radius;
     if (bbox) {
         double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];   // fixme: this is only half the perimeter, is that correct?
-        radius = _fe_cb.get_blur_value() * perimeter / 400;
+        radius = _filter_modifier.get_blur_value() * perimeter / 400;
     } else {
         radius = 0;
     }
 
-    const Glib::ustring blendmode = _fe_cb.get_blend_mode();
+    const Glib::ustring blendmode = _filter_modifier.get_blend_mode();
 
     //apply created filter to every selected item
     std::vector<SPObject*> sel = _subject->list();
@@ -150,7 +136,7 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     }
 
     DocumentUndo::maybeDone(document, _blur_tag.c_str(), _verb_code,
-                            _("Change blur"));
+                            _("Change blur/blend filter"));
 
     // resume interruptibility
     //sp_canvas_end_forced_full_redraws(desktop->getCanvas());
@@ -174,15 +160,10 @@ ObjectCompositeSettings::_opacityValueChanged()
         return;
     _blocked = true;
 
-    // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed; here it results in crash 1580903
-    // UPDATE: crash fixed in GTK+ 2.10.7 (bug 374378), remove this as soon as it's reasonably common
-    // (though this only fixes the crash, not the multiple change events)
-    //sp_canvas_force_full_redraw_after_interruptions(desktop->getCanvas(), 0);
-
     SPCSSAttr *css = sp_repr_css_attr_new ();
 
     Inkscape::CSSOStringStream os;
-    os << CLAMP (_opacity_scale.get_adjustment()->get_value() / 100, 0.0, 1.0);
+    os << CLAMP (_filter_modifier.get_opacity_value() / 100, 0.0, 1.0);
     sp_repr_css_set_property (css, "opacity", os.str().c_str());
 
     _subject->setCSS(css);
@@ -218,14 +199,11 @@ ObjectCompositeSettings::_subjectChanged() {
 
     switch (result) {
         case QUERY_STYLE_NOTHING:
-            _opacity_vbox.set_sensitive(false);
-            // gtk_widget_set_sensitive (opa, FALSE);
             break;
         case QUERY_STYLE_SINGLE:
         case QUERY_STYLE_MULTIPLE_AVERAGED: // TODO: treat this slightly differently
         case QUERY_STYLE_MULTIPLE_SAME:
-            _opacity_vbox.set_sensitive(true);
-            _opacity_scale.get_adjustment()->set_value(100 * SP_SCALE24_TO_FLOAT(query.opacity.value));
+            _filter_modifier.set_opacity_value(100 * SP_SCALE24_TO_FLOAT(query.opacity.value));
             break;
     }
 
@@ -233,16 +211,13 @@ ObjectCompositeSettings::_subjectChanged() {
     const int blend_result = _subject->queryStyle(&query, QUERY_STYLE_PROPERTY_BLEND);
     switch(blend_result) {
         case QUERY_STYLE_NOTHING:
-            _fe_cb.set_sensitive(false);
             break;
         case QUERY_STYLE_SINGLE:
         case QUERY_STYLE_MULTIPLE_SAME:
-            _fe_cb.set_blend_mode(query.filter_blend_mode.value);
-            _fe_cb.set_sensitive(true);
+            _filter_modifier.set_blend_mode(query.filter_blend_mode.value);
             break;
         case QUERY_STYLE_MULTIPLE_DIFFERENT:
             // TODO: set text
-            _fe_cb.set_sensitive(false);
             break;
     }
 
@@ -250,7 +225,7 @@ ObjectCompositeSettings::_subjectChanged() {
         int blur_result = _subject->queryStyle(&query, QUERY_STYLE_PROPERTY_BLUR);
         switch (blur_result) {
             case QUERY_STYLE_NOTHING: //no blurring
-                _fe_cb.set_blur_sensitive(false);
+                _filter_modifier.set_blur_value(0);
                 break;
             case QUERY_STYLE_SINGLE:
             case QUERY_STYLE_MULTIPLE_AVERAGED:
@@ -258,16 +233,23 @@ ObjectCompositeSettings::_subjectChanged() {
                 Geom::OptRect bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
                 if (bbox) {
                     double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];   // fixme: this is only half the perimeter, is that correct?
-                    _fe_cb.set_blur_sensitive(true);
                     //update blur widget value
                     float radius = query.filter_gaussianBlur_deviation.value;
                     float percent = radius * 400 / perimeter; // so that for a square, 100% == half side
-                    _fe_cb.set_blur_value(percent);
+                    _filter_modifier.set_blur_value(percent);
                 }
                 break;
         }
     }
 
+    // If we have nothing selected, disable dialog.
+    if (result       == QUERY_STYLE_NOTHING &&
+        blend_result == QUERY_STYLE_NOTHING ) {
+        _filter_modifier.set_sensitive( false );
+    } else {
+        _filter_modifier.set_sensitive( true );
+    }
+
     _blocked = false;
 }
 
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index d7525093f..9e810bc00 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -18,7 +18,6 @@
 #include <glibmm/ustring.h>
 
 #include "ui/widget/filter-effect-chooser.h"
-#include "ui/widget/spinbutton.h"
 
 class SPDesktop;
 struct InkscapeApplication;
@@ -42,16 +41,13 @@ public:
 
 private:
     unsigned int    _verb_code;
+    Glib::ustring   _blend_tag;
     Glib::ustring   _blur_tag;
     Glib::ustring   _opacity_tag;
 
-    Gtk::VBox       _opacity_vbox;
-    Inkscape::UI::Widget::SpinScale _opacity_scale;
-
     StyleSubject *_subject;
 
-    SimpleFilterModifier _fe_cb;
-    Gtk::VBox       _fe_vbox;
+    SimpleFilterModifier _filter_modifier;
 
     bool _blocked;
     gulong _desktop_activated;
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 8b8e663a5..345864a44 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -96,7 +96,7 @@ void DialogPage::add_line(bool                 indent,
         label_widget->set_mnemonic_widget(widget);
         
         if (indent) {
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
             label_widget->set_margin_start(12);
 #else
             label_widget->set_margin_left(12);
@@ -112,7 +112,7 @@ void DialogPage::add_line(bool                 indent,
     if (label == "")
     {
         if (indent) {
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
             hb->set_margin_start(12);
 #else
             hb->set_margin_left(12);
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index c658b4756..94b178a43 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -2,6 +2,7 @@
  * Author:
  *
  * Copyright (C) 2012 Author
+ *               2017 Tavmjong Bah
  *
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
@@ -11,50 +12,49 @@
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
 
-#include "widgets/gimp/gimpspinscale.h"
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {
 
-SpinScale::SpinScale(const char* label, double value, double lower, double upper, double step_inc,
-                     double /*climb_rate*/, int digits, const SPAttributeEnum a, const char* tip_text)
+SpinScale::SpinScale(const Glib::ustring label, double value,
+                     double lower, double upper,
+                     double step_increment, double page_increment, int digits,
+                     const SPAttributeEnum a, const Glib::ustring tip_text)
     : AttrWidget(a, value)
+    , _inkspinscale(value, lower, upper, step_increment, page_increment, 0)
 {
     set_name("SpinScale");
-    _adjustment = Gtk::Adjustment::create(value, lower, upper, step_inc);
-    _spinscale = gimp_spin_scale_new (_adjustment->gobj(), label, digits);
 
-    signal_value_changed().connect(signal_attr_changed().make_slot());
+    _inkspinscale.set_label (label);
+    _inkspinscale.set_digits (digits);
+    _inkspinscale.set_tooltip_text (tip_text);
 
-    pack_start(*Gtk::manage(Glib::wrap(_spinscale)));
+    _adjustment = _inkspinscale.get_adjustment();
 
-    if (tip_text){
-        gtk_widget_set_tooltip_text( _spinscale, tip_text );
-    }
+    signal_value_changed().connect(signal_attr_changed().make_slot());
+
+    pack_start(_inkspinscale);
 
     show_all_children();
 }
 
-SpinScale::SpinScale(const char* label,
-                     Glib::RefPtr<Gtk::Adjustment> adj,
-                     int digits,
-                     const SPAttributeEnum a,
-                     const char* tip_text)
-    : AttrWidget(a, 0.0),
-      _adjustment(adj)
-
+SpinScale::SpinScale(const Glib::ustring label,
+                     Glib::RefPtr<Gtk::Adjustment> adjustment, int digits,
+                     const SPAttributeEnum a, const Glib::ustring tip_text)
+    : AttrWidget(a, 0.0)
+    , _inkspinscale(adjustment)
 {
+    set_name("SpinScale");
 
-    _spinscale = gimp_spin_scale_new (_adjustment->gobj(), label, digits);
+    _inkspinscale.set_label (label);
+    _inkspinscale.set_digits (digits);
+    _inkspinscale.set_tooltip_text (tip_text);
+
+    _adjustment = _inkspinscale.get_adjustment();
 
     signal_value_changed().connect(signal_attr_changed().make_slot());
 
-    pack_start(*Gtk::manage(Glib::wrap(_spinscale)));
-
-    if (tip_text){
-        gtk_widget_set_tooltip_text( _spinscale, tip_text );
-    }
+    pack_start(_inkspinscale);
 
     show_all_children();
 }
@@ -63,16 +63,16 @@ Glib::ustring SpinScale::get_as_attribute() const
 {
     const double val = _adjustment->get_value();
 
-    //if(_spin.get_digits() == 0)
-    //    return Glib::Ascii::dtostr((int)val);
-    //else
+    if( _inkspinscale.get_digits() == 0)
+        return Glib::Ascii::dtostr((int)val);
+    else
         return Glib::Ascii::dtostr(val);
 }
 
 void SpinScale::set_from_attribute(SPObject* o)
 {
     const gchar* val = attribute_value(o);
-    if(val)
+    if (val)
         _adjustment->set_value(Glib::Ascii::strtod(val));
     else
         _adjustment->set_value(get_default()->as_double());
@@ -95,13 +95,7 @@ void SpinScale::set_value(const double val)
 
 void SpinScale::set_focuswidget(GtkWidget *widget)
 {
-    gimp_spin_scale_set_focuswidget(_spinscale, widget);
-}
-
-
-void SpinScale::set_appearance(const gchar* appearance)
-{
-    gimp_spin_scale_set_appearance(_spinscale, appearance);
+    _inkspinscale.set_focus_widget(widget);
 }
 
 const decltype(SpinScale::_adjustment) SpinScale::get_adjustment() const
@@ -115,11 +109,14 @@ decltype(SpinScale::_adjustment) SpinScale::get_adjustment()
 }
 
 
-DualSpinScale::DualSpinScale(const char* label1, const char* label2, double value, double lower, double upper, double step_inc,
-                               double climb_rate, int digits, const SPAttributeEnum a, char* tip_text1, char* tip_text2)
+DualSpinScale::DualSpinScale(const Glib::ustring label1, const Glib::ustring label2,
+                             double value, double lower, double upper,
+                             double step_increment, double page_increment, int digits,
+                             const SPAttributeEnum a,
+                             const Glib::ustring tip_text1, const Glib::ustring tip_text2)
     : AttrWidget(a),
-      _s1(label1, value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text1),
-      _s2(label2, value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text2),
+      _s1(label1, value, lower, upper, step_increment, page_increment, digits, SP_ATTR_INVALID, tip_text1),
+      _s2(label2, value, lower, upper, step_increment, page_increment, digits, SP_ATTR_INVALID, tip_text2),
       //TRANSLATORS: "Link" means to _link_ two sliders together
       _link(C_("Sliders", "Link"))
 {
@@ -132,7 +129,7 @@ DualSpinScale::DualSpinScale(const char* label1, const char* label2, double valu
 
     _link.signal_toggled().connect(sigc::mem_fun(*this, &DualSpinScale::link_toggled));
 
-    Gtk::VBox* vb = Gtk::manage(new Gtk::VBox);
+    Gtk::Box* vb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
     vb->add(_s1);
     vb->add(_s2);
     pack_start(*vb);
@@ -199,12 +196,6 @@ SpinScale& DualSpinScale::get_SpinScale2()
     return _s2;
 }
 
-/*void DualSpinScale::remove_scale()
-{
-    _s1.remove_scale();
-    _s2.remove_scale();
-}*/
-
 void DualSpinScale::link_toggled()
 {
     _s2.set_sensitive(!_link.get_active());
diff --git a/src/ui/widget/spin-scale.h b/src/ui/widget/spin-scale.h
index 33731f256..123f527bb 100644
--- a/src/ui/widget/spin-scale.h
+++ b/src/ui/widget/spin-scale.h
@@ -2,6 +2,7 @@
  * Author:
  *
  * Copyright (C) 2012 Author
+ *               2017 Tavmjong Bah
  *
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
@@ -16,27 +17,30 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/togglebutton.h>
-#include "spinbutton.h"
 #include "attr-widget.h"
+#include "ink-spinscale.h"
 
 namespace Inkscape {
 namespace UI {
 namespace Widget {
 
 /**
- * Wrap the gimpspinscale class
- * A combo widget with label, scale slider, spinbutton, and adjustment
+ * Wrap the InkSpinScale class and attach an attribute.
+ * A combo widget with label, scale slider, spinbutton, and adjustment;
  */
 class SpinScale : public Gtk::Box, public AttrWidget
 {
 
 public:
-    SpinScale(const char* label, double value, double lower, double upper, double step_inc, double climb_rate,
-	       int digits, const SPAttributeEnum a = SP_ATTR_INVALID, const char* tip_text = NULL);
+    SpinScale(const Glib::ustring label, double value,
+              double lower, double upper,
+              double step_increment, double page_increment, int digits,
+              const SPAttributeEnum a = SP_ATTR_INVALID, const Glib::ustring tip_text = "");
 
-    SpinScale(const char* label,
-              Glib::RefPtr<Gtk::Adjustment> adj,
-	      int digits, const SPAttributeEnum a = SP_ATTR_INVALID, const char* tip_text = NULL);
+    // Used by extensions
+    SpinScale(const Glib::ustring label,
+              Glib::RefPtr<Gtk::Adjustment> adjustment, int digits,
+              const SPAttributeEnum a = SP_ATTR_INVALID, const Glib::ustring tip_text = "");
 
     virtual Glib::ustring get_as_attribute() const;
     virtual void set_from_attribute(SPObject*);
@@ -46,11 +50,10 @@ public:
     double get_value() const;
     void set_value(const double);
     void set_focuswidget(GtkWidget *widget);
-    void set_appearance(const gchar* appearance);
     
 private:
     Glib::RefPtr<Gtk::Adjustment> _adjustment;
-    GtkWidget *_spinscale;
+    InkSpinScale _inkspinscale;
 
 public:
     const decltype(_adjustment) get_adjustment() const;
@@ -66,8 +69,11 @@ public:
 class DualSpinScale : public Gtk::Box, public AttrWidget
 {
 public:
-    DualSpinScale(const char* label1, const char* label2, double value, double lower, double upper, double step_inc,
-                   double climb_rate, int digits, const SPAttributeEnum, char* tip_text1, char* tip_text2);
+    DualSpinScale(const Glib::ustring label1, const Glib::ustring label2,
+                  double value, double lower, double upper,
+                  double step_increment, double page_increment, int digits,
+                  const SPAttributeEnum a,
+                  const Glib::ustring tip_text1, const Glib::ustring tip_text2);
 
     virtual Glib::ustring get_as_attribute() const;
     virtual void set_from_attribute(SPObject*);
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 3d46fd81d..0f0d205e2 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -46,12 +46,12 @@
 
 #include <gtkmm/container.h>
 #include <gtkmm/radiomenuitem.h>
+#include <gtkmm/adjustment.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "widgets/ege-adjustment-action.h"
-#include "gimp/gimpspinscale.h"
 #include "ui/icon-names.h"
-
+#include "ui/widget/ink-spinscale.h"
 
 static void ege_adjustment_action_finalize( GObject* object );
 static void ege_adjustment_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
@@ -820,7 +820,11 @@ static GtkWidget* create_tool_item( GtkAction* action )
 
         if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
             /* Slider */
-            spinbutton  = gimp_spin_scale_new (act->private_data->adj, g_value_get_string( &value ), 0);
+            InkSpinScale* inkspinscale =
+              new InkSpinScale(Glib::wrap(act->private_data->adj));
+            inkspinscale->set_label( g_value_get_string( &value ));
+            inkspinscale->set_digits(0);
+            spinbutton = (GtkWidget*)inkspinscale->gobj();
             gtk_widget_set_size_request(spinbutton, 100, -1);
 
         } else if ( act->private_data->appearanceMode == APPEARANCE_MINIMAL ) {
diff --git a/src/widgets/gimp/CMakeLists.txt b/src/widgets/gimp/CMakeLists.txt
index 7b3e834e3..aa886cc67 100644
--- a/src/widgets/gimp/CMakeLists.txt
+++ b/src/widgets/gimp/CMakeLists.txt
@@ -1,12 +1,10 @@
 set(gimpwidgets_SRC
 	gimpcolorwheel.c
-	gimpspinscale.c
 	ruler.cpp
 
 	# -------
 	# Headers
 	gimpcolorwheel.h
-	gimpspinscale.h
 	ruler.h
 )
 
diff --git a/src/widgets/gimp/gimpspinscale.c b/src/widgets/gimp/gimpspinscale.c
deleted file mode 100644
index 8d8c6c935..000000000
--- a/src/widgets/gimp/gimpspinscale.c
+++ /dev/null
@@ -1,969 +0,0 @@
-/* GIMP - The GNU Image Manipulation Program
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
- *
- * gimpspinscale.c
- * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
- *               2012 Øyvind Kolås    <pippin@gimp.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <math.h>
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "gimpspinscale.h"
-
-
-enum
-{
-  PROP_0,
-  PROP_LABEL,
-  PROP_FOCUS_WIDGET
-};
-
-typedef enum
-{
-  TARGET_NUMBER,
-  TARGET_UPPER,
-  TARGET_LOWER,
-  TARGET_NONE
-} SpinScaleTarget;
-
-typedef enum
-{
-  APPEARANCE_FULL = 1,  /* Full size suitable for tablets */
-  APPEARANCE_COMPACT, /* Compact, suitable for desktops with mouse control */
-} SpinScaleAppearance;
-
-typedef struct _GimpSpinScalePrivate GimpSpinScalePrivate;
-
-struct _GimpSpinScalePrivate
-{
-  gchar       *label;
-
-  gboolean     scale_limits_set;
-  gdouble      scale_lower;
-  gdouble      scale_upper;
-  gdouble      gamma;
-
-  PangoLayout *layout;
-  gboolean     changing_value;
-  gboolean     relative_change;
-  gdouble      start_x;
-  gdouble      start_value;
-
-  GtkWidget*   focusWidget;
-  gboolean     transferFocus;
-  SpinScaleAppearance appearanceMode;
-};
-
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-                                                       GIMP_TYPE_SPIN_SCALE, \
-                                                       GimpSpinScalePrivate))
-
-
-static void       gimp_spin_scale_dispose        (GObject          *object);
-static void       gimp_spin_scale_finalize       (GObject          *object);
-static void       gimp_spin_scale_set_property   (GObject          *object,
-                                                  guint             property_id,
-                                                  const GValue     *value,
-                                                  GParamSpec       *pspec);
-static void       gimp_spin_scale_get_property   (GObject          *object,
-                                                  guint             property_id,
-                                                  GValue           *value,
-                                                  GParamSpec       *pspec);
-
-static void       gimp_spin_scale_style_set      (GtkWidget        *widget,
-                                                  GtkStyle         *prev_style);
-
-static void       gimp_spin_scale_get_preferred_width  (GtkWidget        *widget,
-                                                        gint             *minimum_width,
-                                                        gint             *natural_width);
-static void       gimp_spin_scale_get_preferred_height (GtkWidget        *widget,
-                                                        gint             *minimum_width,
-                                                        gint             *natural_width);
-static gboolean   gimp_spin_scale_draw (GtkWidget *widget,
-                                              cairo_t   *cr);
-
-static gboolean   gimp_spin_scale_button_press   (GtkWidget        *widget,
-                                                  GdkEventButton   *event);
-static gboolean   gimp_spin_scale_button_release (GtkWidget        *widget,
-                                                  GdkEventButton   *event);
-static gboolean   gimp_spin_scale_motion_notify  (GtkWidget        *widget,
-                                                  GdkEventMotion   *event);
-static gboolean   gimp_spin_scale_leave_notify   (GtkWidget        *widget,
-                                                  GdkEventCrossing *event);
-static gboolean   gimp_spin_scale_keypress( GtkWidget *widget,
-                                                GdkEventKey *event);
-
-static void       gimp_spin_scale_defocus( GtkSpinButton *spin_button );
-
-static void       gimp_spin_scale_value_changed  (GtkSpinButton    *spin_button);
-
-
-G_DEFINE_TYPE (GimpSpinScale, gimp_spin_scale, GTK_TYPE_SPIN_BUTTON);
-
-#define parent_class gimp_spin_scale_parent_class
-
-
-static void
-gimp_spin_scale_class_init (GimpSpinScaleClass *klass)
-{
-  GObjectClass       *object_class      = G_OBJECT_CLASS (klass);
-  GtkWidgetClass     *widget_class      = GTK_WIDGET_CLASS (klass);
-  GtkSpinButtonClass *spin_button_class = GTK_SPIN_BUTTON_CLASS (klass);
-
-  object_class->dispose              = gimp_spin_scale_dispose;
-  object_class->finalize             = gimp_spin_scale_finalize;
-  object_class->set_property         = gimp_spin_scale_set_property;
-  object_class->get_property         = gimp_spin_scale_get_property;
-
-  widget_class->style_set            = gimp_spin_scale_style_set;
-  widget_class->get_preferred_width  = gimp_spin_scale_get_preferred_width;
-  widget_class->get_preferred_height = gimp_spin_scale_get_preferred_height;
-  widget_class->draw                 = gimp_spin_scale_draw;
-  widget_class->button_press_event   = gimp_spin_scale_button_press;
-  widget_class->button_release_event = gimp_spin_scale_button_release;
-  widget_class->motion_notify_event  = gimp_spin_scale_motion_notify;
-  widget_class->leave_notify_event   = gimp_spin_scale_leave_notify;
-  widget_class->key_press_event      = gimp_spin_scale_keypress;
-
-  spin_button_class->value_changed   = gimp_spin_scale_value_changed;
-
-  g_object_class_install_property (object_class, PROP_LABEL,
-                                   g_param_spec_string ("label", NULL, NULL,
-                                                        NULL,
-                                                        G_PARAM_READWRITE));
-
-  g_type_class_add_private (klass, sizeof (GimpSpinScalePrivate));
-}
-
-static void
-gimp_spin_scale_init (GimpSpinScale *scale)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
-
-  gtk_widget_add_events (GTK_WIDGET (scale),
-                         GDK_BUTTON_PRESS_MASK   |
-                         GDK_BUTTON_RELEASE_MASK |
-                         GDK_POINTER_MOTION_MASK |
-                         GDK_BUTTON1_MOTION_MASK |
-                         GDK_LEAVE_NOTIFY_MASK);
-
-  gtk_entry_set_alignment (GTK_ENTRY (scale), 1.0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (scale), TRUE);
-
-  private->gamma = 1.0;
-  private->focusWidget = NULL;
-  private->transferFocus = FALSE;
-  private->appearanceMode = APPEARANCE_COMPACT;
-}
-
-static void
-gimp_spin_scale_dispose (GObject *object)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (object);
-
-  if (private->layout)
-    {
-      g_object_unref (private->layout);
-      private->layout = NULL;
-    }
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-gimp_spin_scale_finalize (GObject *object)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (object);
-
-  if (private->label)
-    {
-      g_free (private->label);
-      private->label = NULL;
-    }
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-gimp_spin_scale_set_property (GObject      *object,
-                              guint         property_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (object);
-  GimpSpinScale        *scale   = GIMP_SPIN_SCALE (object);
-
-  switch (property_id)
-    {
-    case PROP_LABEL:
-      gimp_spin_scale_set_label (scale, g_value_get_string (value));
-      break;
-
-    case PROP_FOCUS_WIDGET:
-      {
-        /* TODO unhook prior */
-        private->focusWidget = GTK_WIDGET (g_value_get_pointer (value));
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gimp_spin_scale_get_property (GObject    *object,
-                              guint       property_id,
-                              GValue     *value,
-                              GParamSpec *pspec)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (object);
-  GimpSpinScale        *scale   = GIMP_SPIN_SCALE (object);
-
-  switch (property_id)
-    {
-    case PROP_LABEL:
-      g_value_set_string (value, gimp_spin_scale_get_label (scale));
-      break;
-
-    case PROP_FOCUS_WIDGET:
-      g_value_set_pointer (value, private->focusWidget);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-
-void
-gimp_spin_scale_set_focuswidget( GtkWidget *scale, GtkWidget* widget )
-{
-    GimpSpinScalePrivate *private = GET_PRIVATE (scale);
-
-    /* TODO unhook prior */
-
-    private->focusWidget = widget;
-}
-
-void
-gimp_spin_scale_set_appearance( GtkWidget *widget, const gchar *appearance)
-{
-    GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-
-    if ( strcmp("full", appearance) == 0 ) {
-        private->appearanceMode = APPEARANCE_FULL;
-    } else if ( strcmp("compact", appearance) == 0 ) {
-        private->appearanceMode = APPEARANCE_COMPACT;
-    }
-}
-
-static void
-gimp_spin_scale_get_preferred_width (GtkWidget *widget,
-                                     gint      *minimum_width,
-                                     gint      *natural_width)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-  PangoContext         *context = gtk_widget_get_pango_context (widget);
-  PangoFontMetrics     *metrics;
-
-  GTK_WIDGET_CLASS (parent_class)->get_preferred_width (widget,
-                                                        minimum_width,
-                                                        natural_width);
-
-  metrics = pango_context_get_metrics (context,
-                                       pango_context_get_font_description (context),
-                                       pango_context_get_language (context));
-
-  if (private->label)
-    {
-      gint char_width;
-      gint digit_width;
-      gint char_pixels;
-
-      char_width = pango_font_metrics_get_approximate_char_width (metrics);
-      digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
-      char_pixels = PANGO_PIXELS (MAX (char_width, digit_width));
-
-      /* ~3 chars for the ellipse */
-      *minimum_width += char_pixels * 3;
-      *natural_width += char_pixels * 3;
-    }
-
-  pango_font_metrics_unref (metrics);
-}
-
-static void
-gimp_spin_scale_get_preferred_height (GtkWidget *widget,
-                                      gint      *minimum_height,
-                                      gint      *natural_height)
-{
-  PangoContext     *context = gtk_widget_get_pango_context (widget);
-  PangoFontMetrics *metrics;
-  //gint              height;
-
-  GTK_WIDGET_CLASS (parent_class)->get_preferred_height (widget,
-                                                         minimum_height,
-                                                         natural_height);
-
-  metrics = pango_context_get_metrics (context,
-                                       pango_context_get_font_description (context),
-                                       pango_context_get_language (context));
-
-  //height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
-  //                       pango_font_metrics_get_descent (metrics));
-
-  *minimum_height += 1;
-  *natural_height += 1;
-
-  pango_font_metrics_unref (metrics);
-}
-
-static void
-gimp_spin_scale_style_set (GtkWidget *widget,
-                           GtkStyle  *prev_style)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-
-  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
-
-  if (private->layout)
-    {
-      g_object_unref (private->layout);
-      private->layout = NULL;
-    }
-}
-
-
-static gboolean
-    gimp_spin_scale_draw (GtkWidget *widget,
-                          cairo_t   *cr)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-  GtkStyleContext      *style   = gtk_widget_get_style_context(widget);
-  GtkAllocation         allocation;
-  GdkRGBA               color;
-
-  cairo_save (cr);
-  GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
-  cairo_restore (cr);
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  cairo_set_line_width (cr, 1.0);
-
-  if (private->label)
-    {
-      GdkRectangle   text_area;
-      gint           minimum_width;
-      gint           natural_width;
-      PangoRectangle logical;
-      gint           layout_offset_x;
-      gint           layout_offset_y;
-      GtkStateFlags  state;
-      GdkRGBA        text_color;
-      GdkRGBA        bar_text_color;
-      gdouble        progress_fraction;
-      gint           progress_x;
-      gint           progress_y;
-      gint           progress_width;
-      gint           progress_height;
-
-      gtk_entry_get_text_area (GTK_ENTRY (widget), &text_area);
-
-      GTK_WIDGET_CLASS (parent_class)->get_preferred_width (widget,
-                                                            &minimum_width,
-                                                            &natural_width);
-
-      if (! private->layout)
-        {
-          private->layout = gtk_widget_create_pango_layout (widget,
-                                                            private->label);
-          pango_layout_set_ellipsize (private->layout, PANGO_ELLIPSIZE_END);
-        }
-
-      pango_layout_set_width (private->layout,
-                              PANGO_SCALE *
-                              (allocation.width - minimum_width));
-      pango_layout_get_pixel_extents (private->layout, NULL, &logical);
-
-      gtk_entry_get_layout_offsets (GTK_ENTRY (widget), NULL, &layout_offset_y);
-
-      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-          layout_offset_x = text_area.x + text_area.width - logical.width - 4;
-      else
-        layout_offset_x = 4;
-
-      layout_offset_x -= logical.x;
-
-      state = gtk_widget_get_state_flags (widget);
-
-      gtk_style_context_get_color (style, state, &text_color);
-
-      gtk_style_context_save (style);
-      gtk_style_context_add_class (style, GTK_STYLE_CLASS_PROGRESSBAR);
-      gtk_style_context_get_color (style, state, &bar_text_color);
-      gtk_style_context_restore (style);
-
-      progress_fraction = gtk_entry_get_progress_fraction (GTK_ENTRY (widget));
-
-      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-        {
-          progress_fraction = 1.0 - progress_fraction;
-
-          progress_x      = text_area.width * progress_fraction;
-          progress_y      = 0;
-          progress_width  = text_area.width - progress_x;
-          progress_height = text_area.height;
-        }
-      else
-        {
-          progress_x      = 0;
-          progress_y      = 0;
-          progress_width  = text_area.width * progress_fraction;
-          progress_height = text_area.height;
-        }
-
-      cairo_save (cr);
-
-      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
-      cairo_rectangle (cr, 0, 0, text_area.width, text_area.height);
-      cairo_rectangle (cr, progress_x, progress_y,
-                       progress_width, progress_height);
-      cairo_clip (cr);
-      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
-
-      cairo_move_to (cr, layout_offset_x, text_area.y + layout_offset_y-3);
-      gdk_cairo_set_source_rgba (cr, &text_color);
-      pango_cairo_show_layout (cr, private->layout);
-      cairo_restore (cr);
-
-      cairo_rectangle (cr, progress_x, progress_y,
-                       progress_width, progress_height);
-      cairo_clip (cr);
-
-      cairo_move_to (cr, layout_offset_x, text_area.y + layout_offset_y-3);
-      gdk_cairo_set_source_rgba (cr, &bar_text_color);
-      pango_cairo_show_layout (cr, private->layout);
-    }
-
-  return FALSE;
-}
-
-/* Returns TRUE if a translation should be done */
-static gboolean
-gtk_widget_get_translation_to_window (GtkWidget *widget,
-                                      GdkWindow *window,
-                                      int       *x,
-                                      int       *y)
-{
-  GdkWindow *w, *widget_window;
-
-  if (!gtk_widget_get_has_window (widget))
-    {
-      GtkAllocation allocation;
-
-      gtk_widget_get_allocation (widget, &allocation);
-
-      *x = -allocation.x;
-      *y = -allocation.y;
-    }
-  else
-    {
-      *x = 0;
-      *y = 0;
-    }
-
-  widget_window = gtk_widget_get_window (widget);
-
-  for (w = window; w && w != widget_window; w = gdk_window_get_parent (w))
-    {
-      int wx, wy;
-      gdk_window_get_position (w, &wx, &wy);
-      *x += wx;
-      *y += wy;
-    }
-
-  if (w == NULL)
-    {
-      *x = 0;
-      *y = 0;
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static void
-gimp_spin_scale_event_to_widget_coords (GtkWidget *widget,
-                                        GdkWindow *window,
-                                        gdouble    event_x,
-                                        gdouble    event_y,
-                                        gint      *widget_x,
-                                        gint      *widget_y)
-{
-  gint tx, ty;
-
-  if (gtk_widget_get_translation_to_window (widget, window, &tx, &ty))
-    {
-      event_x += tx;
-      event_y += ty;
-    }
-
-  *widget_x = event_x;
-  *widget_y = event_y;
-}
-
-static SpinScaleTarget
-gimp_spin_scale_get_target (GtkWidget *widget,
-                            gdouble    x,
-                            gdouble    y)
-{
-  GtkAllocation   allocation;
-  PangoRectangle  logical;
-  gint            layout_x;
-  gint            layout_y;
-
-  gtk_widget_get_allocation (widget, &allocation);
-  gtk_entry_get_layout_offsets (GTK_ENTRY (widget), &layout_x, &layout_y);
-  pango_layout_get_pixel_extents (gtk_entry_get_layout (GTK_ENTRY (widget)),
-                                  NULL, &logical);
-
-  GdkRectangle    text_area;
-  gtk_entry_get_text_area (GTK_ENTRY (widget), &text_area);
-
-    if (x >= text_area.x && x < text_area.width &&
-        y >= text_area.y && y < text_area.height)
-       {
-        x -= text_area.x;
-        y -= text_area.y;
-
-        if (x > layout_x && x < layout_x + logical.width &&
-            y > layout_y && y < layout_y + logical.height)
-          {
-            return TARGET_NUMBER;
-          }
-        else if (y > text_area.height / 2)
-          {
-            return TARGET_LOWER;
-          }
-
-        return TARGET_UPPER;
-      }
-
-    return TARGET_NONE;
-}
-
-static void
-gimp_spin_scale_get_limits (GimpSpinScale *scale,
-                            gdouble       *lower,
-                            gdouble       *upper)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
-
-  if (private->scale_limits_set)
-    {
-      *lower = private->scale_lower;
-      *upper = private->scale_upper;
-    }
-  else
-    {
-      GtkSpinButton *spin_button = GTK_SPIN_BUTTON (scale);
-      GtkAdjustment *adjustment  = gtk_spin_button_get_adjustment (spin_button);
-
-      *lower = gtk_adjustment_get_lower (adjustment);
-      *upper = gtk_adjustment_get_upper (adjustment);
-    }
-}
-
-static void
-gimp_spin_scale_change_value (GtkWidget *widget,
-                              gdouble    x)
-{
-  GimpSpinScalePrivate *private     = GET_PRIVATE (widget);
-  GtkSpinButton        *spin_button = GTK_SPIN_BUTTON (widget);
-  GtkAdjustment        *adjustment  = gtk_spin_button_get_adjustment (spin_button);
-  gdouble               lower;
-  gdouble               upper;
-  gdouble               value;
-  GdkRectangle          text_area;
-  gtk_entry_get_text_area (GTK_ENTRY (widget), &text_area);
-  gimp_spin_scale_get_limits (GIMP_SPIN_SCALE (widget), &lower, &upper);
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-      x = text_area.width - x;
-
-  if (private->relative_change)
-    {
-      gdouble diff;
-      gdouble step;
-
-      step = (upper - lower) / text_area.width / 10.0;
-      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-        diff = x - (text_area.width - private->start_x);
-      else
-        diff = x - private->start_x;
-
-      value = (private->start_value + diff * step);
-    }
-  else
-    {
-      gdouble fraction;
-
-      fraction = x / (gdouble) text_area.width;
-      if (fraction > 0.0)
-        fraction = pow (fraction, private->gamma);
-
-      value = fraction * (upper - lower) + lower;
-    }
-
-  gtk_adjustment_set_value (adjustment, value);
-}
-
-static gboolean
-gimp_spin_scale_button_press (GtkWidget      *widget,
-                              GdkEventButton *event)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-
-  private->changing_value  = FALSE;
-  private->relative_change = FALSE;
-
-  gint                  x, y;
-  gimp_spin_scale_event_to_widget_coords (widget, event->window,
-                                           event->x, event->y,
-                                           &x, &y);
-  switch (gimp_spin_scale_get_target (widget, x, y))
-    {
-    case TARGET_UPPER:
-      private->changing_value = TRUE;
-
-      gtk_widget_grab_focus (widget);
-
-      gimp_spin_scale_change_value (widget, x);
-
-      return TRUE;
-
-    case TARGET_LOWER:
-      private->changing_value = TRUE;
-
-      gtk_widget_grab_focus (widget);
-
-      private->relative_change = TRUE;
-      private->start_x = x;
-      private->start_value = gtk_adjustment_get_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)));
-
-      return TRUE;
-
-    default:
-      break;
-    }
-
-  return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
-}
-
-static gboolean
-gimp_spin_scale_button_release (GtkWidget      *widget,
-                                GdkEventButton *event)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-  gint                  x, y;
-
-  gimp_spin_scale_event_to_widget_coords (widget, event->window,
-                                          event->x, event->y,
-                                          &x, &y);
-
-  if (private->changing_value)
-    {
-      private->changing_value = FALSE;
-      gimp_spin_scale_change_value (widget, x);
-      return TRUE;
-    }
-
-  return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-}
-
-static gboolean
-gimp_spin_scale_motion_notify (GtkWidget      *widget,
-                               GdkEventMotion *event)
-{
-  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-
-  gdk_event_request_motions (event);
-
-  gint                  x, y;
-
-  gimp_spin_scale_event_to_widget_coords (widget, event->window,
-                                          event->x, event->y,
-                                          &x, &y);
-
-  if (private->changing_value)
-    {
-      gimp_spin_scale_change_value (widget, x);
-
-      return TRUE;
-    }
-
-  GTK_WIDGET_CLASS (parent_class)->motion_notify_event (widget, event);
-
-  if (! (event->state &
-         (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK))
-      )
-    {
-      GdkDisplay *display = gtk_widget_get_display (widget);
-      GdkCursor  *cursor  = NULL;
-
-      switch (gimp_spin_scale_get_target (widget, x, y))
-        {
-        case TARGET_NUMBER:
-          cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
-          break;
-
-        case TARGET_UPPER:
-          cursor = gdk_cursor_new_for_display (display, GDK_SB_UP_ARROW);
-          break;
-
-        case TARGET_LOWER:
-          cursor = gdk_cursor_new_for_display (display, GDK_SB_H_DOUBLE_ARROW);
-          break;
-
-        default:
-          break;
-        }
-
-      if (cursor)
-        {
-          gdk_window_set_cursor (event->window, cursor);
-          g_object_unref (cursor);
-        }
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gimp_spin_scale_leave_notify (GtkWidget        *widget,
-                              GdkEventCrossing *event)
-{
-  gdk_window_set_cursor (event->window, NULL);
-
-  return GTK_WIDGET_CLASS (parent_class)->leave_notify_event (widget, event);
-}
-
-gboolean gimp_spin_scale_keypress( GtkWidget *widget, GdkEventKey *event)
-{
-    GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-    guint key = 0;
-    gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
-                                         event->hardware_keycode, (GdkModifierType)event->state,
-                                         0, &key, 0, 0, 0 );
-
-    switch ( key ) {
-
-        case GDK_KEY_Escape:
-        case GDK_KEY_Return:
-        case GDK_KEY_KP_Enter:
-        {
-            private->transferFocus = TRUE;
-            gimp_spin_scale_defocus( GTK_SPIN_BUTTON(widget) );
-        }
-        break;
-
-    }
-
-    return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
-}
-
-static void
-gimp_spin_scale_defocus( GtkSpinButton *spin_button )
-{
-    GimpSpinScalePrivate *private = GET_PRIVATE (spin_button);
-
-    if ( private->transferFocus ) {
-        if ( private->focusWidget ) {
-            gtk_widget_grab_focus( private->focusWidget );
-        }
-    }
-}
-
-static void
-gimp_spin_scale_value_changed (GtkSpinButton *spin_button)
-{
-  GtkAdjustment *adjustment = gtk_spin_button_get_adjustment (spin_button);
-  GimpSpinScalePrivate *private = GET_PRIVATE (spin_button);
-  gdouble        lower;
-  gdouble        upper;
-  gdouble        value;
-
-  gimp_spin_scale_get_limits (GIMP_SPIN_SCALE (spin_button), &lower, &upper);
-
-  value = CLAMP (gtk_adjustment_get_value (adjustment), lower, upper);
-
-  gtk_entry_set_progress_fraction (GTK_ENTRY (spin_button),
-                                   pow ((value - lower) / (upper - lower),
-                                        1.0 / private->gamma));
-
-  // TODO - Allow scrollwheel to change value then return focus,
-  // but clicks/keypress should keep focus in the control
-  //if ( gtk_widget_has_focus( GTK_WIDGET(spin_button) ) ) {
-  //    gimp_spin_scale_defocus( spin_button );
-  //}
-}
-
-
-/*  public functions  */
-
-GtkWidget *
-gimp_spin_scale_new (GtkAdjustment *adjustment,
-                     const gchar   *label,
-                     gint           digits)
-{
-  g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), NULL);
-
-  return g_object_new (GIMP_TYPE_SPIN_SCALE,
-                       "adjustment", adjustment,
-                       "label",      label,
-                       "digits",     digits,
-                       NULL);
-}
-
-void
-gimp_spin_scale_set_label (GimpSpinScale *scale,
-                           const gchar   *label)
-{
-  GimpSpinScalePrivate *private;
-
-  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
-
-  private = GET_PRIVATE (scale);
-
-  if (label == private->label)
-    return;
-
-  g_free (private->label);
-  private->label = g_strdup (label);
-
-  if (private->layout)
-    {
-      g_object_unref (private->layout);
-      private->layout = NULL;
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (scale));
-
-  g_object_notify (G_OBJECT (scale), "label");
-}
-
-const gchar *
-gimp_spin_scale_get_label (GimpSpinScale *scale)
-{
-  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), NULL);
-
-  return GET_PRIVATE (scale)->label;
-}
-
-void
-gimp_spin_scale_set_scale_limits (GimpSpinScale *scale,
-                                  gdouble        lower,
-                                  gdouble        upper)
-{
-  GimpSpinScalePrivate *private;
-  GtkSpinButton        *spin_button;
-  GtkAdjustment        *adjustment;
-
-  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
-
-  private     = GET_PRIVATE (scale);
-  spin_button = GTK_SPIN_BUTTON (scale);
-  adjustment  = gtk_spin_button_get_adjustment (spin_button);
-
-  g_return_if_fail (lower >= gtk_adjustment_get_lower (adjustment));
-  g_return_if_fail (upper <= gtk_adjustment_get_upper (adjustment));
-
-  private->scale_limits_set = TRUE;
-  private->scale_lower      = lower;
-  private->scale_upper      = upper;
-  private->gamma            = 1.0;
-
-  gimp_spin_scale_value_changed (spin_button);
-}
-
-void
-gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale)
-{
-  GimpSpinScalePrivate *private;
-
-  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
-
-  private = GET_PRIVATE (scale);
-
-  private->scale_limits_set = FALSE;
-  private->scale_lower      = 0.0;
-  private->scale_upper      = 0.0;
-
-  gimp_spin_scale_value_changed (GTK_SPIN_BUTTON (scale));
-}
-
-gboolean
-gimp_spin_scale_get_scale_limits (GimpSpinScale *scale,
-                                  gdouble       *lower,
-                                  gdouble       *upper)
-{
-  GimpSpinScalePrivate *private;
-
-  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), FALSE);
-
-  private = GET_PRIVATE (scale);
-
-  if (lower)
-    *lower = private->scale_lower;
-
-  if (upper)
-    *upper = private->scale_upper;
-
-  return private->scale_limits_set;
-}
-
-void
-gimp_spin_scale_set_gamma (GimpSpinScale *scale,
-                           gdouble        gamma)
-{
-  GimpSpinScalePrivate *private;
-
-  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
-
-  private = GET_PRIVATE (scale);
-
-  private->gamma = gamma;
-
-  gimp_spin_scale_value_changed (GTK_SPIN_BUTTON (scale));
-}
-
-gdouble
-gimp_spin_scale_get_gamma (GimpSpinScale *scale)
-{
-  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), 1.0);
-
-  return GET_PRIVATE(scale)->gamma;
-}
diff --git a/src/widgets/gimp/gimpspinscale.h b/src/widgets/gimp/gimpspinscale.h
deleted file mode 100644
index b42a0faf8..000000000
--- a/src/widgets/gimp/gimpspinscale.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GIMP - The GNU Image Manipulation Program
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
- *
- * gimpspinscale.h
- * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GIMP_SPIN_SCALE_H__
-#define __GIMP_SPIN_SCALE_H__
-
-#ifndef WITH_GIMP
-#include <gtk/gtk.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define GIMP_TYPE_SPIN_SCALE            (gimp_spin_scale_get_type ())
-#define GIMP_SPIN_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SPIN_SCALE, GimpSpinScale))
-#define GIMP_SPIN_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SPIN_SCALE, GimpSpinScaleClass))
-#define GIMP_IS_SPIN_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SPIN_SCALE))
-#define GIMP_IS_SPIN_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SPIN_SCALE))
-#define GIMP_SPIN_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SPIN_SCALE, GimpSpinScaleClass))
-
-
-typedef struct _GimpSpinScale      GimpSpinScale;
-typedef struct _GimpSpinScaleClass GimpSpinScaleClass;
-
-struct _GimpSpinScale
-{
-  GtkSpinButton  parent_instance;
-};
-
-struct _GimpSpinScaleClass
-{
-  GtkSpinButtonClass  parent_class;
-};
-
-
-GType         gimp_spin_scale_get_type           (void) G_GNUC_CONST;
-
-GtkWidget   * gimp_spin_scale_new                (GtkAdjustment *adjustment,
-                                                  const gchar   *label,
-                                                  gint           digits);
-
-void          gimp_spin_scale_set_label          (GimpSpinScale *scale,
-                                                  const gchar   *label);
-const gchar * gimp_spin_scale_get_label          (GimpSpinScale *scale);
-
-void          gimp_spin_scale_set_scale_limits   (GimpSpinScale *scale,
-                                                  gdouble        lower,
-                                                  gdouble        upper);
-void          gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale);
-gboolean      gimp_spin_scale_get_scale_limits   (GimpSpinScale *scale,
-                                                  gdouble       *lower,
-                                                  gdouble       *upper);
-
-void          gimp_spin_scale_set_gamma          (GimpSpinScale *scale,
-                                                  gdouble        gamma);
-gdouble       gimp_spin_scale_get_gamma          (GimpSpinScale *scale);
-
-void          gimp_spin_scale_set_focuswidget    (GtkWidget     *scale,
-                                                  GtkWidget     *widget);
-
-void          gimp_spin_scale_set_appearance     (GtkWidget     *scale,
-                                                  const gchar   *appearance);
-
-G_END_DECLS
-
-#endif  /*  __GIMP_SPIN_SCALE_H__  */
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 89ce191ee..6116d3be5 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -160,7 +160,7 @@ void SPAttributeTable::set_object(SPObject *object,
             ll->set_halign(Gtk::ALIGN_END);
             ll->set_valign(Gtk::ALIGN_CENTER);
             ll->set_vexpand();
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
             ll->set_margin_start(XPAD);
             ll->set_margin_end(XPAD);
 #else
@@ -177,7 +177,7 @@ void SPAttributeTable::set_object(SPObject *object,
             ee->set_text (val ? val : (const gchar *) "");
             ee->set_hexpand();
             ee->set_vexpand();
-#if WITH_GTKMM_3_12
+#if GTKMM_CHECK_VERSION(3,12,0)
             ee->set_margin_start(XPAD);
             ee->set_margin_end(XPAD);
 #else
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 2a56d81cb..140c60ef6 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -35,13 +35,13 @@
 #include "desktop.h"
 #include "inkscape.h"
 #include "widgets/ege-adjustment-action.h"
-#include "widgets/ege-select-one-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
 #include "toolbox.h"
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/panel-dialog.h"
+#include "ui/widget/ink-select-one-action.h"
 #include "ui/icon-names.h"
 
 #include <glibmm/i18n.h>
@@ -101,6 +101,7 @@ static void sp_stb_update_widgets( GObject *tbl )
 static void sp_spray_init( GObject *tbl){
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int mode = prefs->getInt("/tools/spray/mode", 0);
+
     bool show = true;
     if(mode == 3 || mode == 2){
         show = false;
@@ -161,9 +162,8 @@ static void sp_spray_standard_deviation_value_changed( GtkAdjustment *adj, GObje
             gtk_adjustment_get_value(adj));
 }
 
-static void sp_spray_mode_changed( EgeSelectOneAction *act, GObject * tbl )
+static void sp_spray_mode_changed( GObject * tbl, int mode )
 {
-    int mode = ege_select_one_action_get_active( act );
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setInt("/tools/spray/mode", mode);
     sp_spray_init(tbl);
@@ -352,56 +352,53 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
 
     /* Mode */
     {
-        GtkListStore* model = gtk_list_store_new( 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING );
-
-        GtkTreeIter iter;
-        gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter,
-                            0, _("Spray with copies"),
-                            1, _("Spray copies of the initial selection"),
-                            2, INKSCAPE_ICON("spray-mode-copy"),
-                            -1 );
-
-        gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter,
-                            0, _("Spray with clones"),
-                            1, _("Spray clones of the initial selection"),
-                            2, INKSCAPE_ICON("spray-mode-clone"),
-                            -1 );
-        
+        InkSelectOneActionColumns columns;
+
+        Glib::RefPtr<Gtk::ListStore> store = Gtk::ListStore::create(columns);
+
+        Gtk::TreeModel::Row row;
+
+        row = *(store->append());
+        row[columns.col_label    ] = _("Spray with copies");
+        row[columns.col_tooltip  ] = _("Spray copies of the initial selection");
+        row[columns.col_icon     ] = INKSCAPE_ICON("spray-mode-copy");
+        row[columns.col_sensitive] = true;
+
+        row = *(store->append());
+        row[columns.col_label    ] =   _("Spray with clones");
+        row[columns.col_tooltip  ] =   _("Spray clones of the initial selection");
+        row[columns.col_icon     ] =   INKSCAPE_ICON("spray-mode-clone");
+        row[columns.col_sensitive] =  true;
+
 #ifdef ENABLE_SPRAY_MODE_SINGLE_PATH
-        gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter,
-                            0, _("Spray single path"),
-                            1, _("Spray objects in a single path"),
-                            2, INKSCAPE_ICON("spray-mode-union"),
-                            -1 );
+        row = *(store->append());
+        row[columns.col_label    ] = _("Spray single path");
+        row[columns.col_tooltip  ] = _("Spray objects in a single path");
+        row[columns.col_icon     ] = INKSCAPE_ICON("spray-mode-union");
+        row[columns.col_sensitive] = true;
 #endif
-        
-        gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter,
-                            0, _("Delete sprayed items"),
-                            1, _("Delete sprayed items from selection"),
-                            2, INKSCAPE_ICON("draw-eraser"),
-                            -1 );
-        
-        EgeSelectOneAction* act = ege_select_one_action_new( "SprayModeAction", _("Mode"), (""), NULL, GTK_TREE_MODEL(model) );
-        g_object_set( act, "short_label", _("Mode:"), NULL );
-        gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
-        g_object_set_data( holder, "mode_action", act );
-
-        ege_select_one_action_set_appearance( act, "full" );
-        ege_select_one_action_set_radio_action_type( act, INK_RADIO_ACTION_TYPE );
-        g_object_set( G_OBJECT(act), "icon-property", "iconId", NULL );
-        ege_select_one_action_set_icon_column( act, 2 );
-        ege_select_one_action_set_icon_size( act, secondarySize );
-        ege_select_one_action_set_tooltip_column( act, 1  );
 
+        row = *(store->append());
+        row[columns.col_label    ] = _("Delete sprayed items");
+        row[columns.col_tooltip  ] = _("Delete sprayed items from selection");
+        row[columns.col_icon     ] = INKSCAPE_ICON("draw-eraser");
+        row[columns.col_sensitive] = true;
+
+        InkSelectOneAction* act =
+            InkSelectOneAction::create( "SprayModeAction",   // Name
+                                        _("Mode"),           // Label
+                                        _(""),               // Tooltip
+                                        "Not Used",          // Icon
+                                        store );             // Tree store
+
+        act->use_radio( true );
+        act->use_group_label( true );
         gint mode = prefs->getInt("/tools/spray/mode", 1);
-        ege_select_one_action_set_active( act, mode );
-        g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_spray_mode_changed), holder );
+        act->set_active( mode );
+
+        gtk_action_group_add_action( mainActions, GTK_ACTION( act->gobj() ));
 
-        g_object_set_data( G_OBJECT(holder), "spray_tool_mode", act);
+        act->signal_changed().connect(sigc::bind<0>(sigc::ptr_fun(&sp_spray_mode_changed), holder));
     }
 
     {   /* Population */
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index afa382e5b..ab1dcdfbd 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -17,7 +17,7 @@
 
 #include "preferences.h"
 
-#define TOOLBAR_SLIDER_HINT "full"
+#define TOOLBAR_SLIDER_HINT "compact"
 
 typedef struct _EgeAdjustmentAction      EgeAdjustmentAction;