X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fverbs.cpp;h=00a82624bddac847137f697289181fa21b99f4f6;hb=c580a96092327174256078a5ca30582608e82be7;hp=60982e0360b3a8d42378f0537ba8151060c65a99;hpb=b26cc655b98659f4a33794ee9169b67d908b824b;p=inkscape.git diff --git a/src/verbs.cpp b/src/verbs.cpp index 60982e036..00a82624b 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1,4 +1,3 @@ -#define __SP_VERBS_C__ /** * \file verbs.cpp * @@ -16,6 +15,8 @@ * MenTaLguY * David Turner * bulia byak + * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 2006 Johan Engelen * Copyright (C) (date unspecified) Authors @@ -28,62 +29,64 @@ #endif #include -#include #include - -#include "helper/action.h" - -#include #include +#include #include +#include +#include "bind/javabind.h" +#include "desktop.h" +#include "desktop-handles.h" +#include "dialogs/clonetiler.h" +#include "dialogs/find.h" +#include "dialogs/item-properties.h" +#include "dialogs/spellcheck.h" #include "dialogs/text-edit.h" #include "dialogs/xml-tree.h" -#include "dialogs/item-properties.h" -#include "dialogs/find.h" -#include "dialogs/layer-properties.h" -#include "dialogs/clonetiler.h" -#include "dialogs/iconpreview.h" -#include "dialogs/extensions.h" -#include "dialogs/swatches.h" -#include "dialogs/layers-panel.h" -#include "dialogs/input.h" - -#ifdef WITH_INKBOARD -#include "jabber_whiteboard/session-manager.h" -#endif - +#include "display/curve.h" +#include "document.h" +#include "draw-context.h" #include "extension/effect.h" -#include "bind/javabind.h" - -#include "tools-switch.h" -#include "inkscape-private.h" #include "file.h" +#include "gradient-drag.h" +#include "helper/action.h" #include "help.h" -#include "document.h" -#include "desktop.h" -#include "message-stack.h" -#include "desktop-handles.h" -#include "selection-chemistry.h" -#include "path-chemistry.h" -#include "text-chemistry.h" -#include "ui/dialog/dialog-manager.h" -#include "ui/dialog/inkscape-preferences.h" +#include "inkscape-private.h" #include "interface.h" -#include "prefs-utils.h" -#include "splivarot.h" -#include "sp-namedview.h" -#include "sp-flowtext.h" #include "layer-fns.h" -#include "node-context.h" +#include "layer-manager.h" +#include "message-stack.h" +#include "path-chemistry.h" +#include "preferences.h" #include "select-context.h" +#include "selection-chemistry.h" #include "seltrans.h" -#include "gradient-context.h" #include "shape-editor.h" -#include "draw-context.h" -#include "gradient-drag.h" +#include "shortcuts.h" +#include "sp-flowtext.h" #include "sp-guide.h" +#include "splivarot.h" +#include "sp-namedview.h" +#include "text-chemistry.h" +#include "tools-switch.h" +#include "ui/dialog/dialog-manager.h" +#include "ui/dialog/document-properties.h" +#include "ui/dialog/extensions.h" +#include "ui/dialog/glyphs.h" +#include "ui/dialog/icon-preview.h" +#include "ui/dialog/inkscape-preferences.h" +#include "ui/dialog/layer-properties.h" +#include "ui/dialog/layers.h" +#include "ui/dialog/swatches.h" +#include "ui/icon-names.h" +#include "ui/tool/node-tool.h" + +using Inkscape::DocumentUndo; +//#ifdef WITH_INKBOARD +//#include "jabber_whiteboard/session-manager.h" +//#endif /** * \brief Return the name without underscores and ellipsis, for use in dialog @@ -334,7 +337,15 @@ Verb::VerbIDTable Verb::_verb_ids; in the \c _verbs hashtable which is indexed by the \c code. */ Verb::Verb(gchar const *id, gchar const *name, gchar const *tip, gchar const *image) : - _actions(NULL), _id(id), _name(name), _tip(tip), _image(image) + _actions(0), + _id(id), + _name(name), + _tip(tip), + _full_tip(0), + _shortcut(0), + _image(image), + _code(0), + _default_sensitive(false) { static int count = SP_VERB_LAST; @@ -342,8 +353,6 @@ Verb::Verb(gchar const *id, gchar const *name, gchar const *tip, gchar const *im _code = count; _verbs.insert(VerbTable::value_type(count, this)); _verb_ids.insert(VerbIDTable::value_type(_id, this)); - - return; } /** \brief Destroy a verb. @@ -358,7 +367,10 @@ Verb::~Verb(void) delete _actions; } - return; + if (_full_tip) { + g_free(_full_tip); + _full_tip = 0; + } } /** \brief Verbs are no good without actions. This is a place holder @@ -627,11 +639,31 @@ Verb::sensitive(SPDocument *in_doc, bool in_sensitive) return; } -/** \brief Accessor to get the tooltip for verb as localised string */ -gchar const * -Verb::get_tip (void) +/** \brief Accessor to get the tooltip for verb as localised string */ +gchar const *Verb::get_tip(void) { - return _(_tip); + gchar const *result = 0; + if (_tip) { + unsigned int shortcut = sp_shortcut_get_primary(this); + if ( (shortcut != _shortcut) || !_full_tip) { + if (_full_tip) { + g_free(_full_tip); + _full_tip = 0; + } + _shortcut = shortcut; + gchar* shortcutString = sp_shortcut_get_label(shortcut); + if (shortcutString) { + _full_tip = g_strdup_printf("%s (%s)", _(_tip), shortcutString); + g_free(shortcutString); + shortcutString = 0; + } else { + _full_tip = g_strdup(_(_tip)); + } + } + result = _full_tip; + } + + return result; } void @@ -767,7 +799,7 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/) Gtk::Window *parent = desktop->getToplevel(); g_assert(parent != NULL); - switch ((long) data) { + switch (reinterpret_cast(data)) { case SP_VERB_FILE_NEW: sp_file_new_default(); break; @@ -799,14 +831,14 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/) sp_file_import(*parent); break; case SP_VERB_FILE_EXPORT: - sp_file_export_dialog(NULL); + sp_file_export_dialog(*parent); break; case SP_VERB_FILE_IMPORT_FROM_OCAL: sp_file_import_from_ocal(*parent); break; - case SP_VERB_FILE_EXPORT_TO_OCAL: - sp_file_export_to_ocal(*parent); - break; +// case SP_VERB_FILE_EXPORT_TO_OCAL: +// sp_file_export_to_ocal(*parent); +// break; case SP_VERB_FILE_NEXT_DESKTOP: inkscape_switch_desktops_next(); break; @@ -833,7 +865,6 @@ EditVerb::perform(SPAction *action, void *data, void */*pdata*/) SPDesktop *dt = static_cast(sp_action_get_view(action)); if (!dt) return; - SPEventContext *ec = dt->event_context; switch (reinterpret_cast(data)) { case SP_VERB_EDIT_UNDO: @@ -843,139 +874,112 @@ EditVerb::perform(SPAction *action, void *data, void */*pdata*/) 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(); + sp_selection_copy(dt); 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(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(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); - } else { - sp_edit_select_all(); - } + SelectionHelper::selectAll(dt); break; case SP_VERB_EDIT_INVERT: - if (tools_isactive(dt, TOOLS_NODES)) { - SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(true); - } else { - sp_edit_invert(); - } + SelectionHelper::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); - } else { - sp_edit_select_all_in_all_layers(); - } + SelectionHelper::selectAllInAll(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); - } else { - sp_edit_invert_in_all_layers(); - } + SelectionHelper::invertAllInAll(dt); break; - case SP_VERB_EDIT_SELECT_NEXT: - if (tools_isactive(dt, TOOLS_NODES)) { - SP_NODE_CONTEXT(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(); - } + SelectionHelper::selectNext(dt); break; case SP_VERB_EDIT_SELECT_PREV: - if (tools_isactive(dt, TOOLS_NODES)) { - SP_NODE_CONTEXT(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(); - } + SelectionHelper::selectPrev(dt); break; - case SP_VERB_EDIT_DESELECT: - if (tools_isactive(dt, TOOLS_NODES)) { - SP_NODE_CONTEXT(ec)->shape_editor->deselect(); - } else { - sp_desktop_selection(dt)->clear(); - } + SelectionHelper::selectNone(dt); 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; } @@ -995,22 +999,22 @@ SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/) switch (reinterpret_cast(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: @@ -1024,74 +1028,73 @@ SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/) 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(); + SelectionHelper::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(); @@ -1108,7 +1111,7 @@ void LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) { SPDesktop *dt = static_cast(sp_action_get_view(action)); - unsigned int verb = reinterpret_cast(data); + size_t verb = reinterpret_cast(data); if ( !dt || !dt->currentLayer() ) { return; @@ -1127,8 +1130,8 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer()); if (next) { dt->setCurrentLayer(next); - sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_NEXT, - _("Switch to next layer")); + DocumentUndo::done(sp_desktop_document(dt), SP_VERB_LAYER_NEXT, + _("Switch to next layer")); dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Switched to next layer.")); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot go past last layer.")); @@ -1139,8 +1142,8 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) SPObject *prev=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer()); if (prev) { dt->setCurrentLayer(prev); - sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_PREV, - _("Switch to previous layer")); + DocumentUndo::done(sp_desktop_document(dt), SP_VERB_LAYER_PREV, + _("Switch to previous layer")); dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Switched to previous layer.")); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot go before first layer.")); @@ -1148,11 +1151,11 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) 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: @@ -1167,7 +1170,7 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) SPItem *layer=SP_ITEM(dt->currentLayer()); g_return_if_fail(layer != NULL); - SPObject *old_pos=SP_OBJECT_NEXT(layer); + SPObject *old_pos = layer->getNext(); switch (verb) { case SP_VERB_LAYER_TO_TOP: @@ -1184,7 +1187,7 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) break; } - if ( SP_OBJECT_NEXT(layer) != old_pos ) { + if ( layer->getNext() != old_pos ) { char const *message = NULL; Glib::ustring description = ""; switch (verb) { @@ -1205,7 +1208,7 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) description = _("Lower layer"); break; }; - sp_document_done(sp_desktop_document(dt), verb, description); + DocumentUndo::done(sp_desktop_document(dt), verb, description); if (message) { dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, message); g_free((void *) message); @@ -1216,6 +1219,51 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) break; } + case SP_VERB_LAYER_DUPLICATE: { + if ( dt->currentLayer() != dt->currentRoot() ) { + // Note with either approach: + // Any clone masters are duplicated, their clones use the *original*, + // but the duplicated master is not linked up as master nor clone of the original. +#if 0 + // Only copies selectable things, honoring locks, visibility, avoids sublayers. + SPObject *new_layer = Inkscape::create_layer(dt->currentRoot(), dt->currentLayer(), LPOS_BELOW); + if ( dt->currentLayer()->label() ) { + gchar* name = g_strdup_printf(_("%s copy"), dt->currentLayer()->label()); + dt->layer_manager->renameLayer( new_layer, name, TRUE ); + g_free(name); + } + 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(dt); +#else + // Copies everything, regardless of locks, visibility, sublayers. + //XML Tree being directly used here while it shouldn't be. + Inkscape::XML::Node *selected = dt->currentLayer()->getRepr(); + Inkscape::XML::Node *parent = sp_repr_parent(selected); + Inkscape::XML::Node *dup = selected->duplicate(parent->document()); + parent->addChild(dup, selected); + SPObject *new_layer = dt->currentLayer()->next; + if (new_layer) { + if (new_layer->label()) { + gchar* name = g_strdup_printf(_("%s copy"), new_layer->label()); + dt->layer_manager->renameLayer( new_layer, name, TRUE ); + g_free(name); + } + dt->setCurrentLayer(new_layer); + } +#endif + DocumentUndo::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 { + dt->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No current layer.")); + } + break; + } case SP_VERB_LAYER_DELETE: { if ( dt->currentLayer() != dt->currentRoot() ) { sp_desktop_selection(dt)->clear(); @@ -1238,8 +1286,8 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) dt->setCurrentLayer(survivor); } - sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_DELETE, - _("Delete layer")); + DocumentUndo::done(sp_desktop_document(dt), SP_VERB_LAYER_DELETE, + _("Delete layer")); // TRANSLATORS: this means "The layer has been deleted." dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Deleted layer.")); @@ -1248,6 +1296,15 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) } break; } + case SP_VERB_LAYER_SOLO: { + if ( dt->currentLayer() == dt->currentRoot() ) { + dt->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No current layer.")); + } else { + dt->toggleLayerSolo( dt->currentLayer() ); + DocumentUndo::maybeDone(sp_desktop_document(dt), "layer:solo", SP_VERB_LAYER_SOLO, _("Toggle layer solo")); + } + break; + } } return; @@ -1268,13 +1325,13 @@ ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ ) if (sel->isEmpty()) return; - NR::Maybe 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 @@ -1282,16 +1339,16 @@ ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ ) switch (reinterpret_cast(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(); @@ -1303,61 +1360,32 @@ ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ ) flowtext_to_text(); break; case SP_VERB_OBJECT_FLIP_HORIZONTAL: - // When working with the node tool ... - if (tools_isactive(dt, TOOLS_NODES)) { - Inkscape::NodePath::Node *active_node = Inkscape::NodePath::Path::active_node; - - // ... and one of the nodes is currently mouseovered ... - if (active_node) { - - // ... flip the selected nodes about that node - SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X, active_node->pos); - } else { - - // ... or else about the center of their bounding box. - SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::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_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_HORIZONTAL, - _("Flip horizontally")); + sp_selection_scale_relative(sel, center, Geom::Scale(-1.0, 1.0)); + DocumentUndo::done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_HORIZONTAL, + _("Flip horizontally")); break; case SP_VERB_OBJECT_FLIP_VERTICAL: - // The behaviour is analogous to flipping 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); - } else { - SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::Y); - } - } else { - sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0)); - } - sp_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_VERTICAL, - _("Flip vertically")); + sp_selection_scale_relative(sel, center, Geom::Scale(1.0, -1.0)); + DocumentUndo::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; @@ -1391,132 +1419,148 @@ ContextVerb::perform(SPAction *action, void *data, void */*pdata*/) } } + 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_SPRAY: + tools_switch(dt, TOOLS_SPRAY); 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_SPRAY_PREFS: + prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SPRAY); 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; @@ -1553,11 +1597,11 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) 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)) { + switch (reinterpret_cast(data)) { case SP_VERB_ZOOM_IN: { gint mul = 1 + gobble_key_events( @@ -1565,15 +1609,15 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) // 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)); + if (!rc->is_empty()) { + 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: @@ -1583,33 +1627,36 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) // 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)); + if (!rc->is_empty()) { + 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: @@ -1640,8 +1687,8 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) 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; @@ -1650,6 +1697,9 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) 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; @@ -1665,6 +1715,9 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_VIEW_MODE_OUTLINE: dt->setDisplayModeOutline(); break; +// case SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW: +// dt->setDisplayModePrintColorsPreview(); +// break; case SP_VERB_VIEW_MODE_TOGGLE: dt->displayModeToggle(); break; @@ -1711,6 +1764,9 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_DIALOG_FILL_STROKE: dt->_dlg_mgr->showDialog("FillAndStroke"); break; + case SP_VERB_DIALOG_GLYPHS: + dt->_dlg_mgr->showDialog("Glyphs"); + break; case SP_VERB_DIALOG_SWATCHES: dt->_dlg_mgr->showDialog("Swatches"); break; @@ -1720,6 +1776,9 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_DIALOG_ALIGN_DISTRIBUTE: dt->_dlg_mgr->showDialog("AlignAndDistribute"); break; + case SP_VERB_DIALOG_SPRAY_OPTION: + dt->_dlg_mgr->showDialog("SprayOptionClass"); + break; case SP_VERB_DIALOG_TEXT: sp_text_edit_dialog(); break; @@ -1731,6 +1790,12 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) // Please test the new find dialog if you have time: // dt->_dlg_mgr->showDialog("Find"); break; + case SP_VERB_DIALOG_FINDREPLACE: + // not implemented yet + break; + case SP_VERB_DIALOG_SPELLCHECK: + sp_spellcheck_dialog(); + break; case SP_VERB_DIALOG_DEBUG: dt->_dlg_mgr->showDialog("Messages"); break; @@ -1750,17 +1815,14 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_DIALOG_ITEM: sp_item_dialog(); break; -#ifdef WITH_INKBOARD +/*#ifdef WITH_INKBOARD case SP_VERB_XMPP_CLIENT: { Inkscape::Whiteboard::SessionManager::showClient(); break; } -#endif +#endif*/ 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: @@ -1775,6 +1837,12 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_DIALOG_FILTER_EFFECTS: dt->_dlg_mgr->showDialog("FilterEffectsDialog"); break; + case SP_VERB_DIALOG_SVG_FONTS: + dt->_dlg_mgr->showDialog("SvgFontsDialog"); + break; + case SP_VERB_DIALOG_PRINT_COLORS_PREVIEW: + dt->_dlg_mgr->showDialog("PrintColorsPreviewDialog"); + break; default: break; } @@ -1820,8 +1888,8 @@ TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/) { switch (reinterpret_cast(data)) { case SP_VERB_TUTORIAL_BASIC: - /* TRANSLATORS: If you have translated the tutorial-basic.svg file to your language, - then translate this string as "tutorial-basic.LANG.svg" (where LANG is your language + /* TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, + then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language code); otherwise leave as "tutorial-basic.svg". */ sp_help_open_tutorial(NULL, (gpointer)_("tutorial-basic.svg")); break; @@ -1841,6 +1909,10 @@ TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/) // TRANSLATORS: See "tutorial-basic.svg" comment. sp_help_open_tutorial(NULL, (gpointer)_("tutorial-calligraphy.svg")); break; + case SP_VERB_TUTORIAL_INTERPOLATE: + // TRANSLATORS: See "tutorial-basic.svg" comment. + sp_help_open_tutorial(NULL, (gpointer)_("tutorial-interpolate.svg")); + break; case SP_VERB_TUTORIAL_DESIGN: // TRANSLATORS: See "tutorial-basic.svg" comment. sp_help_open_tutorial(NULL, (gpointer)_("tutorial-elements.svg")); @@ -1986,7 +2058,7 @@ EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/) if (effect == NULL) return; if (current_view == NULL) return; - switch ((long) data) { + switch (reinterpret_cast(data)) { case SP_VERB_EFFECT_LAST_PREF: effect->prefs(current_view); break; @@ -2051,12 +2123,12 @@ FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/) SPDocument *doc = sp_desktop_document(dt); if (!doc) return; - switch ((long) data) { + switch (reinterpret_cast(data)) { case SP_VERB_FIT_CANVAS_TO_SELECTION: - fit_canvas_to_selection(dt); + verb_fit_canvas_to_selection(dt); break; case SP_VERB_FIT_CANVAS_TO_DRAWING: - fit_canvas_to_drawing(doc); + verb_fit_canvas_to_drawing(dt); break; case SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING: fit_canvas_to_selection_or_drawing(dt); @@ -2120,22 +2192,22 @@ LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/) SPDocument *doc = sp_desktop_document(dt); if (!doc) return; - switch ((long) data) { + switch (reinterpret_cast(data)) { case SP_VERB_UNLOCK_ALL: unlock_all(dt); - sp_document_done(doc, SP_VERB_UNLOCK_ALL, _("Unlock all objects in the current layer")); + DocumentUndo::done(doc, SP_VERB_UNLOCK_ALL, _("Unlock all objects in the current layer")); break; case SP_VERB_UNLOCK_ALL_IN_ALL_LAYERS: unlock_all_in_all_layers(dt); - sp_document_done(doc, SP_VERB_UNLOCK_ALL_IN_ALL_LAYERS, _("Unlock all objects in all layers")); + DocumentUndo::done(doc, SP_VERB_UNLOCK_ALL_IN_ALL_LAYERS, _("Unlock all objects in all layers")); break; case SP_VERB_UNHIDE_ALL: unhide_all(dt); - sp_document_done(doc, SP_VERB_UNHIDE_ALL, _("Unhide all objects in the current layer")); + DocumentUndo::done(doc, SP_VERB_UNHIDE_ALL, _("Unhide all objects in the current layer")); break; case SP_VERB_UNHIDE_ALL_IN_ALL_LAYERS: unhide_all_in_all_layers(dt); - sp_document_done(doc, SP_VERB_UNHIDE_ALL_IN_ALL_LAYERS, _("Unhide all objects in all layers")); + DocumentUndo::done(doc, SP_VERB_UNHIDE_ALL_IN_ALL_LAYERS, _("Unhide all objects in all layers")); break; default: return; @@ -2169,19 +2241,19 @@ Verb *Verb::_base_verbs[] = { GTK_STOCK_PRINT ), // 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" ), + INKSCAPE_ICON_DOCUMENT_CLEANUP ), 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_("Import a bitmap or SVG image into this document"), "file_import"), + N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON_DOCUMENT_IMPORT), new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), - N_("Export this document or a selection as a bitmap image"), "file_export"), - new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import From Open Clip Art Library"), N_("Import a document from Open Clip Art Library"), "ocal_import"), - new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), "ocal_export"), + N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON_DOCUMENT_EXPORT), + new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import From Open Clip Art Library"), N_("Import a document from Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_IMPORT_OCAL), +// new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"), - N_("Switch to the next document window"), "window_next"), + N_("Switch to the next document window"), INKSCAPE_ICON_WINDOW_NEXT), new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"), - N_("Switch to the previous document window"), "window_previous"), + N_("Switch to the previous document window"), INKSCAPE_ICON_WINDOW_PREVIOUS), new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"), N_("Close this document window"), GTK_STOCK_CLOSE), new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), GTK_STOCK_QUIT), @@ -2198,7 +2270,7 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"), N_("Paste objects from clipboard to mouse point, or paste text"), GTK_STOCK_PASTE), new EditVerb(SP_VERB_EDIT_PASTE_STYLE, "EditPasteStyle", N_("Paste _Style"), - N_("Apply the style of the copied object to selection"), "selection_paste_style"), + N_("Apply the style of the copied object to selection"), INKSCAPE_ICON_EDIT_PASTE_STYLE), new EditVerb(SP_VERB_EDIT_PASTE_SIZE, "EditPasteSize", N_("Paste Si_ze"), N_("Scale selection to match the size of the copied object"), NULL), new EditVerb(SP_VERB_EDIT_PASTE_SIZE_X, "EditPasteWidth", N_("Paste _Width"), @@ -2212,41 +2284,41 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_Y, "EditPasteHeightSeparately", N_("Paste Height Separately"), 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"), + N_("Paste objects from clipboard to the original location"), INKSCAPE_ICON_EDIT_PASTE_IN_PLACE), 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_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 EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), - N_("Duplicate selected objects"), "edit_duplicate"), + N_("Duplicate selected objects"), INKSCAPE_ICON_EDIT_DUPLICATE), new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"), - N_("Create a clone (a copy linked to the original) of selected object"), "edit_clone"), + N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON_EDIT_CLONE), new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"), - N_("Cut the selected clone's link to its original, turning it into a standalone object"), "edit_unlink_clone"), + N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON_EDIT_CLONE_UNLINK), + new EditVerb(SP_VERB_EDIT_RELINK_CLONE, "EditRelinkClone", N_("Relink to Copied"), + N_("Relink the selected clones to the object currently on the clipboard"), NULL), new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"), - N_("Select the object to which the selected clone is linked"), "edit_select_original"), - // TRANSLATORS: Convert selection to a line marker + N_("Select the object to which the selected clone is linked"), INKSCAPE_ICON_EDIT_SELECT_ORIGINAL), 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), - // TRANSLATORS: Extract objects from a tiled pattern fill new EditVerb(SP_VERB_EDIT_UNTILE, "ObjectsFromPattern", N_("Pattern to _Objects"), N_("Extract objects from a tiled pattern fill"), NULL), new EditVerb(SP_VERB_EDIT_CLEAR_ALL, "EditClearAll", N_("Clea_r All"), N_("Delete all objects from document"), NULL), new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"), - N_("Select all objects or all nodes"), "selection_select_all"), + N_("Select all objects or all nodes"), "fooble"),//GTK_STOCK_SELECT_ALL), new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"), - N_("Select all objects in all visible and unlocked layers"), "selection_select_all_in_all_layers"), + N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON_EDIT_SELECT_ALL_LAYERS), new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"), - N_("Invert selection (unselect what is selected and select everything else)"), "selection_invert"), + N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON_EDIT_SELECT_INVERT), new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"), N_("Invert selection in all visible and unlocked layers"), NULL), new EditVerb(SP_VERB_EDIT_SELECT_NEXT, "EditSelectNext", N_("Select Next"), @@ -2254,54 +2326,54 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_SELECT_PREV, "EditSelectPrev", N_("Select Previous"), 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_("Deselect any selected objects or nodes"), INKSCAPE_ICON_EDIT_SELECT_NONE), + 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"), "edit_next_parameter"), + new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next path effect parameter"), + N_("Show next editable path effect parameter"), INKSCAPE_ICON_PATH_EFFECT_PARAMETER_NEXT), /* Selection */ new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"), - N_("Raise selection to top"), "selection_top"), + N_("Raise selection to top"), INKSCAPE_ICON_SELECTION_TOP), new SelectionVerb(SP_VERB_SELECTION_TO_BACK, "SelectionToBack", N_("Lower to _Bottom"), - N_("Lower selection to bottom"), "selection_bot"), + N_("Lower selection to bottom"), INKSCAPE_ICON_SELECTION_BOTTOM), new SelectionVerb(SP_VERB_SELECTION_RAISE, "SelectionRaise", N_("_Raise"), - N_("Raise selection one step"), "selection_up"), + N_("Raise selection one step"), INKSCAPE_ICON_SELECTION_RAISE), new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"), - N_("Lower selection one step"), "selection_down"), + N_("Lower selection one step"), INKSCAPE_ICON_SELECTION_LOWER), new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"), - N_("Group selected objects"), "selection_group"), + N_("Group selected objects"), INKSCAPE_ICON_OBJECT_GROUP), new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"), - N_("Ungroup selected groups"), "selection_ungroup"), + N_("Ungroup selected groups"), INKSCAPE_ICON_OBJECT_UNGROUP), new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), - N_("Put text on path"), "put_on_path"), + N_("Put text on path"), INKSCAPE_ICON_TEXT_PUT_ON_PATH), new SelectionVerb(SP_VERB_SELECTION_TEXTFROMPATH, "SelectionTextFromPath", N_("_Remove from Path"), - N_("Remove text from path"), "remove_from_path"), + N_("Remove text from path"), INKSCAPE_ICON_TEXT_REMOVE_FROM_PATH), new SelectionVerb(SP_VERB_SELECTION_REMOVE_KERNS, "SelectionTextRemoveKerns", N_("Remove Manual _Kerns"), // TRANSLATORS: "glyph": An image used in the visual representation of characters; // roughly speaking, how a character looks. A font is a set of glyphs. - N_("Remove all manual kerns and glyph rotations from a text object"), "remove_manual_kerns"), + N_("Remove all manual kerns and glyph rotations from a text object"), INKSCAPE_ICON_TEXT_UNKERN), new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"), - N_("Create union of selected paths"), "union"), + N_("Create union of selected paths"), INKSCAPE_ICON_PATH_UNION), new SelectionVerb(SP_VERB_SELECTION_INTERSECT, "SelectionIntersect", N_("_Intersection"), - N_("Create intersection of selected paths"), "intersection"), + N_("Create intersection of selected paths"), INKSCAPE_ICON_PATH_INTERSECTION), new SelectionVerb(SP_VERB_SELECTION_DIFF, "SelectionDiff", N_("_Difference"), - N_("Create difference of selected paths (bottom minus top)"), "difference"), + N_("Create difference of selected paths (bottom minus top)"), INKSCAPE_ICON_PATH_DIFFERENCE), new SelectionVerb(SP_VERB_SELECTION_SYMDIFF, "SelectionSymDiff", N_("E_xclusion"), - N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), "exclusion"), + N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), INKSCAPE_ICON_PATH_EXCLUSION), new SelectionVerb(SP_VERB_SELECTION_CUT, "SelectionDivide", N_("Di_vision"), - N_("Cut the bottom path into pieces"), "division"), + N_("Cut the bottom path into pieces"), INKSCAPE_ICON_PATH_DIVISION), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the // Advanced tutorial for more info new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"), - N_("Cut the bottom path's stroke into pieces, removing fill"), "cut_path"), + N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON_PATH_CUT), // TRANSLATORS: "outset": expand a shape by offsetting the object's path, // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. new SelectionVerb(SP_VERB_SELECTION_OFFSET, "SelectionOffset", N_("Outs_et"), - N_("Outset selected paths"), "outset_path"), + N_("Outset selected paths"), INKSCAPE_ICON_PATH_OUTSET), new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN, "SelectionOffsetScreen", N_("O_utset Path by 1 px"), N_("Outset selected paths by 1 px"), NULL), @@ -2312,7 +2384,7 @@ Verb *Verb::_base_verbs[] = { // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. new SelectionVerb(SP_VERB_SELECTION_INSET, "SelectionInset", N_("I_nset"), - N_("Inset selected paths"), "inset_path"), + N_("Inset selected paths"), INKSCAPE_ICON_PATH_INSET), new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen", N_("I_nset Path by 1 px"), N_("Inset selected paths by 1 px"), NULL), @@ -2320,131 +2392,139 @@ Verb *Verb::_base_verbs[] = { N_("I_nset Path by 10 px"), N_("Inset selected paths by 10 px"), NULL), new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset", - N_("D_ynamic Offset"), N_("Create a dynamic offset object"), "dynamic_offset"), + N_("D_ynamic Offset"), N_("Create a dynamic offset object"), INKSCAPE_ICON_PATH_OFFSET_DYNAMIC), new SelectionVerb(SP_VERB_SELECTION_LINKED_OFFSET, "SelectionLinkedOffset", N_("_Linked Offset"), N_("Create a dynamic offset object linked to the original path"), - "linked_offset"), + INKSCAPE_ICON_PATH_OFFSET_LINKED), new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"), - N_("Convert selected object's stroke to paths"), "stroke_tocurve"), + N_("Convert selected object's stroke to paths"), INKSCAPE_ICON_STROKE_TO_PATH), new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"), - N_("Simplify selected paths (remove extra nodes)"), "simplify"), + N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON_PATH_SIMPLIFY), new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"), - N_("Reverse the direction of selected paths (useful for flipping markers)"), "selection_reverse"), + N_("Reverse the direction of selected paths (useful for flipping markers)"), INKSCAPE_ICON_PATH_REVERSE), // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) new SelectionVerb(SP_VERB_SELECTION_TRACE, "SelectionTrace", N_("_Trace Bitmap..."), - N_("Create one or more paths from a bitmap by tracing it"), "selection_trace"), + N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON_BITMAP_TRACE), new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("_Make a Bitmap Copy"), - N_("Export selection to a bitmap and insert it into document"), "selection_bitmap" ), + N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON_SELECTION_MAKE_BITMAP_COPY ), new SelectionVerb(SP_VERB_SELECTION_COMBINE, "SelectionCombine", N_("_Combine"), - N_("Combine several paths into one"), "selection_combine"), + N_("Combine several paths into one"), INKSCAPE_ICON_PATH_COMBINE), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the // Advanced tutorial for more info new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"), - N_("Break selected paths into subpaths"), "selection_break"), + N_("Break selected paths into subpaths"), INKSCAPE_ICON_PATH_BREAK_APART), new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Rows and Columns..."), - N_("Arrange selected objects in a table"), "grid_arrange"), + N_("Arrange selected objects in a table"), INKSCAPE_ICON_DIALOG_ROWS_AND_COLUMNS), /* Layer */ new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."), - N_("Create a new layer"), "new_layer"), + N_("Create a new layer"), INKSCAPE_ICON_LAYER_NEW), new LayerVerb(SP_VERB_LAYER_RENAME, "LayerRename", N_("Re_name Layer..."), - N_("Rename the current layer"), "rename_layer"), + N_("Rename the current layer"), INKSCAPE_ICON_LAYER_RENAME), new LayerVerb(SP_VERB_LAYER_NEXT, "LayerNext", N_("Switch to Layer Abov_e"), - N_("Switch to the layer above the current"), "switch_to_layer_above"), + N_("Switch to the layer above the current"), INKSCAPE_ICON_LAYER_PREVIOUS), new LayerVerb(SP_VERB_LAYER_PREV, "LayerPrev", N_("Switch to Layer Belo_w"), - N_("Switch to the layer below the current"), "switch_to_layer_below"), + N_("Switch to the layer below the current"), INKSCAPE_ICON_LAYER_NEXT), new LayerVerb(SP_VERB_LAYER_MOVE_TO_NEXT, "LayerMoveToNext", N_("Move Selection to Layer Abo_ve"), - N_("Move selection to the layer above the current"), "move_selection_above"), + N_("Move selection to the layer above the current"), INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_ABOVE), new LayerVerb(SP_VERB_LAYER_MOVE_TO_PREV, "LayerMoveToPrev", N_("Move Selection to Layer Bel_ow"), - N_("Move selection to the layer below the current"), "move_selection_below"), + N_("Move selection to the layer below the current"), INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_BELOW), new LayerVerb(SP_VERB_LAYER_TO_TOP, "LayerToTop", N_("Layer to _Top"), - N_("Raise the current layer to the top"), "layer_to_top"), + N_("Raise the current layer to the top"), INKSCAPE_ICON_LAYER_TOP), new LayerVerb(SP_VERB_LAYER_TO_BOTTOM, "LayerToBottom", N_("Layer to _Bottom"), - N_("Lower the current layer to the bottom"), "layer_to_bottom"), + N_("Lower the current layer to the bottom"), INKSCAPE_ICON_LAYER_BOTTOM), new LayerVerb(SP_VERB_LAYER_RAISE, "LayerRaise", N_("_Raise Layer"), - N_("Raise the current layer"), "raise_layer"), + N_("Raise the current layer"), INKSCAPE_ICON_LAYER_RAISE), new LayerVerb(SP_VERB_LAYER_LOWER, "LayerLower", N_("_Lower Layer"), - N_("Lower the current layer"), "lower_layer"), + N_("Lower the current layer"), INKSCAPE_ICON_LAYER_LOWER), + new LayerVerb(SP_VERB_LAYER_DUPLICATE, "LayerDuplicate", N_("D_uplicate Current Layer"), + N_("Duplicate an existing layer"), NULL), new LayerVerb(SP_VERB_LAYER_DELETE, "LayerDelete", N_("_Delete Current Layer"), - N_("Delete the current layer"), "delete_layer"), + N_("Delete the current layer"), INKSCAPE_ICON_LAYER_DELETE), + new LayerVerb(SP_VERB_LAYER_SOLO, "LayerSolo", N_("_Show/hide other layers"), + N_("Solo the current layer"), NULL), /* Object */ new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CW, "ObjectRotate90", N_("Rotate _90° CW"), // This is shared between tooltips and statusbar, so they // must use UTF-8, not HTML entities for special characters. - N_("Rotate selection 90\xc2\xb0 clockwise"), "object_rotate_90_CW"), + N_("Rotate selection 90\xc2\xb0 clockwise"), INKSCAPE_ICON_OBJECT_ROTATE_RIGHT), new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0° CCW"), // This is shared between tooltips and statusbar, so they // must use UTF-8, not HTML entities for special characters. - N_("Rotate selection 90\xc2\xb0 counter-clockwise"), "object_rotate_90_CCW"), + N_("Rotate selection 90\xc2\xb0 counter-clockwise"), INKSCAPE_ICON_OBJECT_ROTATE_LEFT), new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectRemoveTransform", N_("Remove _Transformations"), - N_("Remove transformations from object"), "object_reset"), + N_("Remove transformations from object"), NULL), new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToPath", N_("_Object to Path"), - N_("Convert selected object to path"), "object_tocurve"), + N_("Convert selected object to path"), INKSCAPE_ICON_OBJECT_TO_PATH), new ObjectVerb(SP_VERB_OBJECT_FLOW_TEXT, "ObjectFlowText", N_("_Flow into Frame"), - N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), "flow_into_frame"), + N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), "text-flow-into-frame"), new ObjectVerb(SP_VERB_OBJECT_UNFLOW_TEXT, "ObjectUnFlowText", N_("_Unflow"), - N_("Remove text from frame (creates a single-line text object)"), "unflow"), + N_("Remove text from frame (creates a single-line text object)"), INKSCAPE_ICON_TEXT_UNFLOW), new ObjectVerb(SP_VERB_OBJECT_FLOWTEXT_TO_TEXT, "ObjectFlowtextToText", N_("_Convert to Text"), - N_("Convert flowed text to regular text object (preserves appearance)"), "convert_to_text"), + N_("Convert flowed text to regular text object (preserves appearance)"), INKSCAPE_ICON_TEXT_CONVERT_TO_REGULAR), new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally", N_("Flip _Horizontal"), N_("Flip selected objects horizontally"), - "object_flip_hor"), + INKSCAPE_ICON_OBJECT_FLIP_HORIZONTAL), new ObjectVerb(SP_VERB_OBJECT_FLIP_VERTICAL, "ObjectFlipVertically", N_("Flip _Vertical"), N_("Flip selected objects vertically"), - "object_flip_ver"), + INKSCAPE_ICON_OBJECT_FLIP_VERTICAL), 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"), + N_("Edit mask"), INKSCAPE_ICON_PATH_MASK_EDIT), 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"), + N_("Edit clipping path"), INKSCAPE_ICON_PATH_CLIP_EDIT), new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"), N_("Remove clipping path from selection"), NULL), /* Tools */ new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"), - N_("Select and transform objects"), "draw_select"), + N_("Select and transform objects"), INKSCAPE_ICON_TOOL_POINTER), new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"), - N_("Edit paths by nodes"), "draw_node"), + N_("Edit paths by nodes"), INKSCAPE_ICON_TOOL_NODE_EDITOR), new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", N_("Tweak"), - N_("Tweak objects by sculpting or painting"), "draw_tweak"), + N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON_TOOL_TWEAK), + new ContextVerb(SP_VERB_CONTEXT_SPRAY, "ToolSpray", N_("Spray"), + N_("Spray objects by sculpting or painting"), INKSCAPE_ICON_TOOL_SPRAY), new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"), - N_("Create rectangles and squares"), "draw_rect"), + N_("Create rectangles and squares"), INKSCAPE_ICON_DRAW_RECTANGLE), new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", N_("3D Box"), - N_("Create 3D boxes"), "draw_3dbox"), + N_("Create 3D boxes"), INKSCAPE_ICON_DRAW_CUBOID), new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", N_("Ellipse"), - N_("Create circles, ellipses, and arcs"), "draw_arc"), + N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON_DRAW_ELLIPSE), new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", N_("Star"), - N_("Create stars and polygons"), "draw_star"), + N_("Create stars and polygons"), INKSCAPE_ICON_DRAW_POLYGON_STAR), new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", N_("Spiral"), - N_("Create spirals"), "draw_spiral"), + N_("Create spirals"), INKSCAPE_ICON_DRAW_SPIRAL), new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", N_("Pencil"), - N_("Draw freehand lines"), "draw_freehand"), + N_("Draw freehand lines"), INKSCAPE_ICON_DRAW_FREEHAND), new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"), - N_("Draw Bezier curves and straight lines"), "draw_pen"), + N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON_DRAW_PATH), new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", N_("Calligraphy"), - N_("Draw calligraphic or brush strokes"), "draw_calligraphic"), + N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON_DRAW_CALLIGRAPHIC), new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"), - N_("Create and edit text objects"), "draw_text"), + N_("Create and edit text objects"), INKSCAPE_ICON_DRAW_TEXT), new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"), - N_("Create and edit gradients"), "draw_gradient"), + N_("Create and edit gradients"), INKSCAPE_ICON_COLOR_GRADIENT), new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"), - N_("Zoom in or out"), "draw_zoom"), + N_("Zoom in or out"), INKSCAPE_ICON_ZOOM), new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"), - N_("Pick colors from image"), "draw_dropper"), + N_("Pick colors from image"), INKSCAPE_ICON_COLOR_PICKER), new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"), - N_("Create diagram connectors"), "draw_connector"), + N_("Create diagram connectors"), INKSCAPE_ICON_DRAW_CONNECTOR), new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", N_("Paint Bucket"), - N_("Fill bounded areas"), "draw_paintbucket"), + N_("Fill bounded areas"), INKSCAPE_ICON_COLOR_FILL), new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", N_("LPE Edit"), - N_("Edit Live Path Effect parameters"), "draw_lpe"), + N_("Edit Path Effect parameters"), NULL), new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"), - N_("Erase existing paths"), "draw_erase"), + N_("Erase existing paths"), INKSCAPE_ICON_DRAW_ERASER), + new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", N_("LPE Tool"), + N_("Do geometric constructions"), "draw-geometry"), /* Tool prefs */ new ContextVerb(SP_VERB_CONTEXT_SELECT_PREFS, "SelectPrefs", N_("Selector Preferences"), N_("Open Preferences for the Selector tool"), NULL), @@ -2452,6 +2532,8 @@ Verb *Verb::_base_verbs[] = { N_("Open Preferences for the Node tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_TWEAK_PREFS, "TweakPrefs", N_("Tweak Tool Preferences"), N_("Open Preferences for the Tweak tool"), NULL), + new ContextVerb(SP_VERB_CONTEXT_SPRAY_PREFS, "SprayPrefs", N_("Spray Tool Preferences"), + N_("Open Preferences for the Spray tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_RECT_PREFS, "RectPrefs", N_("Rectangle Preferences"), N_("Open Preferences for the Rectangle tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_3DBOX_PREFS, "3DBoxPrefs", N_("3D Box Preferences"), @@ -2482,31 +2564,35 @@ Verb *Verb::_base_verbs[] = { 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_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), "zoom_out"), - new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), "rulers"), - 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_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), INKSCAPE_ICON_ZOOM_IN), + new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON_ZOOM_OUT), + new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), NULL), + new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), NULL), + new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), INKSCAPE_ICON_SHOW_GRID), + new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON_SHOW_GUIDES), + new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON_SNAP), new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"), - "zoom_next"), + INKSCAPE_ICON_ZOOM_NEXT), new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"), - "zoom_previous"), + INKSCAPE_ICON_ZOOM_PREVIOUS), new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"), - "zoom_1_to_1"), + INKSCAPE_ICON_ZOOM_ORIGINAL), new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"), - "zoom_1_to_2"), + INKSCAPE_ICON_ZOOM_HALF_SIZE), new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"), - "zoom_2_to_1"), + INKSCAPE_ICON_ZOOM_DOUBLE_SIZE), #ifdef HAVE_GTK_WINDOW_FULLSCREEN new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"), - "fullscreen"), + INKSCAPE_ICON_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"), + INKSCAPE_ICON_WINDOW_NEW), new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"), N_("New View Preview"), NULL/*"view_new_preview"*/), @@ -2516,22 +2602,24 @@ Verb *Verb::_base_verbs[] = { 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_PRINT_COLORS_PREVIEW, "ViewModePrintColorsPreview", N_("_Print Colors Preview"), +// N_("Switch to print colors preview 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-managed view"), - N_("Toggle color-managed display for this document window"), "color_management"), + N_("Toggle color-managed display for this document window"), INKSCAPE_ICON_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"), + N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON_DIALOG_ICON_PREVIEW), new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"), - N_("Zoom to fit page in window"), "zoom_page"), + N_("Zoom to fit page in window"), INKSCAPE_ICON_ZOOM_FIT_PAGE), new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"), - N_("Zoom to fit page width in window"), "zoom_pagewidth"), + N_("Zoom to fit page width in window"), INKSCAPE_ICON_ZOOM_FIT_WIDTH), new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"), - N_("Zoom to fit drawing in window"), "zoom_draw"), + N_("Zoom to fit drawing in window"), INKSCAPE_ICON_ZOOM_FIT_DRAWING), new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"), - N_("Zoom to fit selection in window"), "zoom_select"), + N_("Zoom to fit selection in window"), INKSCAPE_ICON_ZOOM_FIT_SELECTION), /* Dialogs */ new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("In_kscape Preferences..."), @@ -2539,58 +2627,68 @@ Verb *Verb::_base_verbs[] = { new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogDocumentProperties", N_("_Document Properties..."), N_("Edit properties of this document (to be saved with the document)"), GTK_STOCK_PROPERTIES ), new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("Document _Metadata..."), - N_("Edit document metadata (to be saved with the document)"), "document_metadata" ), + N_("Edit document metadata (to be saved with the document)"), INKSCAPE_ICON_DOCUMENT_METADATA ), new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."), - N_("Edit objects' colors, gradients, stroke width, arrowheads, dash patterns..."), "fill_and_stroke"), + N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON_DIALOG_FILL_AND_STROKE), + new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("Glyphs..."), + N_("Select characters from a glyphs palette"), GTK_STOCK_SELECT_FONT), // TRANSLATORS: "Swatches" means: color samples new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."), N_("Select colors from a swatches palette"), GTK_STOCK_SELECT_COLOR), new DialogVerb(SP_VERB_DIALOG_TRANSFORM, "DialogTransform", N_("Transfor_m..."), - N_("Precisely control objects' transformations"), "object_trans"), + N_("Precisely control objects' transformations"), INKSCAPE_ICON_DIALOG_TRANSFORM), new DialogVerb(SP_VERB_DIALOG_ALIGN_DISTRIBUTE, "DialogAlignDistribute", N_("_Align and Distribute..."), - N_("Align and distribute objects"), "object_align"), + N_("Align and distribute objects"), INKSCAPE_ICON_DIALOG_ALIGN_AND_DISTRIBUTE), + new DialogVerb(SP_VERB_DIALOG_SPRAY_OPTION, "DialogSprayOption", N_("_Spray options..."), + N_("Some options for the spray"), INKSCAPE_ICON_DIALOG_SPRAY_OPTIONS), new DialogVerb(SP_VERB_DIALOG_UNDO_HISTORY, "DialogUndoHistory", N_("Undo _History..."), - N_("Undo History"), "edit_undo_history"), + N_("Undo History"), INKSCAPE_ICON_EDIT_UNDO_HISTORY), new DialogVerb(SP_VERB_DIALOG_TEXT, "DialogText", N_("_Text and Font..."), - N_("View and select font family, font size and other text properties"), "object_font"), + N_("View and select font family, font size and other text properties"), INKSCAPE_ICON_DIALOG_TEXT_AND_FONT), new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."), - N_("View and edit the XML tree of the document"), "xml_editor"), + N_("View and edit the XML tree of the document"), INKSCAPE_ICON_DIALOG_XML_EDITOR), new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find..."), N_("Find objects in document"), GTK_STOCK_FIND ), + new DialogVerb(SP_VERB_DIALOG_FINDREPLACE, "DialogFindReplace", N_("Find and _Replace Text..."), + N_("Find and replace text in document"), GTK_STOCK_FIND_AND_REPLACE ), + new DialogVerb(SP_VERB_DIALOG_SPELLCHECK, "DialogSpellcheck", N_("Check Spellin_g..."), + N_("Check spelling of text in document"), GTK_STOCK_SPELL_CHECK ), new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."), - N_("View debug messages"), "messages"), + N_("View debug messages"), INKSCAPE_ICON_DIALOG_MESSAGES), new DialogVerb(SP_VERB_DIALOG_SCRIPT, "DialogScript", N_("S_cripts..."), - N_("Run scripts"), "scripts"), + N_("Run scripts"), INKSCAPE_ICON_DIALOG_SCRIPTS), new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"), - N_("Show or hide all open dialogs"), "dialog_toggle"), + N_("Show or hide all open dialogs"), INKSCAPE_ICON_SHOW_DIALOGS), new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogClonetiler", N_("Create Tiled Clones..."), - N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), "edit_create_tiled_clones"), + N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), INKSCAPE_ICON_DIALOG_TILE_CLONES), new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."), - N_("Edit the ID, locked and visible status, and other object properties"), "dialog_item_properties"), -#ifdef WITH_INKBOARD + N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON_DIALOG_OBJECT_PROPERTIES), +/*#ifdef WITH_INKBOARD new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient", N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL), -#endif +#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"), + N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON_DIALOG_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..."), - 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), + N_("View Layers"), INKSCAPE_ICON_DIALOG_LAYERS), + new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path Effect 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 Font Editor..."), + N_("Edit SVG fonts"), NULL), + new DialogVerb(SP_VERB_DIALOG_PRINT_COLORS_PREVIEW, "DialogPrintColorsPreview", N_("Print Colors..."), + N_("Select which color separations to render in Print Colors Preview rendermode"), NULL), /* Help */ new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"), N_("Information on Inkscape extensions"), NULL), new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"), - N_("Memory usage information"), "about_memory"), + N_("Memory usage information"), INKSCAPE_ICON_DIALOG_MEMORY), new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"), - N_("Inkscape version, authors, license"), /*"help_about"*/"inkscape_options"), + N_("Inkscape version, authors, license"), INKSCAPE_ICON_INKSCAPE), //new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), // N_("Distribution terms"), /*"show_license"*/"inkscape_options"), @@ -2606,16 +2704,18 @@ Verb *Verb::_base_verbs[] = { N_("Using bitmap tracing"), NULL/*"tutorial_tracing"*/), new TutorialVerb(SP_VERB_TUTORIAL_CALLIGRAPHY, "TutorialsCalligraphy", N_("Inkscape: _Calligraphy"), N_("Using the Calligraphy pen tool"), NULL), + new TutorialVerb(SP_VERB_TUTORIAL_INTERPOLATE, "TutorialsInterpolate", N_("Inkscape: _Interpolate"), + N_("Using the interpolate extension"), NULL/*"tutorial_interpolate"*/), new TutorialVerb(SP_VERB_TUTORIAL_DESIGN, "TutorialsDesign", N_("_Elements of Design"), N_("Principles of design in the tutorial form"), NULL/*"tutorial_design"*/), new TutorialVerb(SP_VERB_TUTORIAL_TIPS, "TutorialsTips", N_("_Tips and Tricks"), N_("Miscellaneous tips and tricks"), NULL/*"tutorial_tips"*/), - /* Effect */ - new EffectLastVerb(SP_VERB_EFFECT_LAST, "EffectLast", N_("Previous Effect"), - N_("Repeat the last effect with the same settings"), NULL), - new EffectLastVerb(SP_VERB_EFFECT_LAST_PREF, "EffectLastPref", N_("Previous Effect Settings..."), - N_("Repeat the last effect with new settings"), NULL), + /* Effect -- renamed Extension */ + new EffectLastVerb(SP_VERB_EFFECT_LAST, "EffectLast", N_("Previous Extension"), + N_("Repeat the last extension with the same settings"), NULL), + new EffectLastVerb(SP_VERB_EFFECT_LAST_PREF, "EffectLastPref", N_("Previous Extension Settings..."), + N_("Repeat the last extension with new settings"), NULL), /* Fit Page */ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION, "FitCanvasToSelection", N_("Fit Page to Selection"), @@ -2633,6 +2733,11 @@ Verb *Verb::_base_verbs[] = { 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) }; @@ -2666,4 +2771,4 @@ Verb::list (void) { fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :