move masks to their own page, move tablet checkbox to mouse, copyedit

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 1eb38f99a034bab3f6eca1c87e29f009ed50a51b..dea091f20a6230f271cc417b31206c255cf4f196 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -96,6 +96,7 @@ InkscapePreferences::InkscapePreferences()
     initPageTools();
     initPageWindows();
     initPageClones();
+    initPageMasks();
     initPageTransforms();
     initPageFilters();
     initPageSelecting();
@@ -147,6 +148,11 @@ void InkscapePreferences::initPageMouse()
     _mouse_thres.init ( "options.dragtolerance", "value", 0.0, 20.0, 1.0, 1.0, 4.0, true, false);
     _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_use_ext_input.init( _("Use pressure-sensitive tablet (requires restart)"), "options.useextinput", "value", true);
+    _page_mouse.add_line(true, "",_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)"));
+
 }
 
 void InkscapePreferences::initPageScrolling()
@@ -474,6 +480,17 @@ void InkscapePreferences::initPageClones()
     this->AddPage(_page_clones, _("Clones"), PREFS_PAGE_CLONES);
 }
 
+void InkscapePreferences::initPageMasks()
+{
+    _mask_mask_on_top.init ( _("When applying, use the topmost selected object as clippath/mask"), "options.maskobject", "topmost", true);
+    _page_mask.add_line(true, "", _mask_mask_on_top, "", 
+                        _("Uncheck this to use the bottom selected object as the clipping path or mask"));
+    _mask_mask_remove.init ( _("Remove clippath/mask object after applying"), "options.maskobject", "remove", true);
+    _page_mask.add_line(true, "", _mask_mask_remove, "", 
+                        _("After applying, remove the object used as the clipping path or mask from the drawing"));
+    this->AddPage(_page_mask, _("Clippaths and masks"), PREFS_PAGE_MASKS);
+}
+
 void InkscapePreferences::initPageTransforms()
 {
     _trans_scale_stroke.init ( _("Scale stroke width"), "options.transform", "stroke", true);
@@ -581,17 +598,6 @@ void InkscapePreferences::initPageMisc()
     _misc_overs_bitmap.init("options.bitmapoversample", "value", labels, values, num_items, 1);
     _page_misc.add_line( false, _("Oversample bitmaps:"), _misc_overs_bitmap, "", "", false);
 
-    _page_misc.add_group_header( _("Clipping and masking:"));
-    _misc_mask_on_top.init ( _("Use the topmost selected object as a clipping path or mask"), "options.maskobject", "topmost", true);
-    _page_misc.add_line(true, "", _misc_mask_on_top, "", 
-                        _("Uncheck this to use the bottom selected object as the clipping path or mask"));
-    _misc_mask_remove.init ( _("Remove clipping path or mask after applying"), "options.maskobject", "remove", true);
-    _page_misc.add_line(true, "", _misc_mask_remove, "", 
-                        _("After applying, remove the object used as the clipping path or mask from the drawing"));
-    _misc_use_ext_input.init( _("Use a pressure sensitive tablet or other device (requires restart)"), "options.useextinput", "value", true);
-    _page_misc.add_line(true, "",_misc_use_ext_input, "",
-                        _("Use the capabilities of a tablet or other pressure sensitive device. Disable this only if you have problems with the tablet."));
-
     this->AddPage(_page_misc, _("Misc"), PREFS_PAGE_MISC);
 }
 

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index bf327bf0e801333f5842e1202051695e957c22db..813929d2d7d868db2a330af1b638e2b5c5245c68 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -55,6 +55,7 @@ enum {
     PREFS_PAGE_TOOLS_DROPPER,
     PREFS_PAGE_WINDOWS,
     PREFS_PAGE_CLONES,
+    PREFS_PAGE_MASKS,
     PREFS_PAGE_FILTERS,
     PREFS_PAGE_TRANSFORMS,
     PREFS_PAGE_SELECTING,
@@ -96,12 +97,13 @@ protected:
     Gtk::TreeModel::Path _path_shapes;
 
     DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows,
-               _page_clones, _page_transforms, _page_filters, _page_select, _page_misc;
+        _page_clones, _page_mask, _page_transforms, _page_filters, _page_select, _page_misc;
     DialogPage _page_selector, _page_node, _page_zoom, _page_shapes, _page_pencil, _page_pen,
                _page_calligraphy, _page_text, _page_gradient, _page_connector, _page_dropper;
     DialogPage _page_rectangle, _page_ellipse, _page_star, _page_spiral, _page_paintbucket;
 
     PrefSpinButton _mouse_sens, _mouse_thres;
+    PrefCheckButton _mouse_use_ext_input;
 
     PrefSpinButton _scroll_wheel, _scroll_arrow_px, _scroll_arrow_acc, _scroll_auto_speed, _scroll_auto_thres;
 
@@ -130,6 +132,9 @@ protected:
     PrefRadioButton _clone_option_parallel, _clone_option_stay, _clone_option_transform,
                     _clone_option_unlink, _clone_option_delete;
 
+    PrefCheckButton _mask_mask_on_top;
+    PrefCheckButton _mask_mask_remove;
+
     PrefRadioButton _blur_quality_best, _blur_quality_better, _blur_quality_normal, _blur_quality_worse, _blur_quality_worst;
 
     PrefCheckButton _trans_scale_stroke, _trans_scale_corner, _trans_gradient,_trans_pattern;
@@ -144,9 +149,6 @@ protected:
     PrefSpinButton  _misc_export, _misc_recent, _misc_simpl;
     PrefCheckButton _misc_imp_bitmap, _misc_comment, _misc_scripts;
     PrefCombo       _misc_overs_bitmap;
-    PrefCheckButton _misc_mask_on_top;
-    PrefCheckButton _misc_mask_remove;
-    PrefCheckButton _misc_use_ext_input;
 
     int _max_dialog_width;
     int _max_dialog_height;
@@ -169,6 +171,7 @@ protected:
     void initPageTools();
     void initPageWindows();
     void initPageClones();
+    void initPageMasks();
     void initPageTransforms();
     void initPageFilters();
     void initPageSelecting();