![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 04a49f37c4bd3a58d9ad03275d5e548d96a5f974..ff1e3f676cd48c9e3104c908d6515d88bd6a82d9 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>
#include <gtkmm/filechooserdialog.h>
#include <gtkmm/stock.h>
+#include "layer-manager.h"
#include "dialogs/text-edit.h"
#include "dialogs/xml-tree.h"
-#include "dialogs/object-properties.h"
#include "dialogs/item-properties.h"
#include "dialogs/find.h"
#include "dialogs/layer-properties.h"
#endif
#include "extension/effect.h"
+#include "bind/javabind.h"
#include "tools-switch.h"
#include "inkscape-private.h"
#include "path-chemistry.h"
#include "text-chemistry.h"
#include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/document-properties.h"
#include "ui/dialog/inkscape-preferences.h"
#include "interface.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "splivarot.h"
#include "sp-namedview.h"
#include "sp-flowtext.h"
#include "gradient-context.h"
#include "shape-editor.h"
#include "draw-context.h"
-
+#include "gradient-drag.h"
+#include "sp-guide.h"
+#include "display/curve.h"
/**
* \brief Return the name without underscores and ellipsis, for use in dialog
} // end of sp_action_get_title()
-
namespace Inkscape {
-/// \todo !!!FIXME:: kill this, use DialogManager instead!!!
-
-class PanelDialog : public Inkscape::UI::Dialog::Dialog
-{
-public:
- PanelDialog(char const *prefs_path, int const verb_num) : Dialog(prefs_path, verb_num) {}
-/*
- virtual Glib::ustring getName() const {return "foo";}
- virtual Glib::ustring getDesc() const {return "bar";}
-*/
-};
-
-/** \brief Utility function to get a panel displayed. */
-static void show_panel( Inkscape::UI::Widget::Panel &panel, char const *prefs_path, int const verb_num )
-{
- Gtk::Container *container = panel.get_toplevel();
- if ( &panel == container ) { // safe check?
- //g_message("Creating new dialog to hold it");
- PanelDialog *dia = new PanelDialog(prefs_path, verb_num);
- Gtk::VBox *mainVBox = dia->get_vbox();
- mainVBox->pack_start(panel);
- dia->show_all_children();
- dia->read_geometry();
- dia->present();
- } else {
- PanelDialog *dia = dynamic_cast<PanelDialog*>(container);
- if ( dia ) {
- //g_message("Found an existing dialog");
- dia->read_geometry();
- dia->present();
- } else {
- g_message("Failed to find an existing dialog");
- }
- }
-}
-
/** \brief A class to encompass all of the verbs which deal with
file operations. */
class FileVerb : public Verb {
gchar const *image) :
Verb(code, id, name, tip, image)
{ }
-}; //TextVerb : public Verb
+}; //TextVerb : public Verb
Verb::VerbTable Verb::_verbs;
Verb::VerbIDTable Verb::_verb_ids;
\return NULL to represent error (this function shouldn't ever be called)
*/
SPAction *
-Verb::make_action(Inkscape::UI::View::View *view)
+Verb::make_action(Inkscape::UI::View::View */*view*/)
{
//std::cout << "make_action" << std::endl;
return NULL;
for (ActionTable::iterator cur_action = _actions->begin();
cur_action != _actions->end();
cur_action++) {
- if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
+ if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
sp_action_set_sensitive(cur_action->second, in_sensitive ? 1 : 0);
}
}
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)
for (ActionTable::iterator cur_action = _actions->begin();
cur_action != _actions->end();
cur_action++) {
- if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
- sp_action_set_name(cur_action->second, in_name);
+ if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
+ sp_action_set_name(cur_action->second, in_name);
}
}
}
/** \brief Decode the verb code and take appropriate action */
void
-FileVerb::perform(SPAction *action, void *data, void *pdata)
+FileVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
#if 0
/* These aren't used, but are here to remind people not to use
Inkscape::UI::View::View *current_view = sp_action_get_view(action);
SPDocument *current_document = current_view->doc();
#endif
+
+ SPDesktop *desktop = dynamic_cast<SPDesktop*>(sp_action_get_view(action));
+ g_assert(desktop != NULL);
+ Gtk::Window *parent = desktop->getToplevel();
+ g_assert(parent != NULL);
+
switch ((long) data) {
case SP_VERB_FILE_NEW:
sp_file_new_default();
break;
case SP_VERB_FILE_OPEN:
- sp_file_open_dialog(NULL, NULL);
+ sp_file_open_dialog(*parent, NULL, NULL);
break;
case SP_VERB_FILE_REVERT:
sp_file_revert_dialog();
break;
case SP_VERB_FILE_SAVE:
- sp_file_save(NULL, NULL);
+ sp_file_save(*parent, NULL, NULL);
break;
case SP_VERB_FILE_SAVE_AS:
- sp_file_save_as(NULL, NULL);
+ sp_file_save_as(*parent, NULL, NULL);
break;
case SP_VERB_FILE_SAVE_A_COPY:
- sp_file_save_a_copy(NULL, NULL);
+ 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_FILE_IMPORT:
- sp_file_import(NULL);
+ sp_file_import(*parent);
break;
case SP_VERB_FILE_EXPORT:
sp_file_export_dialog(NULL);
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_NEXT_DESKTOP:
inkscape_switch_desktops_next();
break;
break;
}
+
} // end of sp_verb_action_file_perform()
/** \brief Decode the verb code and take appropriate action */
void
-EditVerb::perform(SPAction *action, void *data, void *pdata)
+EditVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
sp_redo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_CUT:
- sp_selection_cut();
+ sp_selection_cut(dt);
break;
case SP_VERB_EDIT_COPY:
sp_selection_copy();
break;
case SP_VERB_EDIT_PASTE:
- sp_selection_paste(false);
+ sp_selection_paste(dt, false);
break;
case SP_VERB_EDIT_PASTE_STYLE:
- sp_selection_paste_style();
+ sp_selection_paste_style(dt);
break;
case SP_VERB_EDIT_PASTE_SIZE:
- sp_selection_paste_size(true, true);
+ sp_selection_paste_size(dt, true, true);
break;
case SP_VERB_EDIT_PASTE_SIZE_X:
- sp_selection_paste_size(true, false);
+ sp_selection_paste_size(dt, true, false);
break;
case SP_VERB_EDIT_PASTE_SIZE_Y:
- sp_selection_paste_size(false, true);
+ sp_selection_paste_size(dt, false, true);
break;
case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY:
- sp_selection_paste_size_separately(true, true);
+ sp_selection_paste_size_separately(dt, true, true);
break;
case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_X:
- sp_selection_paste_size_separately(true, false);
+ sp_selection_paste_size_separately(dt, true, false);
break;
case SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_Y:
- sp_selection_paste_size_separately(false, true);
+ sp_selection_paste_size_separately(dt, false, true);
break;
case SP_VERB_EDIT_PASTE_IN_PLACE:
- sp_selection_paste(true);
+ sp_selection_paste(dt, true);
+ break;
+ case SP_VERB_EDIT_PASTE_LIVEPATHEFFECT:
+ sp_selection_paste_livepatheffect(dt);
+ break;
+ case SP_VERB_EDIT_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(dt);
+ break;
+ case SP_VERB_EDIT_SELECTION_2_MARKER:
+ sp_selection_to_marker(dt);
break;
- case SP_VERB_EDIT_CLONE_ORIGINAL:
- sp_select_clone_original();
+ case SP_VERB_EDIT_SELECTION_2_GUIDES:
+ sp_selection_to_guides(dt);
break;
case SP_VERB_EDIT_TILE:
- sp_selection_tile();
+ sp_selection_tile(dt);
break;
case SP_VERB_EDIT_UNTILE:
- sp_selection_untile();
+ sp_selection_untile(dt);
break;
case SP_VERB_EDIT_CLEAR_ALL:
- sp_edit_clear_all();
+ sp_edit_clear_all(dt);
break;
case SP_VERB_EDIT_SELECT_ALL:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(false);
+ ec->shape_editor->select_all_from_subpath(false);
} else {
- sp_edit_select_all();
+ sp_edit_select_all(dt);
}
break;
case SP_VERB_EDIT_INVERT:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(true);
+ ec->shape_editor->select_all_from_subpath(true);
} else {
- sp_edit_invert();
+ sp_edit_invert(dt);
}
break;
case SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all(false);
+ ec->shape_editor->select_all(false);
} else {
- sp_edit_select_all_in_all_layers();
+ sp_edit_select_all_in_all_layers(dt);
}
break;
case SP_VERB_EDIT_INVERT_IN_ALL_LAYERS:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->select_all(true);
+ ec->shape_editor->select_all(true);
} else {
- sp_edit_invert_in_all_layers();
+ sp_edit_invert_in_all_layers(dt);
}
break;
- case SP_VERB_EDIT_SELECT_NEXT:
+ 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->shape_editor->select_next();
+ } else if (tools_isactive(dt, TOOLS_GRADIENT)
+ && ec->_grdrag->isNonEmpty()) {
sp_gradient_context_select_next (ec);
} else {
- sp_selection_item_next();
+ sp_selection_item_next(dt);
}
break;
- case SP_VERB_EDIT_SELECT_PREV:
+ 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->shape_editor->select_prev();
+ } else if (tools_isactive(dt, TOOLS_GRADIENT)
+ && ec->_grdrag->isNonEmpty()) {
sp_gradient_context_select_prev (ec);
} else {
- sp_selection_item_prev();
+ sp_selection_item_prev(dt);
}
break;
case SP_VERB_EDIT_DESELECT:
if (tools_isactive(dt, TOOLS_NODES)) {
- SP_NODE_CONTEXT(ec)->shape_editor->deselect();
+ ec->shape_editor->deselect();
} else {
sp_desktop_selection(dt)->clear();
}
break;
+
+ case SP_VERB_EDIT_GUIDES_AROUND_PAGE:
+ sp_guide_create_guides_around_page(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;
}
/** \brief Decode the verb code and take appropriate action */
void
-SelectionVerb::perform(SPAction *action, void *data, void *pdata)
+SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
return;
+ g_assert(dt->_dlg_mgr != NULL);
+
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_SELECTION_TO_FRONT:
- sp_selection_raise_to_top();
+ sp_selection_raise_to_top(dt);
break;
case SP_VERB_SELECTION_TO_BACK:
- sp_selection_lower_to_bottom();
+ sp_selection_lower_to_bottom(dt);
break;
case SP_VERB_SELECTION_RAISE:
- sp_selection_raise();
+ sp_selection_raise(dt);
break;
case SP_VERB_SELECTION_LOWER:
- sp_selection_lower();
+ sp_selection_lower(dt);
break;
case SP_VERB_SELECTION_GROUP:
- sp_selection_group();
+ sp_selection_group(dt);
break;
case SP_VERB_SELECTION_UNGROUP:
- sp_selection_ungroup();
+ sp_selection_ungroup(dt);
break;
case SP_VERB_SELECTION_TEXTTOPATH:
break;
case SP_VERB_SELECTION_UNION:
- sp_selected_path_union();
+ sp_selected_path_union(dt);
break;
case SP_VERB_SELECTION_INTERSECT:
- sp_selected_path_intersect();
+ sp_selected_path_intersect(dt);
break;
case SP_VERB_SELECTION_DIFF:
- sp_selected_path_diff();
+ sp_selected_path_diff(dt);
break;
case SP_VERB_SELECTION_SYMDIFF:
- sp_selected_path_symdiff();
+ sp_selected_path_symdiff(dt);
break;
case SP_VERB_SELECTION_CUT:
- sp_selected_path_cut();
+ sp_selected_path_cut(dt);
break;
case SP_VERB_SELECTION_SLICE:
- sp_selected_path_slice();
+ sp_selected_path_slice(dt);
break;
case SP_VERB_SELECTION_OFFSET:
- sp_selected_path_offset();
+ sp_selected_path_offset(dt);
break;
case SP_VERB_SELECTION_OFFSET_SCREEN:
- sp_selected_path_offset_screen(1);
+ sp_selected_path_offset_screen(dt, 1);
break;
case SP_VERB_SELECTION_OFFSET_SCREEN_10:
- sp_selected_path_offset_screen(10);
+ sp_selected_path_offset_screen(dt, 10);
break;
case SP_VERB_SELECTION_INSET:
- sp_selected_path_inset();
+ sp_selected_path_inset(dt);
break;
case SP_VERB_SELECTION_INSET_SCREEN:
- sp_selected_path_inset_screen(1);
+ sp_selected_path_inset_screen(dt, 1);
break;
case SP_VERB_SELECTION_INSET_SCREEN_10:
- sp_selected_path_inset_screen(10);
+ sp_selected_path_inset_screen(dt, 10);
break;
case SP_VERB_SELECTION_DYNAMIC_OFFSET:
- sp_selected_path_create_offset_object_zero();
- tools_switch_current(TOOLS_NODES);
+ sp_selected_path_create_offset_object_zero(dt);
+ tools_switch(dt, TOOLS_NODES);
break;
case SP_VERB_SELECTION_LINKED_OFFSET:
- sp_selected_path_create_updating_offset_object_zero();
- tools_switch_current(TOOLS_NODES);
+ sp_selected_path_create_updating_offset_object_zero(dt);
+ tools_switch(dt, TOOLS_NODES);
break;
-
case SP_VERB_SELECTION_OUTLINE:
- sp_selected_path_outline();
+ sp_selected_path_outline(dt);
break;
case SP_VERB_SELECTION_SIMPLIFY:
- sp_selected_path_simplify();
+ sp_selected_path_simplify(dt);
break;
case SP_VERB_SELECTION_REVERSE:
- sp_selected_path_reverse();
+ sp_selected_path_reverse(dt);
break;
case SP_VERB_SELECTION_TRACE:
+ inkscape_dialogs_unhide();
dt->_dlg_mgr->showDialog("Trace");
break;
case SP_VERB_SELECTION_CREATE_BITMAP:
- sp_selection_create_bitmap_copy();
+ sp_selection_create_bitmap_copy(dt);
break;
case SP_VERB_SELECTION_COMBINE:
- sp_selected_path_combine();
+ sp_selected_path_combine(dt);
break;
case SP_VERB_SELECTION_BREAK_APART:
- sp_selected_path_break_apart();
+ sp_selected_path_break_apart(dt);
break;
case SP_VERB_SELECTION_GRIDTILE:
+ inkscape_dialogs_unhide();
dt->_dlg_mgr->showDialog("TileDialog");
break;
default:
/** \brief Decode the verb code and take appropriate action */
void
-LayerVerb::perform(SPAction *action, void *data, void *pdata)
+LayerVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
unsigned int verb = reinterpret_cast<std::size_t>(data);
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,
- _("Move to next layer"));
- dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer."));
+ sp_document_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 move past last layer."));
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot go past last layer."));
}
break;
}
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,
- _("Move to previous layer"));
- dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer."));
+ sp_document_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 move past first layer."));
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot go before first layer."));
}
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:
break;
}
+ case SP_VERB_LAYER_DUPLICATE: {
+ if ( dt->currentLayer() != dt->currentRoot() ) {
+ 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 );
+ 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);
+
+ sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_DUPLICATE,
+ _("Duplicate layer"));
+
+ // TRANSLATORS: this means "The layer has been duplicated."
+ dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Duplicated layer."));
+ } else {
+ 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();
dt->setCurrentLayer(survivor);
}
- sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_DELETE,
+ sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_DELETE,
_("Delete layer"));
// TRANSLATORS: this means "The layer has been deleted."
}
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() );
+ sp_document_maybe_done(sp_desktop_document(dt), "layer:solo", SP_VERB_LAYER_SOLO, _("Toggle layer solo"));
+ }
+ break;
+ }
}
return;
/** \brief Decode the verb code and take appropriate action */
void
-ObjectVerb::perform( SPAction *action, void *data, void *pdata )
+ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ )
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
if (sel->isEmpty())
return;
- NR::Maybe<NR::Rect> bbox = sel->bounds();
+ Geom::OptRect bbox = sel->bounds();
if (!bbox) {
return;
}
// If the rotation center of the selection is visible, choose it as reference point
// for horizontal and vertical flips. Otherwise, take the center of the bounding box.
- NR::Point center;
+ Geom::Point center;
if (tools_isactive(dt, TOOLS_SELECT) && sel->center() && SP_SELECT_CONTEXT(ec)->_seltrans->centerIsVisible())
center = *sel->center();
else
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_OBJECT_ROTATE_90_CW:
- sp_selection_rotate_90_cw();
+ sp_selection_rotate_90(dt, false);
break;
case SP_VERB_OBJECT_ROTATE_90_CCW:
- sp_selection_rotate_90_ccw();
+ sp_selection_rotate_90(dt, true);
break;
case SP_VERB_OBJECT_FLATTEN:
- sp_selection_remove_transform();
+ sp_selection_remove_transform(dt);
break;
case SP_VERB_OBJECT_TO_CURVE:
- sp_selected_path_to_curves();
+ sp_selected_path_to_curves(dt);
break;
case SP_VERB_OBJECT_FLOW_TEXT:
text_flow_into_shape();
if (active_node) {
// ... flip the selected nodes about that node
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X, active_node->pos);
- } else {
+ ec->shape_editor->flip(Geom::X, active_node->pos);
+ } else {
// ... or else about the center of their bounding box.
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X);
+ ec->shape_editor->flip(Geom::X);
}
- // When working with the selector tool, flip the selection about its rotation center
+ // When working with the selector tool, flip the selection about its rotation center
// (if it is visible) or about the center of the bounding box.
} else {
- sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0));
+ sp_selection_scale_relative(sel, center, Geom::Scale(-1.0, 1.0));
}
sp_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_HORIZONTAL,
_("Flip horizontally"));
if (tools_isactive(dt, TOOLS_NODES)) {
Inkscape::NodePath::Node *active_node = Inkscape::NodePath::Path::active_node;
if (active_node) {
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::Y, active_node->pos);
+ ec->shape_editor->flip(Geom::Y, active_node->pos);
} else {
- SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::Y);
+ ec->shape_editor->flip(Geom::Y);
}
} else {
- sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0));
+ sp_selection_scale_relative(sel, center, Geom::Scale(1.0, -1.0));
}
sp_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_VERTICAL,
_("Flip vertically"));
break;
case SP_VERB_OBJECT_SET_MASK:
- sp_selection_set_mask(false, false);
+ sp_selection_set_mask(dt, false, false);
+ break;
+ case SP_VERB_OBJECT_EDIT_MASK:
+ sp_selection_edit_clip_or_mask(dt, false);
break;
case SP_VERB_OBJECT_UNSET_MASK:
- sp_selection_unset_mask(false);
+ sp_selection_unset_mask(dt, false);
break;
case SP_VERB_OBJECT_SET_CLIPPATH:
- sp_selection_set_mask(true, false);
+ sp_selection_set_mask(dt, true, false);
+ break;
+ case SP_VERB_OBJECT_EDIT_CLIPPATH:
+ sp_selection_edit_clip_or_mask(dt, true);
break;
case SP_VERB_OBJECT_UNSET_CLIPPATH:
- sp_selection_unset_mask(true);
+ sp_selection_unset_mask(dt, true);
break;
default:
break;
/** \brief Decode the verb code and take appropriate action */
void
-ContextVerb::perform(SPAction *action, void *data, void *pdata)
+ContextVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt;
sp_verb_t verb;
}
}
+ 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(dt, TOOLS_TWEAK);
break;
case SP_VERB_CONTEXT_RECT:
- tools_switch_current(TOOLS_SHAPES_RECT);
+ tools_switch(dt, TOOLS_SHAPES_RECT);
break;
case SP_VERB_CONTEXT_3DBOX:
- tools_switch_current(TOOLS_SHAPES_3DBOX);
+ tools_switch(dt, TOOLS_SHAPES_3DBOX);
break;
case SP_VERB_CONTEXT_ARC:
- tools_switch_current(TOOLS_SHAPES_ARC);
+ tools_switch(dt, TOOLS_SHAPES_ARC);
break;
case SP_VERB_CONTEXT_STAR:
- tools_switch_current(TOOLS_SHAPES_STAR);
+ tools_switch(dt, TOOLS_SHAPES_STAR);
break;
case SP_VERB_CONTEXT_SPIRAL:
- tools_switch_current(TOOLS_SHAPES_SPIRAL);
+ tools_switch(dt, TOOLS_SHAPES_SPIRAL);
break;
case SP_VERB_CONTEXT_PENCIL:
- tools_switch_current(TOOLS_FREEHAND_PENCIL);
+ tools_switch(dt, TOOLS_FREEHAND_PENCIL);
break;
case SP_VERB_CONTEXT_PEN:
- tools_switch_current(TOOLS_FREEHAND_PEN);
+ tools_switch(dt, TOOLS_FREEHAND_PEN);
break;
case SP_VERB_CONTEXT_CALLIGRAPHIC:
- tools_switch_current(TOOLS_CALLIGRAPHIC);
+ tools_switch(dt, TOOLS_CALLIGRAPHIC);
break;
case SP_VERB_CONTEXT_TEXT:
- tools_switch_current(TOOLS_TEXT);
+ tools_switch(dt, TOOLS_TEXT);
break;
case SP_VERB_CONTEXT_GRADIENT:
- tools_switch_current(TOOLS_GRADIENT);
+ tools_switch(dt, TOOLS_GRADIENT);
break;
case SP_VERB_CONTEXT_ZOOM:
- tools_switch_current(TOOLS_ZOOM);
+ tools_switch(dt, TOOLS_ZOOM);
break;
case SP_VERB_CONTEXT_DROPPER:
- tools_switch_current(TOOLS_DROPPER);
+ tools_switch(dt, TOOLS_DROPPER);
break;
case SP_VERB_CONTEXT_CONNECTOR:
- tools_switch_current (TOOLS_CONNECTOR);
+ tools_switch(dt, TOOLS_CONNECTOR);
break;
case SP_VERB_CONTEXT_PAINTBUCKET:
- tools_switch_current(TOOLS_PAINTBUCKET);
+ tools_switch(dt, TOOLS_PAINTBUCKET);
+ break;
+ case SP_VERB_CONTEXT_ERASER:
+ tools_switch(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->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_TWEAK);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_RECT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_RECT);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_RECT);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_3DBOX_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_3DBOX);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_3DBOX);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_ARC_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_ELLIPSE);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_STAR_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_STAR);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_STAR);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_SPIRAL_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SHAPES_SPIRAL);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_SHAPES_SPIRAL);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_PENCIL_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_PENCIL);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PENCIL);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_PEN_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_PEN);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PEN);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_CALLIGRAPHY);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_CALLIGRAPHY);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_TEXT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_TEXT);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_TEXT);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_GRADIENT_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_GRADIENT);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_GRADIENT);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_ZOOM_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_ZOOM);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_ZOOM);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_DROPPER_PREFS:
- prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_DROPPER);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_DROPPER);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_CONNECTOR_PREFS:
- prefs_set_int_attribute ("dialogs.preferences", "page", PREFS_PAGE_TOOLS_CONNECTOR);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_CONNECTOR);
dt->_dlg_mgr->showDialog("InkscapePreferences");
break;
case SP_VERB_CONTEXT_PAINTBUCKET_PREFS:
- prefs_set_int_attribute ("dialogs.preferences", "page", PREFS_PAGE_TOOLS_PAINTBUCKET);
+ prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PAINTBUCKET);
+ dt->_dlg_mgr->showDialog("InkscapePreferences");
+ break;
+ case SP_VERB_CONTEXT_ERASER_PREFS:
+ prefs->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;
/** \brief Decode the verb code and take appropriate action */
void
-TextVerb::perform(SPAction *action, void *data, void *pdata)
+TextVerb::perform(SPAction *action, void */*data*/, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview);
(void)repr;
}
-
+
/** \brief Decode the verb code and take appropriate action */
void
-ZoomVerb::perform(SPAction *action, void *data, void *pdata)
+ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble zoom_inc =
- prefs_get_double_attribute_limited( "options.zoomincrement",
- "value", 1.414213562, 1.01, 10 );
+ prefs->getDoubleLimited( "/options/zoomincrement/value", 1.414213562, 1.01, 10 );
switch (GPOINTER_TO_INT(data)) {
case SP_VERB_ZOOM_IN:
{
+ 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->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], 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:
{
+ 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->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 / 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:
case SP_VERB_TOGGLE_GUIDES:
sp_namedview_toggle_guides(doc, repr);
break;
+ case SP_VERB_TOGGLE_SNAPPING:
+ dt->toggleSnapGlobal();
+ break;
case SP_VERB_TOGGLE_GRID:
- dt->toggleGrid();
+ dt->toggleGrids();
break;
#ifdef HAVE_GTK_WINDOW_FULLSCREEN
case SP_VERB_FULLSCREEN:
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;
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;
case SP_VERB_VIEW_MODE_TOGGLE:
dt->displayModeToggle();
break;
+ case SP_VERB_VIEW_CMS_TOGGLE:
+ dt->toggleColorProfAdjust();
+ break;
case SP_VERB_VIEW_ICON_PREVIEW:
- show_panel( Inkscape::UI::Dialogs::IconPreviewPanel::getInstance(), "dialogs.iconpreview", SP_VERB_VIEW_ICON_PREVIEW );
+ inkscape_dialogs_unhide();
+ dt->_dlg_mgr->showDialog("IconPreviewPanel");
break;
default:
break;
}
-
+
dt->updateNow();
} // end of sp_verb_action_zoom_perform()
/** \brief Decode the verb code and take appropriate action */
void
-DialogVerb::perform(SPAction *action, void *data, void *pdata)
+DialogVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
if (reinterpret_cast<std::size_t>(data) != SP_VERB_DIALOG_TOGGLE) {
// unhide all when opening a new dialog
dt->_dlg_mgr->showDialog("DocumentProperties");
break;
case SP_VERB_DIALOG_FILL_STROKE:
- sp_object_properties_dialog();
- // dt->_dlg_mgr->showDialog("FillAndStroke");
+ dt->_dlg_mgr->showDialog("FillAndStroke");
break;
case SP_VERB_DIALOG_SWATCHES:
- show_panel( Inkscape::UI::Dialogs::SwatchesPanel::getInstance(), "dialogs.swatches", SP_VERB_DIALOG_SWATCHES);
+ dt->_dlg_mgr->showDialog("Swatches");
break;
case SP_VERB_DIALOG_TRANSFORM:
dt->_dlg_mgr->showDialog("Transformation");
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");
break;
#ifdef WITH_INKBOARD
case SP_VERB_XMPP_CLIENT:
- {
+ {
Inkscape::Whiteboard::SessionManager::showClient();
- break;
- }
+ break;
+ }
#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:
dt->_dlg_mgr->showDialog("ExtensionEditor");
break;
case SP_VERB_DIALOG_LAYERS:
- show_panel( Inkscape::UI::Dialogs::LayersPanel::getInstance(), "dialogs.layers", SP_VERB_DIALOG_LAYERS );
+ dt->_dlg_mgr->showDialog("LayersPanel");
+ break;
+ case SP_VERB_DIALOG_LIVE_PATH_EFFECT:
+ dt->_dlg_mgr->showDialog("LivePathEffect");
+ break;
+ case SP_VERB_DIALOG_FILTER_EFFECTS:
+ dt->_dlg_mgr->showDialog("FilterEffectsDialog");
+ break;
+ case SP_VERB_DIALOG_SVG_FONTS:
+ dt->_dlg_mgr->showDialog("SvgFontsDialog");
break;
default:
break;
/** \brief Decode the verb code and take appropriate action */
void
-HelpVerb::perform(SPAction *action, void *data, void *pdata)
+HelpVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
g_assert(dt->_dlg_mgr != NULL);
switch (reinterpret_cast<std::size_t>(data)) {
- case SP_VERB_HELP_KEYS:
- /* TRANSLATORS: If you have translated the keys.svg file to your language, then
- translate this string as "keys.LANG.svg" (where LANG is your language code);
- otherwise leave as "keys.svg". */
- sp_help_open_screen(_("keys.svg"));
- break;
case SP_VERB_HELP_ABOUT:
sp_help_about();
break;
case SP_VERB_HELP_ABOUT_EXTENSIONS: {
- Inkscape::UI::Dialogs::ExtensionsPanel *panel = new Inkscape::UI::Dialogs::ExtensionsPanel();
- panel->set_full(true);
- show_panel( *panel, "dialogs.aboutextensions", SP_VERB_HELP_ABOUT_EXTENSIONS );
+ // Inkscape::UI::Dialogs::ExtensionsPanel *panel = new Inkscape::UI::Dialogs::ExtensionsPanel();
+ // panel->set_full(true);
+ // show_panel( *panel, "dialogs.aboutextensions", SP_VERB_HELP_ABOUT_EXTENSIONS );
break;
}
*/
case SP_VERB_HELP_MEMORY:
+ inkscape_dialogs_unhide();
dt->_dlg_mgr->showDialog("Memory");
break;
default:
/** \brief Decode the verb code and take appropriate action */
void
-TutorialVerb::perform(SPAction *action, void *data, void *pdata)
+TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/)
{
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_TUTORIAL_BASIC:
/** \brief Decode the verb code and take appropriate action */
void
-EffectLastVerb::perform(SPAction *action, void *data, void *pdata)
+EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
/* These aren't used, but are here to remind people not to use
the CURRENT_DOCUMENT macros unless they really have to. */
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;
/** \brief Decode the verb code and take appropriate action */
void
-FitCanvasVerb::perform(SPAction *action, void *data, void *pdata)
+FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt) return;
SPDocument *doc = sp_desktop_document(dt);
if (!doc) return;
-
+
switch ((long) 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);
/** \brief Decode the verb code and take appropriate action */
void
-LockAndHideVerb::perform(SPAction *action, void *data, void *pdata)
+LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt) return;
SPDocument *doc = sp_desktop_document(dt);
if (!doc) return;
-
+
switch ((long) data) {
case SP_VERB_UNLOCK_ALL:
unlock_all(dt);
// 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_("Import a bitmap or SVG image into this document"), "file_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"),
new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"),
N_("Switch to the next document window"), "window_next"),
new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),
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, "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"),
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"),
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"),
- new EditVerb(SP_VERB_EDIT_CLONE_ORIGINAL, "EditCloneOriginal", N_("Select _Original"),
+ N_("Cut the selected clones' links to the originals, turning them into standalone objects"), "edit_unlink_clone"),
+ 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
+ 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"), "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"),
N_("Raise the current layer"), "raise_layer"),
new LayerVerb(SP_VERB_LAYER_LOWER, "LayerLower", N_("_Lower Layer"),
N_("Lower the current layer"), "lower_layer"),
+ new LayerVerb(SP_VERB_LAYER_DUPLICATE, "LayerDuplicate", N_("Duplicate Current Layer..."),
+ N_("Duplicate an existing layer"), 0),
new LayerVerb(SP_VERB_LAYER_DELETE, "LayerDelete", N_("_Delete Current Layer"),
N_("Delete the current layer"), "delete_layer"),
+ new LayerVerb(SP_VERB_LAYER_SOLO, "LayerSolo", N_("_Show/hide other layers"),
+ N_("Solo the current layer"), 0),
/* Object */
new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CW, "ObjectRotate90", N_("Rotate _90° CW"),
"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),
new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"),
N_("Select and transform objects"), "draw_select"),
new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"),
- N_("Edit path nodes or control handles"), "draw_node"),
+ N_("Edit paths by nodes"), "draw_node"),
+ new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", N_("Tweak"),
+ N_("Tweak objects by sculpting or painting"), "draw_tweak"),
new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"),
N_("Create rectangles and squares"), "draw_rect"),
new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", N_("3D Box"),
new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"),
N_("Draw Bezier curves and straight lines"), "draw_pen"),
new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", N_("Calligraphy"),
- N_("Draw calligraphic lines"), "draw_calligraphic"),
+ N_("Draw calligraphic or brush strokes"), "draw_calligraphic"),
new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"),
N_("Create and edit text objects"), "draw_text"),
new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"),
new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"),
N_("Pick colors from image"), "draw_dropper"),
new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"),
- N_("Create connectors"), "draw_connector"),
+ 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 Path Effect parameters"), "draw_lpe"),
+ new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"),
+ N_("Erase existing paths"), "draw_erase"),
+ new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", N_("LPE Tool"),
+ N_("Do geometric constructions"), "draw_lpetool"),
/* Tool prefs */
new ContextVerb(SP_VERB_CONTEXT_SELECT_PREFS, "SelectPrefs", N_("Selector Preferences"),
N_("Open Preferences for the Selector tool"), NULL),
new ContextVerb(SP_VERB_CONTEXT_NODE_PREFS, "NodePrefs", N_("Node Tool Preferences"),
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_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"),
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),
+ new ContextVerb(SP_VERB_CONTEXT_LPETOOL_PREFS, "LPEToolPrefs", N_("LPE Tool Preferences"),
+ N_("Open Preferences for the LPETool tool"), NULL),
/* Zoom/View */
new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), "zoom_in"),
new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), "scrollbars"),
new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), "grid"),
new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), "guides"),
+ new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Toggle snapping on or off"), NULL),
new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"),
"zoom_next"),
new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"),
"zoom_2_to_1"),
#ifdef HAVE_GTK_WINDOW_FULLSCREEN
new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"),
- "fullscreen"),
+ "view-fullscreen"),
#endif /* HAVE_GTK_WINDOW_FULLSCREEN */
+ new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), N_("Remove excess toolbars to focus on drawing"),
+ NULL),
new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"),
- "view_new"),
+ "window-new"),
new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"),
N_("New View Preview"), NULL/*"view_new_preview"*/),
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-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"),
new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"),
#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..."),
N_("View Layers"), "layers"),
+ new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path Effects Editor..."),
+ N_("Manage, edit, and apply path effects"), NULL),
+ new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter Editor..."),
+ N_("Manage, edit, and apply SVG filters"), NULL),
+ new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Fonts Editor..."),
+ N_("Edit SVG fonts"), NULL),
/* Help */
- new HelpVerb(SP_VERB_HELP_KEYS, "HelpKeys", N_("_Keys and Mouse"),
- N_("Keys and mouse shortcuts reference"), "help_keys"),
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_("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)
};