From aa042e930bc5cce596829086ce84f2c3c7c885ad Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 17 Jun 2012 00:08:03 -0700
Subject: Removed outdated classes. Pruned header to not introduce extraneous
 includes.

(bzr r11502)
---
 src/ui/widget/page-sizer.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 83d923c15..90eb6a3fd 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -27,6 +27,9 @@
 #include <string>
 #include <string.h>
 #include <vector>
+
+#include <glibmm/i18n.h>
+
 #include <2geom/transforms.h>
 
 #include "desktop-handles.h"
-- 
cgit v1.2.3


From 3c76aba3f2e1dfe8c0568a7d38a732cd2cf3dd8b Mon Sep 17 00:00:00 2001
From: John Smith <john.smith7545@yahoo.com>
Date: Wed, 31 Oct 2012 09:25:06 +0900
Subject: Fix for 1068763 : Opening 'File > Document Properties' dirties
 current document

(bzr r11855)
---
 src/ui/widget/page-sizer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 90eb6a3fd..2ab72d6c7 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -245,12 +245,14 @@ PageSizer::PageSizer(Registry & _wr)
       _widgetRegistry(&_wr)
 {
     // set precision of scalar entry boxes
+    _wr.setUpdating (true);
     _dimensionWidth.setDigits(5);
     _dimensionHeight.setDigits(5);
     _marginTop.setDigits(5);
     _marginLeft.setDigits(5);
     _marginRight.setDigits(5);
     _marginBottom.setDigits(5);
+    _wr.setUpdating (false);
 
     //# Set up the Paper Size combo box
     _paperSizeListStore = Gtk::ListStore::create(_paperSizeListColumns);
@@ -315,11 +317,13 @@ PageSizer::PageSizer(Registry & _wr)
     // Setting default custom unit to document unit
     SPDesktop *dt = SP_ACTIVE_DESKTOP;
     SPNamedView *nv = sp_desktop_namedview(dt);
+    _wr.setUpdating (true);
     if (nv->units) {
         _dimensionUnits.setUnit(nv->units);
     } else if (nv->doc_units) {
         _dimensionUnits.setUnit(nv->doc_units);
     }
+    _wr.setUpdating (false);
     
     //## Set up custom size frame
     _customFrame.set_label(_("Custom size"));
-- 
cgit v1.2.3


From d2fbb90171b5e595c2258d3f44645d2d109e869d Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sun, 16 Dec 2012 11:57:38 +0000
Subject: Migrate PageSizer to Gtk::Grid

(bzr r11957)
---
 src/ui/widget/page-sizer.cpp | 52 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 2ab72d6c7..fa3f8e3a1 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -330,14 +330,36 @@ PageSizer::PageSizer(Registry & _wr)
     pack_start (_customFrame, false, false, 0);
     _customFrame.add(_customDimTable);
 
-    _customDimTable.resize(3, 2);
     _customDimTable.set_border_width(4);
+
+#if WITH_GTKMM_3_0
+    _customDimTable.set_row_spacing(4);
+    _customDimTable.set_column_spacing(4);
+
+    _dimensionWidth.set_hexpand();
+    _dimensionWidth.set_vexpand();
+    _customDimTable.attach(_dimensionWidth,        0, 0, 1, 1);
+
+    _dimensionUnits.set_hexpand();
+    _dimensionUnits.set_vexpand();
+    _customDimTable.attach(_dimensionUnits,        1, 0, 1, 1);
+
+    _dimensionHeight.set_hexpand();
+    _dimensionHeight.set_vexpand();
+    _customDimTable.attach(_dimensionHeight,       0, 1, 1, 1);
+
+    _fitPageMarginExpander.set_hexpand();
+    _fitPageMarginExpander.set_vexpand();
+    _customDimTable.attach(_fitPageMarginExpander, 0, 2, 2, 1);
+#else
+    _customDimTable.resize(3, 2);
     _customDimTable.set_row_spacings(4);
     _customDimTable.set_col_spacings(4);
     _customDimTable.attach(_dimensionWidth,        0,1, 0,1);
     _customDimTable.attach(_dimensionUnits,        1,2, 0,1);
     _customDimTable.attach(_dimensionHeight,       0,1, 1,2);
     _customDimTable.attach(_fitPageMarginExpander, 0,2, 2,3);
+#endif
     
     _dimTabOrderGList = NULL;
     _dimTabOrderGList = g_list_append(_dimTabOrderGList, _dimensionWidth.gobj());
@@ -353,7 +375,32 @@ PageSizer::PageSizer(Registry & _wr)
     _fitPageMarginExpander.add(_marginTable);
     
     //## Set up margin settings
-    _marginTable.resize(4, 2);
+    _marginTable.set_border_width(4);
+
+#if WITH_GTKMM_3_0
+    _marginTable.set_row_spacing(4);
+    _marginTable.set_column_spacing(4);
+
+    _marginTopAlign.set_hexpand();
+    _marginTopAlign.set_vexpand();
+    _marginTable.attach(_marginTopAlign,     0, 0, 2, 1);
+
+    _marginLeftAlign.set_hexpand();
+    _marginLeftAlign.set_vexpand();
+    _marginTable.attach(_marginLeftAlign,    0, 1, 1, 1);
+
+    _marginRightAlign.set_hexpand();
+    _marginRightAlign.set_vexpand();
+    _marginTable.attach(_marginRightAlign,   1, 1, 1, 1);
+
+    _marginBottomAlign.set_hexpand();
+    _marginBottomAlign.set_vexpand();
+    _marginTable.attach(_marginBottomAlign,  0, 2, 2, 1);
+
+    _fitPageButtonAlign.set_hexpand();
+    _fitPageButtonAlign.set_vexpand();
+    _marginTable.attach(_fitPageButtonAlign, 0, 3, 2, 1);
+#else
     _marginTable.set_border_width(4);
     _marginTable.set_row_spacings(4);
     _marginTable.set_col_spacings(4);
@@ -362,6 +409,7 @@ PageSizer::PageSizer(Registry & _wr)
     _marginTable.attach(_marginRightAlign,   1,2, 1,2);
     _marginTable.attach(_marginBottomAlign,  0,2, 2,3);
     _marginTable.attach(_fitPageButtonAlign, 0,2, 3,4);
+#endif
     
     _marginTopAlign.set(0.5, 0.5, 0.0, 1.0);
     _marginTopAlign.add(_marginTop);
-- 
cgit v1.2.3


From c3a160589a9cb41c70a56e5e7b66a65857a0d10e Mon Sep 17 00:00:00 2001
From: Eric Greveson <eric@greveson.co.uk>
Date: Mon, 1 Jul 2013 21:04:32 +0100
Subject: Factored layer model out into new Inkscape::LayerModel class. This
 allows Inkscape::Selection to use a LayerModel that is not associated with a
 UI. Changed the interface of verbs (SPAction) to use a new ActionContext
 rather than UI::View::View, again so that verbs may be used in a console
 mode. Modified boolean operation verbs to work in console-only mode. Fixed up
 DESKTOP_IS_ACTIVE macro to work in the case of no desktops. Modified main.cpp
 to process selections and verbs in no-GUI mode. Other changes are all
 consequences of the SPDesktop, Selection and LayerModel interface changes.

(bzr r12387.1.1)
---
 src/ui/widget/page-sizer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index fa3f8e3a1..988c4e5de 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -36,6 +36,7 @@
 #include "document.h"
 #include "desktop.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "helper/units.h"
 #include "inkscape.h"
 #include "sp-namedview.h"
@@ -619,7 +620,7 @@ PageSizer::fire_fit_canvas_to_selection_or_drawing()
 
     Verb *verb = Verb::get( SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING );
     if (verb) {
-        SPAction *action = verb->get_action(dt);
+        SPAction *action = verb->get_action(Inkscape::ActionContext(dt));
         if (action) {
             sp_action_perform(action, NULL);
         }
-- 
cgit v1.2.3


From bd77ef25e9161acb007323f851ba77e106036939 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Mon, 1 Jul 2013 23:40:52 -0400
Subject: Ported "ui/widget/page-sizer.cpp" and "document.cpp" to "Util::Unit"
 class.

(bzr r12380.1.4)
---
 src/ui/widget/page-sizer.cpp | 159 +++++++++++++++++++++----------------------
 1 file changed, 78 insertions(+), 81 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index fa3f8e3a1..cceb3f600 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -36,7 +36,7 @@
 #include "document.h"
 #include "desktop.h"
 #include "helper/action.h"
-#include "helper/units.h"
+#include "util/units.h"
 #include "inkscape.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
@@ -46,6 +46,8 @@
 #include "xml/node.h"
 #include "xml/repr.h"
 
+static Inkscape::Util::UnitTable unit_table;
+
 using std::pair;
 
 namespace Inkscape {
@@ -95,7 +97,7 @@ struct PaperSizeRec {
     char const * const name;  //name
     double const smaller;     //lesser dimension
     double const larger;      //greater dimension
-    SPUnitId const unit;      //units
+    Inkscape::Util::Unit const unit;      //units
 };
 
 // list of page formats that should be in landscape automatically
@@ -113,31 +115,31 @@ fill_landscape_papers() {
 }
 
 static PaperSizeRec const inkscape_papers[] = {
-    { "A4",                210,  297, SP_UNIT_MM },
-    { "US Letter",         8.5,   11, SP_UNIT_IN },
-    { "US Legal",          8.5,   14, SP_UNIT_IN },
-    { "US Executive",     7.25, 10.5, SP_UNIT_IN },
-    { "A0",                841, 1189, SP_UNIT_MM },
-    { "A1",                594,  841, SP_UNIT_MM },
-    { "A2",                420,  594, SP_UNIT_MM },
-    { "A3",                297,  420, SP_UNIT_MM },
-    { "A5",                148,  210, SP_UNIT_MM },
-    { "A6",                105,  148, SP_UNIT_MM },
-    { "A7",                 74,  105, SP_UNIT_MM },
-    { "A8",                 52,   74, SP_UNIT_MM },
-    { "A9",                 37,   52, SP_UNIT_MM },
-    { "A10",                26,   37, SP_UNIT_MM },
-    { "B0",               1000, 1414, SP_UNIT_MM },
-    { "B1",                707, 1000, SP_UNIT_MM },
-    { "B2",                500,  707, SP_UNIT_MM },
-    { "B3",                353,  500, SP_UNIT_MM },
-    { "B4",                250,  353, SP_UNIT_MM },
-    { "B5",                176,  250, SP_UNIT_MM },
-    { "B6",                125,  176, SP_UNIT_MM },
-    { "B7",                 88,  125, SP_UNIT_MM },
-    { "B8",                 62,   88, SP_UNIT_MM },
-    { "B9",                 44,   62, SP_UNIT_MM },
-    { "B10",                31,   44, SP_UNIT_MM },
+    { "A4",                210,  297, unit_table.getUnit("mm") },
+    { "US Letter",         8.5,   11, unit_table.getUnit("in") },
+    { "US Legal",          8.5,   14, unit_table.getUnit("in") },
+    { "US Executive",     7.25, 10.5, unit_table.getUnit("in") },
+    { "A0",                841, 1189, unit_table.getUnit("mm") },
+    { "A1",                594,  841, unit_table.getUnit("mm") },
+    { "A2",                420,  594, unit_table.getUnit("mm") },
+    { "A3",                297,  420, unit_table.getUnit("mm") },
+    { "A5",                148,  210, unit_table.getUnit("mm") },
+    { "A6",                105,  148, unit_table.getUnit("mm") },
+    { "A7",                 74,  105, unit_table.getUnit("mm") },
+    { "A8",                 52,   74, unit_table.getUnit("mm") },
+    { "A9",                 37,   52, unit_table.getUnit("mm") },
+    { "A10",                26,   37, unit_table.getUnit("mm") },
+    { "B0",               1000, 1414, unit_table.getUnit("mm") },
+    { "B1",                707, 1000, unit_table.getUnit("mm") },
+    { "B2",                500,  707, unit_table.getUnit("mm") },
+    { "B3",                353,  500, unit_table.getUnit("mm") },
+    { "B4",                250,  353, unit_table.getUnit("mm") },
+    { "B5",                176,  250, unit_table.getUnit("mm") },
+    { "B6",                125,  176, unit_table.getUnit("mm") },
+    { "B7",                 88,  125, unit_table.getUnit("mm") },
+    { "B8",                 62,   88, unit_table.getUnit("mm") },
+    { "B9",                 44,   62, unit_table.getUnit("mm") },
+    { "B10",                31,   44, unit_table.getUnit("mm") },
 
 
 
@@ -149,63 +151,63 @@ static PaperSizeRec const inkscape_papers[] = {
          don't know what D and E series are used for.
          */
 
-    { "C0",                917, 1297, SP_UNIT_MM },
-    { "C1",                648,  917, SP_UNIT_MM },
-    { "C2",                458,  648, SP_UNIT_MM },
-    { "C3",                324,  458, SP_UNIT_MM },
-    { "C4",                229,  324, SP_UNIT_MM },
-    { "C5",                162,  229, SP_UNIT_MM },
-    { "C6",                114,  162, SP_UNIT_MM },
-    { "C7",                 81,  114, SP_UNIT_MM },
-    { "C8",                 57,   81, SP_UNIT_MM },
-    { "C9",                 40,   57, SP_UNIT_MM },
-    { "C10",                28,   40, SP_UNIT_MM },
-    { "D1",                545,  771, SP_UNIT_MM },
-    { "D2",                385,  545, SP_UNIT_MM },
-    { "D3",                272,  385, SP_UNIT_MM },
-    { "D4",                192,  272, SP_UNIT_MM },
-    { "D5",                136,  192, SP_UNIT_MM },
-    { "D6",                 96,  136, SP_UNIT_MM },
-    { "D7",                 68,   96, SP_UNIT_MM },
-    { "E3",                400,  560, SP_UNIT_MM },
-    { "E4",                280,  400, SP_UNIT_MM },
-    { "E5",                200,  280, SP_UNIT_MM },
-    { "E6",                140,  200, SP_UNIT_MM },
+    { "C0",                917, 1297, unit_table.getUnit("mm") },
+    { "C1",                648,  917, unit_table.getUnit("mm") },
+    { "C2",                458,  648, unit_table.getUnit("mm") },
+    { "C3",                324,  458, unit_table.getUnit("mm") },
+    { "C4",                229,  324, unit_table.getUnit("mm") },
+    { "C5",                162,  229, unit_table.getUnit("mm") },
+    { "C6",                114,  162, unit_table.getUnit("mm") },
+    { "C7",                 81,  114, unit_table.getUnit("mm") },
+    { "C8",                 57,   81, unit_table.getUnit("mm") },
+    { "C9",                 40,   57, unit_table.getUnit("mm") },
+    { "C10",                28,   40, unit_table.getUnit("mm") },
+    { "D1",                545,  771, unit_table.getUnit("mm") },
+    { "D2",                385,  545, unit_table.getUnit("mm") },
+    { "D3",                272,  385, unit_table.getUnit("mm") },
+    { "D4",                192,  272, unit_table.getUnit("mm") },
+    { "D5",                136,  192, unit_table.getUnit("mm") },
+    { "D6",                 96,  136, unit_table.getUnit("mm") },
+    { "D7",                 68,   96, unit_table.getUnit("mm") },
+    { "E3",                400,  560, unit_table.getUnit("mm") },
+    { "E4",                280,  400, unit_table.getUnit("mm") },
+    { "E5",                200,  280, unit_table.getUnit("mm") },
+    { "E6",                140,  200, unit_table.getUnit("mm") },
 //#endif
 
 
 
-    { "CSE",               462,  649, SP_UNIT_PT },
-    { "US #10 Envelope", 4.125,  9.5, SP_UNIT_IN },
+    { "CSE",               462,  649, unit_table.getUnit("pt") },
+    { "US #10 Envelope", 4.125,  9.5, unit_table.getUnit("in") },
     /* See http://www.hbp.com/content/PCR_envelopes.cfm for a much larger list of US envelope
        sizes. */
-    { "DL Envelope",       110,  220, SP_UNIT_MM },
-    { "Ledger/Tabloid",     11,   17, SP_UNIT_IN },
+    { "DL Envelope",       110,  220, unit_table.getUnit("mm") },
+    { "Ledger/Tabloid",     11,   17, unit_table.getUnit("in") },
     /* Note that `Folio' (used in QPrinter/KPrinter) is deliberately absent from this list, as it
        means different sizes to different people: different people may expect the width to be
        either 8, 8.25 or 8.5 inches, and the height to be either 13 or 13.5 inches, even
        restricting our interpretation to foolscap folio.  If you wish to introduce a folio-like
        page size to the list, then please consider using a name more specific than just `Folio' or
        `Foolscap Folio'. */
-    { "Banner 468x60",      60,  468, SP_UNIT_PX },
-    { "Icon 16x16",         16,   16, SP_UNIT_PX },
-    { "Icon 32x32",         32,   32, SP_UNIT_PX },
-    { "Icon 48x48",         48,   48, SP_UNIT_PX },
+    { "Banner 468x60",      60,  468, unit_table.getUnit("px") },
+    { "Icon 16x16",         16,   16, unit_table.getUnit("px") },
+    { "Icon 32x32",         32,   32, unit_table.getUnit("px") },
+    { "Icon 48x48",         48,   48, unit_table.getUnit("px") },
     /* business cards */
-    { "Business Card (ISO 7810)", 53.98, 85.60, SP_UNIT_MM },
-    { "Business Card (US)",             2,     3.5,  SP_UNIT_IN },
-    { "Business Card (Europe)",        55,    85,    SP_UNIT_MM },
-    { "Business Card (Aus/NZ)",        55,    90,    SP_UNIT_MM },
+    { "Business Card (ISO 7810)", 53.98, 85.60, unit_table.getUnit("mm") },
+    { "Business Card (US)",             2,     3.5,  unit_table.getUnit("in") },
+    { "Business Card (Europe)",        55,    85,    unit_table.getUnit("mm") },
+    { "Business Card (Aus/NZ)",        55,    90,    unit_table.getUnit("mm") },
 
     // Start Arch Series List
 
 
-    { "Arch A",         9,    12,    SP_UNIT_IN },  // 229 x 305 mm
-    { "Arch B",        12,    18,    SP_UNIT_IN },  // 305 x 457 mm
-    { "Arch C",        18,    24,    SP_UNIT_IN },  // 457 x 610 mm
-    { "Arch D",        24,    36,    SP_UNIT_IN },  // 610 x 914 mm
-    { "Arch E",        36,    48,    SP_UNIT_IN },  // 914 x 1219 mm
-    { "Arch E1",       30,    42,    SP_UNIT_IN },  // 762 x 1067 mm
+    { "Arch A",         9,    12,    unit_table.getUnit("in") },  // 229 x 305 mm
+    { "Arch B",        12,    18,    unit_table.getUnit("in") },  // 305 x 457 mm
+    { "Arch C",        18,    24,    unit_table.getUnit("in") },  // 457 x 610 mm
+    { "Arch D",        24,    36,    unit_table.getUnit("in") },  // 610 x 914 mm
+    { "Arch E",        36,    48,    unit_table.getUnit("in") },  // 914 x 1219 mm
+    { "Arch E1",       30,    42,    unit_table.getUnit("in") },  // 762 x 1067 mm
 
     /*
      * The above list of Arch sizes were taken from the following site:
@@ -216,7 +218,7 @@ static PaperSizeRec const inkscape_papers[] = {
      * September 2009 - DAK
      */
 
-    { NULL,                     0,    0, SP_UNIT_PX },
+    { NULL,                     0,    0, unit_table.getUnit("px") },
 };
 
 
@@ -226,7 +228,7 @@ static PaperSizeRec const inkscape_papers[] = {
 //########################################################################
 
 //The default unit for this widget and its calculations
-static const SPUnit _px_unit = sp_unit_get_by_id (SP_UNIT_PX);
+static Inkscape::Util::Unit _px_unit = unit_table.getUnit("px");
 
 
 /**
@@ -279,12 +281,7 @@ PageSizer::PageSizer(Registry & _wr)
         char formatBuf[80];
         snprintf(formatBuf, 79, "%0.1f x %0.1f", p->smaller, p->larger);
         Glib::ustring desc = formatBuf;
-        if (p->unit == SP_UNIT_IN)
-            desc.append(" in");
-        else if (p->unit == SP_UNIT_MM)
-             desc.append(" mm");
-        else if (p->unit == SP_UNIT_PX)
-            desc.append(" px");
+        desc.append(" " + p->unit.abbr);
         PaperSize paper(name, p->smaller, p->larger, p->unit);
         _paperSizeTable[name] = paper;
         Gtk::TreeModel::Row row = *(_paperSizeListStore->append());
@@ -568,9 +565,9 @@ PageSizer::find_paper_size (double w, double h) const
     for (iter = _paperSizeTable.begin() ;
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
-        SPUnit const &i_unit = sp_unit_get_by_id(paper.unit);
-        double smallX = sp_units_get_pixels(paper.smaller, i_unit);
-        double largeX = sp_units_get_pixels(paper.larger,  i_unit);
+        Inkscape::Util::Unit const &i_unit = paper.unit;
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, &i_unit, &_px_unit);
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, &i_unit, &_px_unit);
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -661,9 +658,9 @@ PageSizer::on_paper_size_list_changed()
         _landscape = _landscapeButton.get_active();
     }
 
-    SPUnit const &src_unit = sp_unit_get_by_id (paper.unit);
-    sp_convert_distance (&w, &src_unit, &_px_unit);
-    sp_convert_distance (&h, &src_unit, &_px_unit);
+    Inkscape::Util::Unit const &src_unit = paper.unit;
+    w = Inkscape::Util::Quantity::convert(w, &src_unit, &_px_unit);
+    h = Inkscape::Util::Quantity::convert(h, &src_unit, &_px_unit);
 
     if (_landscape)
         setDim (h, w, false);
-- 
cgit v1.2.3


From d04405f745da587b2a3ccca8d2ca7bf49edf2d4d Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sat, 6 Jul 2013 11:01:59 -0400
Subject: Switch setWidth and setHeight to use Quantity and switch to forward
 declaration of Inkscape::Util::Quantity in document.h.

(bzr r12380.1.7)
---
 src/ui/widget/page-sizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index cceb3f600..884f9ea0a 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -480,8 +480,8 @@ PageSizer::setDim (double w, double h, bool changeList)
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = doc->getHeight();
-        doc->setWidth (w, &_px_unit);
-        doc->setHeight (h, &_px_unit);
+        doc->setWidth (Inkscape::Util::Quantity(w, &_px_unit));
+        doc->setHeight (Inkscape::Util::Quantity(h, &_px_unit));
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
         Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
-- 
cgit v1.2.3


From 9dc7b786c9ef31060012ea4ae13a8188548b4f62 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Tue, 9 Jul 2013 16:42:04 -0400
Subject: Ported sp-namedview.cpp (todo: fix a bunch of things).

(bzr r12380.1.8)
---
 src/ui/widget/page-sizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 884f9ea0a..14e280f6d 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -316,9 +316,9 @@ PageSizer::PageSizer(Registry & _wr)
     SPNamedView *nv = sp_desktop_namedview(dt);
     _wr.setUpdating (true);
     if (nv->units) {
-        _dimensionUnits.setUnit(nv->units);
+        //_dimensionUnits.setUnit(nv->units);
     } else if (nv->doc_units) {
-        _dimensionUnits.setUnit(nv->doc_units);
+        //_dimensionUnits.setUnit(nv->doc_units);
     }
     _wr.setUpdating (false);
     
-- 
cgit v1.2.3


From 3772fc428950b2b946a1bd7c7c97e06219c3165f Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Thu, 18 Jul 2013 17:21:24 -0400
Subject: Switch unit functions from using pointer arguements to reference
 arguements.

(bzr r12380.1.28)
---
 src/ui/widget/page-sizer.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 73b75090b..f6392cfd8 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -228,10 +228,6 @@ static PaperSizeRec const inkscape_papers[] = {
 //# P A G E    S I Z E R
 //########################################################################
 
-//The default unit for this widget and its calculations
-static Inkscape::Util::Unit _px_unit = unit_table.getUnit("px");
-
-
 /**
  * Constructor
  */
@@ -481,8 +477,8 @@ PageSizer::setDim (double w, double h, bool changeList)
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = doc->getHeight();
-        doc->setWidth (Inkscape::Util::Quantity(w, &_px_unit));
-        doc->setHeight (Inkscape::Util::Quantity(h, &_px_unit));
+        doc->setWidth (Inkscape::Util::Quantity(w, "px"));
+        doc->setHeight (Inkscape::Util::Quantity(h, "px"));
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
         Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
@@ -567,8 +563,8 @@ PageSizer::find_paper_size (double w, double h) const
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
         Inkscape::Util::Unit const &i_unit = paper.unit;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, &i_unit, &_px_unit);
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, &i_unit, &_px_unit);
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, "px");
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, "px");
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -659,9 +655,8 @@ PageSizer::on_paper_size_list_changed()
         _landscape = _landscapeButton.get_active();
     }
 
-    Inkscape::Util::Unit const &src_unit = paper.unit;
-    w = Inkscape::Util::Quantity::convert(w, &src_unit, &_px_unit);
-    h = Inkscape::Util::Quantity::convert(h, &src_unit, &_px_unit);
+    w = Inkscape::Util::Quantity::convert(w, paper.unit, "px");
+    h = Inkscape::Util::Quantity::convert(h, paper.unit, "px");
 
     if (_landscape)
         setDim (h, w, false);
-- 
cgit v1.2.3


From 7aab446af9e2eb34ce50c8ef0ec58710fac49396 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Mon, 29 Jul 2013 22:51:28 -0400
Subject: Cleanup.

(bzr r12380.1.52)
---
 src/ui/widget/page-sizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index f6392cfd8..b15ab2823 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -313,9 +313,9 @@ PageSizer::PageSizer(Registry & _wr)
     SPNamedView *nv = sp_desktop_namedview(dt);
     _wr.setUpdating (true);
     if (nv->units) {
-        //_dimensionUnits.setUnit(nv->units);
+        _dimensionUnits.setUnit(nv->units->abbr);
     } else if (nv->doc_units) {
-        //_dimensionUnits.setUnit(nv->doc_units);
+        _dimensionUnits.setUnit(nv->doc_units->abbr);
     }
     _wr.setUpdating (false);
     
-- 
cgit v1.2.3


From 6ae6c0bea96eef09907091279e0678aa5f83102d Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sun, 4 Aug 2013 18:01:18 -0400
Subject: Switched to global UnitTable.

(bzr r12380.1.62)
---
 src/ui/widget/page-sizer.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index b15ab2823..d912fd9d3 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -47,9 +47,8 @@
 #include "xml/node.h"
 #include "xml/repr.h"
 
-static Inkscape::Util::UnitTable unit_table;
-
 using std::pair;
+using Inkscape::Util::unit_table;
 
 namespace Inkscape {
 namespace UI {
-- 
cgit v1.2.3


From 0ec2d349388ad6a4e0c35039b2f5c09cccadc6b0 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Tue, 6 Aug 2013 14:44:23 -0400
Subject: Fixed bug in page sizer.

(bzr r12380.1.63)
---
 src/ui/widget/page-sizer.cpp | 138 +++++++++++++++++++++----------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index d912fd9d3..8287452d7 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -97,7 +97,7 @@ struct PaperSizeRec {
     char const * const name;  //name
     double const smaller;     //lesser dimension
     double const larger;      //greater dimension
-    Inkscape::Util::Unit const unit;      //units
+    Glib::ustring const unit;      //units
 };
 
 // list of page formats that should be in landscape automatically
@@ -115,31 +115,31 @@ fill_landscape_papers() {
 }
 
 static PaperSizeRec const inkscape_papers[] = {
-    { "A4",                210,  297, unit_table.getUnit("mm") },
-    { "US Letter",         8.5,   11, unit_table.getUnit("in") },
-    { "US Legal",          8.5,   14, unit_table.getUnit("in") },
-    { "US Executive",     7.25, 10.5, unit_table.getUnit("in") },
-    { "A0",                841, 1189, unit_table.getUnit("mm") },
-    { "A1",                594,  841, unit_table.getUnit("mm") },
-    { "A2",                420,  594, unit_table.getUnit("mm") },
-    { "A3",                297,  420, unit_table.getUnit("mm") },
-    { "A5",                148,  210, unit_table.getUnit("mm") },
-    { "A6",                105,  148, unit_table.getUnit("mm") },
-    { "A7",                 74,  105, unit_table.getUnit("mm") },
-    { "A8",                 52,   74, unit_table.getUnit("mm") },
-    { "A9",                 37,   52, unit_table.getUnit("mm") },
-    { "A10",                26,   37, unit_table.getUnit("mm") },
-    { "B0",               1000, 1414, unit_table.getUnit("mm") },
-    { "B1",                707, 1000, unit_table.getUnit("mm") },
-    { "B2",                500,  707, unit_table.getUnit("mm") },
-    { "B3",                353,  500, unit_table.getUnit("mm") },
-    { "B4",                250,  353, unit_table.getUnit("mm") },
-    { "B5",                176,  250, unit_table.getUnit("mm") },
-    { "B6",                125,  176, unit_table.getUnit("mm") },
-    { "B7",                 88,  125, unit_table.getUnit("mm") },
-    { "B8",                 62,   88, unit_table.getUnit("mm") },
-    { "B9",                 44,   62, unit_table.getUnit("mm") },
-    { "B10",                31,   44, unit_table.getUnit("mm") },
+    { "A4",                210,  297, "mm" },
+    { "US Letter",         8.5,   11, "in" },
+    { "US Legal",          8.5,   14, "in" },
+    { "US Executive",     7.25, 10.5, "in" },
+    { "A0",                841, 1189, "mm" },
+    { "A1",                594,  841, "mm" },
+    { "A2",                420,  594, "mm" },
+    { "A3",                297,  420, "mm" },
+    { "A5",                148,  210, "mm" },
+    { "A6",                105,  148, "mm" },
+    { "A7",                 74,  105, "mm" },
+    { "A8",                 52,   74, "mm" },
+    { "A9",                 37,   52, "mm" },
+    { "A10",                26,   37, "mm" },
+    { "B0",               1000, 1414, "mm" },
+    { "B1",                707, 1000, "mm" },
+    { "B2",                500,  707, "mm" },
+    { "B3",                353,  500, "mm" },
+    { "B4",                250,  353, "mm" },
+    { "B5",                176,  250, "mm" },
+    { "B6",                125,  176, "mm" },
+    { "B7",                 88,  125, "mm" },
+    { "B8",                 62,   88, "mm" },
+    { "B9",                 44,   62, "mm" },
+    { "B10",                31,   44, "mm" },
 
 
 
@@ -151,63 +151,63 @@ static PaperSizeRec const inkscape_papers[] = {
          don't know what D and E series are used for.
          */
 
-    { "C0",                917, 1297, unit_table.getUnit("mm") },
-    { "C1",                648,  917, unit_table.getUnit("mm") },
-    { "C2",                458,  648, unit_table.getUnit("mm") },
-    { "C3",                324,  458, unit_table.getUnit("mm") },
-    { "C4",                229,  324, unit_table.getUnit("mm") },
-    { "C5",                162,  229, unit_table.getUnit("mm") },
-    { "C6",                114,  162, unit_table.getUnit("mm") },
-    { "C7",                 81,  114, unit_table.getUnit("mm") },
-    { "C8",                 57,   81, unit_table.getUnit("mm") },
-    { "C9",                 40,   57, unit_table.getUnit("mm") },
-    { "C10",                28,   40, unit_table.getUnit("mm") },
-    { "D1",                545,  771, unit_table.getUnit("mm") },
-    { "D2",                385,  545, unit_table.getUnit("mm") },
-    { "D3",                272,  385, unit_table.getUnit("mm") },
-    { "D4",                192,  272, unit_table.getUnit("mm") },
-    { "D5",                136,  192, unit_table.getUnit("mm") },
-    { "D6",                 96,  136, unit_table.getUnit("mm") },
-    { "D7",                 68,   96, unit_table.getUnit("mm") },
-    { "E3",                400,  560, unit_table.getUnit("mm") },
-    { "E4",                280,  400, unit_table.getUnit("mm") },
-    { "E5",                200,  280, unit_table.getUnit("mm") },
-    { "E6",                140,  200, unit_table.getUnit("mm") },
+    { "C0",                917, 1297, "mm" },
+    { "C1",                648,  917, "mm" },
+    { "C2",                458,  648, "mm" },
+    { "C3",                324,  458, "mm" },
+    { "C4",                229,  324, "mm" },
+    { "C5",                162,  229, "mm" },
+    { "C6",                114,  162, "mm" },
+    { "C7",                 81,  114, "mm" },
+    { "C8",                 57,   81, "mm" },
+    { "C9",                 40,   57, "mm" },
+    { "C10",                28,   40, "mm" },
+    { "D1",                545,  771, "mm" },
+    { "D2",                385,  545, "mm" },
+    { "D3",                272,  385, "mm" },
+    { "D4",                192,  272, "mm" },
+    { "D5",                136,  192, "mm" },
+    { "D6",                 96,  136, "mm" },
+    { "D7",                 68,   96, "mm" },
+    { "E3",                400,  560, "mm" },
+    { "E4",                280,  400, "mm" },
+    { "E5",                200,  280, "mm" },
+    { "E6",                140,  200, "mm" },
 //#endif
 
 
 
-    { "CSE",               462,  649, unit_table.getUnit("pt") },
-    { "US #10 Envelope", 4.125,  9.5, unit_table.getUnit("in") },
+    { "CSE",               462,  649, "pt" },
+    { "US #10 Envelope", 4.125,  9.5, "in" },
     /* See http://www.hbp.com/content/PCR_envelopes.cfm for a much larger list of US envelope
        sizes. */
-    { "DL Envelope",       110,  220, unit_table.getUnit("mm") },
-    { "Ledger/Tabloid",     11,   17, unit_table.getUnit("in") },
+    { "DL Envelope",       110,  220, "mm" },
+    { "Ledger/Tabloid",     11,   17, "in" },
     /* Note that `Folio' (used in QPrinter/KPrinter) is deliberately absent from this list, as it
        means different sizes to different people: different people may expect the width to be
        either 8, 8.25 or 8.5 inches, and the height to be either 13 or 13.5 inches, even
        restricting our interpretation to foolscap folio.  If you wish to introduce a folio-like
        page size to the list, then please consider using a name more specific than just `Folio' or
        `Foolscap Folio'. */
-    { "Banner 468x60",      60,  468, unit_table.getUnit("px") },
-    { "Icon 16x16",         16,   16, unit_table.getUnit("px") },
-    { "Icon 32x32",         32,   32, unit_table.getUnit("px") },
-    { "Icon 48x48",         48,   48, unit_table.getUnit("px") },
+    { "Banner 468x60",      60,  468, "px" },
+    { "Icon 16x16",         16,   16, "px" },
+    { "Icon 32x32",         32,   32, "px" },
+    { "Icon 48x48",         48,   48, "px" },
     /* business cards */
-    { "Business Card (ISO 7810)", 53.98, 85.60, unit_table.getUnit("mm") },
-    { "Business Card (US)",             2,     3.5,  unit_table.getUnit("in") },
-    { "Business Card (Europe)",        55,    85,    unit_table.getUnit("mm") },
-    { "Business Card (Aus/NZ)",        55,    90,    unit_table.getUnit("mm") },
+    { "Business Card (ISO 7810)", 53.98, 85.60, "mm" },
+    { "Business Card (US)",             2,     3.5,  "in" },
+    { "Business Card (Europe)",        55,    85,    "mm" },
+    { "Business Card (Aus/NZ)",        55,    90,    "mm" },
 
     // Start Arch Series List
 
 
-    { "Arch A",         9,    12,    unit_table.getUnit("in") },  // 229 x 305 mm
-    { "Arch B",        12,    18,    unit_table.getUnit("in") },  // 305 x 457 mm
-    { "Arch C",        18,    24,    unit_table.getUnit("in") },  // 457 x 610 mm
-    { "Arch D",        24,    36,    unit_table.getUnit("in") },  // 610 x 914 mm
-    { "Arch E",        36,    48,    unit_table.getUnit("in") },  // 914 x 1219 mm
-    { "Arch E1",       30,    42,    unit_table.getUnit("in") },  // 762 x 1067 mm
+    { "Arch A",         9,    12,    "in" },  // 229 x 305 mm
+    { "Arch B",        12,    18,    "in" },  // 305 x 457 mm
+    { "Arch C",        18,    24,    "in" },  // 457 x 610 mm
+    { "Arch D",        24,    36,    "in" },  // 610 x 914 mm
+    { "Arch E",        36,    48,    "in" },  // 914 x 1219 mm
+    { "Arch E1",       30,    42,    "in" },  // 762 x 1067 mm
 
     /*
      * The above list of Arch sizes were taken from the following site:
@@ -218,7 +218,7 @@ static PaperSizeRec const inkscape_papers[] = {
      * September 2009 - DAK
      */
 
-    { NULL,                     0,    0, unit_table.getUnit("px") },
+    { NULL,                     0,    0, "px" },
 };
 
 
@@ -277,8 +277,8 @@ PageSizer::PageSizer(Registry & _wr)
         char formatBuf[80];
         snprintf(formatBuf, 79, "%0.1f x %0.1f", p->smaller, p->larger);
         Glib::ustring desc = formatBuf;
-        desc.append(" " + p->unit.abbr);
-        PaperSize paper(name, p->smaller, p->larger, p->unit);
+        desc.append(" " + p->unit);
+        PaperSize paper(name, p->smaller, p->larger, unit_table.getUnit(p->unit));
         _paperSizeTable[name] = paper;
         Gtk::TreeModel::Row row = *(_paperSizeListStore->append());
         row[_paperSizeListColumns.nameColumn] = name;
-- 
cgit v1.2.3


From 77f61343ff18f29f05331131c2fe2bd810a64498 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sun, 25 Aug 2013 19:42:22 -0400
Subject: Use real world units for page sizes.

(bzr r12475.1.1)
---
 src/ui/widget/page-sizer.cpp | 69 ++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 8287452d7..5a289096c 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -442,6 +442,7 @@ PageSizer::init ()
     _portrait_connection = _portraitButton.signal_toggled().connect (sigc::mem_fun (*this, &PageSizer::on_portrait));
     _changedw_connection = _dimensionWidth.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_value_changed));
     _changedh_connection = _dimensionHeight.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_value_changed));
+    _changedu_connection = _dimensionUnits.getUnitMenu()->signal_changed().connect (sigc::mem_fun (*this, &PageSizer::on_units_changed));
     _fitPageButton.signal_clicked().connect(sigc::mem_fun(*this, &PageSizer::fire_fit_canvas_to_selection_or_drawing));
 
     show_all_children();
@@ -454,11 +455,11 @@ PageSizer::init ()
  * 'changeList' is true, then adjust the paperSizeList to show the closest
  * standard page size.
  *
- * \param w, h given in px
+ * \param w, h
  * \param changeList whether to modify the paper size list
  */
 void
-PageSizer::setDim (double w, double h, bool changeList)
+PageSizer::setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool changeList)
 {
     static bool _called = false;
     if (_called) {
@@ -476,19 +477,19 @@ PageSizer::setDim (double w, double h, bool changeList)
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = doc->getHeight();
-        doc->setWidth (Inkscape::Util::Quantity(w, "px"));
-        doc->setHeight (Inkscape::Util::Quantity(h, "px"));
+        doc->setWidth (w);
+        doc->setHeight (h);
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
-        Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
+        Geom::Translate const vert_offset(Geom::Point(0, (old_height - h.quantity)));
         doc->getRoot()->translateChildItems(vert_offset);
         DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
 
-    if ( w != h ) {
+    if ( w.quantity != h.quantity ) {
         _landscapeButton.set_sensitive(true);
         _portraitButton.set_sensitive (true);
-        _landscape = ( w > h );
+        _landscape = ( w.quantity > h.quantity );
         _landscapeButton.set_active(_landscape ? true : false);
         _portraitButton.set_active (_landscape ? false : true);
     } else {
@@ -503,9 +504,10 @@ PageSizer::setDim (double w, double h, bool changeList)
             _paperSizeListSelection->select(row);
         }
 
-    Unit const& unit = _dimensionUnits.getUnit();
-    _dimensionWidth.setValue (w / unit.factor);
-    _dimensionHeight.setValue (h / unit.factor);
+    _dimensionWidth.setUnit(w.unit->abbr);
+    _dimensionWidth.setValue (w.quantity);
+    _dimensionHeight.setUnit(h.unit->abbr);
+    _dimensionHeight.setValue (h.quantity);
 
     _paper_size_list_connection.unblock();
     _landscape_connection.unblock();
@@ -547,12 +549,12 @@ PageSizer::updateFitMarginsUI(Inkscape::XML::Node *nv_repr)
  * paperSizeListStore->children().end() if no such paper exists.
  */
 Gtk::ListStore::iterator
-PageSizer::find_paper_size (double w, double h) const
+PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const
 {
-    double smaller = w;
-    double larger  = h;
-    if ( h < w ) {
-        smaller = h; larger = w;
+    double smaller = w.quantity;
+    double larger  = h.quantity;
+    if ( h.quantity < w.quantity ) {
+        smaller = h.quantity; larger = w.quantity;
     }
 
     g_return_val_if_fail(smaller <= larger, _paperSizeListStore->children().end());
@@ -562,8 +564,8 @@ PageSizer::find_paper_size (double w, double h) const
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
         Inkscape::Util::Unit const &i_unit = paper.unit;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, "px");
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, "px");
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, *w.unit);
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, *w.unit);
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -643,8 +645,8 @@ PageSizer::on_paper_size_list_changed()
         return;
     }
     PaperSize paper = piter->second;
-    double w = paper.smaller;
-    double h = paper.larger;
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(paper.smaller, paper.unit);
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(paper.larger, paper.unit);
 
     if (std::find(lscape_papers.begin(), lscape_papers.end(), paper.name.c_str()) != lscape_papers.end()) {
         // enforce landscape mode if this is desired for the given page format
@@ -654,9 +656,6 @@ PageSizer::on_paper_size_list_changed()
         _landscape = _landscapeButton.get_active();
     }
 
-    w = Inkscape::Util::Quantity::convert(w, paper.unit, "px");
-    h = Inkscape::Util::Quantity::convert(h, paper.unit, "px");
-
     if (_landscape)
         setDim (h, w, false);
     else
@@ -673,9 +672,9 @@ PageSizer::on_portrait()
 {
     if (!_portraitButton.get_active())
         return;
-    double w = _dimensionWidth.getValue ("px");
-    double h = _dimensionHeight.getValue ("px");
-    if (h < w) {
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
+    if (h.quantity < w.quantity) {
         setDim (h, w);
     }
 }
@@ -689,9 +688,9 @@ PageSizer::on_landscape()
 {
     if (!_landscapeButton.get_active())
         return;
-    double w = _dimensionWidth.getValue ("px");
-    double h = _dimensionHeight.getValue ("px");
-    if (w < h) {
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
+    if (w.quantity < h.quantity) {
         setDim (h, w);
     }
 }
@@ -703,11 +702,17 @@ void
 PageSizer::on_value_changed()
 {
     if (_widgetRegistry->isUpdating()) return;
-
-    setDim (_dimensionWidth.getValue("px"),
-            _dimensionHeight.getValue("px"));
+    if (_unit != _dimensionUnits.getUnit().abbr) return;
+    setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
+            Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
+}
+void
+PageSizer::on_units_changed()
+{
+    _unit = _dimensionUnits.getUnit().abbr;
+    setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
+            Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
 }
-
 
 } // namespace Widget
 } // namespace UI
-- 
cgit v1.2.3


From f10048be170a45921ae8fc65ccd2588a9ad2897d Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Tue, 27 Aug 2013 12:32:55 -0400
Subject: Added viewBox implement document unit support.

(bzr r12475.1.2)
---
 src/ui/widget/page-sizer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 5a289096c..94c7b453a 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -476,12 +476,12 @@ PageSizer::setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool
 
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
-        double const old_height = doc->getHeight();
+        Inkscape::Util::Quantity const old_height = doc->getHeight();
         doc->setWidth (w);
         doc->setHeight (h);
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
-        Geom::Translate const vert_offset(Geom::Point(0, (old_height - h.quantity)));
+        Geom::Translate const vert_offset(Geom::Point(0, (old_height.value("px") - h.value("px"))));
         doc->getRoot()->translateChildItems(vert_offset);
         DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
@@ -709,6 +709,7 @@ PageSizer::on_value_changed()
 void
 PageSizer::on_units_changed()
 {
+    if (_widgetRegistry->isUpdating()) return;
     _unit = _dimensionUnits.getUnit().abbr;
     setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
             Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
-- 
cgit v1.2.3


From df50dc11aa33a9ceeaa0cac84dd3a869680e998f Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Tue, 27 Aug 2013 22:53:42 -0400
Subject: Use Quantity comparisons in PageSizer.

(bzr r12475.1.8)
---
 src/ui/widget/page-sizer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 94c7b453a..051937c43 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -486,10 +486,10 @@ PageSizer::setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool
         DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
 
-    if ( w.quantity != h.quantity ) {
+    if ( w != h ) {
         _landscapeButton.set_sensitive(true);
         _portraitButton.set_sensitive (true);
-        _landscape = ( w.quantity > h.quantity );
+        _landscape = ( w > h );
         _landscapeButton.set_active(_landscape ? true : false);
         _portraitButton.set_active (_landscape ? false : true);
     } else {
@@ -553,7 +553,7 @@ PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity
 {
     double smaller = w.quantity;
     double larger  = h.quantity;
-    if ( h.quantity < w.quantity ) {
+    if ( h < w ) {
         smaller = h.quantity; larger = w.quantity;
     }
 
@@ -674,7 +674,7 @@ PageSizer::on_portrait()
         return;
     Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
     Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
-    if (h.quantity < w.quantity) {
+    if (h < w) {
         setDim (h, w);
     }
 }
@@ -690,7 +690,7 @@ PageSizer::on_landscape()
         return;
     Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
     Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
-    if (w.quantity < h.quantity) {
+    if (w < h) {
         setDim (h, w);
     }
 }
-- 
cgit v1.2.3


From 37b7de3efa31c7aa3094aed7c849a08e7f7bedfd Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sun, 22 Sep 2013 20:26:44 -0400
Subject: Fix percentage document size handling.

Fixed bugs:
  - https://launchpad.net/bugs/1228852

(bzr r12577)
---
 src/ui/widget/page-sizer.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 051937c43..2379dc181 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -474,6 +474,8 @@ PageSizer::setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool
     _changedw_connection.block();
     _changedh_connection.block();
 
+    _unit = w.unit->abbr;
+
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         Inkscape::Util::Quantity const old_height = doc->getHeight();
-- 
cgit v1.2.3


From a970dc423d59ea844bdb1af48d5d9419a5e2a287 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 13 Oct 2013 00:24:05 +0200
Subject: Units: stop newing Unit objects. pass around pointers to
 "undeletable" Unit objects in the UnitTable. I think we should move to using
 indexed units, and pass around the index of the unit in the unittable, or
 smth like that... ?

(bzr r12679)
---
 src/ui/widget/page-sizer.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 2379dc181..b13567adb 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -565,9 +565,8 @@ PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity
     for (iter = _paperSizeTable.begin() ;
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
-        Inkscape::Util::Unit const &i_unit = paper.unit;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, *w.unit);
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, *w.unit);
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, paper.unit, w.unit);
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, paper.unit, w.unit);
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -704,7 +703,7 @@ void
 PageSizer::on_value_changed()
 {
     if (_widgetRegistry->isUpdating()) return;
-    if (_unit != _dimensionUnits.getUnit().abbr) return;
+    if (_unit != _dimensionUnits.getUnit()->abbr) return;
     setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
             Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
 }
@@ -712,7 +711,7 @@ void
 PageSizer::on_units_changed()
 {
     if (_widgetRegistry->isUpdating()) return;
-    _unit = _dimensionUnits.getUnit().abbr;
+    _unit = _dimensionUnits.getUnit()->abbr;
     setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
             Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
 }
-- 
cgit v1.2.3


From 457a6606406c6b5830fc6990866b1d2cd847602b Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Sun, 23 Feb 2014 19:48:29 -0500
Subject: fix typos in page-sizer (Bug 1240308)

Fixed bugs:
  - https://launchpad.net/bugs/1240308

(bzr r13052)
---
 src/ui/widget/page-sizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index b13567adb..b35f35403 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -555,7 +555,7 @@ PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity
 {
     double smaller = w.quantity;
     double larger  = h.quantity;
-    if ( h < w ) {
+    if ( h.quantity < w.quantity ) {
         smaller = h.quantity; larger = w.quantity;
     }
 
@@ -568,7 +568,7 @@ PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity
         double smallX = Inkscape::Util::Quantity::convert(paper.smaller, paper.unit, w.unit);
         double largeX = Inkscape::Util::Quantity::convert(paper.larger, paper.unit, w.unit);
 
-        g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
+        g_return_val_if_fail(smallX < largeX + 0.001, _paperSizeListStore->children().end());
 
         if ((std::abs(smaller - smallX) <= 0.1) &&
             (std::abs(larger  - largeX) <= 0.1)   ) {
-- 
cgit v1.2.3


From f6060c9447e6f2e5a70e957c19bd4eb1ae4babef Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Mon, 24 Feb 2014 20:32:07 +0100
Subject: inspired by r13052, fix up the code to hopefully work when someone
 has different units for height and width of the page.

Fixed bugs:
  - https://launchpad.net/bugs/1240308

(bzr r13053)
---
 src/ui/widget/page-sizer.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/ui/widget/page-sizer.cpp')

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index b35f35403..eae0d4a95 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -547,36 +547,40 @@ PageSizer::updateFitMarginsUI(Inkscape::XML::Node *nv_repr)
 
 /**
  * Returns an iterator pointing to a row in paperSizeListStore which
- * contains a paper of the specified size (specified in px), or
+ * contains a paper of the specified size, or
  * paperSizeListStore->children().end() if no such paper exists.
+ *
+ * The code is not tested for the case where w and h have different units.
  */
 Gtk::ListStore::iterator
 PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const
 {
-    double smaller = w.quantity;
-    double larger  = h.quantity;
-    if ( h.quantity < w.quantity ) {
-        smaller = h.quantity; larger = w.quantity;
+    using Inkscape::Util::Quantity;
+    using std::swap;
+
+    // The code below assumes that w < h, so make sure that's the case:
+    if ( h < w ) {
+        swap(h,w);
     }
 
-    g_return_val_if_fail(smaller <= larger, _paperSizeListStore->children().end());
+    g_return_val_if_fail(w <= h, _paperSizeListStore->children().end());
 
     std::map<Glib::ustring, PaperSize>::const_iterator iter;
     for (iter = _paperSizeTable.begin() ;
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, paper.unit, w.unit);
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, paper.unit, w.unit);
+        Quantity smallX (paper.smaller, paper.unit);
+        Quantity largeX (paper.larger, paper.unit);
 
-        g_return_val_if_fail(smallX < largeX + 0.001, _paperSizeListStore->children().end());
+        g_return_val_if_fail(smallX.quantity < largeX.quantity + 0.001, _paperSizeListStore->children().end());
 
-        if ((std::abs(smaller - smallX) <= 0.1) &&
-            (std::abs(larger  - largeX) <= 0.1)   ) {
-            Gtk::ListStore::iterator p;
+        if ( are_near(w, smallX, 0.1) && are_near(h, largeX, 0.1) ) {
+            Gtk::ListStore::iterator p = _paperSizeListStore->children().begin();
+            Gtk::ListStore::iterator pend = _paperSizeListStore->children().end();
             // We need to search paperSizeListStore explicitly for the
             // specified paper size because it is sorted in a different
             // way than paperSizeTable (which is sorted alphabetically)
-            for (p = _paperSizeListStore->children().begin(); p != _paperSizeListStore->children().end(); ++p) {
+            for ( ; p != pend; ++p) {
                 if ((*p)[_paperSizeListColumns.nameColumn] == paper.name) {
                     return p;
                 }
@@ -601,7 +605,7 @@ PageSizer::fire_fit_canvas_to_selection_or_drawing()
     SPDocument *doc;
     SPNamedView *nv;
     Inkscape::XML::Node *nv_repr;
-	
+  
     if ((doc = sp_desktop_document(SP_ACTIVE_DESKTOP))
         && (nv = sp_document_namedview(doc, 0))
         && (nv_repr = nv->getRepr())) {
-- 
cgit v1.2.3