![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index addbcf39fe1cc0e19b1efaf5f72fa94778906f12..caf86161acbb10dd791ce2fc0279a2c2a2b95d69 100644 (file)
# 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"
namespace Inkscape {
namespace UI {
sb->set_width_chars(6);
this->get_vbox()->add(*sb);
this->show_all_children();
- _sb_width = sb->size_request().width;
+ Gtk:: Requisition sreq;
+ sb->size_request(sreq);
+ _sb_width = sreq.width;
this->get_vbox()->remove(*sb);
delete sb;
hbox_list_page->set_spacing(12);
this->get_vbox()->add(*hbox_list_page);
-
//Pagelist
Gtk::Frame* list_frame = Gtk::manage(new Gtk::Frame());
Gtk::ScrolledWindow* scrolled_window = Gtk::manage(new Gtk::ScrolledWindow());
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());
initPageWindows();
initPageClones();
initPageTransforms();
+ initPageFilters();
initPageSelecting();
initPageMisc();
_page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::SetMaxDialogSize));
this->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)
+void InkscapePreferences::present()
{
- 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;
+ _page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::PresentPage));
+ Dialog::present();
+}
+
+Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title, int id)
+{
+ 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);
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);
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);
_page_steps.add_line( false, _("Arrow keys move by:"), _steps_arrow, _("px"),
_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")};
@@ -203,37 +212,16 @@ 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);
-
- 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::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;
}
/* 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;
}
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);
+ 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);
+
+ _calligrapy_use_abs_size.init ( _("Width is in absolute units"), "tools.calligraphic", "abs_width", false);
+ _calligrapy_keep_selected.init ( _("Keep selected"), "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:"));
_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);
//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");
//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, "",
false );
this->AddNewObjectsStyle(_page_pencil, "tools.freehand.pencil");
//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");
//Calligraphy
- this->AddPage(_page_calligraphy, _("Calligraphy"), iter_tools);
+ this->AddPage(_page_calligraphy, _("Calligraphy"), iter_tools, PREFS_PAGE_TOOLS_CALLIGRAPHY);
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 object created with this tool will remain selected after you finish drawing it"));
//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);
}
_win_save_geom.init ( _("Save window geometry"), "options.savewindowgeometry", "value", true);
_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);
_("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)"));
+ _page_windows.add_line( false, "", _win_show_close, "",
+ _("Whether dialog windows have a close button (requires restart)"));
_page_windows.add_group_header( _("Dialogs on top:"));
_page_windows.add_line( true, "", _win_ontop_none, "",
_("Dialogs are treated as regular windows"));
_page_windows.add_line( true, "", _win_ontop_agressive, "",
_("Same as Normal but may work better with some window managers"));
- this->AddPage(_page_windows, _("Windows"));
+ this->AddPage(_page_windows, _("Windows"), PREFS_PAGE_WINDOWS);
}
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::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( 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_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"), "options.kbselection", "onlyvisible", true);
_sel_locked.init ( _("Ignore locked objects"), "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)"));
_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)"));
- this->AddPage(_page_select, _("Selecting"));
+ _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::initPageMisc()
{
- _misc_export.init("dialogs.export.defaultxdpi", "value", 0.0, 6000.0, 1.0, 1.0, 1.0, true, false);
+ _misc_export.init("dialogs.export.defaultxdpi", "value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, 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);
_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_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"));
+ _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);
}
bool InkscapePreferences::SetMaxDialogSize(const Gtk::TreeModel::iterator& iter)
@@ -486,12 +583,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
_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();
}
}