![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index df79429744f9622e3fab250fdf258f4e93e6a32f..b90ed8d986df30b27c805e9c1b4fde911fc69c58 100644 (file)
#include <gtkmm/frame.h>
#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/alignment.h>
#include "prefs-utils.h"
#include "inkscape-preferences.h"
#include "selection.h"
#include "selection-chemistry.h"
#include "xml/repr.h"
+#include "ui/widget/style-swatch.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;
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());
_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"),
@@ -203,28 +209,7 @@ 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)
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);
//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");
//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);
//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);
}
_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::initPageSelecting()
_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"));
+ this->AddPage(_page_select, _("Selecting"), PREFS_PAGE_SELECTING);
}
_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_simpl.init("options.simplifythreshold", "value", 0.0001, 1.0, 0.0001, 0.0010, 0.0010, false, false);
_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;
_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, "",
+ _("Affter applying, remove the object used as the clipping path or mask from the drawing"));
+
+ this->AddPage(_page_misc, _("Misc"), PREFS_PAGE_MISC);
}
bool InkscapePreferences::SetMaxDialogSize(const Gtk::TreeModel::iterator& iter)
@@ -486,12 +528,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();
}