![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 2de1ebe6510dfc06b109f27a5c95285e29a633e2..f3429ce7b59de9964f5d78242115fd92858bc52d 100644 (file)
* Authors:
* Carl Hetherington
* Marco Scholten
+ * Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
*
- * 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 "inkscape-preferences.h"
#include "verbs.h"
#include "selcue.h"
+#include "unit-constants.h"
#include <iostream>
#include "enums.h"
#include "inkscape.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 {
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());
initPageTools();
initPageWindows();
initPageClones();
+ initPageMasks();
initPageTransforms();
+ initPageFilters();
initPageSelecting();
initPageMisc();
_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_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")};
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;
}
@@ -284,7 +296,7 @@ void InkscapePreferences::AddNewObjectsStyle(DialogPage& p, const std::string& p
StyleSwatch *swatch = 0;
if (tool_repr) {
SPCSSAttr *css = sp_repr_css_attr_inherited(tool_repr, "style");
- swatch = new StyleSwatch(css);
+ swatch = new StyleSwatch(css, _("This tool's style of new objects"));
hb->add(*swatch);
sp_repr_css_attr_unref(css);
}
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 ( _("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, PREFS_PAGE_TOOLS_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");
//Calligraphy
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 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");
//Text
this->AddPage(_page_text, _("Text"), iter_tools, PREFS_PAGE_TOOLS_TEXT);
this->AddSelcueCheckbox(_page_text, "tools.text", true);
//Connector
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, PREFS_PAGE_TOOLS_DROPPER);
this->AddSelcueCheckbox(_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_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( _("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
+ _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);
}
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()
{
_trans_scale_stroke.init ( _("Scale stroke width"), "options.transform", "stroke", true);
_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"));
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)"));
+ _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_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);
_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();
}
}