add ui for mousewheel zoom and space pan

diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 11af9972940735cd41a99a8887b207559795448f..ca2ce24474a55016345e3ebdb6ff7fff10cf4580 100644 (file)
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -186,6 +186,8 @@ static char const preferences_skeleton[] =
 "    <group id=\"zoomincrement\" value=\"1.414213562\"/>\n"
 "    <group id=\"keyscroll\" value=\"15\"/>\n"
 "    <group id=\"wheelscroll\" value=\"40\"/>\n"
+"    <group id=\"spacepans\" value=\"0\"/>\n"
+"    <group id=\"wheelzooms\" value=\"0\"/>\n"
 "    <group id=\"transientpolicy\" value=\"1\"/>\n"
 "    <group id=\"scrollingacceleration\" value=\"0.4\"/>\n"
 "    <group id=\"autoscrollspeed\" value=\"0.7\"/>\n"

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 7f0708e23f39d80c3fa0044b0dac66413c186c8a..cd6cd0b9f3ee2b80416cedf3dee7ee8ec4c7a22e 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -175,6 +175,12 @@ void InkscapePreferences::initPageScrolling()
     _scroll_auto_thres.init ( "options.autoscrolldistance", "value", -600.0, 600.0, 1.0, 1.0, -10.0, true, false);
     _page_scrolling.add_line( true, _("Threshold:"), _scroll_auto_thres, _("pixels"), 
                            _("How far (in screen pixels) you need to be from the canvas edge to trigger autoscroll; positive is outside the canvas, negative is within the canvas"), false);
+    _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "options.spacepans", "value", false);
+    _page_scrolling.add_line( false, "", _scroll_space, "", 
+                            _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator). When off, Space temporarily switches to Selector tool (default)."));
+    _wheel_zoom.init ( _("Mouse wheel zooms by default"), "options.wheelzooms", "value", false);
+    _page_scrolling.add_line( false, "", _wheel_zoom, "", 
+                            _("When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when off, it zooms with Ctrl and scrolls without Ctrl."));
 }
 
 void InkscapePreferences::initPageSteps()

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 91b7a83ec9679c7ffdd7fe6fcabc7272309aef17..fc3adb20a3a783f4d68f21ab3312b7a48fc007b4 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -107,6 +107,8 @@ protected:
     PrefCheckButton _mouse_use_ext_input;
 
     PrefSpinButton _scroll_wheel, _scroll_arrow_px, _scroll_arrow_acc, _scroll_auto_speed, _scroll_auto_thres;
+    PrefCheckButton _scroll_space;
+    PrefCheckButton _wheel_zoom;
 
     PrefCombo       _steps_rot_snap;
     PrefCheckButton _steps_compass;