X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fverbs.cpp;h=cc01706eacd3ba47297a1fa7373c2066946eb313;hb=ac63672b8bd0ad9539384d4eac6e27875d4d2693;hp=29cf9a7497240a461a07b883e3a2ab5bdc8fd7a2;hpb=6129af7cc5b723223e9617614c931936e5190421;p=inkscape.git diff --git a/src/verbs.cpp b/src/verbs.cpp index 29cf9a749..cc01706ea 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -17,6 +17,8 @@ * David Turner * bulia byak * + * Copyright (C) 2006 Johan Engelen + * Copyright (C) (date unspecified) Authors * This code is in public domain. */ @@ -45,14 +47,11 @@ #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" @@ -77,6 +76,8 @@ #include "sp-flowtext.h" #include "layer-fns.h" #include "node-context.h" +#include "gradient-context.h" +#include "shape-editor.h" /** @@ -332,6 +333,24 @@ public: { } }; /* 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; @@ -508,6 +527,18 @@ TutorialVerb::make_action(Inkscape::UI::View::View *view) 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. @@ -586,6 +617,7 @@ Verb::get_action(Inkscape::UI::View::View *view) 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 { @@ -626,6 +658,21 @@ Verb::sensitive(SPDocument *in_doc, bool in_sensitive) 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 @@ -755,6 +802,9 @@ FileVerb::perform(SPAction *action, void *data, void *pdata) case SP_VERB_FILE_SAVE_AS: sp_file_save_as(NULL, NULL); break; + case SP_VERB_FILE_SAVE_A_COPY: + sp_file_save_a_copy(NULL, NULL); + break; case SP_VERB_FILE_PRINT: sp_file_print(); break; @@ -798,7 +848,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)) { @@ -867,35 +916,55 @@ EditVerb::perform(SPAction *action, void *data, void *pdata) break; case SP_VERB_EDIT_SELECT_ALL: if (tools_isactive(dt, TOOLS_NODES)) { - sp_nodepath_select_all_from_subpath(SP_NODE_CONTEXT(ec)->nodepath, false); + SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(false); } else { sp_edit_select_all(); } break; case SP_VERB_EDIT_INVERT: if (tools_isactive(dt, TOOLS_NODES)) { - sp_nodepath_select_all_from_subpath(SP_NODE_CONTEXT(ec)->nodepath, true); + SP_NODE_CONTEXT(ec)->shape_editor->select_all_from_subpath(true); } else { sp_edit_invert(); } break; case SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS: if (tools_isactive(dt, TOOLS_NODES)) { - sp_nodepath_select_all(SP_NODE_CONTEXT(ec)->nodepath, false); + SP_NODE_CONTEXT(ec)->shape_editor->select_all(false); } else { sp_edit_select_all_in_all_layers(); } break; case SP_VERB_EDIT_INVERT_IN_ALL_LAYERS: if (tools_isactive(dt, TOOLS_NODES)) { - sp_nodepath_select_all(SP_NODE_CONTEXT(ec)->nodepath, true); + SP_NODE_CONTEXT(ec)->shape_editor->select_all(true); } else { sp_edit_invert_in_all_layers(); } 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)) { + sp_gradient_context_select_next (ec); + } else { + sp_selection_item_next(); + } + 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)) { + sp_gradient_context_select_prev (ec); + } else { + sp_selection_item_prev(); + } + break; + case SP_VERB_EDIT_DESELECT: if (tools_isactive(dt, TOOLS_NODES)) { - sp_nodepath_deselect(SP_NODE_CONTEXT(ec)->nodepath); + SP_NODE_CONTEXT(ec)->shape_editor->deselect(); } else { sp_desktop_selection(dt)->clear(); } @@ -985,9 +1054,11 @@ SelectionVerb::perform(SPAction *action, void *data, void *pdata) break; case SP_VERB_SELECTION_DYNAMIC_OFFSET: sp_selected_path_create_offset_object_zero(); + tools_switch_current(TOOLS_NODES); break; case SP_VERB_SELECTION_LINKED_OFFSET: sp_selected_path_create_updating_offset_object_zero(); + tools_switch_current(TOOLS_NODES); break; case SP_VERB_SELECTION_OUTLINE: @@ -1045,7 +1116,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_document_done(sp_desktop_document(dt), SP_VERB_LAYER_NEXT, + _("Move to next layer")); dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer.")); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past last layer.")); @@ -1056,7 +1128,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_document_done(sp_desktop_document(dt), SP_VERB_LAYER_PREV, + _("Move to previous layer")); dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer.")); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past first layer.")); @@ -1102,17 +1175,26 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) 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 %s."), layer->defaultLabel()); + description = _("Layer to top"); + break; case SP_VERB_LAYER_RAISE: message = g_strdup_printf(_("Raised layer %s."), layer->defaultLabel()); + description = _("Raise layer"); break; case SP_VERB_LAYER_TO_BOTTOM: + message = g_strdup_printf(_("Lowered layer %s."), layer->defaultLabel()); + description = _("Layer to bottom"); + break; case SP_VERB_LAYER_LOWER: message = g_strdup_printf(_("Lowered layer %s."), layer->defaultLabel()); + description = _("Lower layer"); break; }; - sp_document_done(sp_desktop_document(dt)); + sp_document_done(sp_desktop_document(dt), verb, description); if (message) { dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, message); g_free((void *) message); @@ -1145,7 +1227,8 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) dt->setCurrentLayer(survivor); } - sp_document_done(sp_desktop_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.")); @@ -1174,7 +1257,11 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata ) if (sel->isEmpty()) return; - NR::Point const center(sel->bounds().midpoint()); + NR::Maybe bbox = sel->bounds(); + if (!bbox) { + return; + } + NR::Point const center(bbox->midpoint()); switch (reinterpret_cast(data)) { case SP_VERB_OBJECT_ROTATE_90_CW: @@ -1196,23 +1283,25 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata ) text_unflow(); break; case SP_VERB_OBJECT_FLOWTEXT_TO_TEXT: - SPFlowtext::convert_to_text(); + flowtext_to_text(); break; case SP_VERB_OBJECT_FLIP_HORIZONTAL: if (tools_isactive(dt, TOOLS_NODES)) { - sp_nodepath_flip(SP_NODE_CONTEXT(ec)->nodepath, NR::X); + SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X); } else { sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0)); } - sp_document_done(sp_desktop_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)) { - sp_nodepath_flip(SP_NODE_CONTEXT(ec)->nodepath, NR::Y); + 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_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); @@ -1250,7 +1339,7 @@ ContextVerb::perform(SPAction *action, void *data, void *pdata) /** \todo !!! hopefully this can go away soon and actions can look after * themselves */ - for (vidx = SP_VERB_CONTEXT_SELECT; vidx <= SP_VERB_CONTEXT_DROPPER_PREFS; vidx++) + for (vidx = SP_VERB_CONTEXT_SELECT; vidx <= SP_VERB_CONTEXT_PAINTBUCKET_PREFS; vidx++) { SPAction *tool_action= get((sp_verb_t)vidx)->get_action(dt); if (tool_action) { @@ -1301,6 +1390,9 @@ ContextVerb::perform(SPAction *action, void *data, void *pdata) case SP_VERB_CONTEXT_CONNECTOR: tools_switch_current (TOOLS_CONNECTOR); break; + case SP_VERB_CONTEXT_PAINTBUCKET: + tools_switch_current(TOOLS_PAINTBUCKET); + break; case SP_VERB_CONTEXT_SELECT_PREFS: prefs_set_int_attribute("dialogs.preferences", "page", PREFS_PAGE_TOOLS_SELECTOR); @@ -1358,6 +1450,10 @@ ContextVerb::perform(SPAction *action, void *data, void *pdata) prefs_set_int_attribute ("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); + dt->_dlg_mgr->showDialog("InkscapePreferences"); + break; default: break; @@ -1365,6 +1461,20 @@ ContextVerb::perform(SPAction *action, void *data, void *pdata) } // 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(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) @@ -1459,12 +1569,17 @@ ZoomVerb::perform(SPAction *action, void *data, void *pdata) case SP_VERB_VIEW_MODE_OUTLINE: dt->setDisplayModeOutline(); break; + case SP_VERB_VIEW_MODE_TOGGLE: + dt->displayModeToggle(); + break; case SP_VERB_VIEW_ICON_PREVIEW: show_panel( Inkscape::UI::Dialogs::IconPreviewPanel::getInstance(), "dialogs.iconpreview", SP_VERB_VIEW_ICON_PREVIEW ); break; default: break; } + + dt->updateNow(); } // end of sp_verb_action_zoom_perform() @@ -1513,6 +1628,8 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata) break; case SP_VERB_DIALOG_FIND: sp_find_dialog(); +// Please test the new find dialog if you have time: +// dt->_dlg_mgr->showDialog("Find"); break; case SP_VERB_DIALOG_DEBUG: dt->_dlg_mgr->showDialog("Messages"); @@ -1520,6 +1637,9 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata) 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; @@ -1530,90 +1650,9 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata) 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 @@ -1623,6 +1662,9 @@ DialogVerb::perform(SPAction *action, void *data, void *pdata) 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; } @@ -1713,48 +1755,48 @@ TutorialVerb::perform(SPAction *action, void *data, void *pdata) * 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}; /** @@ -1762,23 +1804,31 @@ SPActionEventVector ZoomVerb::vector = * 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 { @@ -1804,7 +1854,7 @@ public: * 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 @@ -1847,6 +1897,79 @@ EffectLastVerb::perform(SPAction *action, void *data, void *pdata) } /* *********** 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(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 */ @@ -1864,6 +1987,8 @@ Verb *Verb::_base_verbs[] = { GTK_STOCK_SAVE ), new FileVerb(SP_VERB_FILE_SAVE_AS, "FileSaveAs", N_("Save _As..."), N_("Save document under a new name"), GTK_STOCK_SAVE_AS ), + new FileVerb(SP_VERB_FILE_SAVE_A_COPY, "FileSaveACopy", N_("Save a Cop_y..."), + N_("Save a copy of the document under a new name"), NULL ), new FileVerb(SP_VERB_FILE_PRINT, "FilePrint", N_("_Print..."), N_("Print document"), GTK_STOCK_PRINT ), // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) @@ -1921,7 +2046,7 @@ Verb *Verb::_base_verbs[] = { 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_("Select the object to which the selected clone is linked"), NULL), + N_("Select the object to which the selected clone is linked"), "edit_select_original"), // 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), @@ -1933,13 +2058,17 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"), N_("Select all objects or all nodes"), "selection_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"), NULL), + N_("Select all objects in all visible and unlocked layers"), "selection_select_all_in_all_layers"), new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"), - N_("Invert selection (unselect what is selected and select everything else)"), NULL), + N_("Invert selection (unselect what is selected and select everything else)"), "selection_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"), + N_("Select next object or node"), NULL), + 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"), NULL), + N_("Deselect any selected objects or nodes"), "selection_deselect"), /* Selection */ new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"), @@ -1956,13 +2085,13 @@ Verb *Verb::_base_verbs[] = { N_("Ungroup selected groups"), "selection_ungroup"), new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), - N_("Put text on path"), NULL), + N_("Put text on path"), "put_on_path"), new SelectionVerb(SP_VERB_SELECTION_TEXTFROMPATH, "SelectionTextFromPath", N_("_Remove from Path"), - N_("Remove text from path"), NULL), + N_("Remove text from path"), "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"), NULL), + N_("Remove all manual kerns and glyph rotations from a text object"), "remove_manual_kerns"), new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"), N_("Create union of selected paths"), "union"), @@ -2059,11 +2188,11 @@ Verb *Verb::_base_verbs[] = { 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_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), "flow_into_frame"), new ObjectVerb(SP_VERB_OBJECT_UNFLOW_TEXT, "ObjectUnFlowText", N_("_Unflow"), - N_("Remove text from frame (creates a single-line text object)"), NULL), + N_("Remove text from frame (creates a single-line text object)"), "unflow"), new ObjectVerb(SP_VERB_OBJECT_FLOWTEXT_TO_TEXT, "ObjectFlowtextToText", N_("_Convert to Text"), - N_("Convert flowed text to regular text object (preserves appearance)"), NULL), + N_("Convert flowed text to regular text object (preserves appearance)"), "convert_to_text"), new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally", N_("Flip _Horizontal"), N_("Flip selected objects horizontally"), "object_flip_hor"), @@ -2105,9 +2234,11 @@ Verb *Verb::_base_verbs[] = { new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"), N_("Zoom in or out"), "draw_zoom"), new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"), - N_("Pick averaged colors from image"), "draw_dropper"), + N_("Pick colors from image"), "draw_dropper"), new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"), N_("Create connectors"), "draw_connector"), + new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", N_("Paint Bucket"), + N_("Fill bounded areas"), "draw_paintbucket"), /* Tool prefs */ new ContextVerb(SP_VERB_CONTEXT_SELECT_PREFS, "SelectPrefs", N_("Selector Preferences"), @@ -2138,6 +2269,8 @@ Verb *Verb::_base_verbs[] = { N_("Open Preferences for the Dropper tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_CONNECTOR_PREFS, "ConnectorPrefs", N_("Connector 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), /* Zoom/View */ new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), "zoom_in"), @@ -2169,9 +2302,11 @@ Verb *Verb::_base_verbs[] = { N_("Switch to normal display mode"), 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_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview"), - N_("Open a window to preview objects at different icon resolutions"), NULL/*"view_icon_preview"*/), + 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"), N_("Zoom to fit page in window"), "zoom_page"), new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"), @@ -2186,10 +2321,10 @@ Verb *Verb::_base_verbs[] = { N_("Edit global Inkscape preferences"), GTK_STOCK_PREFERENCES ), 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)"), NULL ), + new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("Document _Metadata..."), + N_("Edit document metadata (to be saved with the document)"), "document_metadata" ), 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_("Edit objects' colors, gradients, stroke width, arrowheads, dash patterns..."), "fill_and_stroke"), // 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), @@ -2197,6 +2332,8 @@ Verb *Verb::_base_verbs[] = { 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_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..."), @@ -2204,38 +2341,25 @@ Verb *Verb::_base_verbs[] = { new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find..."), N_("Find objects in document"), GTK_STOCK_FIND ), new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."), - N_("View debug messages"), NULL), + N_("View debug messages"), "messages"), new DialogVerb(SP_VERB_DIALOG_SCRIPT, "DialogScript", N_("S_cripts..."), - N_("Run scripts"), NULL), + N_("Run scripts"), "scripts"), 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, "DialogClonetiler", N_("Create Tiled Clones..."), - N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), NULL), + N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), "edit_create_tiled_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 - 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), + 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"), /* Help */ new HelpVerb(SP_VERB_HELP_KEYS, "HelpKeys", N_("_Keys and Mouse"), @@ -2243,9 +2367,11 @@ Verb *Verb::_base_verbs[] = { 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"), NULL), + N_("Memory usage information"), "about_memory"), 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_("_License"), + // N_("Distribution terms"), /*"show_license"*/"inkscape_options"), /* Tutorials */ new TutorialVerb(SP_VERB_TUTORIAL_BASIC, "TutorialsBasic", N_("Inkscape: _Basic"), @@ -2266,15 +2392,39 @@ Verb *Verb::_base_verbs[] = { /* 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) }; +void +Verb::list (void) { + // Go through the dynamic verb table + for (VerbTable::iterator iter = _verbs.begin(); iter != _verbs.end(); iter++) { + Verb * verb = iter->second; + if (verb->get_code() == SP_VERB_INVALID || + verb->get_code() == SP_VERB_NONE || + verb->get_code() == SP_VERB_LAST) { + continue; + } + + printf("%s: %s\n", verb->get_id(), verb->get_tip()? verb->get_tip() : verb->get_name()); + } + + return; +}; + } /* namespace Inkscape */ /*