![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/verbs.cpp b/src/verbs.cpp
index ee85380a9244c8493c721f561790e0c4b1ddf4a6..1fb179660fe4187188e66c802f8195ae706a0466 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
*/
-
-
-#include <gtk/gtkstock.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <cstring>
+#include <string>
+#include <gtk/gtkstock.h>
+
#include "helper/action.h"
#include <gtkmm/messagedialog.h>
#endif
#include "extension/effect.h"
+#include "bind/javabind.h"
#include "tools-switch.h"
#include "inkscape-private.h"
#include "shape-editor.h"
#include "draw-context.h"
#include "gradient-drag.h"
+#include "sp-guide.h"
/**
return;
}
+/** \brief Accessor to get the tooltip for verb as localised string */
+gchar const *
+Verb::get_tip (void)
+{
+ return _(_tip);
+}
void
Verb::name(SPDocument *in_doc, Glib::ustring in_name)
sp_file_save_a_copy(*parent, NULL, NULL);
break;
case SP_VERB_FILE_PRINT:
- sp_file_print();
+ sp_file_print(*parent);
break;
case SP_VERB_FILE_VACUUM:
sp_file_vacuum();
break;
- case SP_VERB_FILE_PRINT_DIRECT:
- sp_file_print_direct();
- break;
case SP_VERB_FILE_PRINT_PREVIEW:
sp_file_print_preview(NULL, NULL);
break;
case SP_VERB_EDIT_PASTE_LIVEPATHEFFECT:
sp_selection_paste_livepatheffect();
break;
+ case SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT:
+ sp_selection_remove_livepatheffect();
+ break;
case SP_VERB_EDIT_DELETE:
sp_selection_delete();
break;
case SP_VERB_EDIT_SELECTION_2_MARKER:
sp_selection_to_marker();
break;
+ case SP_VERB_EDIT_SELECTION_2_GUIDES:
+ sp_selection_to_guides();
+ break;
case SP_VERB_EDIT_TILE:
sp_selection_tile();
break;
}
break;
+ case SP_VERB_EDIT_GUIDES_AROUND_PAGE:
+ sp_guide_create_guides_around_page(sp_desktop_document(dt));
+ break;
+
case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
sp_selection_next_patheffect_param(dt);
break;
case SP_VERB_OBJECT_SET_MASK:
sp_selection_set_mask(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);
break;
case SP_VERB_OBJECT_SET_CLIPPATH:
sp_selection_set_mask(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);
break;
case SP_VERB_CONTEXT_PAINTBUCKET:
tools_switch_current(TOOLS_PAINTBUCKET);
break;
+ case SP_VERB_CONTEXT_ERASER:
+ tools_switch_current(TOOLS_ERASER);
+ break;
case SP_VERB_CONTEXT_SELECT_PREFS:
prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SELECTOR);
prefs_set_int_attribute ("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);
+ dt->_dlg_mgr->showDialog("InkscapePreferences");
+ break;
default:
break;
switch (GPOINTER_TO_INT(data)) {
case SP_VERB_ZOOM_IN:
{
+ gint mul = 1 + gobble_key_events(
+ GDK_KP_Add, 0); // with any mask
// While drawing with the pen/pencil tool, zoom towards the end of the unfinished path
if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
- if (sp_curve_last_bpath(rc)) {
- NR::Point const zoom_to (sp_curve_last_point(rc));
- dt->zoom_relative_keep_point(zoom_to, zoom_inc);
+ if (rc->last_bpath()) {
+ NR::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], zoom_inc);
+ dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], mul*zoom_inc);
break;
}
case SP_VERB_ZOOM_OUT:
{
+ gint mul = 1 + gobble_key_events(
+ GDK_KP_Subtract, 0); // with any mask
// While drawing with the pen/pencil tool, zoom away from the end of the unfinished path
if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
- if (sp_curve_last_bpath(rc)) {
- NR::Point const zoom_to (sp_curve_last_point(rc));
- dt->zoom_relative_keep_point(zoom_to, 1 / zoom_inc);
+ if (rc->last_bpath()) {
+ NR::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 / zoom_inc );
+ dt->zoom_relative( d.midpoint()[NR::X], d.midpoint()[NR::Y], 1 / (mul*zoom_inc) );
break;
}
case SP_VERB_ZOOM_1_1:
case SP_VERB_TOGGLE_GUIDES:
sp_namedview_toggle_guides(doc, repr);
break;
+ case SP_VERB_TOGGLE_SNAPPING:
+ dt->toggleSnapping();
+ break;
case SP_VERB_TOGGLE_GRID:
dt->toggleGrids();
break;
case SP_VERB_VIEW_MODE_NORMAL:
dt->setDisplayModeNormal();
break;
+ case SP_VERB_VIEW_MODE_NO_FILTERS:
+ dt->setDisplayModeNoFilters();
+ break;
case SP_VERB_VIEW_MODE_OUTLINE:
dt->setDisplayModeOutline();
break;
dt->_dlg_mgr->showDialog("Messages");
break;
case SP_VERB_DIALOG_SCRIPT:
- dt->_dlg_mgr->showDialog("Script");
+ //dt->_dlg_mgr->showDialog("Script");
+ Inkscape::Bind::JavaBindery::getInstance()->showConsole();
break;
case SP_VERB_DIALOG_UNDO_HISTORY:
dt->_dlg_mgr->showDialog("UndoHistory");
case SP_VERB_DIALOG_INPUT:
sp_input_dialog();
break;
+ case SP_VERB_DIALOG_INPUT2:
+ dt->_dlg_mgr->showDialog("InputDevices");
+ break;
case SP_VERB_DIALOG_EXTENSIONEDITOR:
dt->_dlg_mgr->showDialog("ExtensionEditor");
break;
switch ((long) data) {
case SP_VERB_EFFECT_LAST_PREF:
- if (!effect->prefs(current_view))
- return;
- /* Note: fall through */
+ effect->prefs(current_view);
+ break;
case SP_VERB_EFFECT_LAST:
effect->effect(current_view);
break;
// TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions)
new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"),
"file_vacuum" ),
- new FileVerb(SP_VERB_FILE_PRINT_DIRECT, "FilePrintDirect", N_("Print _Direct"),
- N_("Print directly without prompting to a file or pipe"), NULL ),
new FileVerb(SP_VERB_FILE_PRINT_PREVIEW, "FilePrintPreview", N_("Print Previe_w"),
N_("Preview document printout"), GTK_STOCK_PRINT_PREVIEW ),
new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."),
N_("Scale each selected object vertically to match the height of the copied object"), NULL),
new EditVerb(SP_VERB_EDIT_PASTE_IN_PLACE, "EditPasteInPlace", N_("Paste _In Place"),
N_("Paste objects from clipboard to the original location"), "selection_paste_in_place"),
- new EditVerb(SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, "EditPasteLivePathEffect", N_("Paste Path _Effect"),
+ new EditVerb(SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, "PasteLivePathEffect", N_("Paste Path _Effect"),
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_DELETE, "EditDelete", N_("_Delete"),
N_("Delete selection"), GTK_STOCK_DELETE),
new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"),
// TRANSLATORS: Convert selection to a line marker
new EditVerb(SP_VERB_EDIT_SELECTION_2_MARKER, "ObjectsToMarker", N_("Objects to _Marker"),
N_("Convert selection to a line marker"), NULL),
+ // TRANSLATORS: Convert selection to a collection of guidelines
+ new EditVerb(SP_VERB_EDIT_SELECTION_2_GUIDES, "ObjectsToGuides", N_("Objects to Gu_ides"),
+ N_("Convert selected objects to a collection of guidelines aligned with their edges"), NULL),
// TRANSLATORS: Convert selection to a rectangle with tiled pattern fill
new EditVerb(SP_VERB_EDIT_TILE, "ObjectsToPattern", N_("Objects to Patter_n"),
N_("Convert selection to a rectangle with tiled pattern fill"), NULL),
N_("Select previous object or node"), NULL),
new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"),
N_("Deselect any selected objects or nodes"), "selection_deselect"),
+ new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("_Guides around page"),
+ N_("Create four guides aligned with the page borders"), NULL),
new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next Path Effect Parameter"),
- N_("Show next Path Effect parameter for editing"), NULL),
+ N_("Show next Path Effect parameter for editing"), "edit_next_parameter"),
/* Selection */
new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
// Advanced tutorial for more info
new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"),
N_("Break selected paths into subpaths"), "selection_break"),
- new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Gri_d Arrange..."),
- N_("Arrange selected objects in a grid pattern"), "grid_arrange"),
+ new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Rows and Columns..."),
+ N_("Arrange selected objects in a table"), "grid_arrange"),
/* Layer */
new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."),
N_("Create a new layer"), "new_layer"),
"object_flip_ver"),
new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"),
N_("Apply mask to selection (using the topmost object as mask)"), NULL),
+ new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"),
+ N_("Edit mask"), "nodeedit-mask"),
new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"),
N_("Remove mask from selection"), NULL),
new ObjectVerb(SP_VERB_OBJECT_SET_CLIPPATH, "ObjectSetClipPath", N_("_Set"),
N_("Apply clipping path to selection (using the topmost object as clipping path)"), NULL),
+ new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"),
+ N_("Edit clipping path"), "nodeedit-clippath"),
new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"),
N_("Remove clipping path from selection"), NULL),
N_("Create diagram connectors"), "draw_connector"),
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"),
+ new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"),
+ N_("Erase existing paths"), "draw_erase"),
/* 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 Connector tool"), NULL),
new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "PaintBucketPrefs", N_("Paint Bucket Preferences"),
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),
/* 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_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)"),
new ZoomVerb(SP_VERB_VIEW_MODE_NORMAL, "ViewModeNormal", N_("_Normal"),
N_("Switch to normal display mode"), NULL),
+ new ZoomVerb(SP_VERB_VIEW_MODE_NO_FILTERS, "ViewModeNoFilters", N_("No _Filters"),
+ N_("Switch to normal display without filters"), NULL),
new ZoomVerb(SP_VERB_VIEW_MODE_OUTLINE, "ViewModeOutline", N_("_Outline"),
N_("Switch to outline (wireframe) display mode"), NULL),
new ZoomVerb(SP_VERB_VIEW_MODE_TOGGLE, "ViewModeToggle", N_("_Toggle"),
N_("Toggle between normal and outline display modes"), NULL),
- new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color manage view"),
- N_("Toggle color managed display adjustment for this document window"), "color_management"),
+ new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"),
+ N_("Toggle color-managed display for this document window"), "color_management"),
new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."),
N_("Open a window to preview objects at different icon resolutions"), "view_icon_preview"),
#endif
new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."),
N_("Configure extended input devices, such as a graphics tablet"), "input_devices"),
+ new DialogVerb(SP_VERB_DIALOG_INPUT2, "DialogInput2", N_("_Input Devices (new)..."),
+ N_("Configure extended input devices, such as a graphics tablet"), "input_devices"),
new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."),
N_("Query information about extensions"), NULL),
new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."),