![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/verbs.cpp b/src/verbs.cpp
index b92eb52c06f03969691c4aa38628e2a3c6ddf996..ff1e3f676cd48c9e3104c908d6515d88bd6a82d9 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
#include "path-chemistry.h"
#include "text-chemistry.h"
#include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/document-properties.h"
#include "ui/dialog/inkscape-preferences.h"
#include "interface.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "splivarot.h"
#include "sp-namedview.h"
#include "sp-flowtext.h"
return;
}
-/** \brief Accessor to get the tooltip for verb as localised string */
+/** \brief Accessor to get the tooltip for verb as localised string */
gchar const *
-Verb::get_tip (void)
+Verb::get_tip (void)
{
- return _(_tip);
+ return _(_tip);
}
void
sp_redo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_CUT:
- sp_selection_cut();
+ sp_selection_cut(dt);
break;
case SP_VERB_EDIT_COPY:
sp_selection_copy();
break;
case SP_VERB_EDIT_PASTE:
- sp_selection_paste(false);
+ sp_selection_paste(dt, false);
break;
case SP_VERB_EDIT_PASTE_STYLE:
- sp_selection_paste_style();
+ sp_selection_paste_style(dt);
break;
case SP_VERB_EDIT_PASTE_SIZE:
- sp_selection_paste_size(true, true);
+ sp_selection_paste_size(dt, true, true);
break;
case SP_VERB_EDIT_PASTE_SIZE_X:
- sp_selection_paste_size(true, false);
+ sp_selection_paste_size(dt, true, false);
break;
case SP_VERB_EDIT_PASTE_SIZE_Y:
- sp_selection_paste_size(false, true);
+ sp_selection_paste_size(dt, false, true);
break;
case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY:
- sp_selection_paste_size_separately(true, true);
+ sp_selection_paste_size_separately(dt, true, true);
break;
case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_X:
- sp_selection_paste_size_separately(true, false);
+ sp_selection_paste_size_separately(dt, true, false);
break;
case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_Y:
- sp_selection_paste_size_separately(false, true);
+ sp_selection_paste_size_separately(dt, false, true);
break;
case SP_VERB_EDIT_PASTE_IN_PLACE:
- sp_selection_paste(true);
+ sp_selection_paste(dt, true);
break;
case SP_VERB_EDIT_PASTE_LIVEPATHEFFECT:
- sp_selection_paste_livepatheffect();
+ sp_selection_paste_livepatheffect(dt);
break;
case SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT:
- sp_selection_remove_livepatheffect();
+ sp_selection_remove_livepatheffect(dt);
break;
case SP_VERB_EDIT_REMOVE_FILTER:
- sp_selection_remove_filter();
+ sp_selection_remove_filter(dt);
break;
case SP_VERB_EDIT_DELETE:
- sp_selection_delete();
+ sp_selection_delete(dt);
break;
case SP_VERB_EDIT_DUPLICATE:
- sp_selection_duplicate();
+ sp_selection_duplicate(dt);
break;
case SP_VERB_EDIT_CLONE:
- sp_selection_clone();
+ sp_selection_clone(dt);
break;
case SP_VERB_EDIT_UNLINK_CLONE:
- sp_selection_unlink();
+ sp_selection_unlink(dt);
break;
case SP_VERB_EDIT_RELINK_CLONE:
- sp_selection_relink();
+ sp_selection_relink(dt);
break;
case SP_VERB_EDIT_CLONE_SELECT_ORIGINAL:
- sp_select_clone_original();
+ sp_select_clone_original(dt);
break;
case SP_VERB_EDIT_SELECTION_2_MARKER:
- sp_selection_to_marker();
+ sp_selection_to_marker(dt);
break;
case SP_VERB_EDIT_SELECTION_2_GUIDES:
- sp_selection_to_guides();
+ sp_selection_to_guides(dt);
break;
case SP_VERB_EDIT_TILE:
- sp_selection_tile();
+ sp_selection_tile(dt);
break;
case SP_VERB_EDIT_UNTILE:
- sp_selection_untile();
+ sp_selection_untile(dt);
break;
case SP_VERB_EDIT_CLEAR_ALL:
- sp_edit_clear_all();
+ sp_edit_clear_all(dt);
break;
case SP_VERB_EDIT_SELECT_ALL:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(false);
+ ec->shape_editor->select_all_from_subpath(false);
} else {
- sp_edit_select_all();
+ sp_edit_select_all(dt);
}
break;
case SP_VERB_EDIT_INVERT:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(true);
+ ec->shape_editor->select_all_from_subpath(true);
} else {
- sp_edit_invert();
+ sp_edit_invert(dt);
}
break;
case SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all(false);
+ ec->shape_editor->select_all(false);
} else {
- sp_edit_select_all_in_all_layers();
+ sp_edit_select_all_in_all_layers(dt);
}
break;
case SP_VERB_EDIT_INVERT_IN_ALL_LAYERS:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all(true);
+ ec->shape_editor->select_all(true);
} else {
- sp_edit_invert_in_all_layers();
+ sp_edit_invert_in_all_layers(dt);
}
break;
case SP_VERB_EDIT_SELECT_NEXT:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_next();
+ ec->shape_editor->select_next();
} else if (tools_isactive(dt, TOOLS_GRADIENT)
&& ec->_grdrag->isNonEmpty()) {
sp_gradient_context_select_next (ec);
} else {
- sp_selection_item_next();
+ sp_selection_item_next(dt);
}
break;
case SP_VERB_EDIT_SELECT_PREV:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_prev();
+ ec->shape_editor->select_prev();
} else if (tools_isactive(dt, TOOLS_GRADIENT)
&& ec->_grdrag->isNonEmpty()) {
sp_gradient_context_select_prev (ec);
} else {
- sp_selection_item_prev();
+ sp_selection_item_prev(dt);
}
break;
case SP_VERB_EDIT_DESELECT:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->deselect();
+ ec->shape_editor->deselect();
} else {
sp_desktop_selection(dt)->clear();
}
break;
case SP_VERB_EDIT_GUIDES_AROUND_PAGE:
- sp_guide_create_guides_around_page(sp_desktop_document(dt));
+ sp_guide_create_guides_around_page(dt);
break;
case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
sp_selection_next_patheffect_param(dt);
break;
+ case SP_VERB_EDIT_LINK_COLOR_PROFILE:
+ break;
+ case SP_VERB_EDIT_REMOVE_COLOR_PROFILE:
+ break;
default:
break;
}
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_SELECTION_TO_FRONT:
- sp_selection_raise_to_top();
+ sp_selection_raise_to_top(dt);
break;
case SP_VERB_SELECTION_TO_BACK:
- sp_selection_lower_to_bottom();
+ sp_selection_lower_to_bottom(dt);
break;
case SP_VERB_SELECTION_RAISE:
- sp_selection_raise();
+ sp_selection_raise(dt);
break;
case SP_VERB_SELECTION_LOWER:
- sp_selection_lower();
+ sp_selection_lower(dt);
break;
case SP_VERB_SELECTION_GROUP:
- sp_selection_group();
+ sp_selection_group(dt);
break;
case SP_VERB_SELECTION_UNGROUP:
- sp_selection_ungroup();
+ sp_selection_ungroup(dt);
break;
case SP_VERB_SELECTION_TEXTTOPATH:
break;
case SP_VERB_SELECTION_UNION:
- sp_selected_path_union();
+ sp_selected_path_union(dt);
break;
case SP_VERB_SELECTION_INTERSECT:
- sp_selected_path_intersect();
+ sp_selected_path_intersect(dt);
break;
case SP_VERB_SELECTION_DIFF:
- sp_selected_path_diff();
+ sp_selected_path_diff(dt);
break;
case SP_VERB_SELECTION_SYMDIFF:
- sp_selected_path_symdiff();
+ sp_selected_path_symdiff(dt);
break;
case SP_VERB_SELECTION_CUT:
- sp_selected_path_cut();
+ sp_selected_path_cut(dt);
break;
case SP_VERB_SELECTION_SLICE:
- sp_selected_path_slice();
+ sp_selected_path_slice(dt);
break;
case SP_VERB_SELECTION_OFFSET:
- sp_selected_path_offset();
+ sp_selected_path_offset(dt);
break;
case SP_VERB_SELECTION_OFFSET_SCREEN:
- sp_selected_path_offset_screen(1);
+ sp_selected_path_offset_screen(dt, 1);
break;
case SP_VERB_SELECTION_OFFSET_SCREEN_10:
- sp_selected_path_offset_screen(10);
+ sp_selected_path_offset_screen(dt, 10);
break;
case SP_VERB_SELECTION_INSET:
- sp_selected_path_inset();
+ sp_selected_path_inset(dt);
break;
case SP_VERB_SELECTION_INSET_SCREEN:
- sp_selected_path_inset_screen(1);
+ sp_selected_path_inset_screen(dt, 1);
break;
case SP_VERB_SELECTION_INSET_SCREEN_10:
- sp_selected_path_inset_screen(10);
+ sp_selected_path_inset_screen(dt, 10);
break;
case SP_VERB_SELECTION_DYNAMIC_OFFSET:
- sp_selected_path_create_offset_object_zero();
- tools_switch_current(TOOLS_NODES);
+ sp_selected_path_create_offset_object_zero(dt);
+ tools_switch(dt, TOOLS_NODES);
break;
case SP_VERB_SELECTION_LINKED_OFFSET:
- sp_selected_path_create_updating_offset_object_zero();
- tools_switch_current(TOOLS_NODES);
+ sp_selected_path_create_updating_offset_object_zero(dt);
+ tools_switch(dt, TOOLS_NODES);
break;
-
case SP_VERB_SELECTION_OUTLINE:
- sp_selected_path_outline();
+ sp_selected_path_outline(dt);
break;
case SP_VERB_SELECTION_SIMPLIFY:
- sp_selected_path_simplify();
+ sp_selected_path_simplify(dt);
break;
case SP_VERB_SELECTION_REVERSE:
- sp_selected_path_reverse();
+ sp_selected_path_reverse(dt);
break;
case SP_VERB_SELECTION_TRACE:
inkscape_dialogs_unhide();
dt->_dlg_mgr->showDialog("Trace");
break;
case SP_VERB_SELECTION_CREATE_BITMAP:
- sp_selection_create_bitmap_copy();
+ sp_selection_create_bitmap_copy(dt);
break;
case SP_VERB_SELECTION_COMBINE:
- sp_selected_path_combine();
+ sp_selected_path_combine(dt);
break;
case SP_VERB_SELECTION_BREAK_APART:
- sp_selected_path_break_apart();
+ sp_selected_path_break_apart(dt);
break;
case SP_VERB_SELECTION_GRIDTILE:
inkscape_dialogs_unhide();
break;
}
case SP_VERB_LAYER_MOVE_TO_NEXT: {
- sp_selection_to_next_layer();
+ sp_selection_to_next_layer(dt);
break;
}
case SP_VERB_LAYER_MOVE_TO_PREV: {
- sp_selection_to_prev_layer();
+ sp_selection_to_prev_layer(dt);
break;
}
case SP_VERB_LAYER_TO_TOP:
g_free(name);
}
- sp_edit_select_all();
- sp_selection_duplicate(true);
- sp_selection_to_prev_layer(true);
+ sp_edit_select_all(dt);
+ sp_selection_duplicate(dt, true);
+ sp_selection_to_prev_layer(dt, true);
dt->setCurrentLayer(new_layer);
- sp_edit_select_all();
+ sp_edit_select_all(dt);
sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_DUPLICATE,
_("Duplicate layer"));
-
+
// TRANSLATORS: this means "The layer has been duplicated."
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Duplicated layer."));
} else {
if (sel->isEmpty())
return;
- NR::Maybe<NR::Rect> bbox = sel->bounds();
+ Geom::OptRect bbox = sel->bounds();
if (!bbox) {
return;
}
// If the rotation center of the selection is visible, choose it as reference point
// for horizontal and vertical flips. Otherwise, take the center of the bounding box.
- NR::Point center;
+ Geom::Point center;
if (tools_isactive(dt, TOOLS_SELECT) && sel->center() && SP_SELECT_CONTEXT(ec)->_seltrans->centerIsVisible())
center = *sel->center();
else
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_OBJECT_ROTATE_90_CW:
- sp_selection_rotate_90_cw();
+ sp_selection_rotate_90(dt, false);
break;
case SP_VERB_OBJECT_ROTATE_90_CCW:
- sp_selection_rotate_90_ccw();
+ sp_selection_rotate_90(dt, true);
break;
case SP_VERB_OBJECT_FLATTEN:
- sp_selection_remove_transform();
+ sp_selection_remove_transform(dt);
break;
case SP_VERB_OBJECT_TO_CURVE:
- sp_selected_path_to_curves();
+ sp_selected_path_to_curves(dt);
break;
case SP_VERB_OBJECT_FLOW_TEXT:
text_flow_into_shape();
if (active_node) {
// ... flip the selected nodes about that node
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X, active_node->pos);
+ ec->shape_editor->flip(Geom::X, active_node->pos);
} else {
// ... or else about the center of their bounding box.
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X);
+ ec->shape_editor->flip(Geom::X);
}
// When working with the selector tool, flip the selection about its rotation center
// (if it is visible) or about the center of the bounding box.
} else {
- sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0));
+ sp_selection_scale_relative(sel, center, Geom::Scale(-1.0, 1.0));
}
sp_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_HORIZONTAL,
_("Flip horizontally"));
if (tools_isactive(dt, TOOLS_NODES)) {
Inkscape::NodePath::Node *active_node = Inkscape::NodePath::Path::active_node;
if (active_node) {
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::Y, active_node->pos);
+ ec->shape_editor->flip(Geom::Y, active_node->pos);
} else {
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::Y);
+ ec->shape_editor->flip(Geom::Y);
}
} else {
- sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0));
+ sp_selection_scale_relative(sel, center, Geom::Scale(1.0, -1.0));
}
sp_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_VERTICAL,
_("Flip vertically"));
break;
case SP_VERB_OBJECT_SET_MASK:
- sp_selection_set_mask(false, false);
+ sp_selection_set_mask(dt, false, false);
break;
case SP_VERB_OBJECT_EDIT_MASK:
sp_selection_edit_clip_or_mask(dt, false);
break;
case SP_VERB_OBJECT_UNSET_MASK:
- sp_selection_unset_mask(false);
+ sp_selection_unset_mask(dt, false);
break;
case SP_VERB_OBJECT_SET_CLIPPATH:
- sp_selection_set_mask(true, false);
+ sp_selection_set_mask(dt, true, false);
break;
case SP_VERB_OBJECT_EDIT_CLIPPATH:
sp_selection_edit_clip_or_mask(dt, true);
break;
case SP_VERB_OBJECT_UNSET_CLIPPATH:
- sp_selection_unset_mask(true);
+ sp_selection_unset_mask(dt, true);
break;
default:
break;
}
}
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
switch (verb) {
case SP_VERB_CONTEXT_SELECT:
- tools_switch_current(TOOLS_SELECT);
+ tools_switch(dt, TOOLS_SELECT);
break;
case SP_VERB_CONTEXT_NODE:
- tools_switch_current(TOOLS_NODES);
+ tools_switch(dt, TOOLS_NODES);
break;
case SP_VERB_CONTEXT_TWEAK:
- tools_switch_current(TOOLS_TWEAK);
+ tools_switch(dt, TOOLS_TWEAK);
break;
case SP_VERB_CONTEXT_RECT:
- tools_switch_current(TOOLS_SHAPES_RECT);
+ tools_switch(dt, TOOLS_SHAPES_RECT);
break;
case SP_VERB_CONTEXT_3DBOX:
- tools_switch_current(TOOLS_SHAPES_3DBOX);
+ tools_switch(dt, TOOLS_SHAPES_3DBOX);
break;
case SP_VERB_CONTEXT_ARC:
- tools_switch_current(TOOLS_SHAPES_ARC);
+ tools_switch(dt, TOOLS_SHAPES_ARC);
break;
case SP_VERB_CONTEXT_STAR:
- tools_switch_current(TOOLS_SHAPES_STAR);
+ tools_switch(dt, TOOLS_SHAPES_STAR);
break;
case SP_VERB_CONTEXT_SPIRAL:
- tools_switch_current(TOOLS_SHAPES_SPIRAL);
+ tools_switch(dt, TOOLS_SHAPES_SPIRAL);
break;
case SP_VERB_CONTEXT_PENCIL:
- tools_switch_current(TOOLS_FREEHAND_PENCIL);
+ tools_switch(dt, TOOLS_FREEHAND_PENCIL);
break;
case SP_VERB_CONTEXT_PEN:
- tools_switch_current(TOOLS_FREEHAND_PEN);
+ tools_switch(dt, TOOLS_FREEHAND_PEN);
break;
case SP_VERB_CONTEXT_CALLIGRAPHIC:
- tools_switch_current(TOOLS_CALLIGRAPHIC);
+ tools_switch(dt, TOOLS_CALLIGRAPHIC);
break;
case SP_VERB_CONTEXT_TEXT:
- tools_switch_current(TOOLS_TEXT);
+ tools_switch(dt, TOOLS_TEXT);
break;
case SP_VERB_CONTEXT_GRADIENT:
- tools_switch_current(TOOLS_GRADIENT);
+ tools_switch(dt, TOOLS_GRADIENT);
break;
case SP_VERB_CONTEXT_ZOOM:
- tools_switch_current(TOOLS_ZOOM);
+ tools_switch(dt, TOOLS_ZOOM);
break;
case SP_VERB_CONTEXT_DROPPER:
- tools_switch_current(TOOLS_DROPPER);
+ tools_switch(dt, TOOLS_DROPPER);
break;
case SP_VERB_CONTEXT_CONNECTOR:
- tools_switch_current (TOOLS_CONNECTOR);
+ tools_switch(dt, TOOLS_CONNECTOR);
break;
case SP_VERB_CONTEXT_PAINTBUCKET:
- tools_switch_current(TOOLS_PAINTBUCKET);
+ tools_switch(dt, TOOLS_PAINTBUCKET);
break;
case SP_VERB_CONTEXT_ERASER:
- tools_switch_current(TOOLS_ERASER);
+ tools_switch(dt, TOOLS_ERASER);
+ break;
+ case SP_VERB_CONTEXT_LPETOOL:
+ tools_switch(dt, TOOLS_LPETOOL);
break;
case SP_VERB_CONTEXT_SELECT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SELECTOR);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SELECTOR);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_NODE_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_NODE);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_NODE);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_TWEAK_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_TWEAK);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_TWEAK);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_RECT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_RECT);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_RECT);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_3DBOX_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_3DBOX);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_3DBOX);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_ARC_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_STAR_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_STAR);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_STAR);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_SPIRAL_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_SPIRAL);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_SPIRAL);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_PENCIL_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_PENCIL);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PENCIL);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_PEN_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_PEN);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PEN);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_CALLIGRAPHY);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_CALLIGRAPHY);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_TEXT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_TEXT);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_TEXT);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_GRADIENT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_GRADIENT);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_GRADIENT);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_ZOOM_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_ZOOM);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_ZOOM);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_DROPPER_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_DROPPER);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_DROPPER);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_CONNECTOR_PREFS:
- prefs_set_int_attribute ("dialogs.preferences", "page", PREFS_PAGE_TOOLS_CONNECTOR);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_CONNECTOR);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_PAINTBUCKET_PREFS:
- prefs_set_int_attribute ("dialogs.preferences", "page", PREFS_PAGE_TOOLS_PAINTBUCKET);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PAINTBUCKET);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_ERASER_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_ERASER);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_ERASER);
+ dt->_dlg_mgr->showDialog("InkscapePreferences");
+ break;
+ case SP_VERB_CONTEXT_LPETOOL_PREFS:
+ g_print ("TODO: Create preferences page for LPETool\n");
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_LPETOOL);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble zoom_inc =
- prefs_get_double_attribute_limited( "options.zoomincrement",
- "value", 1.414213562, 1.01, 10 );
+ prefs->getDoubleLimited( "/options/zoomincrement/value", 1.414213562, 1.01, 10 );
switch (GPOINTER_TO_INT(data)) {
case SP_VERB_ZOOM_IN:
if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
if (!rc->is_empty()) {
- NR::Point const zoom_to (rc->last_point());
+ Geom::Point const zoom_to (*rc->last_point());
dt->zoom_relative_keep_point(zoom_to, mul*zoom_inc);
break;
}
}
- NR::Rect const d = dt->get_display_area();
- dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], mul*zoom_inc);
+ Geom::Rect const d = dt->get_display_area();
+ dt->zoom_relative( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], mul*zoom_inc);
break;
}
case SP_VERB_ZOOM_OUT:
if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
if (!rc->is_empty()) {
- NR::Point const zoom_to (rc->last_point());
+ Geom::Point const zoom_to (*rc->last_point());
dt->zoom_relative_keep_point(zoom_to, 1 / (mul*zoom_inc));
break;
}
}
- NR::Rect const d = dt->get_display_area();
- dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], 1 / (mul*zoom_inc) );
+ Geom::Rect const d = dt->get_display_area();
+ dt->zoom_relative( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 1 / (mul*zoom_inc) );
break;
}
case SP_VERB_ZOOM_1_1:
{
- NR::Rect const d = dt->get_display_area();
- dt->zoom_absolute( d.midpoint()[NR::X], d.midpoint()[NR::Y], 1.0 );
+ double zcorr = prefs->getDouble("/options/zoomcorrection/value", 1.0);
+ Geom::Rect const d = dt->get_display_area();
+ dt->zoom_absolute( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 1.0 * zcorr );
break;
}
case SP_VERB_ZOOM_1_2:
{
- NR::Rect const d = dt->get_display_area();
- dt->zoom_absolute( d.midpoint()[NR::X], d.midpoint()[NR::Y], 0.5);
+ double zcorr = prefs->getDouble("/options/zoomcorrection/value", 1.0);
+ Geom::Rect const d = dt->get_display_area();
+ dt->zoom_absolute( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 0.5 * zcorr );
break;
}
case SP_VERB_ZOOM_2_1:
{
- NR::Rect const d = dt->get_display_area();
- dt->zoom_absolute( d.midpoint()[NR::X], d.midpoint()[NR::Y], 2.0 );
+ double zcorr = prefs->getDouble("/options/zoomcorrection/value", 1.0);
+ Geom::Rect const d = dt->get_display_area();
+ dt->zoom_absolute( d.midpoint()[Geom::X], d.midpoint()[Geom::Y], 2.0 * zcorr );
break;
}
case SP_VERB_ZOOM_PAGE:
sp_namedview_toggle_guides(doc, repr);
break;
case SP_VERB_TOGGLE_SNAPPING:
- dt->toggleSnapping();
- break;
+ dt->toggleSnapGlobal();
+ break;
case SP_VERB_TOGGLE_GRID:
dt->toggleGrids();
break;
dt->fullscreen();
break;
#endif /* HAVE_GTK_WINDOW_FULLSCREEN */
+ case SP_VERB_FOCUSTOGGLE:
+ dt->focusMode(!dt->is_focusMode());
+ break;
case SP_VERB_VIEW_NEW:
sp_ui_new_view();
break;
N_("Apply the path effect of the copied object to selection"), NULL),
new EditVerb(SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT, "RemoveLivePathEffect", N_("Remove Path _Effect"),
N_("Remove any path effects from selected objects"), NULL),
- new EditVerb(SP_VERB_EDIT_REMOVE_FILTER, "RemoveFilter", N_("Remove Filter"),
+ new EditVerb(SP_VERB_EDIT_REMOVE_FILTER, "RemoveFilter", N_("Remove Filters"),
N_("Remove any filters from selected objects"), NULL),
new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"),
N_("Delete selection"), GTK_STOCK_DELETE),
new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", N_("Paint Bucket"),
N_("Fill bounded areas"), "draw_paintbucket"),
new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", N_("LPE Edit"),
- N_("Edit Live Path Effect parameters"), "draw_lpe"),
+ N_("Edit Path Effect parameters"), "draw_lpe"),
new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"),
N_("Erase existing paths"), "draw_erase"),
+ new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", N_("LPE Tool"),
+ N_("Do geometric constructions"), "draw_lpetool"),
/* Tool prefs */
new ContextVerb(SP_VERB_CONTEXT_SELECT_PREFS, "SelectPrefs", N_("Selector Preferences"),
N_("Open Preferences for the Selector tool"), NULL),
N_("Open Preferences for the Paint Bucket tool"), NULL),
new ContextVerb(SP_VERB_CONTEXT_ERASER_PREFS, "EraserPrefs", N_("Eraser Preferences"),
N_("Open Preferences for the Eraser tool"), NULL),
+ new ContextVerb(SP_VERB_CONTEXT_LPETOOL_PREFS, "LPEToolPrefs", N_("LPE Tool Preferences"),
+ N_("Open Preferences for the LPETool tool"), NULL),
/* Zoom/View */
new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), "zoom_in"),
new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), "scrollbars"),
new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), "grid"),
new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), "guides"),
- new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapping", N_("Snap"), N_("Toggle snapping on or off"), NULL),
+ new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Toggle snapping on or off"), NULL),
new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"),
"zoom_next"),
new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"),
"zoom_2_to_1"),
#ifdef HAVE_GTK_WINDOW_FULLSCREEN
new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"),
- "fullscreen"),
+ "view-fullscreen"),
#endif /* HAVE_GTK_WINDOW_FULLSCREEN */
+ new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), N_("Remove excess toolbars to focus on drawing"),
+ NULL),
new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"),
- "view_new"),
+ "window-new"),
new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"),
N_("New View Preview"), NULL/*"view_new_preview"*/),
N_("Query information about extensions"), NULL),
new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."),
N_("View Layers"), "layers"),
- new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path Effects..."),
- N_("Manage path effects"), NULL),
- new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter Effects..."),
- N_("Manage SVG filter effects"), NULL),
- new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Fonts..."),
- N_("Manage SVG fonts"), NULL),
+ new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path Effects Editor..."),
+ N_("Manage, edit, and apply path effects"), NULL),
+ new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter Editor..."),
+ N_("Manage, edit, and apply SVG filters"), NULL),
+ new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Fonts Editor..."),
+ N_("Edit SVG fonts"), NULL),
/* Help */
new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"),
N_("Unhide all objects in the current layer"), NULL),
new LockAndHideVerb(SP_VERB_UNHIDE_ALL_IN_ALL_LAYERS, "UnhideAllInAllLayers", N_("Unhide All in All Layers"),
N_("Unhide all objects in all layers"), NULL),
+ /*Color Management*/
+ new EditVerb(SP_VERB_EDIT_LINK_COLOR_PROFILE, "LinkColorProfile", N_("Link Color Profile"),
+ N_("Link an ICC color profile"), NULL),
+ new EditVerb(SP_VERB_EDIT_REMOVE_COLOR_PROFILE, "RemoveColorProfile", N_("Remove Color Profile"),
+ N_("Remove a linked ICC color profile"), NULL),
/* Footer */
new Verb(SP_VERB_LAST, " '\"invalid id", NULL, NULL, NULL)
};