Merge lp:~caldoria+inkscape.dev/inkscape/clonetiler-absolute-units into lp:~inkscape.dev/inkscape/trunk

[Mark]

I've changed the clonetiler dialog so that absolute units can be used for both shifting and scaling. So far only dimensionless units (percent) could be used for this.

Absolute units help when trying to place irregular objects on a regular grid, where it is inconvenient to specify the grid spacing as a multiple of the object size.

Note that this is my first contribution to Inkscape, so I am not sure if this is the avenue you guys prefer for contributions. I find the various wiki pages and instructions a little unclear, using the procedure detailed on http://wiki.inkscape.org/wiki/index.php/Working_with_Bazaar#Publishing_your_work_on_Launchpad.

[lp:~caldoria+inkscape.dev/inkscape/clonetiler-absolute-units]

14453. By jabiertxof<email address hidden> on 2015-11-10

Spray Tool: Change hide invisibe by over visible and over invisible, sugested by Ivan Louette

14454. By Jabiertxof <email address hidden> on 2015-11-11

Improvements to the over visible/invisible to minimize the colisions, sprayed items fit on background whith overlap visible or invisible areas
Add option in picker mode to compute the center/or average area of sprayed item
Now reverse work without adbanced trace dialog inverting the color. By this all buttons have a utility in advanced and in normal mode

14455. By Jabiertxof <email address hidden> on 2015-11-11

Add option to spray tool to no overlap between colors

14456. By Jabiertxof <email address hidden> on 2015-11-11

Remove unused functions

14457. By jabiertxof<email address hidden> on 2015-11-11

Improve offseting calculation
Improve no picoverlap feature

14458. By jabiertxof<email address hidden> on 2015-11-11

Refactor of code, minor bugs fixed.

14459. By jabiertxof<email address hidden> on 2015-11-11

Add erase mode to spray. Bugfixes.

14460. By jabiertxof<email address hidden> on 2015-11-12

Fix a warn on launch

14461. By jabiertxof<email address hidden> on 2015-11-12

Fix crashes in erase mode of spray

14462. By jabiertxof<email address hidden> on 2015-11-13

Fix a bug on bspline, duplicating end nodes

14463. By Kris on 2015-11-13

static code analysis

14464. By Kris on 2015-11-13

static code analysis

14465. By Alexandre Prokoudine on 2015-11-14

Update Russian translation

14466. By Alexandre Prokoudine on 2015-11-14

Update Russian translation

14467. By Alexandre Prokoudine on 2015-11-14

Some sane defaults for spray offset, subject to further tweaking

14468. By Alexandre Prokoudine on 2015-11-14

Update Russian translation

14469. By Jabiertxof <email address hidden> on 2015-11-14

Fix erase mode in no overlap mode, pointed by Ivan Louette

14470. By Hasan Kiran on 2015-11-14

Translation. Turkish translation update.

14471. By Jabiertxof <email address hidden> on 2015-11-15

Fixed roughen LPE

14472. By Janis Eisaks on 2015-11-15

Latvian translation update

14473. By Firas Hanife on 2015-11-15

Translations. Italian translation update.

14474. By Kris on 2015-11-16

static code analysis

14475. By Mc on 2015-11-16

removes warnings when compiling with c++11 using uniqueptr instead of autoptr

14476. By Kris on 2015-11-16

Fix potentential null pointer dereference

[Mc (mc...)]

Hi,

there are a lot of conflicts with current trunk since jabier's work, could you update to trunk and fix these ?

Also, can you roughly explain what you changed in the code (a high-level explanation) ?

Thanks.

Mc

[lp:~caldoria+inkscape.dev/inkscape/clonetiler-absolute-units]

14477. By Hasan Kiran on 2015-11-18

Translations. Turkish translation update.

14478. By Mc on 2015-11-19

fix for bug 1517740 (crash in some cases in selection sets)

14479. By insaner on 2015-11-20

window/task bar icon missing when installed in non-standard location

14480. By Alex Valavanis on 2015-11-21

Compile against external libpotrace

14481. By Alex Valavanis on 2015-11-21

src/Makefile.am: Rm notes about tests that have been fixed

14482. By su_v on 2015-11-21

packaging/macosx: update scripts for potrace switch to external dependency

14483. By caldoria <email address hidden> on 2015-11-21

Enabled absolute units for clonetiler shift and scale functions. Addressed first reviewer comments, removed some dead code.

[Mark (caldoria)]

Hi,

Thanks for reviewing the code. I've tried to address your comments. There seem to be no conflicts at the moment.

As to what I did in the code, I changed the widgets in the clonetiler dialog to be able to deal with units. Before one could only input dimensionless quantities via that dialog. I have only changed the "Shift" and "Scale" pages, as these seem to me to be the only ones that would reasonably benefit from unit quantities. This mainly meant replacing the relevant input widgets with UI::Widget::ScalarUnit and adding corresponding UI::Widget::UnitMenu widgets. I've based my changes on the code for the Transformation dialog. I've added appropriate signal handling functions that make use of the existing model of storing all quantities within the preferences subsystem before calculating the required transforms. I also made some changes to the code actually calculating the transforms so that the units are respected.

I also made a small change to the "Labelled" widget. Before a label would be placed into the layout manager even if no label (empty string) is specified, which could yield an unsightly space. I've made this conditional on non-empty strings. I've done this because the ScalarUnit widget is a Labelled, and while I don't want to label the widget, I do want to make use of the unit capabilities.

Thanks,
Mark

[Mc (mc...)]

I tested the branch, and got into those problems:

-> by default, there is no unit selected, not even "%" (blank choice)
-> "reset" does not work as expected (or at all in some tabs, and does not reset units to %)
-> default % setting set 100% randomness...
-> Not sure the unit choice is ideally placed (since you have to choose the unit before the values)

Unmerged revisions

14483. By caldoria <email address hidden> on 2015-11-21

Enabled absolute units for clonetiler shift and scale functions. Addressed first reviewer comments, removed some dead code.

=== modified file 'src/ui/dialog/clonetiler.cpp'
--- src/ui/dialog/clonetiler.cpp	2015-11-08 09:49:26 +0000
+++ src/ui/dialog/clonetiler.cpp	2015-11-21 20:12:56 +0000
@@ -81,7 +81,48 @@
     dlg(NULL),
     desktop(NULL),
     deskTrack(),
-    table_row_labels(NULL)
+    table_row_labels(NULL),
+
+    // Shift page
+    _scalar_shift_x_row         ("", _("Shift in x coordinate per row"), UNIT_TYPE_LINEAR, "", "", &_units_shift),
+    _scalar_shift_x_column      ("", _("Shift in x coordinate per column"), UNIT_TYPE_LINEAR, "", "", &_units_shift),
+    _scalar_shift_x_randomize   ("", _("Randomization of x coordinate per shift"), UNIT_TYPE_LINEAR, "", "", &_units_shift),
+    
+    _scalar_shift_y_row         ("", _("Shift in y coordinate per row"), UNIT_TYPE_LINEAR, "", "", &_units_shift),
+    _scalar_shift_y_column      ("", _("Shift in y coordinate per column"), UNIT_TYPE_LINEAR, "", "", &_units_shift),
+    _scalar_shift_y_randomize   ("", _("Randomization of y coordinate per shift"), UNIT_TYPE_LINEAR, "", "", &_units_shift),
+
+    _scalar_shift_exponent_row     ("", _("Whether rows are spaced evenly (1), diverge (> 1) or converge (< 1)"), UNIT_TYPE_DIMENSIONLESS, "", ""),
+    _scalar_shift_exponent_column  ("", _("Whether columns are spaced evenly (1), diverge (> 1) or converge (< 1)"), UNIT_TYPE_DIMENSIONLESS, "", ""),
+    
+    _check_shift_alternate_row     ("", _("Alternate sign of shifts for each row")),
+    _check_shift_alternate_column  ("", _("Alternate sign of shifts for each column")),
+    _check_shift_cumulate_row      ("", _("Combine shifts cumulatively for each row")),
+    _check_shift_cumulate_column   ("", _("Combine shifts cumulatively for each column")),
+    _check_shift_exclude_row       ("", _("Exclude tile width from row shifts")),
+    _check_shift_exclude_column    ("", _("Exclude tile height from column shifts")),
+
+
+    // Scale page
+    _scalar_scale_x_row           ("", _("Horizontal scale per row"), UNIT_TYPE_LINEAR, "", "", &_units_scale),
+    _scalar_scale_x_column        ("", _("Horizontal scale per column"), UNIT_TYPE_LINEAR, "", "", &_units_scale),
+    _scalar_scale_x_randomize     ("", _("Randomize the horizontal scale"), UNIT_TYPE_LINEAR, "", "", &_units_scale),
+
+    _scalar_scale_y_row           ("", _("Vertical scale per row"), UNIT_TYPE_LINEAR, "", "", &_units_scale),
+    _scalar_scale_y_column        ("", _("Vertical scale per column"), UNIT_TYPE_LINEAR, "", "", &_units_scale),
+    _scalar_scale_y_randomize     ("", _("Randomize the vertical scale"), UNIT_TYPE_LINEAR, "", "", &_units_scale),
+
+    _scalar_scale_exponent_row    ("", _("Whether row scaling is uniform (1), converges (< 1) or diverges (> 1)"), UNIT_TYPE_DIMENSIONLESS, "", ""),
+    _scalar_scale_exponent_column ("", _("Whether column scaling is uniform (1), converges (< 1) or diverges (> 1)"), UNIT_TYPE_DIMENSIONLESS, "", ""),
+
+    _scalar_scale_base_row        ("", _("Base for a logarithmic spiral: not used (0), convergent (< 1) or divergent (> 1)"), UNIT_TYPE_DIMENSIONLESS, "", ""),
+    _scalar_scale_base_column     ("", _("Base for a logarithmic spiral: not used (0), convergent (< 1) or divergent (> 1)"), UNIT_TYPE_DIMENSIONLESS, "", ""),
+
+    _check_scale_alternate_row     ("", _("Alternate sign of scales across rows")),
+    _check_scale_alternate_column  ("", _("Alternate sign of scales across columns")),
+    _check_scale_cumulate_row      ("", _("Cumulate scales across rows")),
+    _check_scale_cumulate_column   ("", _("Cumulate scales across columns"))
+
 {
     Gtk::Box *contents = _getContents();
     contents->set_spacing(0);
@@ -173,14 +214,15 @@
 
         table_row_labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-        // Shift
+        // Shift page
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("S_hift"));
 
             GtkWidget *table = clonetiler_table_x_y_rand (3);
             gtk_box_pack_start (GTK_BOX (vb), table, FALSE, FALSE, 0);
-
-            // X
+            prepareUnitMenu(_units_shift, "shiftx_per_j", "px");
+            
+            // X Label
             {
                 GtkWidget *l = gtk_label_new ("");
                     // TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount
@@ -190,59 +232,40 @@
                 clonetiler_table_attach (table, l, 1, 2, 1);
             }
 
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                   _("Horizontal shift per row (in % of tile width)"), "shiftx_per_j",
-                   -10000, 10000, "%");
-                clonetiler_table_attach (table, l, 0, 2, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                   _("Horizontal shift per column (in % of tile width)"), "shiftx_per_i",
-                   -10000, 10000, "%");
-                clonetiler_table_attach (table, l, 0, 2, 3);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Randomize the horizontal shift by this percentage"), "shiftx_rand",
-                                                   0, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 2, 4);
-            }
-
-            // Y
+            // Y Label
             {
                 GtkWidget *l = gtk_label_new ("");
-                    // TRANSLATORS: "shift" means: the tiles will be shifted (offset) vertically by this amount
+                    // TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount
                     // xgettext:no-c-format
                 gtk_label_set_markup (GTK_LABEL(l), _("<b>Shift Y:</b>"));
                 gtk_size_group_add_widget(table_row_labels, l);
                 clonetiler_table_attach (table, l, 1, 3, 1);
             }
 
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                                                   _("Vertical shift per row (in % of tile height)"), "shifty_per_j",
-                                                   -10000, 10000, "%");
-                clonetiler_table_attach (table, l, 0, 3, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                                                   _("Vertical shift per column (in % of tile height)"), "shifty_per_i",
-                                                   -10000, 10000, "%");
-                clonetiler_table_attach (table, l, 0, 3, 3);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                                                   _("Randomize the vertical shift by this percentage"), "shifty_rand",
-                                                   0, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 3, 4);
+            // X and Y Shifts
+            {
+                prepareScalarUnit(_scalar_shift_x_row, "shiftx_per_j", 0);
+                prepareScalarUnit(_scalar_shift_x_column, "shiftx_per_i", 0);
+                prepareScalarUnit(_scalar_shift_x_randomize, "shiftx_rand", 0);
+                prepareScalarUnit(_scalar_shift_y_row, "shifty_per_j", 0);
+                prepareScalarUnit(_scalar_shift_y_column, "shifty_per_i", 0);
+                prepareScalarUnit(_scalar_shift_y_randomize, "shifty_rand", 0);
+
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_x_row.gobj(), 0, 2, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_x_column.gobj(), 0, 2, 3);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_x_randomize.gobj(), 0, 2, 4);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_y_row.gobj(), 0, 3, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_y_column.gobj(), 0, 3, 3);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_y_randomize.gobj(), 0, 3, 4);
+            }
+
+            // UnitMenu
+            {
+                GtkWidget *l = gtk_label_new("");
+                gtk_label_set_markup(GTK_LABEL(l), _("<b>Units:</b>"));
+                gtk_size_group_add_widget(table_row_labels, l);                
+                clonetiler_table_attach(table, l, 1, 4, 1);
+                clonetiler_table_attach(table, (GtkWidget*)_units_shift.gobj(), 0, 4, 2);
             }
 
             // Exponent
@@ -250,86 +273,72 @@
                 GtkWidget *l = gtk_label_new ("");
                 gtk_label_set_markup (GTK_LABEL(l), _("<b>Exponent:</b>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 4, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                                                   _("Whether rows are spaced evenly (1), converge (<1) or diverge (>1)"), "shifty_exp",
-                                                   0, 10, "", true);
-                clonetiler_table_attach (table, l, 0, 4, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                                                   _("Whether columns are spaced evenly (1), converge (<1) or diverge (>1)"), "shiftx_exp",
-                                                   0, 10, "", true);
-                clonetiler_table_attach (table, l, 0, 4, 3);
-            }
-
-            { // alternates
+                clonetiler_table_attach (table, l, 1, 5, 1);
+            }
+
+            {
+                prepareScalar(_scalar_shift_exponent_row, "shifty_exp", 1);
+                prepareScalar(_scalar_shift_exponent_column, "shiftx_exp", 1);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_exponent_row.gobj(), 0, 5, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_shift_exponent_column.gobj(), 0, 5, 3);
+            }
+
+            // Alternate
+            {
                 GtkWidget *l = gtk_label_new ("");
                 // TRANSLATORS: "Alternate" is a verb here
                 gtk_label_set_markup (GTK_LABEL(l), _("<small>Alternate:</small>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 5, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of shifts for each row"), "shifty_alternate");
-                clonetiler_table_attach (table, l, 0, 5, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of shifts for each column"), "shiftx_alternate");
-                clonetiler_table_attach (table, l, 0, 5, 3);
-            }
-
-            { // Cumulate
+                clonetiler_table_attach (table, l, 1, 6, 1);
+            }
+
+            {
+                prepareCheckButton(_check_shift_alternate_row, "shifty_alternate");
+                prepareCheckButton(_check_shift_alternate_column, "shiftx_alternate");
+                clonetiler_table_attach (table, (GtkWidget*)_check_shift_alternate_row.gobj(), 0.5, 6, 2);
+                clonetiler_table_attach (table, (GtkWidget*)_check_shift_alternate_column.gobj(), 0.5, 6, 3);                
+            }
+
+            // Cumulate
+            {
                 GtkWidget *l = gtk_label_new ("");
                 // TRANSLATORS: "Cumulate" is a verb here
                 gtk_label_set_markup (GTK_LABEL(l), _("<small>Cumulate:</small>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 6, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Cumulate the shifts for each row"), "shifty_cumulate");
-                clonetiler_table_attach (table, l, 0, 6, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Cumulate the shifts for each column"), "shiftx_cumulate");
-                clonetiler_table_attach (table, l, 0, 6, 3);
-            }
-
-            { // Exclude tile width and height in shift
+                clonetiler_table_attach (table, l, 1, 7, 1);
+            }
+
+            {
+                prepareCheckButton(_check_shift_cumulate_row, "shifty_cumulate");
+                prepareCheckButton(_check_shift_cumulate_column, "shiftx_cumulate");
+                clonetiler_table_attach (table, (GtkWidget*)_check_shift_cumulate_row.gobj(), 0.5, 7, 2);
+                clonetiler_table_attach (table, (GtkWidget*)_check_shift_cumulate_column.gobj(), 0.5, 7, 3);                
+            }
+
+            // Exclude
+            {
                 GtkWidget *l = gtk_label_new ("");
-                // TRANSLATORS: "Cumulate" is a verb here
                 gtk_label_set_markup (GTK_LABEL(l), _("<small>Exclude tile:</small>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 7, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Exclude tile height in shift"), "shifty_excludeh");
-                clonetiler_table_attach (table, l, 0, 7, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Exclude tile width in shift"), "shiftx_excludew");
-                clonetiler_table_attach (table, l, 0, 7, 3);
+                clonetiler_table_attach (table, l, 1, 8, 1);
+            }
+
+            {
+                prepareCheckButton(_check_shift_exclude_row, "shifty_excludeh");
+                prepareCheckButton(_check_shift_exclude_column, "shiftx_excludew");
+                clonetiler_table_attach (table, (GtkWidget*)_check_shift_exclude_row.gobj(), 0.5, 8, 2);
+                clonetiler_table_attach (table, (GtkWidget*)_check_shift_exclude_column.gobj(), 0.5, 8, 3);                
             }
 
         }
 
-
-        // Scale
+        // Scale page
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("Sc_ale"));
 
             GtkWidget *table = clonetiler_table_x_y_rand (2);
             gtk_box_pack_start (GTK_BOX (vb), table, FALSE, FALSE, 0);
+            prepareUnitMenu(_units_scale, "scalex_per_j", "px");
 
             // X
             {
@@ -339,28 +348,6 @@
                 clonetiler_table_attach (table, l, 1, 2, 1);
             }
 
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                                                   _("Horizontal scale per row (in % of tile width)"), "scalex_per_j",
-                                                   -100, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 2, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                                                   _("Horizontal scale per column (in % of tile width)"), "scalex_per_i",
-                                                   -100, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 2, 3);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Randomize the horizontal scale by this percentage"), "scalex_rand",
-                                                   0, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 2, 4);
-            }
-
             // Y
             {
                 GtkWidget *l = gtk_label_new ("");
@@ -368,47 +355,45 @@
                 gtk_size_group_add_widget(table_row_labels, l);
                 clonetiler_table_attach (table, l, 1, 3, 1);
             }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                                                   _("Vertical scale per row (in % of tile height)"), "scaley_per_j",
-                                                   -100, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 3, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (
-                    // xgettext:no-c-format
-                                                   _("Vertical scale per column (in % of tile height)"), "scaley_per_i",
-                                                   -100, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 3, 3);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Randomize the vertical scale by this percentage"), "scaley_rand",
-                                                   0, 1000, "%");
-                clonetiler_table_attach (table, l, 0, 3, 4);
-            }
-
+            
+            {
+                prepareScalarUnit(_scalar_scale_x_row, "scalex_per_j", 0);
+                prepareScalarUnit(_scalar_scale_x_column, "scalex_per_i", 0);
+                prepareScalarUnit(_scalar_scale_x_randomize, "scalex_rand", 0);
+                prepareScalarUnit(_scalar_scale_y_row, "scaley_per_j", 0);
+                prepareScalarUnit(_scalar_scale_y_column, "scaley_per_i", 0);
+                prepareScalarUnit(_scalar_scale_y_randomize, "scaley_rand", 0);
+
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_x_row.gobj(), 0, 2, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_x_column.gobj(), 0, 2, 3);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_x_randomize.gobj(), 0, 2, 4);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_y_row.gobj(), 0, 3, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_y_column.gobj(), 0, 3, 3);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_y_randomize.gobj(), 0, 3, 4);
+            }
+
+            // UnitMenu
+            {
+                GtkWidget *l = gtk_label_new("");
+                gtk_label_set_markup(GTK_LABEL(l), _("<b>Units:</b>"));
+                gtk_size_group_add_widget(table_row_labels, l);                
+                clonetiler_table_attach(table, l, 1, 4, 1);
+                clonetiler_table_attach(table, (GtkWidget*)_units_scale.gobj(), 0, 4, 2);
+            }
+            
             // Exponent
             {
                 GtkWidget *l = gtk_label_new ("");
                 gtk_label_set_markup (GTK_LABEL(l), _("<b>Exponent:</b>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 4, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Whether row scaling is uniform (1), converge (<1) or diverge (>1)"), "scaley_exp",
-                                                   0, 10, "", true);
-                clonetiler_table_attach (table, l, 0, 4, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Whether column scaling is uniform (1), converge (<1) or diverge (>1)"), "scalex_exp",
-                                                   0, 10, "", true);
-                clonetiler_table_attach (table, l, 0, 4, 3);
+                clonetiler_table_attach (table, l, 1, 5, 1);
+            }
+
+            {
+                prepareScalar(_scalar_scale_exponent_row, "scaley_exp", 1);
+                prepareScalar(_scalar_scale_exponent_column, "scalex_exp", 1);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_exponent_row.gobj(), 0, 5, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_exponent_column.gobj(), 0, 5, 3);
             }
 
             // Logarithmic (as in logarithmic spiral)
@@ -416,19 +401,14 @@
                 GtkWidget *l = gtk_label_new ("");
                 gtk_label_set_markup (GTK_LABEL(l), _("<b>Base:</b>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 5, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scaley_log",
-                                                   0, 10, "", false);
-                clonetiler_table_attach (table, l, 0, 5, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_spinbox (_("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scalex_log",
-                                                   0, 10, "", false);
-                clonetiler_table_attach (table, l, 0, 5, 3);
+                clonetiler_table_attach (table, l, 1, 6, 1);
+            }
+
+            {
+                prepareScalar(_scalar_scale_base_row, "scaley_log", 0);
+                prepareScalar(_scalar_scale_base_column, "scalex_log", 0);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_base_row.gobj(), 0, 6, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_scalar_scale_base_column.gobj(), 0, 6, 3);
             }
 
             { // alternates
@@ -436,17 +416,14 @@
                 // TRANSLATORS: "Alternate" is a verb here
                 gtk_label_set_markup (GTK_LABEL(l), _("<small>Alternate:</small>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 6, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of scales for each row"), "scaley_alternate");
-                clonetiler_table_attach (table, l, 0, 6, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of scales for each column"), "scalex_alternate");
-                clonetiler_table_attach (table, l, 0, 6, 3);
+                clonetiler_table_attach (table, l, 1, 7, 1);
+            }
+
+            {
+                prepareCheckButton(_check_scale_alternate_row, "scaley_alternate");
+                prepareCheckButton(_check_scale_alternate_column, "scalex_alternate");
+                clonetiler_table_attach(table, (GtkWidget*)_check_scale_alternate_row.gobj(), 0.5, 7, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_check_scale_alternate_column.gobj(), 0.5, 7, 3);                
             }
 
             { // Cumulate
@@ -454,22 +431,17 @@
                 // TRANSLATORS: "Cumulate" is a verb here
                 gtk_label_set_markup (GTK_LABEL(l), _("<small>Cumulate:</small>"));
                 gtk_size_group_add_widget(table_row_labels, l);
-                clonetiler_table_attach (table, l, 1, 7, 1);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Cumulate the scales for each row"), "scaley_cumulate");
-                clonetiler_table_attach (table, l, 0, 7, 2);
-            }
-
-            {
-                GtkWidget *l = clonetiler_checkbox (_("Cumulate the scales for each column"), "scalex_cumulate");
-                clonetiler_table_attach (table, l, 0, 7, 3);
-            }
-
+                clonetiler_table_attach (table, l, 1, 8, 1);
+            }
+
+            {
+                prepareCheckButton(_check_scale_cumulate_row, "scaley_cumulate");
+                prepareCheckButton(_check_scale_cumulate_column, "scalex_cumulate");
+                clonetiler_table_attach(table, (GtkWidget*)_check_scale_cumulate_row.gobj(), 0.5, 8, 2);
+                clonetiler_table_attach(table, (GtkWidget*)_check_scale_cumulate_column.gobj(), 0.5, 8, 3);                
+            }
         }
-
-
+        
         // Rotation
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("_Rotation"));
@@ -1324,6 +1296,68 @@
     deskTrack.setBase(desktop);
 }
 
+void CloneTiler::prepareScalarUnit(UI::Widget::ScalarUnit &item, const char* attr, double def) {
+    item.initScalar(-1e5, 1e5);
+    item.setDigits(3);
+
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    double number = prefs->getDouble(prefs_path + attr, def);
+    Glib::ustring unit = prefs->getUnit(prefs_path + attr);
+    
+    item.setValue(number, unit);
+    item.signal_value_changed().connect(
+        sigc::bind(sigc::mem_fun(*this, &CloneTiler::onUnitValueChanged), sigc::ref(item), attr)
+        );
+}
+
+void CloneTiler::prepareScalar(UI::Widget::Scalar &item, const char* attr, double def) {
+    item.setRange(-1e5, 1e5);
+    item.setDigits(3);
+    item.setIncrements(0.01, 1);
+
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    double number = prefs->getDouble(prefs_path + attr, def);
+    
+    item.setValue(number);
+    item.signal_value_changed().connect(
+        sigc::bind(&CloneTiler::clonetiler_value_changed,
+                   (GtkAdjustment*)((Gtk::SpinButton*)item.getWidget())->get_adjustment()->gobj(),
+                   (gpointer)attr)
+        );
+}
+
+void CloneTiler::prepareCheckButton(UI::Widget::CheckButton &item, const char* attr) {
+
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool state = prefs->getBool(prefs_path + attr);
+
+    item.set_active(state);
+    
+    item.signal_toggled().connect(
+        sigc::bind(&CloneTiler::clonetiler_checkbox_toggled,
+                   (GtkToggleButton*)item.gobj(),
+                   (gpointer*)attr)
+        );
+}
+
+void CloneTiler::prepareUnitMenu(UI::Widget::UnitMenu &item, const char* attr, Glib::ustring def) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring unit = prefs->getUnit(prefs_path + attr);
+    
+    if (unit == "") unit = def;
+
+    item.setUnitType(UNIT_TYPE_DIMENSIONLESS);
+    item.setUnitType(UNIT_TYPE_LINEAR);
+    item.setUnit(unit);
+}
+
+void CloneTiler::onUnitValueChanged(UI::Widget::ScalarUnit &item, const char* attr) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring unit_abbr = item.getUnit()->abbr;
+    double number = item.getValue(unit_abbr);
+    prefs->setDoubleUnit(prefs_path + attr, number, unit_abbr);
+}
+
 void CloneTiler::setTargetDesktop(SPDesktop *desktop)
 {
     if (this->desktop != desktop) {
@@ -2258,14 +2292,97 @@
 
     clonetiler_remove (NULL, dlg, false);
 
-    double scale_units = Inkscape::Util::Quantity::convert(1, "px", &desktop->getDocument()->getSVGUnit());
-
-    double shiftx_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "shiftx_per_i", 0, -10000, 10000);
-    double shifty_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "shifty_per_i", 0, -10000, 10000);
-    double shiftx_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "shiftx_per_j", 0, -10000, 10000);
-    double shifty_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "shifty_per_j", 0, -10000, 10000);
-    double shiftx_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "shiftx_rand", 0, 0, 1000);
-    double shifty_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "shifty_rand", 0, 0, 1000);
+    bool   keepbbox = prefs->getBool(prefs_path + "keepbbox", true);
+    bool   dotrace = prefs->getBool(prefs_path + "dotrace");
+    
+    SPItem *item = dynamic_cast<SPItem *>(obj);
+    if (dotrace) {
+        clonetiler_trace_setup (desktop->getDocument(), 1.0, item);
+    }
+
+    Geom::Point center;
+    double w = 0;
+    double h = 0;
+    double x0 = 0;
+    double y0 = 0;
+
+    Util::Unit svg_unit = desktop->getDocument()->getSVGUnit();
+    double scale_units = Inkscape::Util::Quantity::convert(1, "px", &svg_unit);
+
+    if (keepbbox &&
+        obj_repr->attribute("inkscape:tile-w") &&
+        obj_repr->attribute("inkscape:tile-h") &&
+        obj_repr->attribute("inkscape:tile-x0") &&
+        obj_repr->attribute("inkscape:tile-y0") &&
+        obj_repr->attribute("inkscape:tile-cx") &&
+        obj_repr->attribute("inkscape:tile-cy")) {
+
+        double cx = 0;
+        double cy = 0;
+        sp_repr_get_double (obj_repr, "inkscape:tile-cx", &cx);
+        sp_repr_get_double (obj_repr, "inkscape:tile-cy", &cy);
+        center = Geom::Point (cx, cy);
+
+        sp_repr_get_double (obj_repr, "inkscape:tile-w", &w);
+        sp_repr_get_double (obj_repr, "inkscape:tile-h", &h);
+        sp_repr_get_double (obj_repr, "inkscape:tile-x0", &x0);
+        sp_repr_get_double (obj_repr, "inkscape:tile-y0", &y0);
+    } else {
+        bool prefs_bbox = prefs->getBool("/tools/bounding_box", false);
+        SPItem::BBoxType bbox_type = ( !prefs_bbox ?
+            SPItem::VISUAL_BBOX : SPItem::GEOMETRIC_BBOX );
+        Geom::OptRect r = item->documentBounds(bbox_type);
+        if (r) {
+            w = scale_units*r->dimensions()[Geom::X];
+            h = scale_units*r->dimensions()[Geom::Y];
+            x0 = scale_units*r->min()[Geom::X];
+            y0 = scale_units*r->min()[Geom::Y];
+            center = scale_units*desktop->dt2doc(item->getCenter());
+
+            sp_repr_set_svg_double(obj_repr, "inkscape:tile-cx", center[Geom::X]);
+            sp_repr_set_svg_double(obj_repr, "inkscape:tile-cy", center[Geom::Y]);
+            sp_repr_set_svg_double(obj_repr, "inkscape:tile-w", w);
+            sp_repr_set_svg_double(obj_repr, "inkscape:tile-h", h);
+            sp_repr_set_svg_double(obj_repr, "inkscape:tile-x0", x0);
+            sp_repr_set_svg_double(obj_repr, "inkscape:tile-y0", y0);
+        } else {
+            center = Geom::Point(0, 0);
+            w = h = 0;
+            x0 = y0 = 0;
+        }
+    }
+
+    /* Now we have w and h in SVG units. */
+    
+    Glib::ustring svg_unit_abbr = svg_unit.abbr;
+    double prefactor_w = 1.0/w;
+    double prefactor_h = 1.0/h;
+
+    const Util::Unit *shift_unit = unit_table.getUnit(prefs->getUnit(prefs_path + "shiftx_per_i"));
+    if (!shift_unit->isAbsolute()) {
+        // Deal with dimensionless (percentage) shift.
+        svg_unit_abbr = "%";
+        prefactor_w = prefactor_h = 0.01;
+    }
+    
+    // double scale_units = Inkscape::Util::Quantity::convert(1, "px", &desktop->getDocument()->getSVGUnit());
+
+    // double shiftx_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "shiftx_per_i", 0, -10000, 10000);
+    // double shifty_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "shifty_per_i", 0, -10000, 10000);
+    // double shiftx_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "shiftx_per_j", 0, -10000, 10000);
+    // double shifty_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "shifty_per_j", 0, -10000, 10000);
+    // double shiftx_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "shiftx_rand", 0, 0, 1000);
+    // double shifty_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "shifty_rand", 0, 0, 1000);
+
+    /* Get quantities in px since width and height will be sent in px. */
+    double shiftx_per_i = prefactor_w * prefs->getDouble(prefs_path + "shiftx_per_i", 0, svg_unit_abbr);
+    double shifty_per_i = prefactor_h * prefs->getDouble(prefs_path + "shifty_per_i", 0, svg_unit_abbr);
+    double shiftx_per_j = prefactor_w * prefs->getDouble(prefs_path + "shiftx_per_j", 0, svg_unit_abbr);
+    double shifty_per_j = prefactor_h * prefs->getDouble(prefs_path + "shifty_per_j", 0, svg_unit_abbr);
+
+    double shiftx_rand  = prefactor_w * prefs->getDouble(prefs_path + "shiftx_rand", 0, svg_unit_abbr);
+    double shifty_rand  = prefactor_h * prefs->getDouble(prefs_path + "shifty_rand", 0, svg_unit_abbr);
+
     double shiftx_exp   =        prefs->getDoubleLimited(prefs_path + "shiftx_exp",   1, 0, 10);
     double shifty_exp   =        prefs->getDoubleLimited(prefs_path + "shifty_exp", 1, 0, 10);
     bool   shiftx_alternate =    prefs->getBool(prefs_path + "shiftx_alternate");
@@ -2275,12 +2392,30 @@
     bool   shiftx_excludew  =    prefs->getBool(prefs_path + "shiftx_excludew");
     bool   shifty_excludeh  =    prefs->getBool(prefs_path + "shifty_excludeh");
 
-    double scalex_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "scalex_per_i", 0, -100, 1000);
-    double scaley_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "scaley_per_i", 0, -100, 1000);
-    double scalex_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "scalex_per_j", 0, -100, 1000);
-    double scaley_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "scaley_per_j", 0, -100, 1000);
-    double scalex_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "scalex_rand",  0, 0, 1000);
-    double scaley_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "scaley_rand",  0, 0, 1000);
+    const Util::Unit *scale_unit = unit_table.getUnit(prefs->getUnit(prefs_path + "scalex_per_i"));
+    if (scale_unit->isAbsolute()) {
+        svg_unit_abbr = svg_unit.abbr;
+        prefactor_w = 1.0/w;
+        prefactor_h = 1.0/h;
+    } else {
+        prefactor_w = prefactor_h = 0.01;
+        svg_unit_abbr = "%";
+    }
+    
+    // double scalex_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "scalex_per_i", 0, -100, 1000);
+    // double scaley_per_i = 0.01 * prefs->getDoubleLimited(prefs_path + "scaley_per_i", 0, -100, 1000);
+    // double scalex_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "scalex_per_j", 0, -100, 1000);
+    // double scaley_per_j = 0.01 * prefs->getDoubleLimited(prefs_path + "scaley_per_j", 0, -100, 1000);
+    // double scalex_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "scalex_rand",  0, 0, 1000);
+    // double scaley_rand  = 0.01 * prefs->getDoubleLimited(prefs_path + "scaley_rand",  0, 0, 1000);
+
+    double scalex_per_i = prefactor_w * prefs->getDouble(prefs_path + "scalex_per_i", 0, svg_unit_abbr);
+    double scaley_per_i = prefactor_h * prefs->getDouble(prefs_path + "scaley_per_i", 0, svg_unit_abbr);
+    double scalex_per_j = prefactor_w * prefs->getDouble(prefs_path + "scalex_per_j", 0, svg_unit_abbr);
+    double scaley_per_j = prefactor_h * prefs->getDouble(prefs_path + "scaley_per_j", 0, svg_unit_abbr);
+    double scalex_rand  = prefactor_w * prefs->getDouble(prefs_path + "scalex_rand",  0, svg_unit_abbr);
+    double scaley_rand  = prefactor_h * prefs->getDouble(prefs_path + "scaley_rand",  0, svg_unit_abbr);
+    
     double scalex_exp   =        prefs->getDoubleLimited(prefs_path + "scalex_exp",   1, 0, 10);
     double scaley_exp   =        prefs->getDoubleLimited(prefs_path + "scaley_exp",   1, 0, 10);
     double scalex_log       =    prefs->getDoubleLimited(prefs_path + "scalex_log",   0, 0, 10);
@@ -2324,7 +2459,6 @@
     bool   color_alternatei = prefs->getBool(prefs_path + "color_alternatei");
 
     int    type = prefs->getInt(prefs_path + "symmetrygroup", 0);
-    bool   keepbbox = prefs->getBool(prefs_path + "keepbbox", true);
     int    imax = prefs->getInt(prefs_path + "imax", 2);
     int    jmax = prefs->getInt(prefs_path + "jmax", 2);
 
@@ -2332,7 +2466,6 @@
     double fillwidth = scale_units*prefs->getDoubleLimited(prefs_path + "fillwidth", 50, 0, 1e6);
     double fillheight = scale_units*prefs->getDoubleLimited(prefs_path + "fillheight", 50, 0, 1e6);
 
-    bool   dotrace = prefs->getBool(prefs_path + "dotrace");
     int    pick = prefs->getInt(prefs_path + "pick");
     bool   pick_to_presence = prefs->getBool(prefs_path + "pick_to_presence");
     bool   pick_to_size = prefs->getBool(prefs_path + "pick_to_size");
@@ -2342,60 +2475,6 @@
     bool   invert_picked = prefs->getBool(prefs_path + "invert_picked");
     double gamma_picked = prefs->getDoubleLimited(prefs_path + "gamma_picked", 0, -10, 10);
 
-    SPItem *item = dynamic_cast<SPItem *>(obj);
-    if (dotrace) {
-        clonetiler_trace_setup (desktop->getDocument(), 1.0, item);
-    }
-
-    Geom::Point center;
-    double w = 0;
-    double h = 0;
-    double x0 = 0;
-    double y0 = 0;
-
-    if (keepbbox &&
-        obj_repr->attribute("inkscape:tile-w") &&
-        obj_repr->attribute("inkscape:tile-h") &&
-        obj_repr->attribute("inkscape:tile-x0") &&
-        obj_repr->attribute("inkscape:tile-y0") &&
-        obj_repr->attribute("inkscape:tile-cx") &&
-        obj_repr->attribute("inkscape:tile-cy")) {
-
-        double cx = 0;
-        double cy = 0;
-        sp_repr_get_double (obj_repr, "inkscape:tile-cx", &cx);
-        sp_repr_get_double (obj_repr, "inkscape:tile-cy", &cy);
-        center = Geom::Point (cx, cy);
-
-        sp_repr_get_double (obj_repr, "inkscape:tile-w", &w);
-        sp_repr_get_double (obj_repr, "inkscape:tile-h", &h);
-        sp_repr_get_double (obj_repr, "inkscape:tile-x0", &x0);
-        sp_repr_get_double (obj_repr, "inkscape:tile-y0", &y0);
-    } else {
-        bool prefs_bbox = prefs->getBool("/tools/bounding_box", false);
-        SPItem::BBoxType bbox_type = ( !prefs_bbox ?
-            SPItem::VISUAL_BBOX : SPItem::GEOMETRIC_BBOX );
-        Geom::OptRect r = item->documentBounds(bbox_type);
-        if (r) {
-            w = scale_units*r->dimensions()[Geom::X];
-            h = scale_units*r->dimensions()[Geom::Y];
-            x0 = scale_units*r->min()[Geom::X];
-            y0 = scale_units*r->min()[Geom::Y];
-            center = scale_units*desktop->dt2doc(item->getCenter());
-
-            sp_repr_set_svg_double(obj_repr, "inkscape:tile-cx", center[Geom::X]);
-            sp_repr_set_svg_double(obj_repr, "inkscape:tile-cy", center[Geom::Y]);
-            sp_repr_set_svg_double(obj_repr, "inkscape:tile-w", w);
-            sp_repr_set_svg_double(obj_repr, "inkscape:tile-h", h);
-            sp_repr_set_svg_double(obj_repr, "inkscape:tile-x0", x0);
-            sp_repr_set_svg_double(obj_repr, "inkscape:tile-y0", y0);
-        } else {
-            center = Geom::Point(0, 0);
-            w = h = 0;
-            x0 = y0 = 0;
-        }
-    }
-
     Geom::Point cur(0, 0);
     Geom::Rect bbox_original (Geom::Point (x0, y0), Geom::Point (x0 + w, y0 + h));
     double perimeter_original = (w + h)/4;
 
=== modified file 'src/ui/dialog/clonetiler.h'
--- src/ui/dialog/clonetiler.h	2015-10-30 16:45:39 +0000
+++ src/ui/dialog/clonetiler.h	2015-11-21 20:12:56 +0000
@@ -15,6 +15,8 @@
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/color-picker.h"
 #include "sp-root.h"
+#include "ui/widget/scalar-unit.h"
+#include "ui/widget/button.h"
 
 namespace Inkscape {
 namespace UI {
@@ -108,6 +110,56 @@
             );
 
 
+    // Shift page
+    UI::Widget::UnitMenu        _units_shift;
+    
+    UI::Widget::ScalarUnit      _scalar_shift_x_row;
+    UI::Widget::ScalarUnit      _scalar_shift_x_column;
+    UI::Widget::ScalarUnit      _scalar_shift_x_randomize;
+    
+    UI::Widget::ScalarUnit      _scalar_shift_y_row;
+    UI::Widget::ScalarUnit      _scalar_shift_y_column;
+    UI::Widget::ScalarUnit      _scalar_shift_y_randomize;
+
+    UI::Widget::Scalar          _scalar_shift_exponent_row;
+    UI::Widget::Scalar          _scalar_shift_exponent_column;
+
+    UI::Widget::CheckButton     _check_shift_alternate_row;
+    UI::Widget::CheckButton     _check_shift_alternate_column;
+    UI::Widget::CheckButton     _check_shift_cumulate_row;
+    UI::Widget::CheckButton     _check_shift_cumulate_column;
+    UI::Widget::CheckButton     _check_shift_exclude_row;
+    UI::Widget::CheckButton     _check_shift_exclude_column;
+
+    // Scale page
+    UI::Widget::UnitMenu        _units_scale;
+
+    UI::Widget::ScalarUnit      _scalar_scale_x_row;
+    UI::Widget::ScalarUnit      _scalar_scale_x_column;
+    UI::Widget::ScalarUnit      _scalar_scale_x_randomize;
+
+    UI::Widget::ScalarUnit      _scalar_scale_y_row;
+    UI::Widget::ScalarUnit      _scalar_scale_y_column;
+    UI::Widget::ScalarUnit      _scalar_scale_y_randomize;
+
+    UI::Widget::Scalar          _scalar_scale_exponent_row;
+    UI::Widget::Scalar          _scalar_scale_exponent_column;
+    UI::Widget::Scalar          _scalar_scale_base_row;
+    UI::Widget::Scalar          _scalar_scale_base_column;
+
+    UI::Widget::CheckButton     _check_scale_alternate_row;
+    UI::Widget::CheckButton     _check_scale_alternate_column;
+    UI::Widget::CheckButton     _check_scale_cumulate_row;
+    UI::Widget::CheckButton     _check_scale_cumulate_column;
+    
+    void prepareScalarUnit(UI::Widget::ScalarUnit &item, const char* attr, double def);
+    void prepareScalar(UI::Widget::Scalar &item, const char* attr, double def);
+    void prepareCheckButton(UI::Widget::CheckButton &item, const char* attr);
+    void prepareUnitMenu(UI::Widget::UnitMenu &item, const char* attr, Glib::ustring def);
+
+    // Signal handlers
+    void onUnitValueChanged(UI::Widget::ScalarUnit& item, const char* attr);
+
 private:
     CloneTiler(CloneTiler const &d);
     CloneTiler& operator=(CloneTiler const &d);
 
=== modified file 'src/ui/widget/labelled.cpp'
--- src/ui/widget/labelled.cpp	2014-03-27 01:33:44 +0000
+++ src/ui/widget/labelled.cpp	2015-11-21 20:12:56 +0000
@@ -36,7 +36,10 @@
         _icon = sp_icon_get_icon(icon.c_str(), Inkscape::ICON_SIZE_LARGE_TOOLBAR);
         pack_start(*Gtk::manage(_icon), Gtk::PACK_SHRINK);
     }
-    pack_start(*Gtk::manage(_label), Gtk::PACK_EXPAND_WIDGET, 6);
+    if (label != "") {
+        // The label takes up some space otherwise.
+        pack_start(*Gtk::manage(_label), Gtk::PACK_EXPAND_WIDGET, 6);
+    }
     pack_start(*Gtk::manage(_widget), Gtk::PACK_SHRINK, 6);
     if (mnemonic) {
         _label->set_mnemonic_widget(*_widget);