Adding base configurable sizing of controls/handles.

(bzr r11316)

4 files changed, 22 insertions, 12 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 36a53dada..2903a97fa 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set(ui_SRC
 	clipboard.cpp
+	control-manager.cpp
 	previewholder.cpp
 	uxmanager.cpp
 
@@ -121,6 +122,7 @@ set(ui_SRC
 	# -------
 	# Headers
 	clipboard.h
+	control-manager.h
 	icon-names.h
 	previewable.h
 	previewfillable.h
diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index 19ecef0fc..59b290dc4 100644
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -3,6 +3,8 @@
 ink_common_sources +=		\
 	ui/clipboard.cpp	\
 	ui/clipboard.h		\
+	ui/control-manager.cpp	\
+	ui/control-manager.h	\
 	ui/icon-names.h		\
 	ui/previewable.h	\
 	ui/previewfillable.h	\
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 103d3a039..8c13ae760 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -520,21 +520,22 @@ void InkscapePreferences::initPageUI()
     _page_ui.add_line( false, _("Language (requires restart):"), _ui_languages, "",
                               _("Set the language for menus and number formats"), false);
 
-     Glib::ustring sizeLabels[] = {_("Large"), _("Small"), _("Smaller")};
-    int sizeValues[] = {0, 1, 2};
-
-    _misc_small_tools.init( "/toolbox/tools/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 );
-    _page_ui.add_line( false, _("Toolbox icon size:"), _misc_small_tools, "",
-                              _("Set the size for the tool icons (requires restart)"), false);
+    {
+        Glib::ustring sizeLabels[] = {_("Large"), _("Small"), _("Smaller")};
+        int sizeValues[] = {0, 1, 2};
 
-    _misc_small_toolbar.init( "/toolbox/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 );
-    _page_ui.add_line( false, _("Control bar icon size:"), _misc_small_toolbar, "",
-                              _("Set the size for the icons in tools' control bars to use (requires restart)"), false);
+        _misc_small_tools.init( "/toolbox/tools/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 );
+        _page_ui.add_line( false, _("Toolbox icon size:"), _misc_small_tools, "",
+                           _("Set the size for the tool icons (requires restart)"), false);
 
-    _misc_small_secondary.init( "/toolbox/secondary", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 1 );
-    _page_ui.add_line( false, _("Secondary toolbar icon size:"), _misc_small_secondary, "",
-                              _("Set the size for the icons in secondary toolbars to use (requires restart)"), false);
+        _misc_small_toolbar.init( "/toolbox/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 );
+        _page_ui.add_line( false, _("Control bar icon size:"), _misc_small_toolbar, "",
+                           _("Set the size for the icons in tools' control bars to use (requires restart)"), false);
 
+        _misc_small_secondary.init( "/toolbox/secondary", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 1 );
+        _page_ui.add_line( false, _("Secondary toolbar icon size:"), _misc_small_secondary, "",
+                           _("Set the size for the icons in secondary toolbars to use (requires restart)"), false);
+    }
 
     _ui_colorsliders_top.init( _("Work-around color sliders not drawing"), "/options/workarounds/colorsontop", false);
     _page_ui.add_line( false, "", _ui_colorsliders_top, "",
@@ -768,6 +769,10 @@ void InkscapePreferences::initPageIO()
     _page_mouse.add_line( false, _("Click/drag threshold:"), _mouse_thres, _("pixels"),
                            _("Maximum mouse drag (in screen pixels) which is considered a click, not a drag"), false);
 
+    _mouse_grabsize.init("/options/grabsize/value", 1, 7, 1, 2, 3, 0);
+    _page_mouse.add_line(false, _("Handle size"), _mouse_grabsize, "",
+                         _("Set the relative size of node handles."), true);
+
     _mouse_use_ext_input.init( _("Use pressure-sensitive tablet (requires restart)"), "/options/useextinput/value", true);
     _page_mouse.add_line(false, "",_mouse_use_ext_input, "",
                         _("Use the capabilities of a tablet or other pressure-sensitive device. Disable this only if you have problems with the tablet (you can still use it as a mouse)"));
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 1d03ab706..101831086 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -166,6 +166,7 @@ protected:
 
     UI::Widget::PrefSpinButton _mouse_sens;
     UI::Widget::PrefSpinButton _mouse_thres;
+    UI::Widget::PrefSlider      _mouse_grabsize;
     UI::Widget::PrefCheckButton _mouse_use_ext_input;
     UI::Widget::PrefCheckButton _mouse_switch_on_ext_input;