![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 3176c374ffdf339513411244bc72b9aba91ff92d..34e97a71372789c4e35634d1e1abcd8d4a85d81f 100644 (file)
@@ -229,6 +229,22 @@ void InkscapePreferences::AddGradientCheckbox(DialogPage& p, const std::string&
p.add_line( false, "", *cb, "", _("Whether selected objects display gradient editing controls"));
}
+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."));
+}
+
+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 StyleFromSelectionToTool(gchar const *prefs_path, StyleSwatch *swatch)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
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);
_page_selector.add_line( true, "", _t_sel_cue_box, "",
_("Each selected object displays its bounding box"));
- _page_selector.add_group_header( _("Bounding box to use:"));
- _t_sel_bbox_visual.init ( _("Visual bounding box"), "tools.select", "bounding_box", "visual", false, 0);
- _page_selector.add_line( true, "", _t_sel_bbox_visual, "",
- _("This bounding box includes stroke width, markers, filter margins, etc."));
- _t_sel_bbox_geometric.init ( _("Geometric bounding box"), "tools.select", "bounding_box", "geometric", true, &_t_sel_bbox_visual);
- _page_selector.add_line( true, "", _t_sel_bbox_geometric, "",
- _("This bounding box includes only the bare path"));
-
//Node
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, PREFS_PAGE_TOOLS_ZOOM);
AddSelcueCheckbox(_page_zoom, "tools.zoom", true);
//Rectangle
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, PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
this->AddNewObjectsStyle(_page_ellipse, "tools.shapes.arc");
_("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, 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, 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"));
_("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, PREFS_PAGE_TOOLS_TEXT);
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)"));
+ 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_group_header( _("Display adjustment"));
_page_cms.add_line( false, _("Display profile:"), _cms_display_profile, "",
_("The ICC profile to use to calibrate display output."), false);
_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);
+ _cms_proof_blackpoint.init( _("Black point compensation"), "options.softproof", "bpc", false);
_page_cms.add_line( false, "", _cms_proof_blackpoint, "",
_("Enables black point compensation."), false);
#else
_("(LittleCMS 1.15 or later required)"),
#endif // defined(cmsFLAGS_PRESERVEBLACK)
- _("Preserve K channel on CMYK -> CMYK transforms"), false);
+ _("Preserve K channel in CMYK -> CMYK transforms"), false);
#if !defined(cmsFLAGS_PRESERVEBLACK)
_cms_proof_preserveblack.set_sensitive( false );
_cms_proof_preserveblack.set_sensitive( false );
#endif // ENABLE_LCMS
- this->AddPage(_page_cms, _("Color Management"), PREFS_PAGE_CMS);
+ 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 ));