X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Finkscape-preferences.cpp;h=cd6cd0b9f3ee2b80416cedf3dee7ee8ec4c7a22e;hb=2f0671c87b6a763e933001d3fd29a8bbb5b02bad;hp=7f0708e23f39d80c3fa0044b0dac66413c186c8a;hpb=087c06ec698d218ea16dca659d4169c61ee7028b;p=inkscape.git

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 7f0708e23..cd6cd0b9f 100644
--- 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()