![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 9cfe33ddab57071edd14648c4b96f02845c31ddb..c70e62fe220e04af68536e03aa139cd15922a064 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
#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 "ui/dialog/whiteboard-connect.h"
-#include "ui/dialog/whiteboard-sharewithuser.h"
-#include "ui/dialog/whiteboard-sharewithchat.h"
#include "jabber_whiteboard/session-manager.h"
-#include "jabber_whiteboard/node-tracker.h"
#endif
#include "extension/effect.h"
{ }
}; /* TutorialVerb class */
+/** \brief A class to encompass all of the verbs which deal with
+ text operations. */
+class TextVerb : public Verb {
+private:
+ static void perform(SPAction *action, void *mydata, void *otherdata);
+ static SPActionEventVector vector;
+protected:
+ virtual SPAction *make_action(Inkscape::UI::View::View *view);
+public:
+ /** \brief Use the Verb initializer with the same parameters. */
+ TextVerb(unsigned int const code,
+ gchar const *id,
+ gchar const *name,
+ gchar const *tip,
+ gchar const *image) :
+ Verb(code, id, name, tip, image)
+ { }
+}; //TextVerb : public Verb
Verb::VerbTable Verb::_verbs;
Verb::VerbIDTable Verb::_verb_ids;
return make_action_helper(view, &vector);
}
+/** \brief Create an action for a \c TextVerb
+ \param view Which view the action should be created for
+ \return The built action.
+
+ Calls \c make_action_helper with the \c vector.
+*/
+SPAction *
+TextVerb::make_action(Inkscape::UI::View::View *view)
+{
+ return make_action_helper(view, &vector);
+}
+
/** \brief A quick little convience function to make building actions
a little bit easier.
\param view Which view the action should be created for.
action = this->make_action(view);
// if (action == NULL) printf("Hmm, NULL in %s\n", _name);
+ if (action == NULL) printf("Hmm, NULL in %s\n", _name);
if (!_default_sensitive) {
sp_action_set_sensitive(action, 0);
} else {
return;
}
+
+void
+Verb::name(SPDocument *in_doc, Glib::ustring in_name)
+{
+ if (_actions != 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)) {
+ sp_action_set_name(cur_action->second, in_name);
+ }
+ }
+ }
+}
+
/** \brief A function to remove the action associated with a view.
\param view Which view's actions should be removed.
\return None
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_EDIT_UNDO:
- sp_undo(dt, SP_DT_DOCUMENT(dt));
+ sp_undo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_REDO:
- sp_redo(dt, SP_DT_DOCUMENT(dt));
+ sp_redo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_CUT:
sp_selection_cut();
if (tools_isactive(dt, TOOLS_NODES)) {
sp_nodepath_deselect(SP_NODE_CONTEXT(ec)->nodepath);
} else {
- SP_DT_SELECTION(dt)->clear();
+ sp_desktop_selection(dt)->clear();
}
break;
default:
SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer());
if (next) {
dt->setCurrentLayer(next);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_NEXT,
+ /* TODO: annotate */ "verbs.cpp:1077");
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer."));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past last layer."));
SPObject *prev=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer());
if (prev) {
dt->setCurrentLayer(prev);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_PREV,
+ /* TODO: annotate */ "verbs.cpp:1089");
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer."));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past first layer."));
if ( SP_OBJECT_NEXT(layer) != old_pos ) {
char const *message = NULL;
+ Glib::ustring description = "";
switch (verb) {
case SP_VERB_LAYER_TO_TOP:
+ message = g_strdup_printf(_("Raised layer <b>%s</b>."), layer->defaultLabel());
+ description = _("Layer to Top");
+ break;
case SP_VERB_LAYER_RAISE:
message = g_strdup_printf(_("Raised layer <b>%s</b>."), layer->defaultLabel());
+ description = _("Raise Layer");
break;
case SP_VERB_LAYER_TO_BOTTOM:
+ message = g_strdup_printf(_("Lowered layer <b>%s</b>."), layer->defaultLabel());
+ description = _("Layer to Bottom");
+ break;
case SP_VERB_LAYER_LOWER:
message = g_strdup_printf(_("Lowered layer <b>%s</b>."), layer->defaultLabel());
+ description = _("Lower Layer");
break;
};
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt), verb, description);
if (message) {
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, message);
g_free((void *) message);
}
case SP_VERB_LAYER_DELETE: {
if ( dt->currentLayer() != dt->currentRoot() ) {
- SP_DT_SELECTION(dt)->clear();
+ sp_desktop_selection(dt)->clear();
SPObject *old_layer=dt->currentLayer();
sp_object_ref(old_layer, NULL);
dt->setCurrentLayer(survivor);
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_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."));
SPEventContext *ec = dt->event_context;
- Inkscape::Selection *sel = SP_DT_SELECTION(dt);
+ Inkscape::Selection *sel = sp_desktop_selection(dt);
if (sel->isEmpty())
return;
} else {
sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0));
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt), SP_VERB_OBJECT_FLIP_HORIZONTAL,
+ _("Flip horizontally"));
break;
case SP_VERB_OBJECT_FLIP_VERTICAL:
if (tools_isactive(dt, TOOLS_NODES)) {
} else {
sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0));
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ 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);
} // end of sp_verb_action_ctx_perform()
+/** \brief Decode the verb code and take appropriate action */
+void
+TextVerb::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);
+ (void)doc;
+ 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)
if (!dt)
return;
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview);
default:
break;
}
+
+ dt->updateNow();
} // end of sp_verb_action_zoom_perform()
case SP_VERB_DIALOG_SCRIPT:
dt->_dlg_mgr->showDialog("Script");
break;
+ case SP_VERB_DIALOG_UNDO_HISTORY:
+ dt->_dlg_mgr->showDialog("UndoHistory");
+ break;
case SP_VERB_DIALOG_TOGGLE:
inkscape_dialogs_toggle();
break;
sp_item_dialog();
break;
#ifdef WITH_INKBOARD
- case SP_VERB_DIALOG_WHITEBOARD_CONNECT: {
- // We need to ensure that this dialog is associated with the correct SessionManager,
- // since the user may have opened a new document (and hence swapped SessionManager
- // instances) sometime before this dialog invocation
- Inkscape::UI::Dialog::WhiteboardConnectDialogImpl *dlg = dynamic_cast< Inkscape::UI::Dialog::WhiteboardConnectDialogImpl *>(dt->_dlg_mgr->getDialog("WhiteboardConnect"));
- dlg->setSessionManager();
- dt->_dlg_mgr->showDialog("WhiteboardConnect");
- break;
- }
- case SP_VERB_DIALOG_WHITEBOARD_SHAREWITHUSER: {
- //sp_whiteboard_sharewithuser_dialog(NULL);
- Inkscape::Whiteboard::SessionManager *sm = SP_ACTIVE_DESKTOP->whiteboard_session_manager();
- if (sm->session_data && sm->session_data->status[Inkscape::Whiteboard::LOGGED_IN]) {
- // We need to ensure that this dialog is associated with the correct SessionManager,
- // since the user may have opened a new document (and hence swapped SessionManager
- // instances) sometime before this dialog invocation
- Inkscape::UI::Dialog::WhiteboardShareWithUserDialogImpl *dlg = dynamic_cast< Inkscape::UI::Dialog::WhiteboardShareWithUserDialogImpl *>(dt->_dlg_mgr->getDialog("WhiteboardShareWithUser"));
- dlg->setSessionManager();
- dt->_dlg_mgr->showDialog("WhiteboardShareWithUser");
- } else {
- Gtk::MessageDialog dlg(_("You need to connect to a Jabber server before sharing a document with another user."), true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_CLOSE);
- dlg.run();
- }
- break;
- }
- case SP_VERB_DIALOG_WHITEBOARD_SHAREWITHCHAT: {
- Inkscape::Whiteboard::SessionManager *sm = SP_ACTIVE_DESKTOP->whiteboard_session_manager();
- if (sm->session_data && sm->session_data->status[Inkscape::Whiteboard::LOGGED_IN]) {
- // We need to ensure that this dialog is associated with the correct SessionManager,
- // since the user may have opened a new document (and hence swapped SessionManager
- // instances) sometime before this dialog invocation
- Inkscape::UI::Dialog::WhiteboardShareWithChatroomDialogImpl *dlg = dynamic_cast< Inkscape::UI::Dialog::WhiteboardShareWithChatroomDialogImpl *>(dt->_dlg_mgr->getDialog("WhiteboardShareWithChat"));
- dlg->setSessionManager();
- dt->_dlg_mgr->showDialog("WhiteboardShareWithChat");
- } else {
- Gtk::MessageDialog dlg(_("You need to connect to a Jabber server before sharing a document with a chatroom."), true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_CLOSE);
- dlg.run();
- }
- break;
- }
-
- case SP_VERB_DIALOG_WHITEBOARD_DUMPXMLTRACKER:
- if (SP_ACTIVE_DESKTOP->whiteboard_session_manager()->node_tracker()) {
- SP_ACTIVE_DESKTOP->whiteboard_session_manager()->node_tracker()->dump();
- } else {
- g_log(NULL, G_LOG_LEVEL_DEBUG, _("XML node tracker has not been initialized; nothing to dump"));
- }
- break;
- case SP_VERB_DIALOG_WHITEBOARD_OPENSESSIONFILE: {
- Gtk::FileChooserDialog sessionfiledlg(_("Open session file"), Gtk::FILE_CHOOSER_ACTION_OPEN);
- sessionfiledlg.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
- sessionfiledlg.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
-
- int result = sessionfiledlg.run();
- switch (result) {
- case Gtk::RESPONSE_OK:
- {
- SP_ACTIVE_DESKTOP->whiteboard_session_manager()->clearDocument();
- SP_ACTIVE_DESKTOP->whiteboard_session_manager()->loadSessionFile(sessionfiledlg.get_filename());
- dt->_dlg_mgr->showDialog("SessionPlayer");
- //SP_ACTIVE_DESKTOP->whiteboard_session_manager()->session_player()->start();
- break;
- }
- case Gtk::RESPONSE_CANCEL:
- default:
- break;
- }
- break;
- }
-
- case SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SESSION:
+ case SP_VERB_XMPP_CLIENT:
{
- Inkscape::Whiteboard::SessionManager *sm = SP_ACTIVE_DESKTOP->whiteboard_session_manager();
- if (sm->session_data && sm->session_data->status[Inkscape::Whiteboard::IN_WHITEBOARD]) {
- SP_ACTIVE_DESKTOP->whiteboard_session_manager()->disconnectFromDocument();
- }
- break;
- }
- case SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SERVER:
- {
- Inkscape::Whiteboard::SessionManager *sm = SP_ACTIVE_DESKTOP->whiteboard_session_manager();
- if (sm->session_data && sm->session_data->status[Inkscape::Whiteboard::LOGGED_IN]) {
- SP_ACTIVE_DESKTOP->whiteboard_session_manager()->disconnectFromServer();
- }
+ Inkscape::Whiteboard::SessionManager::showClient();
break;
}
#endif
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 );
+ break;
default:
break;
}
* is called.
*/
SPActionEventVector FileVerb::vector =
- {{NULL},FileVerb::perform, NULL, NULL, NULL};
+ {{NULL},FileVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined edit verb is
* called.
*/
SPActionEventVector EditVerb::vector =
- {{NULL},EditVerb::perform, NULL, NULL, NULL};
+ {{NULL},EditVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined selection
* verb is called
*/
SPActionEventVector SelectionVerb::vector =
- {{NULL},SelectionVerb::perform, NULL, NULL, NULL};
+ {{NULL},SelectionVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined layer
* verb is called
*/
SPActionEventVector LayerVerb::vector =
- {{NULL}, LayerVerb::perform, NULL, NULL, NULL};
+ {{NULL}, LayerVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined object
* editing verb is called
*/
SPActionEventVector ObjectVerb::vector =
- {{NULL},ObjectVerb::perform, NULL, NULL, NULL};
+ {{NULL},ObjectVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined context
* verb is called
*/
SPActionEventVector ContextVerb::vector =
- {{NULL},ContextVerb::perform, NULL, NULL, NULL};
+ {{NULL},ContextVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined zoom verb
* is called
*/
SPActionEventVector ZoomVerb::vector =
- {{NULL},ZoomVerb::perform, NULL, NULL, NULL};
+ {{NULL},ZoomVerb::perform, NULL, NULL, NULL, NULL};
/**
* is called
*/
SPActionEventVector DialogVerb::vector =
- {{NULL},DialogVerb::perform, NULL, NULL, NULL};
+ {{NULL},DialogVerb::perform, NULL, NULL, NULL, NULL};
/**
* Action vector to define functions called if a staticly defined help verb
* is called
*/
SPActionEventVector HelpVerb::vector =
- {{NULL},HelpVerb::perform, NULL, NULL, NULL};
+ {{NULL},HelpVerb::perform, NULL, NULL, NULL, NULL};
-
-/* *********** Effect Last ********** */
/**
* Action vector to define functions called if a staticly defined tutorial verb
* is called
*/
SPActionEventVector TutorialVerb::vector =
- {{NULL},TutorialVerb::perform, NULL, NULL, NULL};
+ {{NULL},TutorialVerb::perform, NULL, NULL, NULL, NULL};
+
+/**
+ * Action vector to define functions called if a staticly defined tutorial verb
+ * is called
+ */
+SPActionEventVector TextVerb::vector =
+ {{NULL},TextVerb::perform, NULL, NULL, NULL, NULL};
+
+
+/* *********** Effect Last ********** */
/** \brief A class to represent the last effect issued */
class EffectLastVerb : public Verb {
* The vector to attach in the last effect verb.
*/
SPActionEventVector EffectLastVerb::vector =
- {{NULL},EffectLastVerb::perform, NULL, NULL, NULL};
+ {{NULL},EffectLastVerb::perform, NULL, NULL, NULL, NULL};
/** \brief Create an action for a \c EffectLastVerb
\param view Which view the action should be created for
}
/* *********** End Effect Last ********** */
+/* *********** Fit Canvas ********** */
+
+/** \brief A class to represent the canvas fitting verbs */
+class FitCanvasVerb : public Verb {
+private:
+ static void perform(SPAction *action, void *mydata, void *otherdata);
+ static SPActionEventVector vector;
+protected:
+ virtual SPAction *make_action(Inkscape::UI::View::View *view);
+public:
+ /** \brief Use the Verb initializer with the same parameters. */
+ FitCanvasVerb(unsigned int const code,
+ gchar const *id,
+ gchar const *name,
+ gchar const *tip,
+ gchar const *image) :
+ Verb(code, id, name, tip, image)
+ {
+ set_default_sensitive(false);
+ }
+}; /* FitCanvasVerb class */
+
+/**
+ * The vector to attach in the fit canvas verb.
+ */
+SPActionEventVector FitCanvasVerb::vector =
+ {{NULL},FitCanvasVerb::perform, NULL, NULL, NULL, NULL};
+
+/** \brief Create an action for a \c FitCanvasVerb
+ \param view Which view the action should be created for
+ \return The built action.
+
+ Calls \c make_action_helper with the \c vector.
+*/
+SPAction *
+FitCanvasVerb::make_action(Inkscape::UI::View::View *view)
+{
+ SPAction *action = make_action_helper(view, &vector);
+ return action;
+}
+
+/** \brief Decode the verb code and take appropriate action */
+void
+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);
+ break;
+ case SP_VERB_FIT_CANVAS_TO_DRAWING:
+ fit_canvas_to_drawing(doc);
+ break;
+ case SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING:
+ fit_canvas_to_selection_or_drawing(dt);
+ break;
+ default:
+ return;
+ }
+
+ return;
+}
+/* *********** End Fit Canvas ********** */
+
+
+
+
+
+
/* these must be in the same order as the SP_VERB_* enum in "verbs.h" */
Verb *Verb::_base_verbs[] = {
/* Header */
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_NEXT_DESKTOP, "FileNextDesktop", N_("N_ext Window"),
+ 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, "FilePrevDesktop", N_("P_revious Window"),
+ new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),
N_("Switch to the previous document window"), "window_previous"),
- new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileCloseView", N_("_Close"),
+ 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),
new EditVerb(SP_VERB_EDIT_COPY, "EditCopy", N_("_Copy"),
N_("Copy selection to clipboard"), GTK_STOCK_COPY),
new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"),
- N_("Paste objects from clipboard to mouse point"), GTK_STOCK_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"),
new EditVerb(SP_VERB_EDIT_PASTE_SIZE, "EditPasteSize", N_("Paste Si_ze"),
new EditVerb(SP_VERB_EDIT_CLONE_ORIGINAL, "EditCloneOriginal", N_("Select _Original"),
N_("Select the object to which the selected clone is linked"), NULL),
// TRANSLATORS: Convert selection to a rectangle with tiled pattern fill
- new EditVerb(SP_VERB_EDIT_TILE, "EditTile", N_("Objects to Patter_n"),
+ 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, "EditUnTile", N_("Pattern to _Objects"),
+ 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 SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen",
N_("I_nset Path by 1 px"),
N_("Inset selected paths by 1 px"), NULL),
- new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN_10, "SelectionInsetScreen",
+ new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN_10, "SelectionInsetScreen10",
N_("I_nset Path by 10 px"),
N_("Inset selected paths by 10 px"), NULL),
new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset",
N_("_Linked Offset"),
N_("Create a dynamic offset object linked to the original path"),
"linked_offset"),
- new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "SelectionOutline", N_("_Stroke to Path"),
+ new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"),
N_("Convert selected object's stroke to paths"), "stroke_tocurve"),
new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"),
N_("Simplify selected paths (remove extra nodes)"), "simplify"),
// 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, "SelectionGridTile", N_("Gri_d Arrange..."),
+ new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Gri_d Arrange..."),
N_("Arrange selected objects in a grid pattern"), "grid_arrange"),
/* Layer */
new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."),
N_("Rotate selection 90° clockwise"), "object_rotate_90_CW"),
new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0° CCW"),
N_("Rotate selection 90° counter-clockwise"), "object_rotate_90_CCW"),
- new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectFlatten", N_("Remove _Transformations"),
+ new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectRemoveTransform", N_("Remove _Transformations"),
N_("Remove transformations from object"), "object_reset"),
- new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToCurve", N_("_Object to Path"),
+ new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToPath", N_("_Object to Path"),
N_("Convert selected object to path"), "object_tocurve"),
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"), NULL),
N_("Remove clipping path from selection"), NULL),
/* Tools */
- new ContextVerb(SP_VERB_CONTEXT_SELECT, "DrawSelect", N_("Select"),
+ new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"),
N_("Select and transform objects"), "draw_select"),
- new ContextVerb(SP_VERB_CONTEXT_NODE, "DrawNode", N_("Node Edit"),
+ new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"),
N_("Edit path nodes or control handles"), "draw_node"),
- new ContextVerb(SP_VERB_CONTEXT_RECT, "DrawRect", N_("Rectangle"),
+ new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"),
N_("Create rectangles and squares"), "draw_rect"),
- new ContextVerb(SP_VERB_CONTEXT_ARC, "DrawArc", N_("Ellipse"),
+ new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", N_("Ellipse"),
N_("Create circles, ellipses, and arcs"), "draw_arc"),
- new ContextVerb(SP_VERB_CONTEXT_STAR, "DrawStar", N_("Star"),
+ new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", N_("Star"),
N_("Create stars and polygons"), "draw_star"),
- new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "DrawSpiral", N_("Spiral"),
+ new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", N_("Spiral"),
N_("Create spirals"), "draw_spiral"),
- new ContextVerb(SP_VERB_CONTEXT_PENCIL, "DrawPencil", N_("Pencil"),
+ new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", N_("Pencil"),
N_("Draw freehand lines"), "draw_freehand"),
- new ContextVerb(SP_VERB_CONTEXT_PEN, "DrawPen", N_("Pen"),
+ new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"),
N_("Draw Bezier curves and straight lines"), "draw_pen"),
- new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "DrawCalligrphic", N_("Calligraphy"),
+ new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligrphic", N_("Calligraphy"),
N_("Draw calligraphic lines"), "draw_calligraphic"),
- new ContextVerb(SP_VERB_CONTEXT_TEXT, "DrawText", N_("Text"),
+ new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"),
N_("Create and edit text objects"), "draw_text"),
- new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "DrawGradient", N_("Gradient"),
+ new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"),
N_("Create and edit gradients"), "draw_gradient"),
- new ContextVerb(SP_VERB_CONTEXT_ZOOM, "DrawZoom", N_("Zoom"),
+ new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"),
N_("Zoom in or out"), "draw_zoom"),
- new ContextVerb(SP_VERB_CONTEXT_DROPPER, "DrawDropper", N_("Dropper"),
+ new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"),
N_("Pick averaged colors from image"), "draw_dropper"),
- new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "DrawConnector", N_("Connector"),
+ new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"),
N_("Create connectors"), "draw_connector"),
/* Tool prefs */
N_("Zoom to fit selection in window"), "zoom_select"),
/* Dialogs */
- new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogDisplay", N_("In_kscape Preferences..."),
+ new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("In_kscape Preferences..."),
N_("Edit global Inkscape preferences"), GTK_STOCK_PREFERENCES ),
- new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogNamedview", N_("_Document Properties..."),
+ 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..."),
+ new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("Document _Metadata..."),
N_("Edit document metadata (to be saved with the document)"), NULL ),
new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."),
N_("Edit objects' style, such as color or stroke width"), "fill_and_stroke"),
N_("Precisely control objects' transformations"), "object_trans"),
new DialogVerb(SP_VERB_DIALOG_ALIGN_DISTRIBUTE, "DialogAlignDistribute", N_("_Align and Distribute..."),
N_("Align and distribute objects"), "object_align"),
- new DialogVerb(SP_VERB_DIALOG_TEXT, "Dialogtext", N_("_Text and Font..."),
+ new DialogVerb(SP_VERB_DIALOG_UNDO_HISTORY, "DialogUndoHistory", N_("Undo _History..."),
+ N_("Undo History"), "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"),
new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."),
N_("View and edit the XML tree of the document"), "xml_editor"),
new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"),
N_("Show or hide all open dialogs"), "dialog_toggle"),
// TRANSLATORS: "Tile Clones" means: "Create tiled clones"
- new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogsClonetiler", N_("Create Tiled Clones..."),
+ 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"), NULL),
- new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogItem", N_("_Object Properties..."),
+ 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
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_CONNECT, "DialogWhiteboardConnect",
- N_("_Connect to Jabber server..."), N_("Connect to a Jabber server"), NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_SHAREWITHUSER, "DialogWhiteboardShareWithUser",
- N_("Share with _user..."), N_("Establish a whiteboard session with another Jabber user"), NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_SHAREWITHCHAT, "DialogWhiteboardShareWithChat",
- N_("Share with _chatroom..."), N_("Join a chatroom to start a new whiteboard session or join one in progress"), NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_DUMPXMLTRACKER, "DialogWhiteboardDumpXMLTracker",
- N_("_Dump XML node tracker"), N_("Dump the contents of the XML tracker to the console"), NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_OPENSESSIONFILE, "DialogWhiteboardOpenSessionFile",
- N_("_Open session file..."), N_("Open and browse through records of past whiteboard sessions"), NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_SESSIONPLAYBACK, "DialogWhiteboardSessionPlayback",
- N_("Session file playback"), "", NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SESSION, "DialogWhiteboardDisconnectSession",
- N_("_Disconnect from session"), "", NULL),
- new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SERVER, "DialogWhiteboardDisconnectServer",
- N_("Disconnect from _server"), "", NULL),
+ new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient",
+ N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL),
#endif
new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."),
N_("Configure extended input devices, such as a graphics tablet"), NULL),
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"), NULL),
/* Help */
new HelpVerb(SP_VERB_HELP_KEYS, "HelpKeys", N_("_Keys and Mouse"),
N_("Memory usage information"), NULL),
new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"),
N_("Inkscape version, authors, license"), /*"help_about"*/"inkscape_options"),
-// new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("Modifying or Redistributing Inkscape"),
-// N_("Show license to modify and/or redistribute Inkscape: GNU GPL"), NULL),
+ //new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"),
+ // N_("Distribution terms"), /*"show_license"*/"inkscape_options"),
/* Tutorials */
new TutorialVerb(SP_VERB_TUTORIAL_BASIC, "TutorialsBasic", N_("Inkscape: _Basic"),
/* Effect */
new EffectLastVerb(SP_VERB_EFFECT_LAST, "EffectLast", N_("Previous Effect"),
- N_("Repeat the last effect with the same settings"), NULL/*"tutorial_tips"*/),
+ 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/*"tutorial_tips"*/),
-
+ N_("Repeat the last effect with new settings"), NULL),
+
+ /* Fit Page */
+ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION, "FitCanvasToSelection", N_("Fit Page to Selection"),
+ N_("Fit the page to the current selection"), NULL),
+ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_DRAWING, "FitCanvasToDrawing", N_("Fit Page to Drawing"),
+ N_("Fit the page to the drawing"), NULL),
+ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, "FitCanvasToSelectionOrDrawing", N_("Fit Page to Selection or Drawing"),
+ N_("Fit the page to the current selection or the drawing if there is no selection"), NULL),
/* Footer */
- new Verb(SP_VERB_LAST, NULL, NULL, NULL, NULL)
+ new Verb(SP_VERB_LAST, " '\"invalid id", NULL, NULL, NULL)
};