Initial cut of eraser tool

[inkscape.git] / src / ui / dialog / inkscape-preferences.h

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 1609e808ce35e8beb29b9a4ab267932ff0dbd6cb..a1a577b95710165057b284ed72f9eddad53fa0af 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -54,6 +54,7 @@ enum {
     PREFS_PAGE_TOOLS_PEN,
     PREFS_PAGE_TOOLS_CALLIGRAPHY,
     PREFS_PAGE_TOOLS_PAINTBUCKET,
+    PREFS_PAGE_TOOLS_ERASER,
     PREFS_PAGE_TOOLS_TEXT,
     PREFS_PAGE_TOOLS_GRADIENT,
     PREFS_PAGE_TOOLS_CONNECTOR,
@@ -67,24 +68,9 @@ enum {
     PREFS_PAGE_IMPORTEXPORT,
     PREFS_PAGE_CMS,
     PREFS_PAGE_GRIDS,
-    PREFS_PAGE_METADATA,
-    PREFS_PAGE_LICENSE,
     PREFS_PAGE_MISC
 };
 
-enum {
-    LICENSE_PROPRIETARY = 0,
-    LICENSE_CC_BY = 1,
-    LICENSE_CC_BY_SA = 2,
-    LICENSE_CC_BY_ND = 3,
-    LICENSE_CC_BY_NC = 4,
-    LICENSE_CC_BY_NC_SA = 5,
-    LICENSE_CC_BY_NC_ND = 6,
-    LICENSE_PUBLIC_DOMAIN = 7,
-    LICENSE_FREE_ART = 8,
-    LICENSE_OPEN_FONT = 9
-};
-
 using namespace Inkscape::UI::Widget;
 
 namespace Inkscape {
@@ -120,13 +106,14 @@ protected:
 
     DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows,
         _page_clones, _page_mask, _page_transforms, _page_filters, _page_select,
-        _page_importexport, _page_cms, _page_grids, _page_metadata, _page_license, _page_misc;
-    DialogPage _page_selector, _page_node, _page_zoom, _page_shapes, _page_pencil, _page_pen,
+        _page_importexport, _page_cms, _page_grids, _page_misc;
+    DialogPage _page_selector, _page_node, _page_tweak, _page_zoom, _page_shapes, _page_pencil, _page_pen,
                _page_calligraphy, _page_text, _page_gradient, _page_connector, _page_dropper;
-    DialogPage _page_rectangle, _page_3dbox, _page_ellipse, _page_star, _page_spiral, _page_paintbucket;
+    DialogPage _page_rectangle, _page_3dbox, _page_ellipse, _page_star, _page_spiral, _page_paintbucket, _page_eraser;
 
     PrefSpinButton _mouse_sens, _mouse_thres;
     PrefCheckButton _mouse_use_ext_input;
+    PrefCheckButton _mouse_switch_on_ext_input;
 
     PrefSpinButton _scroll_wheel, _scroll_arrow_px, _scroll_arrow_acc, _scroll_auto_speed, _scroll_auto_thres;
     PrefCheckButton _scroll_space;
@@ -137,7 +124,11 @@ protected:
     PrefSpinButton  _steps_arrow, _steps_scale, _steps_inset, _steps_zoom;
 
     PrefRadioButton _t_sel_trans_obj, _t_sel_trans_outl, _t_sel_cue_none, _t_sel_cue_mark,
-                    _t_sel_cue_box, _t_sel_bbox_visual, _t_sel_bbox_geometric;
+                    _t_sel_cue_box, _t_bbox_visual, _t_bbox_geometric;
+    PrefCheckButton _t_cvg_keep_objects, _t_cvg_convert_whole_groups;
+    PrefCheckButton _t_node_pathflash_enabled;
+    PrefSpinButton  _t_node_pathflash_timeout;
+    PrefColorPicker _t_node_pathoutline_color;
 
     PrefSpinButton  _t_pencil_tolerance;
 
@@ -146,11 +137,6 @@ protected:
     PrefRadioButton _win_save_geom_off, _win_save_geom, _win_save_geom_prefs;
     PrefCheckButton _win_hide_task, _win_zoom_resize , _win_show_close;
 
-// FIXME: Temporary Win32 special code to enable transient dialogs
-#ifdef WIN32
-    PrefCheckButton _win_ontop_win32;
-#endif
-
     PrefCheckButton _calligrapy_use_abs_size;
     PrefCheckButton _calligrapy_keep_selected;
 
@@ -162,18 +148,8 @@ protected:
     PrefCheckButton _mask_mask_on_top;
     PrefCheckButton _mask_mask_remove;
 
-    PrefEntry _metadata_title, _metadata_date, _metadata_format, _metadata_type, _metadata_creator;
-    PrefEntry _metadata_rights, _metadata_publisher, _metadata_identifier, _metadata_source;
-    PrefEntry _metadata_relation, _metadata_language, _metadata_subject, _metadata_coverage;
-    PrefEntry _metadata_description, _metadata_contributor;
-
-    PrefRadioButton _license_ccby, _license_ccbysa, _license_ccbync, _license_ccbynd;
-    PrefRadioButton _license_ccbyncsa, _license_ccbyncnd;
-    PrefRadioButton _license_freeart, _license_pdomain, _license_openfont, _license_proprietary;
-    PrefEntry _license_uri;
-    void on_license_changed();
-
     PrefRadioButton _blur_quality_best, _blur_quality_better, _blur_quality_normal, _blur_quality_worse, _blur_quality_worst;
+    PrefCheckButton _show_filters_info_box;
 
     PrefCheckButton _trans_scale_stroke, _trans_scale_corner, _trans_gradient,_trans_pattern;
     PrefRadioButton _trans_optimized, _trans_preserved;
@@ -186,8 +162,9 @@ protected:
 
     PrefSpinButton  _importexport_export, _misc_recent, _misc_simpl;
     PrefCheckButton _misc_comment, _misc_forkvectors, _misc_scripts;
-    PrefCheckButton _misc_small_toolbar;
-    PrefCheckButton _misc_small_tools;
+    PrefCombo       _misc_small_toolbar;
+    PrefCombo       _misc_small_secondary;
+    PrefCombo       _misc_small_tools;
     PrefCombo       _misc_overs_bitmap;
 
     Gtk::ComboBoxText   _cms_display_profile;
@@ -203,6 +180,7 @@ protected:
     PrefCheckButton     _cms_proof_preserveblack;
 
     Gtk::Notebook       _grids_notebook;
+    PrefCheckButton     _grids_no_emphasize_on_zoom;
     DialogPage          _grids_xy, _grids_axonom;
     // CanvasXYGrid properties:
         PrefUnit            _grids_xy_units;
@@ -241,6 +219,8 @@ protected:
 
     static void AddSelcueCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
     static void AddGradientCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
+    static void AddConvertGuidesCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
+    static void AddDotSizeSpinbutton(DialogPage& p, const std::string& prefs_path, double def_value);
     static void AddNewObjectsStyle(DialogPage& p, const std::string& prefs_path);
 
     void on_pagelist_selection_changed();
@@ -257,8 +237,6 @@ protected:
     void initPageImportExport();
     void initPageCMS();
     void initPageGrids();
-    void initPageMetadata();
-    void initPageLicense();
     void initPageMisc();
 
     void _presentPages();
@@ -275,7 +253,7 @@ private:
 
 #endif //INKSCAPE_UI_DIALOG_INKSCAPE_PREFERENCES_H
 
-/* 
+/*
   Local Variables:
   mode:c++
   c-file-style:"stroustrup"