Code

Ctrl+click in pen/pencil tool: Created dots are now selected; Alt is used for randomn...
[inkscape.git] / src / ui / dialog / inkscape-preferences.cpp
index df79429744f9622e3fab250fdf258f4e93e6a32f..34e97a71372789c4e35634d1e1abcd8d4a85d81f 100644 (file)
@@ -4,8 +4,10 @@
  * Authors:
  *   Carl Hetherington
  *   Marco Scholten
+ *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
+ *   Bruno Dilly <bruno.dilly@gmail.com>
  *
- * Copyright (C) 2004, 2006 Authors
+ * Copyright (C) 2004-2007 Authors
  *
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */ 
 # include <config.h>
 #endif
 
+#include <gtkmm/main.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/alignment.h>
 
 #include "prefs-utils.h"
 #include "inkscape-preferences.h"
 #include "verbs.h"
 #include "selcue.h"
+#include "unit-constants.h"
 #include <iostream>
 #include "enums.h"
 #include "inkscape.h"
 #include "selection.h"
 #include "selection-chemistry.h"
 #include "xml/repr.h"
+#include "ui/widget/style-swatch.h"
+#include "display/nr-filter-gaussian.h"
+#include "color-profile-fns.h"
+#include "display/canvas-grid.h"
 
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
 InkscapePreferences::InkscapePreferences()
-    : Dialog ("dialogs.preferences", SP_VERB_DIALOG_DISPLAY),
+    : UI::Widget::Panel ("", "dialogs.preferences", SP_VERB_DIALOG_DISPLAY),
       _max_dialog_width(0), 
       _max_dialog_height(0),
       _current_page(0)
@@ -44,18 +53,19 @@ InkscapePreferences::InkscapePreferences()
     //get the width of a spinbutton
     Gtk::SpinButton* sb = new Gtk::SpinButton;
     sb->set_width_chars(6);
-    this->get_vbox()->add(*sb);
-    this->show_all_children();
-    _sb_width = sb->size_request().width;
-    this->get_vbox()->remove(*sb);
+    _getContents()->add(*sb);
+    show_all_children();
+    Gtk::Requisition sreq;
+    sb->size_request(sreq);
+    _sb_width = sreq.width;
+    _getContents()->remove(*sb);
     delete sb;
 
     //Main HBox
     Gtk::HBox* hbox_list_page = Gtk::manage(new Gtk::HBox());
     hbox_list_page->set_border_width(12);
     hbox_list_page->set_spacing(12);
-    this->get_vbox()->add(*hbox_list_page);
-
+    _getContents()->add(*hbox_list_page);
 
     //Pagelist
     Gtk::Frame* list_frame = Gtk::manage(new Gtk::Frame());
@@ -68,10 +78,10 @@ InkscapePreferences::InkscapePreferences()
     list_frame->add(*scrolled_window);
     _page_list_model = Gtk::TreeStore::create(_page_list_columns);
     _page_list.set_model(_page_list_model);
-    _page_list.append_column("id",_page_list_columns._col_id);
-       Glib::RefPtr<Gtk::TreeSelection> _page_list_selection = _page_list.get_selection();
-       _page_list_selection->signal_changed().connect(sigc::mem_fun(*this, &InkscapePreferences::on_pagelist_selection_changed));
-       _page_list_selection->set_mode(Gtk::SELECTION_BROWSE);
+    _page_list.append_column("name",_page_list_columns._col_name);
+       Glib::RefPtr<Gtk::TreeSelection> page_list_selection = _page_list.get_selection();
+       page_list_selection->signal_changed().connect(sigc::mem_fun(*this, &InkscapePreferences::on_pagelist_selection_changed));
+       page_list_selection->set_mode(Gtk::SELECTION_BROWSE);
     
     //Pages
     Gtk::VBox* vbox_page = Gtk::manage(new Gtk::VBox());
@@ -89,59 +99,67 @@ InkscapePreferences::InkscapePreferences()
     initPageTools();
     initPageWindows();
     initPageClones();
+    initPageMasks();
     initPageTransforms();
+    initPageFilters();
     initPageSelecting();
+    initPageImportExport();
+    initPageCMS();
+    initPageGrids();
     initPageMisc();
 
+    signalPresent().connect(sigc::mem_fun(*this, &InkscapePreferences::_presentPages));
+
     //calculate the size request for this dialog
     this->show_all_children();
     _page_list.expand_all();
     _page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::SetMaxDialogSize)); 
-    this->set_size_request(_max_dialog_width, _max_dialog_height);
+    _getContents()->set_size_request(_max_dialog_width, _max_dialog_height);
     _page_list.collapse_all();
-
-    //Select page todo: select last 
-    Gtk::TreeModel::iterator iter = _page_list_model->children().begin();
-    if(iter)
-      _page_list_selection->select(iter);
 }
 
 InkscapePreferences::~InkscapePreferences()
 {
 }
 
-Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title)
+Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title, int id)
 {
-    Gtk::TreeModel::iterator iter = _page_list_model->append();
-    Gtk::TreeModel::Row row = *iter;
-    row[_page_list_columns._col_id] = title;
-    row[_page_list_columns._col_page] = &p;
-    return iter;
+    return AddPage(p, title, Gtk::TreeModel::iterator() , id);
 }
 
-Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title, Gtk::TreeModel::iterator parent)
+Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title, Gtk::TreeModel::iterator parent, int id)
 {
-    Gtk::TreeModel::iterator iter = _page_list_model->append((*parent).children());
+    Gtk::TreeModel::iterator iter;
+    if (parent)
+       iter = _page_list_model->append((*parent).children());
+    else
+       iter = _page_list_model->append();
     Gtk::TreeModel::Row row = *iter;
-    row[_page_list_columns._col_id] = title;
+    row[_page_list_columns._col_name] = title;
+    row[_page_list_columns._col_id] = id;
     row[_page_list_columns._col_page] = &p;
     return iter;
 }
 
 void InkscapePreferences::initPageMouse()
 {
-    this->AddPage(_page_mouse, _("Mouse"));
+    this->AddPage(_page_mouse, _("Mouse"), PREFS_PAGE_MOUSE);
     _mouse_sens.init ( "options.cursortolerance", "value", 0.0, 30.0, 1.0, 1.0, 8.0, true, false);
     _page_mouse.add_line( false, _("Grab sensitivity:"), _mouse_sens, _("pixels"), 
                            _("How close on the screen you need to be to an object to be able to grab it with mouse (in screen pixels)"), false);
     _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()
 {
-    this->AddPage(_page_scrolling, _("Scrolling"));
+    this->AddPage(_page_scrolling, _("Scrolling"), PREFS_PAGE_SCROLLING);
     _scroll_wheel.init ( "options.wheelscroll", "value", 0.0, 1000.0, 1.0, 1.0, 40.0, true, false);
     _page_scrolling.add_line( false, _("Mouse wheel scrolls by:"), _scroll_wheel, _("pixels"), 
                            _("One mouse wheel notch scrolls by this distance in screen pixels (horizontally with Shift)"), false);
@@ -159,27 +177,35 @@ 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()
 {
-    this->AddPage(_page_steps, _("Steps"));
+    this->AddPage(_page_steps, _("Steps"), PREFS_PAGE_STEPS);
 
-    _steps_arrow.init ( "options.nudgedistance", "value", 0.0, 3000.0, 0.01, 1.0, 2.0, false, false);
+    _steps_arrow.init ( "options.nudgedistance", "value", 0.0, 1000.0, 0.01, 1.0, 2.0, false, false);
+    //nudgedistance is limited to 1000 in select-context.cpp: use the same limit here
     _page_steps.add_line( false, _("Arrow keys move by:"), _steps_arrow, _("px"), 
                           _("Pressing an arrow key moves selected object(s) or node(s) by this distance (in px units)"), false);
-    _steps_scale.init ( "options.defaultscale", "value", 0.0, 3000.0, 0.01, 1.0, 2.0, false, false);
+    _steps_scale.init ( "options.defaultscale", "value", 0.0, 1000.0, 0.01, 1.0, 2.0, false, false);
+    //defaultscale is limited to 1000 in select-context.cpp: use the same limit here 
     _page_steps.add_line( false, _("> and < scale by:"), _steps_scale, _("px"), 
                           _("Pressing > or < scales selection up or down by this increment (in px units)"), false);
     _steps_inset.init ( "options.defaultoffsetwidth", "value", 0.0, 3000.0, 0.01, 1.0, 2.0, false, false);
     _page_steps.add_line( false, _("Inset/Outset by:"), _steps_inset, _("px"), 
                           _("Inset and Outset commands displace the path by this distance (in px units)"), false);
     _steps_compass.init ( _("Compass-like display of angles"), "options.compassangledisplay", "value", true);
-    _page_windows.add_line( false, "", _steps_compass, "", 
+    _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"), 
@@ -203,37 +229,32 @@ void InkscapePreferences::AddGradientCheckbox(DialogPage& p, const std::string&
     p.add_line( false, "", *cb, "", _("Whether selected objects display gradient editing controls"));
 }
 
-void InkscapePreferences::AddNewObjectsStyle(DialogPage& p, const std::string& prefs_path)
-{
-    PrefRadioButton* current = Gtk::manage( new PrefRadioButton);
-    PrefRadioButton* own = Gtk::manage( new PrefRadioButton);
-    Gtk::Button* button = Gtk::manage( new Gtk::Button(_("Take from selection"),true));
-
-    own->changed_signal.connect( sigc::mem_fun(*button, &Gtk::Button::set_sensitive) );
-    button->signal_clicked().connect(sigc::bind( sigc::ptr_fun(InkscapePreferences::StyleFromSelectionToTool), prefs_path.c_str() ) );
-
-    current->init ( _("Last used style"), prefs_path, "usecurrent", 1, true, 0);
-    own->init ( _("This tool's own style:"), prefs_path, "usecurrent", 0, false, current);
+void InkscapePreferences::AddConvertGuidesCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value) {
+    PrefCheckButton* cb = Gtk::manage( new PrefCheckButton);
+    cb->init ( _("Conversion to guides uses edges instead of bounding box"), prefs_path, "convertguides", def_value);
+    p.add_line( false, "", *cb, "", _("Converting an object to guides places these along the object's true edges (imitating the object's shape), not along the bounding box."));
+}
 
-    p.add_group_header( _("Create new objects with:"));
-    p.add_line( true, "", *current, "",
-                _("Apply the style you last set on an object"));
-    p.add_line( true, "", *own, "",
-                _("Each tool may store its own style to apply to the newly created objects. Use the button below to set it."));
-    p.add_line( true, "", *button, "",
-                _("Remember the style of the (first) selected object as this tool's style"));
+void InkscapePreferences::AddDotSizeSpinbutton(DialogPage& p, const std::string& prefs_path, double def_value)
+{
+    PrefSpinButton* sb = Gtk::manage( new PrefSpinButton);
+    sb->init ( prefs_path, "dot-size", 0.0, 1000.0, 0.1, 10.0, def_value, false, false);
+    p.add_line( false, _("Ctrl+click dot size:"), *sb, "times current stroke width", 
+                       _("Size of dots created with Ctrl+click (relative to current stroke width)"),
+                       false );
 }
 
-void InkscapePreferences::StyleFromSelectionToTool(gchar const *prefs_path)
+
+void StyleFromSelectionToTool(gchar const *prefs_path, StyleSwatch *swatch)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
-    Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+    Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
     if (selection->isEmpty()) {
-        SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE,
+        sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE,
                                        _("<b>No objects selected</b> to take the style from."));
         return;
     }
@@ -242,7 +263,7 @@ void InkscapePreferences::StyleFromSelectionToTool(gchar const *prefs_path)
         /* TODO: If each item in the selection has the same style then don't consider it an error.
          * Maybe we should try to handle multiple selections anyway, e.g. the intersection of the
          * style attributes for the selected items. */
-        SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE,
+        sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE,
                                        _("<b>More than one object selected.</b>  Cannot take style from multiple objects."));
         return;
     }
@@ -261,14 +282,79 @@ void InkscapePreferences::StyleFromSelectionToTool(gchar const *prefs_path)
 
     sp_repr_css_change (inkscape_get_repr (INKSCAPE, prefs_path), css, "style");
     sp_repr_css_attr_unref (css);
+
+    // update the swatch
+    if (swatch) {
+        Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, prefs_path);
+        if (tool_repr) {
+            SPCSSAttr *css = sp_repr_css_attr_inherited(tool_repr, "style");
+            swatch->setStyle (css);
+            sp_repr_css_attr_unref(css);
+        }
+    }
+}
+
+void InkscapePreferences::AddNewObjectsStyle(DialogPage& p, const std::string& prefs_path)
+{
+
+
+    p.add_group_header( _("Create new objects with:"));
+    PrefRadioButton* current = Gtk::manage( new PrefRadioButton);
+    current->init ( _("Last used style"), prefs_path, "usecurrent", 1, true, 0);
+    p.add_line( true, "", *current, "",
+                _("Apply the style you last set on an object"));
+
+    PrefRadioButton* own = Gtk::manage( new PrefRadioButton);
+    Gtk::HBox* hb = Gtk::manage( new Gtk::HBox);
+    Gtk::Alignment* align = Gtk::manage( new Gtk::Alignment);
+    own->init ( _("This tool's own style:"), prefs_path, "usecurrent", 0, false, current);
+    align->set(0,0,0,0);    
+    align->add(*own);
+    hb->add(*align);
+    p.set_tip( *own, _("Each tool may store its own style to apply to the newly created objects. Use the button below to set it."));
+    p.add_line( true, "", *hb, "", "");
+
+    // style swatch
+    Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, prefs_path.c_str());
+    Gtk::Button* button = Gtk::manage( new Gtk::Button(_("Take from selection"),true));
+    StyleSwatch *swatch = 0;
+    if (tool_repr) {
+        SPCSSAttr *css = sp_repr_css_attr_inherited(tool_repr, "style");
+        swatch = new StyleSwatch(css, _("This tool's style of new objects"));
+        hb->add(*swatch);
+        sp_repr_css_attr_unref(css);
+    }
+
+    button->signal_clicked().connect( sigc::bind( sigc::ptr_fun(StyleFromSelectionToTool), prefs_path.c_str(), swatch)  );
+    own->changed_signal.connect( sigc::mem_fun(*button, &Gtk::Button::set_sensitive) );
+    p.add_line( true, "", *button, "",
+                _("Remember the style of the (first) selected object as this tool's style"));
 }
 
 void InkscapePreferences::initPageTools()
 {
-    Gtk::TreeModel::iterator iter_tools = this->AddPage(_page_tools, _("Tools"));    
+    Gtk::TreeModel::iterator iter_tools = this->AddPage(_page_tools, _("Tools"), PREFS_PAGE_TOOLS);    
+    _path_tools = _page_list.get_model()->get_path(iter_tools);
+
+    _page_tools.add_group_header( _("Bounding box to use:"));
+    _t_bbox_visual.init ( _("Visual bounding box"), "tools", "bounding_box", "visual", false, 0);
+    _page_tools.add_line( true, "", _t_bbox_visual, "",
+                            _("This bounding box includes stroke width, markers, filter margins, etc."));
+    _t_bbox_geometric.init ( _("Geometric bounding box"), "tools", "bounding_box", "geometric", true, &_t_bbox_visual);
+    _page_tools.add_line( true, "", _t_bbox_geometric, "",
+                            _("This bounding box includes only the bare path"));
+
+    _page_tools.add_group_header( _("Conversion to guides:"));
+    _t_cvg_keep_objects.init ( _("Keep objects after conversion to guides"), "tools", "cvg_keep_objects", false);
+    _page_tools.add_line( true, "", _t_cvg_keep_objects, "",
+                            _("When converting an object to guides, don't delete the object after the conversion."));
+
+    _calligrapy_use_abs_size.init ( _("Width is in absolute units"), "tools.calligraphic", "abs_width", false);
+    _calligrapy_keep_selected.init ( _("Select new path"), "tools.calligraphic", "keep_selected", true);
+    _connector_ignore_text.init( _("Don't attach connectors to text objects"), "tools.connector", "ignoretext", true);
 
     //Selector
-    this->AddPage(_page_selector, _("Selector"), iter_tools);
+    this->AddPage(_page_selector, _("Selector"), iter_tools, PREFS_PAGE_TOOLS_SELECTOR);
 
     AddSelcueCheckbox(_page_selector, "tools.select", false);
     _page_selector.add_group_header( _("When transforming, show:"));
@@ -288,93 +374,144 @@ void InkscapePreferences::initPageTools()
     _t_sel_cue_box.init ( _("Box"), "options.selcue", "value", Inkscape::SelCue::BBOX, false, &_t_sel_cue_none);
     _page_selector.add_line( true, "", _t_sel_cue_box, "", 
                             _("Each selected object displays its bounding box"));
-    _page_selector.add_group_header( _("Default scale origin:"));
-    _t_sel_org_edge.init ( _("Opposite bounding box edge"), "tools.select", "scale_origin", "bbox", true, 0);
-    _page_selector.add_line( true, "", _t_sel_org_edge, "", 
-                            _("Default scale origin will be on the bounding box of the item"));
-    _t_sel_org_node.init ( _("Farthest opposite node"), "tools.select", "scale_origin", "points", false, &_t_sel_org_edge);
-    _page_selector.add_line( true, "", _t_sel_org_node, "", 
-                            _("Default scale origin will be on the bounding box of the item's points"));
+
     //Node
-    this->AddPage(_page_node, _("Node"), iter_tools);
+    this->AddPage(_page_node, _("Node"), iter_tools, PREFS_PAGE_TOOLS_NODE);
     AddSelcueCheckbox(_page_node, "tools.nodes", true);
     AddGradientCheckbox(_page_node, "tools.nodes", true);
+    //Tweak
+    this->AddPage(_page_tweak, _("Tweak"), iter_tools, PREFS_PAGE_TOOLS_NODE);
+    AddSelcueCheckbox(_page_tweak, "tools.tweak", true);
+    AddGradientCheckbox(_page_tweak, "tools.tweak", false);
     //Zoom
-    this->AddPage(_page_zoom, _("Zoom"), iter_tools);
+    this->AddPage(_page_zoom, _("Zoom"), iter_tools, PREFS_PAGE_TOOLS_ZOOM);
     AddSelcueCheckbox(_page_zoom, "tools.zoom", true);
     AddGradientCheckbox(_page_zoom, "tools.zoom", false);
     //Shapes
-    Gtk::TreeModel::iterator iter_shapes = this->AddPage(_page_shapes, _("Shapes"), iter_tools);
+    Gtk::TreeModel::iterator iter_shapes = this->AddPage(_page_shapes, _("Shapes"), iter_tools, PREFS_PAGE_TOOLS_SHAPES);
+    _path_shapes = _page_list.get_model()->get_path(iter_shapes);
     this->AddSelcueCheckbox(_page_shapes, "tools.shapes", true);
     this->AddGradientCheckbox(_page_shapes, "tools.shapes", true);
     //Rectangle
-    this->AddPage(_page_rectangle, _("Rectangle"), iter_shapes);
+    this->AddPage(_page_rectangle, _("Rectangle"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_RECT);
     this->AddNewObjectsStyle(_page_rectangle, "tools.shapes.rect");
+    this->AddConvertGuidesCheckbox(_page_rectangle, "tools.shapes.rect", true);
+    //3D box
+    this->AddPage(_page_3dbox, _("3D Box"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_3DBOX);
+    this->AddNewObjectsStyle(_page_3dbox, "tools.shapes.3dbox");
+    this->AddConvertGuidesCheckbox(_page_3dbox, "tools.shapes.3dbox", true);
     //ellipse
-    this->AddPage(_page_ellipse, _("Ellipse"), iter_shapes);
+    this->AddPage(_page_ellipse, _("Ellipse"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
     this->AddNewObjectsStyle(_page_ellipse, "tools.shapes.arc");
     //star
-    this->AddPage(_page_star, _("Star"), iter_shapes);
+    this->AddPage(_page_star, _("Star"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_STAR);
     this->AddNewObjectsStyle(_page_star, "tools.shapes.star");
     //spiral
-    this->AddPage(_page_spiral, _("Spiral"), iter_shapes);
+    this->AddPage(_page_spiral, _("Spiral"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_SPIRAL);
     this->AddNewObjectsStyle(_page_spiral, "tools.shapes.spiral");
     //Pencil
-    this->AddPage(_page_pencil, _("Pencil"), iter_tools);
+    this->AddPage(_page_pencil, _("Pencil"), iter_tools, PREFS_PAGE_TOOLS_PENCIL);
     this->AddSelcueCheckbox(_page_pencil, "tools.freehand.pencil", true);
     _t_pencil_tolerance.init ( "tools.freehand.pencil", "tolerance", 0.0, 100.0, 0.5, 1.0, 10.0, false, false);
     _page_pencil.add_line( false, _("Tolerance:"), _t_pencil_tolerance, "", 
                            _("This value affects the amount of smoothing applied to freehand lines; lower values produce more uneven paths with more nodes"),
                            false );
     this->AddNewObjectsStyle(_page_pencil, "tools.freehand.pencil");
+    this->AddDotSizeSpinbutton(_page_pencil, "tools.freehand.pencil", 3.0);
     //Pen
-    this->AddPage(_page_pen, _("Pen"), iter_tools);
+    this->AddPage(_page_pen, _("Pen"), iter_tools, PREFS_PAGE_TOOLS_PEN);
     this->AddSelcueCheckbox(_page_pen, "tools.freehand.pen", true);
     this->AddNewObjectsStyle(_page_pen, "tools.freehand.pen");
+    this->AddDotSizeSpinbutton(_page_pen, "tools.freehand.pen", 3.0);
     //Calligraphy
-    this->AddPage(_page_calligraphy, _("Calligraphy"), iter_tools);
+    this->AddPage(_page_calligraphy, _("Calligraphy"), iter_tools, PREFS_PAGE_TOOLS_CALLIGRAPHY);
+    this->AddSelcueCheckbox(_page_calligraphy, "tools.calligraphic", false);
     this->AddNewObjectsStyle(_page_calligraphy, "tools.calligraphic");
+    _page_calligraphy.add_line( false, "", _calligrapy_use_abs_size, "", 
+                            _("If on, pen width is in absolute units (px) independent of zoom; otherwise pen width depends on zoom so that it looks the same at any zoom"));
+    _page_calligraphy.add_line( false, "", _calligrapy_keep_selected, "", 
+                            _("If on, each newly created object will be selected (deselecting previous selection)"));
+    //Paint Bucket
+    this->AddPage(_page_paintbucket, _("Paint Bucket"), iter_tools, PREFS_PAGE_TOOLS_PAINTBUCKET);
+    this->AddSelcueCheckbox(_page_paintbucket, "tools.paintbucket", false);
+    this->AddNewObjectsStyle(_page_paintbucket, "tools.paintbucket");
     //Text
-    this->AddPage(_page_text, _("Text"), iter_tools);
+    this->AddPage(_page_text, _("Text"), iter_tools, PREFS_PAGE_TOOLS_TEXT);
     this->AddSelcueCheckbox(_page_text, "tools.text", true);
     this->AddGradientCheckbox(_page_text, "tools.text", true);
     this->AddNewObjectsStyle(_page_text, "tools.text");
     //Gradient
-    this->AddPage(_page_gradient, _("Gradient"), iter_tools);
+    this->AddPage(_page_gradient, _("Gradient"), iter_tools, PREFS_PAGE_TOOLS_GRADIENT);
     this->AddSelcueCheckbox(_page_gradient, "tools.gradient", true);
     //Connector
-    this->AddPage(_page_connector, _("Connector"), iter_tools);
+    this->AddPage(_page_connector, _("Connector"), iter_tools, PREFS_PAGE_TOOLS_CONNECTOR);
     this->AddSelcueCheckbox(_page_connector, "tools.connector", true);
+    _page_connector.add_line(false, "", _connector_ignore_text, "", 
+            _("If on, connector attachment points will not be shown for text objects"));
     //Dropper
-    this->AddPage(_page_dropper, _("Dropper"), iter_tools);
+    this->AddPage(_page_dropper, _("Dropper"), iter_tools, PREFS_PAGE_TOOLS_DROPPER);
     this->AddSelcueCheckbox(_page_dropper, "tools.dropper", true);
     this->AddGradientCheckbox(_page_dropper, "tools.dropper", true);
 }
 
 void InkscapePreferences::initPageWindows()
 {
-    _win_save_geom.init ( _("Save window geometry"), "options.savewindowgeometry", "value", true);
+    _win_save_geom.init ( _("Save and restore window geometry for each document"), "options.savewindowgeometry", "value", 1, true, 0);
+    _win_save_geom_prefs.init ( _("Remember and use last window's geometry"), "options.savewindowgeometry", "value", 2, false, &_win_save_geom);
+    _win_save_geom_off.init ( _("Don't save window geometry"), "options.savewindowgeometry", "value", 0, false, &_win_save_geom);
+
+    _win_dockable.init ( _("Dockable"), "options.dialogtype", "value", 1, true, 0);
+    _win_floating.init ( _("Floating"), "options.dialogtype", "value", 0, false, &_win_dockable);
+
     _win_hide_task.init ( _("Dialogs are hidden in taskbar"), "options.dialogsskiptaskbar", "value", true);
     _win_zoom_resize.init ( _("Zoom when window is resized"), "options.stickyzoom", "value", false);
+    _win_show_close.init ( _("Show close button on dialogs"), "dialogs", "showclose", false);
     _win_ontop_none.init ( _("None"), "options.transientpolicy", "value", 0, false, 0);
     _win_ontop_normal.init ( _("Normal"), "options.transientpolicy", "value", 1, true, &_win_ontop_none);
     _win_ontop_agressive.init ( _("Aggressive"), "options.transientpolicy", "value", 2, false, &_win_ontop_none);
 
+// FIXME: Temporary Win32 special code to enable transient dialogs
+#ifdef WIN32 
+    _win_ontop_win32.init ( _("Dialogs stay on top (experimental!)"), "options.dialogsontopwin32", "value", false);
+#endif 
+
+    _page_windows.add_group_header( _("Saving window geometry (size and position):"));
+    _page_windows.add_line( false, "", _win_save_geom_off, "", 
+                            _("Let the window manager determine placement of all windows"));
+    _page_windows.add_line( false, "", _win_save_geom_prefs, "", 
+                            _("Remember and use the last window's geometry (saves geometry to user preferences)"));
     _page_windows.add_line( false, "", _win_save_geom, "", 
-                            _("Save the window size and position with each document (only for Inkscape SVG format)"));
-    _page_windows.add_line( false, "", _win_hide_task, "", 
-                            _("Whether dialog windows are to be hidden in the window manager taskbar"));
-    _page_windows.add_line( false, "", _win_zoom_resize, "", 
-                            _("Zoom drawing when document window is resized, to keep the same area visible (this is the default which can be changed in any window using the button above the right scrollbar)"));
+                            _("Save and restore window geometry for each document (saves geometry in the document)"));
+
+    _page_windows.add_group_header( _("Dialog behavior (requires restart):"));
+    _page_windows.add_line( true, "", _win_dockable, "", 
+                            _("Dockable"));
+    _page_windows.add_line( true, "", _win_floating, "", 
+                            _("Floating"));
+
     _page_windows.add_group_header( _("Dialogs on top:"));
+#ifndef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs
     _page_windows.add_line( true, "", _win_ontop_none, "", 
                             _("Dialogs are treated as regular windows"));
     _page_windows.add_line( true, "", _win_ontop_normal, "", 
                             _("Dialogs stay on top of document windows"));
     _page_windows.add_line( true, "", _win_ontop_agressive, "", 
                             _("Same as Normal but may work better with some window managers"));
+#else
+    _page_windows.add_line( false, "", _win_ontop_win32, "", 
+                            _("Whether dialogs should stay on top of document windows. Read the ReleaseNotes on this issue! (Rightclick the taskbar button and press 'Restore' to bring back a minimized document window)"));
+#endif                            
 
-    this->AddPage(_page_windows, _("Windows"));
+    _page_windows.add_group_header( _("Miscellaneous:"));
+#ifndef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs
+    _page_windows.add_line( false, "", _win_hide_task, "", 
+                            _("Whether dialog windows are to be hidden in the window manager taskbar"));
+#endif                           
+    _page_windows.add_line( false, "", _win_zoom_resize, "", 
+                            _("Zoom drawing when document window is resized, to keep the same area visible (this is the default which can be changed in any window using the button above the right scrollbar)"));
+    _page_windows.add_line( false, "", _win_show_close, "", 
+                            _("Whether dialog windows have a close button (requires restart)"));
+    this->AddPage(_page_windows, _("Windows"), PREFS_PAGE_WINDOWS);
 }
 
 void InkscapePreferences::initPageClones()
@@ -403,7 +540,18 @@ void InkscapePreferences::initPageClones()
     _page_clones.add_line( true, "", _clone_option_delete, "", 
                            _("Orphaned clones are deleted along with their original."));
 
-    this->AddPage(_page_clones, _("Clones"));
+    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()
@@ -412,62 +560,328 @@ void InkscapePreferences::initPageTransforms()
     _trans_scale_corner.init ( _("Scale rounded corners in rectangles"), "options.transform", "rectcorners", false);
     _trans_gradient.init ( _("Transform gradients"), "options.transform", "gradient", true);
     _trans_pattern.init ( _("Transform patterns"), "options.transform", "pattern", false);
-    _trans_optimized.init ( _("Normal"), "options.preservetransform", "value", 0, true, 0);
-    _trans_preserved.init ( _("Aggressive"), "options.preservetransform", "value", 1, false, &_trans_optimized);
+    _trans_optimized.init ( _("Optimized"), "options.preservetransform", "value", 0, true, 0);
+    _trans_preserved.init ( _("Preserved"), "options.preservetransform", "value", 1, false, &_trans_optimized);
 
     _page_transforms.add_line( false, "", _trans_scale_stroke, "", 
                                _("When scaling objects, scale the stroke width by the same proportion"));
     _page_transforms.add_line( false, "", _trans_scale_corner, "", 
                                _("When scaling rectangles, scale the radii of rounded corners"));
     _page_transforms.add_line( false, "", _trans_gradient, "", 
-                               _("Transform gradients (in fill or stroke) along with the objects"));
+                               _("Move gradients (in fill or stroke) along with the objects"));
     _page_transforms.add_line( false, "", _trans_pattern, "", 
-                               _("Transform patterns (in fill or stroke) along with the objects"));
+                               _("Move patterns (in fill or stroke) along with the objects"));
     _page_transforms.add_group_header( _("Store transformation:"));
     _page_transforms.add_line( true, "", _trans_optimized, "", 
                                _("If possible, apply transformation to objects without adding a transform= attribute"));
     _page_transforms.add_line( true, "", _trans_preserved, "", 
                                _("Always store transformation as a transform= attribute on objects"));
 
-    this->AddPage(_page_transforms, _("Transforms"));
+    this->AddPage(_page_transforms, _("Transforms"), PREFS_PAGE_TRANSFORMS);
 }
 
+void InkscapePreferences::initPageFilters()
+{
+    _blur_quality_best.init ( _("Best quality (slowest)"), "options.blurquality", "value", 
+                                  BLUR_QUALITY_BEST, false, 0);
+    _blur_quality_better.init ( _("Better quality (slower)"), "options.blurquality", "value", 
+                                  BLUR_QUALITY_BETTER, false, &_blur_quality_best);
+    _blur_quality_normal.init ( _("Average quality"), "options.blurquality", "value", 
+                                  BLUR_QUALITY_NORMAL, true, &_blur_quality_best);
+    _blur_quality_worse.init ( _("Lower quality (faster)"), "options.blurquality", "value", 
+                                  BLUR_QUALITY_WORSE, false, &_blur_quality_best);
+    _blur_quality_worst.init ( _("Lowest quality (fastest)"), "options.blurquality", "value", 
+                                  BLUR_QUALITY_WORST, false, &_blur_quality_best);
+
+    _page_filters.add_group_header( _("Gaussian blur quality for display:"));
+    _page_filters.add_line( true, "", _blur_quality_best, "", 
+                           _("Best quality, but display may be very slow at high zooms (bitmap export always uses best quality)"));
+    _page_filters.add_line( true, "", _blur_quality_better, "", 
+                           _("Better quality, but slower display"));
+    _page_filters.add_line( true, "", _blur_quality_normal, "", 
+                           _("Average quality, acceptable display speed"));
+    _page_filters.add_line( true, "", _blur_quality_worse, "", 
+                           _("Lower quality (some artifacts), but display is faster"));
+    _page_filters.add_line( true, "", _blur_quality_worst, "", 
+                           _("Lowest quality (considerable artifacts), but display is fastest"));
+
+    this->AddPage(_page_filters, _("Filters"), PREFS_PAGE_FILTERS);
+}
+
+
 void InkscapePreferences::initPageSelecting()
 {
-    _sel_current.init ( _("Select only within current layer"), "options.kbselection", "inlayer", true);
-    _sel_hidden.init ( _("Ignore hidden objects"), "options.kbselection", "onlyvisible", true);
-    _sel_locked.init ( _("Ignore locked objects"), "options.kbselection", "onlysensitive", true);
+    _sel_all.init ( _("Select in all layers"), "options.kbselection", "inlayer", PREFS_SELECTION_ALL, false, 0);
+    _sel_current.init ( _("Select only within current layer"), "options.kbselection", "inlayer", PREFS_SELECTION_LAYER, true, &_sel_all);
+    _sel_recursive.init ( _("Select in current layer and sublayers"), "options.kbselection", "inlayer", PREFS_SELECTION_LAYER_RECURSIVE, false, &_sel_all);
+    _sel_hidden.init ( _("Ignore hidden objects and layers"), "options.kbselection", "onlyvisible", true);
+    _sel_locked.init ( _("Ignore locked objects and layers"), "options.kbselection", "onlysensitive", true);
+    _sel_layer_deselects.init ( _("Deselect upon layer change"), "options.selection", "layerdeselect", true);
 
     _page_select.add_group_header( _("Ctrl+A, Tab, Shift+Tab:"));
+    _page_select.add_line( true, "", _sel_all, "", 
+                           _("Make keyboard selection commands work on objects in all layers"));
     _page_select.add_line( true, "", _sel_current, "", 
-                           _("Uncheck this to make keyboard selection commands work on objects in all layers"));
+                           _("Make keyboard selection commands work on objects in current layer only"));
+    _page_select.add_line( true, "", _sel_recursive, "", 
+                           _("Make keyboard selection commands work on objects in current layer and all its sublayers"));
     _page_select.add_line( true, "", _sel_hidden, "", 
-                           _("Uncheck this to be able to select objects that are hidden (either by themselves or by being in a hidden group or layer)"));
+                           _("Uncheck this to be able to select objects that are hidden (either by themselves or by being in a hidden layer)"));
     _page_select.add_line( true, "", _sel_locked, "", 
-                           _("Uncheck this to be able to select objects that are locked (either by themselves or by being in a locked group or layer)"));
+                           _("Uncheck this to be able to select objects that are locked (either by themselves or by being in a locked layer)"));
+
+    _page_select.add_line( false, "", _sel_layer_deselects, "", 
+                           _("Uncheck this to be able to keep the current objects selected when the current layer changes"));
+
+    this->AddPage(_page_select, _("Selecting"), PREFS_PAGE_SELECTING);
+}
+
+
+void InkscapePreferences::initPageImportExport()
+{
+    _importexport_export.init("dialogs.export.defaultxdpi", "value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _page_importexport.add_line( false, _("Default export resolution:"), _importexport_export, _("dpi"),
+                            _("Default bitmap resolution (in dots per inch) in the Export dialog"), false);
+    _importexport_ocal_url.init("options.ocalurl", "str", true, g_strdup_printf("openclipart.org"));
+    _page_importexport.add_line( false, _("Open Clip Art Library Server Name:"), _importexport_ocal_url, "", 
+        _("The server name of the Open Clip Art Library webdav server. It's used by the Import and Export to OCAL function."), true);
+    _importexport_ocal_username.init("options.ocalusername", "str", true);
+    _page_importexport.add_line( false, _("Open Clip Art Library Username:"), _importexport_ocal_username, "", 
+            _("The username used to log into Open Clip Art Library."), true);
+    _importexport_ocal_password.init("options.ocalpassword", "str", false);
+    _page_importexport.add_line( false, _("Open Clip Art Library Password:"), _importexport_ocal_password, "", 
+            _("The password used to log into Open Clip Art Library."), true);
+
+    this->AddPage(_page_importexport, _("Import/Export"), PREFS_PAGE_IMPORTEXPORT);
+}
+
+#if ENABLE_LCMS
+static void profileComboChanged( Gtk::ComboBoxText* combo )
+{
+    int rowNum = combo->get_active_row_number();
+    if ( rowNum < 1 ) {
+        prefs_set_string_attribute( "options.displayprofile", "uri", "" );
+    } else {
+        Glib::ustring active = combo->get_active_text();
+
+        Glib::ustring path = get_path_for_profile(active);
+        if ( !path.empty() ) {
+            prefs_set_string_attribute( "options.displayprofile", "uri", path.c_str() );
+        }
+    }
+}
+
+static void proofComboChanged( Gtk::ComboBoxText* combo )
+{
+    Glib::ustring active = combo->get_active_text();
 
-    this->AddPage(_page_select, _("Selecting"));
+    Glib::ustring path = get_path_for_profile(active);
+    if ( !path.empty() ) {
+        prefs_set_string_attribute( "options.softproof", "uri", path.c_str() );
+    }
+}
+
+static void gamutColorChanged( Gtk::ColorButton* btn ) {
+    Gdk::Color color = btn->get_color();
+    gushort r = color.get_red();
+    gushort g = color.get_green();
+    gushort b = color.get_blue();
+
+    gchar* tmp = g_strdup_printf("#%02x%02x%02x", (r >> 8), (g >> 8), (b >> 8) );
+
+    prefs_set_string_attribute( "options.softproof", "gamutcolor", tmp );
+    g_free(tmp);
 }
+#endif // ENABLE_LCMS
+
+void InkscapePreferences::initPageCMS()
+{
+    int const numIntents = 4;
+    /* TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm */
+    Glib::ustring intentLabels[numIntents] = {_("Perceptual"), _("Relative Colorimetric"), _("Saturation"), _("Absolute Colorimetric")};
+    int intentValues[numIntents] = {0, 1, 2, 3};
+
+#if !ENABLE_LCMS
+    Gtk::Label* lbl = new Gtk::Label(_("(Note: Color management has been disabled in this build)"));
+    _page_cms.add_line( false, "", *lbl, "", "", true);
+#endif // !ENABLE_LCMS
+
+    _page_cms.add_group_header( _("Display adjustment"));
+
+    _page_cms.add_line( false, _("Display profile:"), _cms_display_profile, "",
+                        _("The ICC profile to use to calibrate display output."), false);
+
+    _cms_from_display.init( _("Retrieve profile from display"), "options.displayprofile", "from_display", false);
+    _page_cms.add_line( false, "", _cms_from_display, "",
+#ifdef GDK_WINDOWING_X11
+                        _("Retrieve profiles from those attached to displays via XICC."), false);
+#else
+                        _("Retrieve profiles from those attached to displays."), false);
+#endif // GDK_WINDOWING_X11
+
+
+    _cms_intent.init("options.displayprofile", "intent", intentLabels, intentValues, numIntents, 0);
+    _page_cms.add_line( false, _("Display rendering intent:"), _cms_intent, "",
+                        _("The rendering intent to use to calibrate display output."), false);
+
+    _page_cms.add_group_header( _("Proofing"));
+
+    _cms_softproof.init( _("Simulate output on screen"), "options.softproof", "enable", false);
+    _page_cms.add_line( false, "", _cms_softproof, "",
+                        _("Simulates output of target device."), false);
+
+    _cms_gamutwarn.init( _("Mark out of gamut colors"), "options.softproof", "gamutwarn", false);
+    _page_cms.add_line( false, "", _cms_gamutwarn, "",
+                        _("Highlights colors that are out of gamut for the target device."), false);
+
+    gchar const* colorStr = prefs_get_string_attribute("options.softproof", "gamutcolor");
+    Gdk::Color tmpColor( (colorStr && colorStr[0]) ? colorStr : "#00ff00");
+    _cms_gamutcolor.set_color( tmpColor );
+    _page_cms.add_line( true, _("Out of gamut warning color:"), _cms_gamutcolor, "",
+                        _("Selects the color used for out of gamut warning."), false);
 
+    _page_cms.add_line( false, _("Device profile:"), _cms_proof_profile, "",
+                        _("The ICC profile to use to simulate device output."), false);
+
+    _cms_proof_intent.init("options.softproof", "intent", intentLabels, intentValues, numIntents, 0);
+    _page_cms.add_line( false, _("Device rendering intent:"), _cms_proof_intent, "",
+                        _("The rendering intent to use to calibrate display output."), false);
+
+    _cms_proof_blackpoint.init( _("Black point compensation"), "options.softproof", "bpc", false);
+    _page_cms.add_line( false, "", _cms_proof_blackpoint, "",
+                        _("Enables black point compensation."), false);
+
+    _cms_proof_preserveblack.init( _("Preserve black"), "options.softproof", "preserveblack", false);
+    _page_cms.add_line( false, "", _cms_proof_preserveblack,
+#if defined(cmsFLAGS_PRESERVEBLACK)
+                        "",
+#else
+                        _("(LittleCMS 1.15 or later required)"),
+#endif // defined(cmsFLAGS_PRESERVEBLACK)
+                        _("Preserve K channel in CMYK -> CMYK transforms"), false);
+
+#if !defined(cmsFLAGS_PRESERVEBLACK)
+    _cms_proof_preserveblack.set_sensitive( false );
+#endif // !defined(cmsFLAGS_PRESERVEBLACK)
+
+
+#if ENABLE_LCMS
+    {
+        std::vector<Glib::ustring> names = ::Inkscape::colorprofile_get_display_names();
+        Glib::ustring current = prefs_get_string_attribute( "options.displayprofile", "uri" );
+
+        gint index = 0;
+        _cms_display_profile.append_text(_("<none>"));
+        index++;
+        for ( std::vector<Glib::ustring>::iterator it = names.begin(); it != names.end(); ++it ) {
+            _cms_display_profile.append_text( *it );
+            Glib::ustring path = get_path_for_profile(*it);
+            if ( !path.empty() && path == current ) {
+                _cms_display_profile.set_active(index);
+            }
+            index++;
+        }
+        if ( current.empty() ) {
+            _cms_display_profile.set_active(0);
+        }
+
+        names = ::Inkscape::colorprofile_get_softproof_names();
+        const gchar * tmp = prefs_get_string_attribute( "options.softproof", "uri" );
+        current = tmp ? tmp : "";
+        index = 0;
+        for ( std::vector<Glib::ustring>::iterator it = names.begin(); it != names.end(); ++it ) {
+            _cms_proof_profile.append_text( *it );
+            Glib::ustring path = get_path_for_profile(*it);
+            if ( !path.empty() && path == current ) {
+                _cms_proof_profile.set_active(index);
+            }
+            index++;
+        }
+    }
+
+    _cms_gamutcolor.signal_color_set().connect( sigc::bind( sigc::ptr_fun(gamutColorChanged), &_cms_gamutcolor) );
+
+    _cms_display_profile.signal_changed().connect( sigc::bind( sigc::ptr_fun(profileComboChanged), &_cms_display_profile) );
+    _cms_proof_profile.signal_changed().connect( sigc::bind( sigc::ptr_fun(proofComboChanged), &_cms_proof_profile) );
+#else
+    // disable it, but leave it visible
+    _cms_intent.set_sensitive( false );
+    _cms_display_profile.set_sensitive( false );
+    _cms_from_display.set_sensitive( false );
+    _cms_softproof.set_sensitive( false );
+    _cms_gamutwarn.set_sensitive( false );
+    _cms_gamutcolor.set_sensitive( false );
+    _cms_proof_intent.set_sensitive( false );
+    _cms_proof_profile.set_sensitive( false );
+    _cms_proof_blackpoint.set_sensitive( false );
+    _cms_proof_preserveblack.set_sensitive( false );
+#endif // ENABLE_LCMS
+
+    this->AddPage(_page_cms, _("Color management"), PREFS_PAGE_CMS);
+}
+
+void InkscapePreferences::initPageGrids()
+{
+    _page_grids.add_group_header( _("Default grid settings"));
+
+    _grids_no_emphasize_on_zoom.init( _("Don't emphasize gridlines when zoomed out"), "options.grids", "no_emphasize_when_zoomedout", false);
+    _page_grids.add_line( false, "", _grids_no_emphasize_on_zoom, "", _("If set and zoomed out, the gridlines will be shown in normal color instead of major grid line color."), false);
+    _page_grids.add_line( false, "", _grids_notebook, "", "", false);
+    _grids_notebook.append_page(_grids_xy,     CanvasGrid::getName( GRID_RECTANGULAR ));
+    _grids_notebook.append_page(_grids_axonom, CanvasGrid::getName( GRID_AXONOMETRIC ));
+        _grids_xy_units.init("options.grids.xy", "units");
+        _grids_xy.add_line( false, _("Grid units"), _grids_xy_units, "", "", false);
+        _grids_xy_origin_x.init("options.grids.xy", "origin_x", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
+        _grids_xy_origin_y.init("options.grids.xy", "origin_y", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
+        _grids_xy.add_line( false, _("Origin X"), _grids_xy_origin_x, "", _("X coordinate of grid origin"), false);
+        _grids_xy.add_line( false, _("Origin Y"), _grids_xy_origin_y, "", _("Y coordinate of grid origin"), false);
+        _grids_xy_spacing_x.init("options.grids.xy", "spacing_x", -10000.0, 10000.0, 0.1, 1.0, 1.0, false, false);
+        _grids_xy_spacing_y.init("options.grids.xy", "spacing_y", -10000.0, 10000.0, 0.1, 1.0, 1.0, false, false);
+        _grids_xy.add_line( false, _("Spacing X"), _grids_xy_spacing_x, "", _("Distance between vertical grid lines"), false);
+        _grids_xy.add_line( false, _("Spacing Y"), _grids_xy_spacing_y, "", _("Distance between horizontal grid lines"), false);
+        
+        _grids_xy_color.init(_("Grid line color"), "options.grids.xy", "color", 0x0000ff20);
+        _grids_xy.add_line( false, _("Grid line color"), _grids_xy_color, "", _("Selects the color used for normal grid lines."), false);
+        _grids_xy_empcolor.init(_("Major grid line color"), "options.grids.xy", "empcolor", 0x0000ff40);
+        _grids_xy.add_line( false, _("Major grid line color"), _grids_xy_empcolor, "", _("Selects the color used for major (highlighted) grid lines."), false);
+        _grids_xy_empspacing.init("options.grids.xy", "empspacing", 1.0, 1000.0, 1.0, 5.0, 5.0, true, false);
+        _grids_xy.add_line( false, _("Major grid line every"), _grids_xy_empspacing, "", "", false);
+        _grids_xy_dotted.init( _("Show dots instead of lines"), "options.grids.xy", "dotted", false);
+        _grids_xy.add_line( false, "", _grids_xy_dotted, "", _("If set, displays dots at gridpoints instead of gridlines"), false);
+
+    // CanvasAxonomGrid properties:
+        _grids_axonom_units.init("options.grids.axonom", "units");
+        _grids_axonom.add_line( false, _("Grid units"), _grids_axonom_units, "", "", false);
+        _grids_axonom_origin_x.init("options.grids.axonom", "origin_x", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
+        _grids_axonom_origin_y.init("options.grids.axonom", "origin_y", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
+        _grids_axonom.add_line( false, _("Origin X"), _grids_axonom_origin_x, "", _("X coordinate of grid origin"), false);
+        _grids_axonom.add_line( false, _("Origin Y"), _grids_axonom_origin_y, "", _("Y coordinate of grid origin"), false);
+        _grids_axonom_spacing_y.init("options.grids.axonom", "spacing_y", -10000.0, 10000.0, 0.1, 1.0, 1.0, false, false);
+        _grids_axonom.add_line( false, _("Spacing Y"), _grids_axonom_spacing_y, "", _("Base length of z-axis"), false);
+        _grids_axonom_angle_x.init("options.grids.axonom", "angle_x", -360.0, 360.0, 1.0, 10.0, 30.0, false, false);
+        _grids_axonom_angle_z.init("options.grids.axonom", "angle_z", -360.0, 360.0, 1.0, 10.0, 30.0, false, false);
+        _grids_axonom.add_line( false, _("Angle X"), _grids_axonom_angle_x, "", _("Angle of x-axis"), false);
+        _grids_axonom.add_line( false, _("Angle Z"), _grids_axonom_angle_z, "", _("Angle of z-axis"), false);
+        _grids_axonom_color.init(_("Grid line color"), "options.grids.axonom", "color", 0x0000ff20);
+        _grids_axonom.add_line( false, _("Grid line color"), _grids_axonom_color, "", _("Selects the color used for normal grid lines."), false);
+        _grids_axonom_empcolor.init(_("Major grid line color"), "options.grids.axonom", "empcolor", 0x0000ff40);
+        _grids_axonom.add_line( false, _("Major grid line color"), _grids_axonom_empcolor, "", _("Selects the color used for major (highlighted) grid lines."), false);
+        _grids_axonom_empspacing.init("options.grids.axonom", "empspacing", 1.0, 1000.0, 1.0, 5.0, 5.0, true, false);
+        _grids_axonom.add_line( false, _("Major grid line every"), _grids_axonom_empspacing, "", "", false);
+
+    this->AddPage(_page_grids, _("Grids"), PREFS_PAGE_GRIDS);
+}
 
 void InkscapePreferences::initPageMisc()
 {
-    _misc_export.init("dialogs.export.defaultxdpi", "value", 0.0, 6000.0, 1.0, 1.0, 1.0, true, false);
-    _page_misc.add_line( false, _("Default export resolution:"), _misc_export, _("dpi"), 
-                           _("Default bitmap resolution (in dots per inch) in the Export dialog"), false);
-    _misc_imp_bitmap.init( _("Import bitmap as <image>"), "options.importbitmapsasimages", "value", true);
-    _page_misc.add_line( false, "", _misc_imp_bitmap, "", 
-                           _("When on, an imported bitmap creates an <image> element; otherwise it is a rectangle with bitmap fill"), true);
     _misc_comment.init( _("Add label comments to printing output"), "printing.debug", "show-label-comments", false);
     _page_misc.add_line( false, "", _misc_comment, "", 
                            _("When on, a comment will be added to the raw print output, marking the rendered output for an object with its label"), true);
-    _misc_scripts.init( _("Enable script effects (requires restart) - EXPERIMENTAL"), "extensions", "show-effects-menu", false);
-    _page_misc.add_line( false, "", _misc_scripts, "", 
-                           _("When on, the effects menu is enabled, allowing external effect scripts to be called, requires restart before effective - EXPERIMENTAL"), true);
-    _misc_recent.init("options.maxrecentdocuments", "value", 0.0, 1000.0, 1.0, 1.0, 1.0, true, false);
-    _page_misc.add_line( false, _("Max recent documents:"), _misc_recent, "", 
-                           _("The maximum length of the Open Recent list in the File menu"), false);
-    _misc_simpl.init("options.simplifythreshold", "value", 0.0001, 1.0, 0.0001, 0.001, 0.001, false, false);
+
+    _misc_forkvectors.init( _("Prevent sharing of gradient definitions"), "options.forkgradientvectors", "value", true);
+    _page_misc.add_line( false, "", _misc_forkvectors, "", 
+                           _("When on, shared gradient definitions are automatically forked on change; uncheck to allow sharing of gradient definitions so that editing one object may affect other objects using the same gradient"), true);
+
     _page_misc.add_line( false, _("Simplification threshold:"), _misc_simpl, "", 
                            _("How strong is the Simplify command by default. If you invoke this command several times in quick succession, it will act more and more aggressively; invoking it again after a pause restores the default threshold."), false);
     int const num_items = 5;
@@ -477,7 +891,22 @@ 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);
 
-    this->AddPage(_page_misc, _("Misc"));
+
+    // consider moving this to an UI tab:
+    _misc_small_toolbar.init( _("Make the commands toolbar icons smaller"), "toolbox", "small", true);
+    _page_misc.add_line( false, "", _misc_small_toolbar, "",
+                           _("Make the commands toolbar use the 'secondary' toolbar size (requires restart)"), true);
+
+    _misc_small_tools.init( _("Make the main toolbar icons smaller"), "toolbox.tools", "small", true);
+    _page_misc.add_line( false, "", _misc_small_tools, "",
+                           _("Make the main tools use the 'secondary' toolbar size (requires restart)"), true);
+
+    _misc_recent.init("options.maxrecentdocuments", "value", 0.0, 1000.0, 1.0, 1.0, 1.0, true, false);
+    _page_misc.add_line( false, _("Maximum number of recent documents:"), _misc_recent, "", 
+                           _("The maximum length of the Open Recent list in the File menu"), false);
+    _misc_simpl.init("options.simplifythreshold", "value", 0.0001, 1.0, 0.0001, 0.0010, 0.0010, false, false);
+
+    this->AddPage(_page_misc, _("Misc"), PREFS_PAGE_MISC);
 }
 
 bool InkscapePreferences::SetMaxDialogSize(const Gtk::TreeModel::iterator& iter)
@@ -486,12 +915,30 @@ bool InkscapePreferences::SetMaxDialogSize(const Gtk::TreeModel::iterator& iter)
     DialogPage* page = row[_page_list_columns._col_page];
     _page_frame.add(*page);
     this->show_all_children();
-    _max_dialog_width=std::max(_max_dialog_width, this->size_request().width);
-    _max_dialog_height=std::max(_max_dialog_height, this->size_request().height);
+    Gtk:: Requisition sreq;
+    this->size_request(sreq);
+    _max_dialog_width=std::max(_max_dialog_width, sreq.width);
+    _max_dialog_height=std::max(_max_dialog_height, sreq.height);
     _page_frame.remove();
     return false;
 }
 
+bool InkscapePreferences::PresentPage(const Gtk::TreeModel::iterator& iter)
+{
+    Gtk::TreeModel::Row row = *iter;
+    int desired_page = prefs_get_int_attribute("dialogs.preferences", "page", 0);
+    if (desired_page == row[_page_list_columns._col_id])
+    {
+        if (desired_page >= PREFS_PAGE_TOOLS && desired_page <= PREFS_PAGE_TOOLS_DROPPER)
+            _page_list.expand_row(_path_tools, false);
+        if (desired_page >= PREFS_PAGE_TOOLS_SHAPES && desired_page <= PREFS_PAGE_TOOLS_SHAPES_SPIRAL)
+            _page_list.expand_row(_path_shapes, false);
+        _page_list.get_selection()->select(iter);
+        return true;
+    }
+    return false;
+}
+
 void InkscapePreferences::on_pagelist_selection_changed()
 {
     // show new selection
@@ -503,12 +950,23 @@ void InkscapePreferences::on_pagelist_selection_changed()
             _page_frame.remove();
         Gtk::TreeModel::Row row = *iter;
         _current_page = row[_page_list_columns._col_page];
-        _page_title.set_markup("<span size='large'><b>" + row[_page_list_columns._col_id] + "</b></span>");
+        prefs_set_int_attribute("dialogs.preferences", "page", row[_page_list_columns._col_id]);
+        _page_title.set_markup("<span size='large'><b>" + row[_page_list_columns._col_name] + "</b></span>");
         _page_frame.add(*_current_page);
         _current_page->show();
+        while (Gtk::Main::events_pending()) 
+        {
+            Gtk::Main::iteration();
+        }
+        this->show_all_children();
     }
 }
 
+void InkscapePreferences::_presentPages()
+{
+    _page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::PresentPage)); 
+}
+
 } // namespace Dialog
 } // namespace UI
 } // namespace Inkscape