update to trunk

(bzr r11950.1.127)

14 files changed, 115 insertions, 426 deletions

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index 580b47522..bbede9df1 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -81,8 +81,6 @@ ink_common_sources +=		\
 	ui/dialog/print.h			\
 	ui/dialog/print-colors-preview-dialog.cpp		\
 	ui/dialog/print-colors-preview-dialog.h		\
-	ui/dialog/scriptdialog.cpp		\
-	ui/dialog/scriptdialog.h		\
 	ui/dialog/spellcheck.cpp		\
 	ui/dialog/spellcheck.h		\
 	ui/dialog/svg-fonts-dialog.cpp		\
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 753320ab9..b3675440b 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -34,8 +34,8 @@
 #include "document.h"
 #include "document-undo.h"
 #include "filter-chemistry.h"
-#include "helper/unit-menu.h"
-#include "helper/units.h"
+#include "ui/widget/unit-menu.h"
+#include "util/units.h"
 #include "helper/window.h"
 #include "inkscape.h"
 #include "interface.h"
@@ -58,6 +58,7 @@
 #include "sp-root.h"
 
 using Inkscape::DocumentUndo;
+using Inkscape::Util::unit_table;
 
 namespace Inkscape {
 namespace UI {
@@ -1092,35 +1093,36 @@ CloneTiler::CloneTiler (void) :
                 g_object_set_data (G_OBJECT(dlg), "widthheight", (gpointer) hb);
 
                 // unitmenu
-                GtkWidget *u = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
-                sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units);
+                unit_menu = new Inkscape::UI::Widget::UnitMenu();
+                unit_menu->setUnitType(Inkscape::Util::UNIT_TYPE_LINEAR);
+                unit_menu->setUnit(sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units->abbr);
+                unitChangedConn = unit_menu->signal_changed().connect(sigc::mem_fun(*this, &CloneTiler::clonetiler_unit_changed));
 
                 {
                     // Width spinbutton
 #if WITH_GTKMM_3_0
-                    Glib::RefPtr<Gtk::Adjustment> a = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_width = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #else
-                    Gtk::Adjustment *a = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_width = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #endif
-                    sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a->gobj()));
 
                     double value = prefs->getDouble(prefs_path + "fillwidth", 50.0);
-                    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-                    gdouble const units = sp_pixels_get_units (value, unit);
-                    a->set_value (units);
+                    Inkscape::Util::Unit const unit = unit_menu->getUnit();
+                    gdouble const units = Inkscape::Util::Quantity::convert(value, "px", unit);
+                    fill_width->set_value (units);
 
 #if WITH_GTKMM_3_0
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(fill_width, 1.0, 2);
 #else
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*fill_width, 1.0, 2);
 #endif
                     e->set_tooltip_text (_("Width of the rectangle to be filled"));
                     e->set_width_chars (7);
                     e->set_digits (4);
                     gtk_box_pack_start (GTK_BOX (hb), GTK_WIDGET(e->gobj()), TRUE, TRUE, 0);
                     // TODO: C++ification
-            g_signal_connect(G_OBJECT(a->gobj()), "value_changed",
-                                       G_CALLBACK(clonetiler_fill_width_changed), u);
+            g_signal_connect(G_OBJECT(fill_width->gobj()), "value_changed",
+                                       G_CALLBACK(clonetiler_fill_width_changed), unit_menu);
                 }
                 {
                     GtkWidget *l = gtk_label_new ("");
@@ -1132,32 +1134,31 @@ CloneTiler::CloneTiler (void) :
                 {
                     // Height spinbutton
 #if WITH_GTKMM_3_0
-                    Glib::RefPtr<Gtk::Adjustment> a = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_height = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #else
-                    Gtk::Adjustment *a = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_height = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #endif
-                    sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a->gobj()));
 
                     double value = prefs->getDouble(prefs_path + "fillheight", 50.0);
-                    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-                    gdouble const units = sp_pixels_get_units (value, unit);
-                    a->set_value (units);
+                    Inkscape::Util::Unit const unit = unit_menu->getUnit();
+                    gdouble const units = Inkscape::Util::Quantity::convert(value, "px", unit);
+                    fill_height->set_value (units);
 
 #if WITH_GTKMM_3_0
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(fill_height, 1.0, 2);
 #else
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*fill_height, 1.0, 2);
 #endif
                     e->set_tooltip_text (_("Height of the rectangle to be filled"));
                     e->set_width_chars (7);
                     e->set_digits (4);
                     gtk_box_pack_start (GTK_BOX (hb), GTK_WIDGET(e->gobj()), TRUE, TRUE, 0);
                     // TODO: C++ification
-            g_signal_connect(G_OBJECT(a->gobj()), "value_changed",
-                                       G_CALLBACK(clonetiler_fill_height_changed), u);
+            g_signal_connect(G_OBJECT(fill_height->gobj()), "value_changed",
+                                       G_CALLBACK(clonetiler_fill_height_changed), unit_menu);
                 }
 
-                gtk_box_pack_start (GTK_BOX (hb), u, TRUE, TRUE, 0);
+                gtk_box_pack_start (GTK_BOX (hb), (GtkWidget*) unit_menu->gobj(), TRUE, TRUE, 0);
                 clonetiler_table_attach (table, hb, 0.0, 2, 2);
 
             }
@@ -2944,26 +2945,39 @@ void CloneTiler::clonetiler_switch_to_fill(GtkToggleButton * /*tb*/, GtkWidget *
 
 
 
-void CloneTiler::clonetiler_fill_width_changed(GtkAdjustment *adj, GtkWidget *u)
+void CloneTiler::clonetiler_fill_width_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u)
 {
     gdouble const raw_dist = gtk_adjustment_get_value (adj);
-    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-    gdouble const pixels = sp_units_get_pixels (raw_dist, unit);
+    Inkscape::Util::Unit const unit = u->getUnit();
+    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, unit, "px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setDouble(prefs_path + "fillwidth", pixels);
 }
 
-void CloneTiler::clonetiler_fill_height_changed(GtkAdjustment *adj, GtkWidget *u)
+void CloneTiler::clonetiler_fill_height_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u)
 {
     gdouble const raw_dist = gtk_adjustment_get_value (adj);
-    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-    gdouble const pixels = sp_units_get_pixels (raw_dist, unit);
+    Inkscape::Util::Unit const unit = u->getUnit();
+    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, unit, "px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setDouble(prefs_path + "fillheight", pixels);
 }
 
+void CloneTiler::clonetiler_unit_changed()
+{
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    gdouble width_pixels = prefs->getDouble(prefs_path + "fillwidth");
+    gdouble height_pixels = prefs->getDouble(prefs_path + "fillheight");
+    
+    Inkscape::Util::Unit unit = unit_menu->getUnit();
+    
+    gdouble width_value = Inkscape::Util::Quantity::convert(width_pixels, "px", unit);
+    gdouble height_value = Inkscape::Util::Quantity::convert(height_pixels, "px", unit);
+    gtk_adjustment_set_value(fill_width->gobj(), width_value);
+    gtk_adjustment_set_value(fill_height->gobj(), height_value);
+}
 
 void CloneTiler::clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg)
 {
@@ -2977,7 +2991,6 @@ void CloneTiler::clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg)
     }
 }
 
-
 }
 }
 }
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index 7ec30cfaa..e2a0240ee 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -19,6 +19,11 @@
 
 namespace Inkscape {
 namespace UI {
+
+namespace Widget {
+    class UnitMenu;
+}
+
 namespace Dialog {
 
 class CloneTiler : public Widget::Panel {
@@ -45,8 +50,9 @@ protected:
     static void clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg);
     static void clonetiler_pick_to(GtkToggleButton *tb, gpointer data);
     static void clonetiler_xy_changed(GtkAdjustment *adj, gpointer data);
-    static void clonetiler_fill_width_changed(GtkAdjustment *adj, GtkWidget *u);
-    static void clonetiler_fill_height_changed(GtkAdjustment *adj, GtkWidget *u);
+    static void clonetiler_fill_width_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u);
+    static void clonetiler_fill_height_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u);
+    void clonetiler_unit_changed();
     static void clonetiler_switch_to_create(GtkToggleButton */*tb*/, GtkWidget *dlg);
     static void clonetiler_switch_to_fill(GtkToggleButton */*tb*/, GtkWidget *dlg);
     static void clonetiler_keep_bbox_toggled(GtkToggleButton *tb, gpointer /*data*/);
@@ -112,12 +118,22 @@ private:
     DesktopTracker deskTrack;
     Inkscape::UI::Widget::ColorPicker *color_picker;
     GtkSizeGroup* table_row_labels;
+    Inkscape::UI::Widget::UnitMenu *unit_menu;
+
+#if WITH_GTKMM_3_0
+    Glib::RefPtr<Gtk::Adjustment> fill_width;
+    Glib::RefPtr<Gtk::Adjustment> fill_height;
+#else
+    Gtk::Adjustment *fill_width;
+    Gtk::Adjustment *fill_height;
+#endif
 
     sigc::connection desktopChangeConn;
     sigc::connection selectChangedConn;
     sigc::connection subselChangedConn;
     sigc::connection selectModifiedConn;
     sigc::connection color_changed_connection;
+    sigc::connection unitChangedConn;
 
     /**
      * Can be invoked for setting the desktop. Currently not used.
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 993f48d8f..0ce74f54e 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -32,7 +32,6 @@
 #include "ui/dialog/livepatheffect-editor.h"
 #include "ui/dialog/memory.h"
 #include "ui/dialog/messages.h"
-#include "ui/dialog/scriptdialog.h"
 #include "ui/dialog/symbols.h"
 #include "ui/dialog/tile.h"
 #include "ui/dialog/tracedialog.h"
@@ -114,7 +113,6 @@ DialogManager::DialogManager() {
         registerFactory("ObjectAttributes",    &create<ObjectAttributes,     FloatingBehavior>);
         registerFactory("ObjectProperties",    &create<ObjectProperties,     FloatingBehavior>);
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       FloatingBehavior>);
-        registerFactory("Script",              &create<ScriptDialog,         FloatingBehavior>);
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       FloatingBehavior>);
         registerFactory("Swatches",            &create<SwatchesPanel,        FloatingBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        FloatingBehavior>);
@@ -148,7 +146,6 @@ DialogManager::DialogManager() {
         registerFactory("ObjectAttributes",    &create<ObjectAttributes,     DockBehavior>);
         registerFactory("ObjectProperties",    &create<ObjectProperties,     DockBehavior>);
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
-        registerFactory("Script",              &create<ScriptDialog,         DockBehavior>);
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index d335fb303..77fb182e5 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -28,7 +28,6 @@
 #include "document.h"
 #include "desktop-handles.h"
 #include "desktop.h"
-#include "helper/units.h"
 #include "inkscape.h"
 #include "io/sys.h"
 #include "preferences.h"
@@ -1432,7 +1431,7 @@ void DocumentProperties::update()
     _rcb_shad.setActive (nv->showpageshadow);
 
     if (nv->doc_units)
-        _rum_deflt.setUnit (nv->doc_units);
+        _rum_deflt.setUnit (nv->doc_units->abbr);
 
     double const doc_w_px = sp_desktop_document(dt)->getWidth();
     double const doc_h_px = sp_desktop_document(dt)->getHeight();
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index a851503fe..2c92608d7 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -48,9 +48,8 @@
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 
-#include "helper/unit-menu.h"
-#include "helper/units.h"
-#include "unit-constants.h"
+#include "ui/widget/unit-menu.h"
+#include "util/units.h"
 #include "helper/window.h"
 #include "inkscape-private.h"
 #include "document.h"
@@ -98,7 +97,7 @@
 
 #define SP_EXPORT_MIN_SIZE 1.0
 
-#define DPI_BASE PX_PER_IN
+#define DPI_BASE Inkscape::Util::Quantity::convert(1, "in", "px")
 
 #define EXPORT_COORD_PRECISION 3
 
@@ -108,6 +107,8 @@
 #include "verbs.h"
 #include "export.h"
 
+using Inkscape::Util::unit_table;
+
 namespace {
 
 class MessageCleaner
@@ -198,10 +199,13 @@ Export::Export (void) :
         /* Units box */
         /* gets added to the vbox later, but the unit selector is needed
            earlier than that */
-        unit_selector = Glib::wrap(sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE));
+        unit_selector = new Inkscape::UI::Widget::UnitMenu();
+        unit_selector->setUnitType(Inkscape::Util::UNIT_TYPE_LINEAR);
+        unitChangedConn = unit_selector->signal_changed().connect(sigc::mem_fun(*this, &Export::onUnitChanged));
+        
         SPDesktop *desktop = SP_ACTIVE_DESKTOP;
         if (desktop)
-            sp_unit_selector_set_unit (SP_UNIT_SELECTOR(unit_selector->gobj()), sp_desktop_namedview(desktop)->doc_units);
+            unit_selector->setUnit(sp_desktop_namedview(desktop)->doc_units->abbr);
         unitbox.pack_end(*unit_selector, false, false, 0);
         unitbox.pack_end(units_label, false, false, 3);
 
@@ -226,28 +230,28 @@ Export::Export (void) :
         t->set_col_spacings (4);
 #endif
 
-        x0_adj = createSpinbutton ( "x0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        x0_adj = createSpinbutton ( "x0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 0, 0, _("_x0:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaX0Change);
 
-        x1_adj = createSpinbutton ( "x1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        x1_adj = createSpinbutton ( "x1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 0, 1, _("x_1:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaX1Change);
 
         width_adj = createSpinbutton ( "width", 0.0, 0.0, PNG_UINT_31_MAX, 0.1, 1.0,
-                                   unit_selector->gobj(), t, 0, 2, _("Wid_th:"), "", EXPORT_COORD_PRECISION, 1,
+                                   ((Gtk::Widget*) unit_selector)->gobj(), t, 0, 2, _("Wid_th:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaWidthChange);
 
-        y0_adj = createSpinbutton ( "y0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        y0_adj = createSpinbutton ( "y0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 2, 0, _("_y0:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaY0Change);
 
-        y1_adj = createSpinbutton ( "y1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        y1_adj = createSpinbutton ( "y1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 2, 1, _("y_1:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaY1Change);
 
         height_adj = createSpinbutton ( "height", 0.0, 0.0, PNG_UINT_31_MAX, 0.1, 1.0,
-                                   unit_selector->gobj(), t, 2, 2, _("Hei_ght:"), "", EXPORT_COORD_PRECISION, 1,
+                                   ((Gtk::Widget*) unit_selector)->gobj(), t, 2, 2, _("Hei_ght:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaHeightChange);
 
         area_box.pack_start(togglebox, false, false, 3);
@@ -496,9 +500,6 @@ Gtk::Adjustment * Export::createSpinbutton( gchar const * /*key*/, float val, fl
 #else
     Gtk::Adjustment *adj = new Gtk::Adjustment  ( val, min, max, step, page, 0 );
 #endif
-    if (us) {
-        sp_unit_selector_add_adjustment ( SP_UNIT_SELECTOR (us), GTK_ADJUSTMENT (adj->gobj()) );
-    }
 
     int pos = 0;
     Gtk::Label *l = NULL;
@@ -979,6 +980,12 @@ Glib::ustring Export::absolutize_path_from_document_location (SPDocument *doc, c
     return path;
 }
 
+// Called when unit is changed
+void Export::onUnitChanged()
+{
+    onAreaToggled();
+}
+
 void Export::onHideExceptSelected ()
 {
     prefs->setBool("/dialogs/export/hideexceptselected/value", hide_export.get_active());
@@ -1042,8 +1049,8 @@ void Export::onExport ()
 
             Geom::OptRect area = item->desktopVisualBounds();
             if (area) {
-                gint width = (gint) (area->width() * dpi / PX_PER_IN + 0.5);
-                gint height = (gint) (area->height() * dpi / PX_PER_IN + 0.5);
+                gint width = (gint) (area->width() * dpi / DPI_BASE + 0.5);
+                gint height = (gint) (area->height() * dpi / DPI_BASE + 0.5);
 
                 if (width > 1 && height > 1) {
                     // Do export
@@ -1507,10 +1514,6 @@ void Export::areaXChange (Gtk::Adjustment *adj)
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-        return;
-    }
-
     update = true;
 
     x0 = getValuePx(x0_adj);
@@ -1554,10 +1557,6 @@ void Export::areaYChange (Gtk::Adjustment *adj)
         return;
     }
 
-    if (sp_unit_selector_update_test (SP_UNIT_SELECTOR(unit_selector->gobj())))  {
-        return;
-    }
-
     update = true;
 
     y0 = getValuePx(y0_adj);
@@ -1597,10 +1596,6 @@ void Export::onAreaWidthChange()
         return;
     }
 
-    if (sp_unit_selector_update_test(reinterpret_cast<SPUnitSelector *>(unit_selector->gobj()))) {
-        return;
-    }
-
     update = true;
 
     float x0 = getValuePx(x0_adj);
@@ -1630,10 +1625,6 @@ void Export::onAreaHeightChange()
         return;
     }
 
-    if (sp_unit_selector_update_test(reinterpret_cast<SPUnitSelector *>(unit_selector->gobj()))) {
-        return;
-    }
-
     update = true;
 
     float y0 = getValuePx(y0_adj);
@@ -1709,10 +1700,6 @@ void Export::onBitmapWidthChange ()
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-       return;
-    }
-
     update = true;
 
     x0 = getValuePx(x0_adj);
@@ -1743,10 +1730,6 @@ void Export::onBitmapHeightChange ()
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-       return;
-    }
-
     update = true;
 
     y0 = getValuePx(y0_adj);
@@ -1803,10 +1786,6 @@ void Export::onExportXdpiChange()
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-       return;
-    }
-
     update = true;
 
     x0 = getValuePx(x0_adj);
@@ -1905,9 +1884,9 @@ void Export::setValuePx(Glib::RefPtr<Gtk::Adjustment>& adj, double val)
 void Export::setValuePx( Gtk::Adjustment *adj, double val)
 #endif
 {
-    const SPUnit *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(unit_selector->gobj()) );
+    const Unit unit = unit_selector->getUnit();
 
-    setValue(adj, sp_pixels_get_units (val, *unit));
+    setValue(adj, Inkscape::Util::Quantity::convert(val, "px", unit));
 
     return;
 }
@@ -1955,9 +1934,9 @@ float Export::getValuePx(  Gtk::Adjustment *adj )
 #endif
 {
     float value = getValue( adj);
-    const SPUnit *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(unit_selector->gobj()));
+    const Unit unit = unit_selector->getUnit();
 
-    return sp_units_get_pixels (value, *unit);
+    return Inkscape::Util::Quantity::convert(value, unit, "px");
 } // end of sp_export_value_get_px()
 
 /**
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index b10c98fd2..f324f5dc5 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -172,6 +172,11 @@ private:
 #endif
 
     /**
+     * Unit changed callback
+     */
+    void onUnitChanged();
+
+    /**
      * Hide except selected callback
      */
     void onHideExceptSelected ();
@@ -330,7 +335,7 @@ private:
 
     /* Unit selector widgets */
     Gtk::HBox unitbox;
-    Gtk::Widget* unit_selector;
+    Inkscape::UI::Widget::UnitMenu *unit_selector;
     Gtk::Label units_label;
 
     /* Filename widgets  */
@@ -365,6 +370,7 @@ private:
     sigc::connection selectChangedConn;
     sigc::connection subselChangedConn;
     sigc::connection selectModifiedConn;
+    sigc::connection unitChangedConn;
 
 };
 
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 51bbc7d9a..2de387364 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -230,7 +230,7 @@ void GuidelinePropertiesDialog::_setup() {
     _unit_menu.setUnitType(UNIT_TYPE_LINEAR);
     _unit_menu.setUnit("px");
     if (_desktop->namedview->doc_units) {
-        _unit_menu.setUnit( sp_unit_get_abbreviation(_desktop->namedview->doc_units) );
+        _unit_menu.setUnit( _desktop->namedview->doc_units->abbr );
     }
     _spin_angle.setUnit(_angle_unit_status);
 
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index bc648002d..7890b0b4c 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -28,7 +28,7 @@
 #include "preferences.h"
 #include "verbs.h"
 #include "selcue.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include <iostream>
 #include "enums.h"
 #include "desktop-handles.h"
@@ -1428,10 +1428,10 @@ void InkscapePreferences::initPageBitmaps()
                            _("Automatically reload linked images when file is changed on disk"));
     _misc_bitmap_editor.init("/options/bitmapeditor/value", true);
     _page_bitmaps.add_line( false, _("_Bitmap editor:"), _misc_bitmap_editor, "", "", true);
-    _importexport_export_res.init("/dialogs/export/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _importexport_export_res.init("/dialogs/export/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, Inkscape::Util::Quantity::convert(1, "in", "px"), true, false);
     _page_bitmaps.add_line( false, _("Default export _resolution:"), _importexport_export_res, _("dpi"),
                             _("Default bitmap resolution (in dots per inch) in the Export dialog"), false);
-    _bitmap_copy_res.init("/options/createbitmap/resolution", 1.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _bitmap_copy_res.init("/options/createbitmap/resolution", 1.0, 6000.0, 1.0, 1.0, Inkscape::Util::Quantity::convert(1, "in", "px"), true, false);
     _page_bitmaps.add_line( false, _("Resolution for Create Bitmap _Copy:"), _bitmap_copy_res, _("dpi"),
                             _("Resolution used by the Create Bitmap Copy command"), false);
     {
@@ -1443,7 +1443,7 @@ void InkscapePreferences::initPageBitmaps()
         _bitmap_import_quality.init("/dialogs/import/quality", 1, 100, 1, 1, 100, true, false);
         _page_bitmaps.add_line( false, _("Bitmap import quality:"), _bitmap_import_quality, "%", "Bitmap import quality (jpeg only). 100 is best quality", false);
     }
-    _importexport_import_res.init("/dialogs/import/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _importexport_import_res.init("/dialogs/import/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, Inkscape::Util::Quantity::convert(1, "in", "px"), true, false);
     _page_bitmaps.add_line( false, _("Default _import resolution:"), _importexport_import_res, _("dpi"),
                             _("Default bitmap resolution (in dots per inch) for bitmap import"), false);
     _importexport_import_res_override.init(_("Override file resolution"), "/dialogs/import/forcexdpi", false);
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index e6bb9b43d..6c6f3a582 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -448,9 +448,9 @@ LivePathEffectEditor::onAdd()
 
                     // run sp_selection_clone_original_path_lpe 
                     sp_selection_clone_original_path_lpe(current_desktop);
-                    item = sel->singleItem();
-                    item->getRepr()->setAttribute("id", id);
-                    item->getRepr()->setAttribute("transform", transform);
+                    SPItem *new_item = sel->singleItem();
+                    new_item->getRepr()->setAttribute("id", id);
+                    new_item->getRepr()->setAttribute("transform", transform);
                     g_free(id);
                     g_free(transform);
 
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 2ab8cf121..4c8c77f96 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -26,7 +26,7 @@
 #include "ui/widget/rendering-options.h"
 #include "document.h"
 
-#include "unit-constants.h"
+#include "util/units.h"
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
 #include "io/sys.h"
@@ -72,8 +72,8 @@ static void draw_page(
 
             sp_export_png_file(junk->_doc, tmp_png.c_str(), 0.0, 0.0,
                 width, height,
-                (unsigned long)(width * dpi / PX_PER_IN),
-                (unsigned long)(height * dpi / PX_PER_IN),
+                (unsigned long)(width * dpi / Inkscape::Util::Quantity::convert(1, "in", "px")),
+                (unsigned long)(height * dpi / Inkscape::Util::Quantity::convert(1, "in", "px")),
                 dpi, dpi, bgcolor, NULL, NULL, true, NULL);
 
             // This doesn't seem to work:
@@ -90,7 +90,7 @@ static void draw_page(
                 cairo_t *cr = gtk_print_context_get_cairo_context (context);
                 cairo_matrix_t m;
                 cairo_get_matrix(cr, &m);
-                cairo_scale(cr, PT_PER_IN / dpi, PT_PER_IN / dpi);
+                cairo_scale(cr, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi);
                 // FIXME: why is the origin offset??
                 cairo_set_source_surface(cr, png->cobj(), -16.0, -16.0);
                 cairo_paint(cr);
@@ -195,8 +195,8 @@ Print::Print(SPDocument *doc, SPItem *base) :
     // set up paper size to match the document size
     gtk_print_operation_set_unit (_printop, GTK_UNIT_POINTS);
     GtkPageSetup *page_setup = gtk_page_setup_new();
-    gdouble doc_width = _doc->getWidth() * PT_PER_PX;
-    gdouble doc_height = _doc->getHeight() * PT_PER_PX;
+    gdouble doc_width = _doc->getWidth() * Inkscape::Util::Quantity::convert(1, "px", "pt");
+    gdouble doc_height = _doc->getHeight() * Inkscape::Util::Quantity::convert(1, "px", "pt");
     GtkPaperSize *paper_size;
     if (doc_width > doc_height) {
         gtk_page_setup_set_orientation (page_setup, GTK_PAGE_ORIENTATION_LANDSCAPE);
diff --git a/src/ui/dialog/scriptdialog.cpp b/src/ui/dialog/scriptdialog.cpp
deleted file mode 100644
index 87794a3ce..000000000
--- a/src/ui/dialog/scriptdialog.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * @file
- * Dialog for executing and monitoring script execution.
- */
-/* Author:  
- *   Bob Jamison
- *
- * Copyright (C) 2004-2008 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "scriptdialog.h"
-#include <glibmm/i18n.h>
-#include <gtkmm/menubar.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/textview.h>
-
-#include <extension/script/InkscapeScript.h>
-
-
-
-namespace Inkscape
-{
-namespace UI
-{
-namespace Dialog
-{
-
-
-
-//#########################################################################
-//## I M P L E M E N T A T I O N
-//#########################################################################
-
-/**
- * A script editor/executor
- */
-class ScriptDialogImpl : public ScriptDialog
-{
-
-    public:
-    ScriptDialogImpl();
-    ~ScriptDialogImpl()
-        {}
-
-
-    /**
-     * Remove all text from the dialog.
-     */
-    void clear();
-
-    /**
-     * Execute a script in the dialog.
-     *
-     * @param lang language in which the script is programmed
-     */
-    void execute(Inkscape::Extension::Script::InkscapeScript::ScriptLanguage lang);
-
-    /**
-     * Execute a Javascript script
-     */
-    void executeJavascript();
-
-    /**
-     * Execute a Python script
-     */
-    void executePython();
-
-    /**
-     * Execute a Ruby script
-     */
-    void executeRuby();
-
-
-
-    private:
-    Gtk::MenuBar menuBar;
-    Gtk::Menu   fileMenu;
-
-    //## Script text
-    Gtk::Frame          scriptTextFrame;
-    Gtk::ScrolledWindow scriptTextScroll;
-    Gtk::TextView       scriptText;
-
-    //## Output text
-    Gtk::Frame          outputTextFrame;
-    Gtk::ScrolledWindow outputTextScroll;
-    Gtk::TextView       outputText;
-
-    //## Error text
-    Gtk::Frame          errorTextFrame;
-    Gtk::ScrolledWindow errorTextScroll;
-    Gtk::TextView       errorText;
-
-
-
-};
-
-static const char *defaultCodeStr =
-    "/**\n"
-    " * This is some example Javascript.\n"
-    " * Try 'Execute Javascript'\n"
-    " */\n"
-    "importPackage(javax.swing);\n"
-    "function sayHello() {\n"
-    "  JOptionPane.showMessageDialog(null, 'Hello, world!',\n"
-	"     'Welcome to Inkscape', JOptionPane.WARNING_MESSAGE);\n"
-    "}\n"
-    "\n"
-    "sayHello();\n"
-    "\n";
-
-
-
-
-//#########################################################################
-//## E V E N T S
-//#########################################################################
-
-static void textViewClear(Gtk::TextView &view)
-{
-    Glib::RefPtr<Gtk::TextBuffer> buffer = view.get_buffer();
-    buffer->erase(buffer->begin(), buffer->end());
-}
-
-void ScriptDialogImpl::clear()
-{
-    textViewClear(scriptText);
-    textViewClear(outputText);
-    textViewClear(errorText);
-}
-
-void ScriptDialogImpl::execute(Inkscape::Extension::Script::InkscapeScript::ScriptLanguage lang)
-{
-    Glib::ustring script = scriptText.get_buffer()->get_text(true);
-    Glib::ustring output;
-    Glib::ustring error;
-    Inkscape::Extension::Script::InkscapeScript engine;
-    bool ok = engine.interpretScript(script, output, error, lang);
-    outputText.get_buffer()->set_text(output);
-    errorText.get_buffer()->set_text(error);
-    if (!ok)
-        {
-        //do we want something here?
-        }
-}
-
-void ScriptDialogImpl::executeJavascript()
-{
-    execute(Inkscape::Extension::Script::InkscapeScript::JAVASCRIPT);
-}
-
-void ScriptDialogImpl::executePython()
-{
-    execute(Inkscape::Extension::Script::InkscapeScript::PYTHON);
-}
-
-void ScriptDialogImpl::executeRuby()
-{
-    execute(Inkscape::Extension::Script::InkscapeScript::RUBY);
-}
-
-
-//#########################################################################
-//## C O N S T R U C T O R    /    D E S T R U C T O R
-//#########################################################################
-ScriptDialogImpl::ScriptDialogImpl() :
-    ScriptDialog()
-{
-    Gtk::Box *contents = _getContents();
-
-    //## Add a menu for clear()
-    Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("File"), true));
-    item->set_submenu(fileMenu);
-    menuBar.append(*item);
-
-    item = Gtk::manage(new Gtk::MenuItem(_("_Clear"), true));
-    item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::clear));
-    fileMenu.append(*item);
-    
-    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Javascript"), true));
-    item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::executeJavascript));
-    fileMenu.append(*item);
-    
-    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Python"), true));
-    item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::executePython));
-    fileMenu.append(*item);
-    
-    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Ruby"), true));
-    item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::executeRuby));
-    fileMenu.append(*item);
-    
-    contents->pack_start(menuBar, Gtk::PACK_SHRINK);
-
-    //### Set up the script field
-    scriptText.set_editable(true);
-    scriptText.get_buffer()->set_text(defaultCodeStr);
-    scriptTextScroll.add(scriptText);
-    scriptTextScroll.set_policy(Gtk::POLICY_ALWAYS, Gtk::POLICY_ALWAYS);
-    scriptTextFrame.set_label(_("Script"));
-    scriptTextFrame.set_shadow_type(Gtk::SHADOW_NONE);
-    scriptTextFrame.add(scriptTextScroll);
-    contents->pack_start(scriptTextFrame);
-
-    //### Set up the output field
-    outputText.set_editable(true);
-    outputText.get_buffer()->set_text("");
-    outputTextScroll.add(outputText);
-    outputTextScroll.set_policy(Gtk::POLICY_ALWAYS, Gtk::POLICY_ALWAYS);
-    outputTextFrame.set_label(_("Output"));
-    outputTextFrame.set_shadow_type(Gtk::SHADOW_NONE);
-    outputTextFrame.add(outputTextScroll);
-    contents->pack_start(outputTextFrame);
-
-    //### Set up the error field
-    errorText.set_editable(true);
-    errorText.get_buffer()->set_text("");
-    errorTextScroll.add(errorText);
-    errorTextScroll.set_policy(Gtk::POLICY_ALWAYS, Gtk::POLICY_ALWAYS);
-    errorTextFrame.set_label(_("Errors"));
-    errorTextFrame.set_shadow_type(Gtk::SHADOW_NONE);
-    errorTextFrame.add(errorTextScroll);
-    contents->pack_start(errorTextFrame);
-
-    // sick of this thing shrinking too much
-    set_size_request(350, 400);
-    show_all_children();
-
-}
-
-ScriptDialog &ScriptDialog::getInstance()
-{
-    ScriptDialog *dialog = new ScriptDialogImpl();
-    return *dialog;
-}
-
-} //namespace Dialogs
-} //namespace UI
-} //namespace Inkscape
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/dialog/scriptdialog.h b/src/ui/dialog/scriptdialog.h
deleted file mode 100644
index d1962bf6f..000000000
--- a/src/ui/dialog/scriptdialog.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file
- * @brief Script dialog
- *
- * This dialog is for launching scripts whose main purpose is
- * the scripting of Inkscape itself.
- */
-/* Authors:
- *   Bob Jamison
- *   Other dudes from The Inkscape Organization
- *
- * Copyright (C) 2004, 2005 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifndef __SCRIPTDIALOG_H__
-#define __SCRIPTDIALOG_H__
-
-#include "ui/widget/panel.h"
-#include "verbs.h"
-
-namespace Inkscape {
-namespace UI {
-namespace Dialog {
-
-
-/**
- * A script editor, loader, and executor
- */
-class ScriptDialog : public UI::Widget::Panel
-{
-
-    public:
-    ScriptDialog() : 
-     UI::Widget::Panel("", "/dialogs/script", SP_VERB_DIALOG_SCRIPT)
-    {}
-
-    /**
-     * Helper function which returns a new instance of the dialog.
-     * getInstance is needed by the dialog manager (Inkscape::UI::Dialog::DialogManager).
-     */
-    static ScriptDialog &getInstance();
-
-    virtual ~ScriptDialog() {};
-
-}; // class ScriptDialog
-
-
-} //namespace Dialog
-} //namespace UI
-} //namespace Inkscape
-
-#endif /* __DEBUGDIALOG_H__ */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index a662495a0..4a25f723b 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -58,7 +58,7 @@ extern "C" {
 #include "widgets/font-selector.h"
 #include <glibmm/i18n.h>
 #include <glibmm/markup.h>
-#include "unit-constants.h"
+#include "util/units.h"
 #include "sp-textpath.h"
 
 namespace Inkscape {
@@ -401,7 +401,7 @@ void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring phrase)
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
-    double pt_size = sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit) * PT_PER_PX;
+    double pt_size = sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit) * Inkscape::Util::Quantity::convert(1, "px", "pt");
 
     // Pango font size is in 1024ths of a point
     // C++11: Glib::ustring size = std::to_string( pt_size * PANGO_SCALE );