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

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index f3429ce7b..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()
@@ -195,9 +201,9 @@ void InkscapePreferences::initPageSteps()
     _steps_compass.init ( _("Compass-like display of angles"), "options.compassangledisplay", "value", true);
     _page_steps.add_line( false, "", _steps_compass, "", 
                             _("When on, angles are displayed with 0 at north, 0 to 360 range, positive clockwise; otherwise with 0 at east, -180 to 180 range, positive counterclockwise"));
-    int const num_items = 12;
-    Glib::ustring labels[num_items] = {"90", "60", "45", "30", "15", "10", "7.5", "6", "3", "2", "1", _("None")};
-    int values[num_items] = {2, 3, 4, 6, 12, 18, 24, 30, 60, 90, 180, 0};
+    int const num_items = 17;
+    Glib::ustring labels[num_items] = {"90", "60", "45", "36", "30", "22.5", "18", "15", "12", "10", "7.5", "6", "3", "2", "1", "0.5", _("None")};
+    int values[num_items] = {2, 3, 4, 5, 6, 8, 10, 12, 15, 18, 24, 30, 60, 90, 180, 360, 0};
     _steps_rot_snap.set_size_request(_sb_width);
     _steps_rot_snap.init("options.rotationsnapsperpi", "value", labels, values, num_items, 12);
     _page_steps.add_line( false, _("Rotation snaps every:"), _steps_rot_snap, _("degrees"),