index dea091f20a6230f271cc417b31206c255cf4f196..f3429ce7b59de9964f5d78242115fd92858bc52d 100644 (file)
_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);
+ _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
_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"));
+
+ _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);
//Rectangle
this->AddPage(_page_rectangle, _("Rectangle"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_RECT);
this->AddNewObjectsStyle(_page_rectangle, "tools.shapes.rect");
+ //3D box
+ this->AddPage(_page_3dbox, _("3D Box"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_3DBOX);
+ this->AddNewObjectsStyle(_page_3dbox, "tools.shapes.3dbox");
//ellipse
this->AddPage(_page_ellipse, _("Ellipse"), iter_shapes, PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
this->AddNewObjectsStyle(_page_ellipse, "tools.shapes.arc");
_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"));
+ _("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->AddNewObjectsStyle(_page_paintbucket, "tools.paintbucket");
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_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_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)"));
-#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)"));
+ _("Save and restore window geometry for each document (saves geometry in the document)"));
+
_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, "",
_("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
+ _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);
}
_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_small_toolbar.init( _("Make commands toolbar 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_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);