X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Finkscape-preferences.h;h=a6da63617d3cba7145fc912450e607e58163acbc;hb=4533e5e378aae1df5a980a1dd6b2359d02891513;hp=c1999f946ca087c70834f771c1c5a64ab49626df;hpb=1c8797563cc134190fe424f8fdb6b2f8ed7d9275;p=inkscape.git

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index c1999f946..a6da63617 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <vector>
 #include <gtkmm/table.h>
+#include <gtkmm/colorbutton.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/treestore.h>
@@ -40,6 +41,7 @@ enum {
     PREFS_PAGE_TOOLS,
     PREFS_PAGE_TOOLS_SELECTOR,
     PREFS_PAGE_TOOLS_NODE,
+    PREFS_PAGE_TOOLS_TWEAK,
     PREFS_PAGE_TOOLS_ZOOM,
     PREFS_PAGE_TOOLS_SHAPES,
     PREFS_PAGE_TOOLS_SHAPES_RECT,
@@ -61,6 +63,8 @@ enum {
     PREFS_PAGE_FILTERS,
     PREFS_PAGE_TRANSFORMS,
     PREFS_PAGE_SELECTING,
+    PREFS_PAGE_IMPORTEXPORT,
+    PREFS_PAGE_CMS,
     PREFS_PAGE_MISC
 };
 
@@ -74,7 +78,9 @@ class InkscapePreferences : public Dialog {
 public:
     virtual ~InkscapePreferences();
 
-    static InkscapePreferences *create() {return new InkscapePreferences(); }
+    static InkscapePreferences *create(Behavior::BehaviorFactory behavior_factory) 
+    { return new InkscapePreferences(behavior_factory); }
+
     void present();
 
 protected:
@@ -99,7 +105,8 @@ protected:
     Gtk::TreeModel::Path _path_shapes;
 
     DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows,
-        _page_clones, _page_mask, _page_transforms, _page_filters, _page_select, _page_misc;
+        _page_clones, _page_mask, _page_transforms, _page_filters, _page_select, 
+        _page_importexport, _page_cms, _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_3dbox, _page_ellipse, _page_star, _page_spiral, _page_paintbucket;
@@ -120,6 +127,7 @@ protected:
 
     PrefSpinButton  _t_pencil_tolerance;
 
+    PrefRadioButton _win_dockable, _win_floating;
     PrefRadioButton _win_ontop_none, _win_ontop_normal, _win_ontop_agressive;
     PrefRadioButton _win_save_geom_off, _win_save_geom, _win_save_geom_prefs;
     PrefCheckButton _win_hide_task, _win_zoom_resize , _win_show_close;
@@ -151,13 +159,27 @@ protected:
     PrefCheckButton _sel_hidden, _sel_locked;
     PrefCheckButton _sel_layer_deselects;
 
-    PrefSpinButton  _misc_export, _misc_recent, _misc_simpl;
-    PrefCheckButton _misc_imp_bitmap, _misc_comment, _misc_scripts;
+    PrefSpinButton  _importexport_export, _misc_recent, _misc_simpl;
+    PrefCheckButton _misc_comment, _misc_forkvectors, _misc_scripts;
     PrefCheckButton _misc_small_toolbar;
+    PrefCheckButton _misc_small_tools;
     PrefCombo       _misc_overs_bitmap;
-    PrefEntry       _misc_ocal_url;
-    PrefEntry       _misc_ocal_username;
-    PrefEntry       _misc_ocal_password;
+
+    PrefCheckButton     _cms_display;
+    Gtk::ComboBoxText   _cms_display_profile;
+    PrefCombo           _cms_intent;
+
+    PrefCheckButton     _cms_softproof;
+    PrefCheckButton     _cms_gamutwarn;
+    Gtk::ColorButton    _cms_gamutcolor;
+    Gtk::ComboBoxText   _cms_proof_profile;
+    PrefCombo           _cms_proof_intent;
+    PrefCheckButton     _cms_proof_blackpoint;
+    PrefCheckButton     _cms_proof_preserveblack;
+
+    PrefEntryButtonHBox _importexport_ocal_url;
+    PrefEntry       _importexport_ocal_username;
+    PrefEntry       _importexport_ocal_password;
 
     int _max_dialog_width;
     int _max_dialog_height;
@@ -184,10 +206,12 @@ protected:
     void initPageTransforms();
     void initPageFilters();
     void initPageSelecting();
+    void initPageImportExport();
+    void initPageCMS();
     void initPageMisc();
 
 private:
-    InkscapePreferences();
+    InkscapePreferences(Behavior::BehaviorFactory behavior_factory);
     InkscapePreferences(InkscapePreferences const &d);
     InkscapePreferences operator=(InkscapePreferences const &d);
 };