diff options
Diffstat (limited to 'src/verbs.cpp')
| -rw-r--r-- | src/verbs.cpp | 1206 |
1 files changed, 574 insertions, 632 deletions
diff --git a/src/verbs.cpp b/src/verbs.cpp index f31a3df58..ebe1a4307 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1,7 +1,7 @@ /** * \file verbs.cpp * - * \brief Actions for inkscape + * Actions for inkscape. * * This file implements routines necessary to deal with verbs. A verb * is a numeric identifier used to retrieve standard SPActions for particular @@ -29,7 +29,7 @@ #endif #include <cstring> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include <gtkmm/filechooserdialog.h> #include <gtkmm/messagedialog.h> #include <gtkmm/stock.h> @@ -89,11 +89,10 @@ using Inkscape::DocumentUndo; //#endif /** - * \brief Return the name without underscores and ellipsis, for use in dialog + * Return the name without underscores and ellipsis, for use in dialog * titles, etc. Allocated memory must be freed by caller. */ -gchar * -sp_action_get_title(SPAction const *action) +gchar *sp_action_get_title(SPAction const *action) { char const *src = action->name; gchar *ret = g_new(gchar, strlen(src) + 1); @@ -114,16 +113,16 @@ sp_action_get_title(SPAction const *action) namespace Inkscape { -/** \brief A class to encompass all of the verbs which deal with - file operations. */ +/** + * A class to encompass all of the verbs which deal with file operations. + */ class FileVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ FileVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -131,18 +130,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* FileVerb class */ +}; // FileVerb class -/** \brief A class to encompass all of the verbs which deal with - edit operations. */ +/** + * A class to encompass all of the verbs which deal with edit operations. + */ class EditVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ EditVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -150,18 +149,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* EditVerb class */ +}; // EditVerb class -/** \brief A class to encompass all of the verbs which deal with - selection operations. */ +/** + * A class to encompass all of the verbs which deal with selection operations. + */ class SelectionVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ SelectionVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -169,18 +168,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* SelectionVerb class */ +}; // SelectionVerb class -/** \brief A class to encompass all of the verbs which deal with - layer operations. */ +/** + * A class to encompass all of the verbs which deal with layer operations. + */ class LayerVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ LayerVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -188,18 +187,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* LayerVerb class */ +}; // LayerVerb class -/** \brief A class to encompass all of the verbs which deal with - operations related to objects. */ +/** + * A class to encompass all of the verbs which deal with operations related to objects. + */ class ObjectVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ ObjectVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -207,18 +206,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* ObjectVerb class */ +}; // ObjectVerb class -/** \brief A class to encompass all of the verbs which deal with - operations relative to context. */ +/** + * A class to encompass all of the verbs which deal with operations relative to context. + */ class ContextVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ ContextVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -226,18 +225,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* ContextVerb class */ +}; // ContextVerb class -/** \brief A class to encompass all of the verbs which deal with - zoom operations. */ +/** + * A class to encompass all of the verbs which deal with zoom operations. + */ class ZoomVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ ZoomVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -245,19 +244,19 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* ZoomVerb class */ +}; // ZoomVerb class -/** \brief A class to encompass all of the verbs which deal with - dialog operations. */ +/** + * A class to encompass all of the verbs which deal with dialog operations. + */ class DialogVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ DialogVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -265,18 +264,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* DialogVerb class */ +}; // DialogVerb class -/** \brief A class to encompass all of the verbs which deal with - help operations. */ +/** + * A class to encompass all of the verbs which deal with help operations. + */ class HelpVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ HelpVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -284,18 +283,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* HelpVerb class */ +}; // HelpVerb class -/** \brief A class to encompass all of the verbs which deal with - tutorial operations. */ +/** + * A class to encompass all of the verbs which deal with tutorial operations. + */ class TutorialVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ TutorialVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -303,18 +302,18 @@ public: gchar const *image) : Verb(code, id, name, tip, image) { } -}; /* TutorialVerb class */ +}; // TutorialVerb class -/** \brief A class to encompass all of the verbs which deal with - text operations. */ +/** + * 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; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ TextVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -327,15 +326,16 @@ public: Verb::VerbTable Verb::_verbs; Verb::VerbIDTable Verb::_verb_ids; -/** \brief Create a verb without a code. - - This function calls the other constructor for all of the parameters, - but generates the code. It is important to READ THE OTHER DOCUMENTATION - it has important details in it. To generate the code a static is - used which starts at the last static value: \c SP_VERB_LAST. For - each call it is incremented. The list of allocated verbs is kept - in the \c _verbs hashtable which is indexed by the \c code. -*/ +/** + * Create a verb without a code. + * + * This function calls the other constructor for all of the parameters, + * but generates the code. It is important to READ THE OTHER DOCUMENTATION + * it has important details in it. To generate the code a static is + * used which starts at the last static value: \c SP_VERB_LAST. For + * each call it is incremented. The list of allocated verbs is kept + * in the \c _verbs hashtable which is indexed by the \c code. + */ Verb::Verb(gchar const *id, gchar const *name, gchar const *tip, gchar const *image) : _actions(0), _id(id), @@ -355,17 +355,16 @@ Verb::Verb(gchar const *id, gchar const *name, gchar const *tip, gchar const *im _verb_ids.insert(VerbIDTable::value_type(_id, this)); } -/** \brief Destroy a verb. - - The only allocated variable is the _actions variable. If it has - been allocated it is deleted. -*/ +/** + * Destroy a verb. + * + * The only allocated variable is the _actions variable. If it has + * been allocated it is deleted. + */ Verb::~Verb(void) { /// \todo all the actions need to be cleaned up first. - if (_actions != NULL) { - delete _actions; - } + delete _actions; if (_full_tip) { g_free(_full_tip); @@ -373,168 +372,180 @@ Verb::~Verb(void) } } -/** \brief Verbs are no good without actions. This is a place holder - for a function that every subclass should write. Most - can be written using \c make_action_helper. - \param view Which view the action should be created for. - \return NULL to represent error (this function shouldn't ever be called) -*/ -SPAction * -Verb::make_action(Inkscape::UI::View::View */*view*/) +/** + * Verbs are no good without actions. This is a place holder + * for a function that every subclass should write. Most + * can be written using \c make_action_helper. + * + * @param view Which view the action should be created for. + * @return NULL to represent error (this function shouldn't ever be called) + */ +SPAction *Verb::make_action(Inkscape::UI::View::View */*view*/) { //std::cout << "make_action" << std::endl; return NULL; } -/** \brief Create an action for a \c FileVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -FileVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c FileVerb. + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *FileVerb::make_action(Inkscape::UI::View::View *view) { - //std::cout << "fileverb: make_action: " << &vector << std::endl; - return make_action_helper(view, &vector); + //std::cout << "fileverb: make_action: " << &perform << std::endl; + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c EditVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -EditVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c EditVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *EditVerb::make_action(Inkscape::UI::View::View *view) { - //std::cout << "editverb: make_action: " << &vector << std::endl; - return make_action_helper(view, &vector); + //std::cout << "editverb: make_action: " << &perform << std::endl; + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c SelectionVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -SelectionVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c SelectionVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *SelectionVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c LayerVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -LayerVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c LayerVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *LayerVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c ObjectVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -ObjectVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c ObjectVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *ObjectVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c ContextVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -ContextVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c ContextVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *ContextVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c ZoomVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -ZoomVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c ZoomVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *ZoomVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c DialogVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -DialogVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c DialogVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *DialogVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c HelpVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -HelpVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c HelpVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *HelpVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Create an action for a \c TutorialVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -TutorialVerb::make_action(Inkscape::UI::View::View *view) +/** + * Create an action for a \c TutorialVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *TutorialVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \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) +/** + * Create an action for a \c TextVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. + */ +SPAction *TextVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief A quick little convience function to make building actions - a little bit easier. - \param view Which view the action should be created for. - \param vector The function vector for the verb. - \return The created action. - - This function does a couple of things. The most obvious is that - it allocates and creates the action. When it does this it - translates the \c _name and \c _tip variables. This allows them - to be staticly allocated easily, and get translated in the end. Then, - if the action gets crated, a listener is added to the action with - the vector that is passed in. -*/ -SPAction * -Verb::make_action_helper(Inkscape::UI::View::View *view, SPActionEventVector *vector, void *in_pntr) +/** + * A quick little convience function to make building actions + * a little bit easier. + * + * This function does a couple of things. The most obvious is that + * it allocates and creates the action. When it does this it + * translates the \c _name and \c _tip variables. This allows them + * to be staticly allocated easily, and get translated in the end. Then, + * if the action gets crated, a listener is added to the action with + * the vector that is passed in. + * + * @param view Which view the action should be created for. + * @param vector The function vector for the verb. + * @return The created action. + */ +SPAction *Verb::make_action_helper(Inkscape::UI::View::View *view, void (*perform_fun)(SPAction *, void *), void *in_pntr) { SPAction *action; @@ -542,48 +553,39 @@ Verb::make_action_helper(Inkscape::UI::View::View *view, SPActionEventVector *ve action = sp_action_new(view, _id, _(_name), _(_tip), _image, this); - if (action != NULL) { - if (in_pntr == NULL) { - nr_active_object_add_listener( - (NRActiveObject *) action, - (NRObjectEventVector *) vector, - sizeof(SPActionEventVector), - reinterpret_cast<void *>(_code) - ); - } else { - nr_active_object_add_listener( - (NRActiveObject *) action, - (NRObjectEventVector *) vector, - sizeof(SPActionEventVector), - in_pntr - ); - } - } + if (action == NULL) return NULL; + + action->signal_perform.connect( + sigc::bind( + sigc::bind( + sigc::ptr_fun(perform_fun), + in_pntr ? in_pntr : reinterpret_cast<void*>(_code)), + action)); return action; } -/** \brief A function to get an action if it exists, or otherwise to - build it. - \param view The view which this action would relate to - \return The action, or NULL if there is an error. - - This function will get the action for a given view for this verb. It - will create the verb if it can't be found in the ActionTable. Also, - if the \c ActionTable has not been created, it gets created by this - function. - - If the action is created, it's sensitivity must be determined. The - default for a new action is that it is sensitive. If the value in - \c _default_sensitive is \c false, then the sensitivity must be - removed. Also, if the view being created is based on the same - document as a view already created, the sensitivity should be the - same as views on that document. A view with the same document is - looked for, and the sensitivity is matched. Unfortunately, this is - currently a linear search. -*/ -SPAction * -Verb::get_action(Inkscape::UI::View::View *view) +/** + * A function to get an action if it exists, or otherwise to build it. + * + * This function will get the action for a given view for this verb. It + * will create the verb if it can't be found in the ActionTable. Also, + * if the \c ActionTable has not been created, it gets created by this + * function. + * + * If the action is created, it's sensitivity must be determined. The + * default for a new action is that it is sensitive. If the value in + * \c _default_sensitive is \c false, then the sensitivity must be + * removed. Also, if the view being created is based on the same + * document as a view already created, the sensitivity should be the + * same as views on that document. A view with the same document is + * looked for, and the sensitivity is matched. Unfortunately, this is + * currently a linear search. + * + * @param view The view which this action would relate to. + * @return The action, or NULL if there is an error. + */ +SPAction *Verb::get_action(Inkscape::UI::View::View *view) { SPAction *action = NULL; @@ -639,7 +641,9 @@ Verb::sensitive(SPDocument *in_doc, bool in_sensitive) return; } -/** \brief Accessor to get the tooltip for verb as localised string */ +/** + * Accessor to get the tooltip for verb as localised string. + */ gchar const *Verb::get_tip(void) { gchar const *result = 0; @@ -680,16 +684,17 @@ Verb::name(SPDocument *in_doc, Glib::ustring in_name) } } -/** \brief A function to remove the action associated with a view. - \param view Which view's actions should be removed. - \return None - - This function looks for the action in \c _actions. If it is - found then it is unreferenced and the entry in the action - table is erased. -*/ -void -Verb::delete_view(Inkscape::UI::View::View *view) +/** + * A function to remove the action associated with a view. + * + * This function looks for the action in \c _actions. If it is + * found then it is unreferenced and the entry in the action + * table is erased. + * + * @param view Which view's actions should be removed. + * @return None + */ +void Verb::delete_view(Inkscape::UI::View::View *view) { if (_actions == NULL) return; if (_actions->empty()) return; @@ -703,24 +708,25 @@ Verb::delete_view(Inkscape::UI::View::View *view) if (action_found != _actions->end()) { SPAction *action = action_found->second; - nr_object_unref(NR_OBJECT(action)); _actions->erase(action_found); + g_object_unref(action); } return; } -/** \brief A function to delete a view from all verbs - \param view Which view's actions should be removed. - \return None - - This function first looks through _base_verbs and deteles - the view from all of those views. If \c _verbs is not empty - then all of the entries in that table have all of the views - deleted also. -*/ -void -Verb::delete_all_view(Inkscape::UI::View::View *view) +/** + * A function to delete a view from all verbs. + * + * This function first looks through _base_verbs and deteles + * the view from all of those views. If \c _verbs is not empty + * then all of the entries in that table have all of the views + * deleted also. + * + * @param view Which view's actions should be removed. + * @return None + */ +void Verb::delete_all_view(Inkscape::UI::View::View *view) { for (int i = 0; i <= SP_VERB_LAST; i++) { if (_base_verbs[i]) @@ -739,16 +745,16 @@ Verb::delete_all_view(Inkscape::UI::View::View *view) return; } -/** \brief A function to turn a \c code into a Verb for dynamically - created Verbs. - \param code What code is being looked for - \return The found Verb of NULL if none is found. - - This function basically just looks through the \c _verbs hash - table. STL does all the work. -*/ -Verb * -Verb::get_search(unsigned int code) +/** + * A function to turn a \c code into a Verb for dynamically created Verbs. + * + * This function basically just looks through the \c _verbs hash + * table. STL does all the work. + * + * @param code What code is being looked for. + * @return The found Verb of NULL if none is found. + */ +Verb *Verb::get_search(unsigned int code) { Verb *verb = NULL; VerbTable::iterator verb_found = _verbs.find(code); @@ -760,15 +766,16 @@ Verb::get_search(unsigned int code) return verb; } -/** \brief Find a Verb using it's ID - \param id Which id to search for - - This function uses the \c _verb_ids has table to find the - verb by it's id. Should be much faster than previous - implementations. -*/ -Verb * -Verb::getbyid(gchar const *id) +/** + * Find a Verb using it's ID. + * + * This function uses the \c _verb_ids has table to find the + * verb by it's id. Should be much faster than previous + * implementations. + * + * @param id Which id to search for. + */ +Verb *Verb::getbyid(gchar const *id) { Verb *verb = NULL; VerbIDTable::iterator verb_found = _verb_ids.find(id); @@ -783,13 +790,14 @@ Verb::getbyid(gchar const *id) return verb; } -/** \brief Decode the verb code and take appropriate action */ -void -FileVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void FileVerb::perform(SPAction *action, void *data) { #if 0 - /* These aren't used, but are here to remind people not to use - the CURRENT_DOCUMENT macros unless they really have to. */ + // These aren't used, but are here to remind people not to use + // the CURRENT_DOCUMENT macros unless they really have to. Inkscape::UI::View::View *current_view = sp_action_get_view(action); SPDocument *current_document = current_view->doc(); #endif @@ -824,9 +832,6 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_FILE_VACUUM: sp_file_vacuum(); break; - case SP_VERB_FILE_PRINT_PREVIEW: - sp_file_print_preview(NULL, NULL); - break; case SP_VERB_FILE_IMPORT: sp_file_import(*parent); break; @@ -858,9 +863,10 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/) } // 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*/) +/** + * Decode the verb code and take appropriate action. + */ +void EditVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) @@ -969,6 +975,9 @@ EditVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_EDIT_DESELECT: SelectionHelper::selectNone(dt); break; + case SP_VERB_EDIT_DELETE_ALL_GUIDES: + sp_guide_delete_all_guides(dt); + break; case SP_VERB_EDIT_GUIDES_AROUND_PAGE: sp_guide_create_guides_around_page(dt); break; @@ -986,9 +995,10 @@ EditVerb::perform(SPAction *action, void *data, void */*pdata*/) } // end of sp_verb_action_edit_perform() -/** \brief Decode the verb code and take appropriate action */ -void -SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void SelectionVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); @@ -1106,9 +1116,10 @@ SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/) } // end of sp_verb_action_selection_perform() -/** \brief Decode the verb code and take appropriate action */ -void -LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void LayerVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); size_t verb = reinterpret_cast<std::size_t>(data); @@ -1275,11 +1286,11 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) survivor = Inkscape::previous_layer(dt->currentRoot(), old_layer); } - /* Deleting the old layer before switching layers is a hack to trigger the - * listeners of the deletion event (as happens when old_layer is deleted using the - * xml editor). See - * http://sourceforge.net/tracker/index.php?func=detail&aid=1339397&group_id=93438&atid=604306 - */ + // Deleting the old layer before switching layers is a hack to trigger the + // listeners of the deletion event (as happens when old_layer is deleted using the + // xml editor). See + // http://sourceforge.net/tracker/index.php?func=detail&aid=1339397&group_id=93438&atid=604306 + // old_layer->deleteObject(); sp_object_unref(old_layer, NULL); if (survivor) { @@ -1310,9 +1321,10 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) return; } // end of sp_verb_action_layer_perform() -/** \brief Decode the verb code and take appropriate action */ -void -ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ ) +/** + * Decode the verb code and take appropriate action. + */ +void ObjectVerb::perform( SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) @@ -1325,7 +1337,7 @@ ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ ) if (sel->isEmpty()) return; - Geom::OptRect bbox = sel->bounds(); + Geom::OptRect bbox = sel->visualBounds(); if (!bbox) { return; } @@ -1393,9 +1405,10 @@ ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ ) } // end of sp_verb_action_object_perform() -/** \brief Decode the verb code and take appropriate action */ -void -ContextVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void ContextVerb::perform(SPAction *action, void *data) { SPDesktop *dt; sp_verb_t verb; @@ -1466,6 +1479,9 @@ ContextVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_CONTEXT_ZOOM: tools_switch(dt, TOOLS_ZOOM); break; + case SP_VERB_CONTEXT_MEASURE: + tools_switch(dt, TOOLS_MEASURE); + break; case SP_VERB_CONTEXT_DROPPER: tools_switch(dt, TOOLS_DROPPER); break; @@ -1542,6 +1558,10 @@ ContextVerb::perform(SPAction *action, void *data, void */*pdata*/) prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_ZOOM); dt->_dlg_mgr->showDialog("InkscapePreferences"); break; + case SP_VERB_CONTEXT_MEASURE_PREFS: + prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_MEASURE); + dt->_dlg_mgr->showDialog("InkscapePreferences"); + break; case SP_VERB_CONTEXT_DROPPER_PREFS: prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_DROPPER); dt->_dlg_mgr->showDialog("InkscapePreferences"); @@ -1570,9 +1590,10 @@ 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*/) +/** + * Decode the verb code and take appropriate action. + */ +void TextVerb::perform(SPAction *action, void */*data*/) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) @@ -1584,9 +1605,10 @@ TextVerb::perform(SPAction *action, void */*data*/, void */*pdata*/) (void)repr; } -/** \brief Decode the verb code and take appropriate action */ -void -ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void ZoomVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) @@ -1696,7 +1718,7 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_FULLSCREEN: dt->fullscreen(); break; -#endif /* HAVE_GTK_WINDOW_FULLSCREEN */ +#endif // HAVE_GTK_WINDOW_FULLSCREEN case SP_VERB_FOCUSTOGGLE: dt->focusMode(!dt->is_focusMode()); break; @@ -1745,9 +1767,10 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) } // 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*/) +/** + * Decode the verb code and take appropriate action. + */ +void DialogVerb::perform(SPAction *action, void *data) { if (reinterpret_cast<std::size_t>(data) != SP_VERB_DIALOG_TOGGLE) { // unhide all when opening a new dialog @@ -1857,9 +1880,10 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) } } // end of sp_verb_action_dialog_perform() -/** \brief Decode the verb code and take appropriate action */ -void -HelpVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void HelpVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); g_assert(dt->_dlg_mgr != NULL); @@ -1891,15 +1915,16 @@ HelpVerb::perform(SPAction *action, void *data, void */*pdata*/) } } // end of sp_verb_action_help_perform() -/** \brief Decode the verb code and take appropriate action */ -void -TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void TutorialVerb::perform(SPAction */*action*/, void *data) { switch (reinterpret_cast<std::size_t>(data)) { case SP_VERB_TUTORIAL_BASIC: - /* TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, - then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language - code); otherwise leave as "tutorial-basic.svg". */ + // TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, + // then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language + // code); otherwise leave as "tutorial-basic.svg". sp_help_open_tutorial(NULL, (gpointer)_("tutorial-basic.svg")); break; case SP_VERB_TUTORIAL_SHAPES: @@ -1935,96 +1960,18 @@ TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/) } } // end of sp_verb_action_tutorial_perform() +// *********** Effect Last ********** /** - * Action vector to define functions called if a staticly defined file verb - * is called. - */ -SPActionEventVector FileVerb::vector = - {{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}; - -/** - * Action vector to define functions called if a staticly defined selection - * verb is called - */ -SPActionEventVector SelectionVerb::vector = - {{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}; - -/** - * 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}; - -/** - * Action vector to define functions called if a staticly defined context - * verb is called - */ -SPActionEventVector ContextVerb::vector = - {{NULL},ContextVerb::perform, NULL, NULL, NULL, NULL}; - -/** - * Action vector to define functions called if a staticly defined zoom verb - * is called + * A class to represent the last effect issued. */ -SPActionEventVector ZoomVerb::vector = - {{NULL},ZoomVerb::perform, NULL, NULL, NULL, NULL}; - - -/** - * Action vector to define functions called if a staticly defined dialog verb - * is called - */ -SPActionEventVector DialogVerb::vector = - {{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}; - -/** - * Action vector to define functions called if a staticly defined tutorial verb - * is called - */ -SPActionEventVector TutorialVerb::vector = - {{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 { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ EffectLastVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -2034,32 +1981,28 @@ public: { set_default_sensitive(false); } -}; /* EffectLastVerb class */ +}; // EffectLastVerb class /** - * The vector to attach in the last effect verb. + * Create an action for a \c EffectLastVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. */ -SPActionEventVector EffectLastVerb::vector = - {{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 - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -EffectLastVerb::make_action(Inkscape::UI::View::View *view) +SPAction *EffectLastVerb::make_action(Inkscape::UI::View::View *view) { - return make_action_helper(view, &vector); + return make_action_helper(view, &perform); } -/** \brief Decode the verb code and take appropriate action */ -void -EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void EffectLastVerb::perform(SPAction *action, void *data) { - /* These aren't used, but are here to remind people not to use - the CURRENT_DOCUMENT macros unless they really have to. */ + // These aren't used, but are here to remind people not to use + // the CURRENT_DOCUMENT macros unless they really have to. Inkscape::UI::View::View *current_view = sp_action_get_view(action); // SPDocument *current_document = SP_VIEW_DOCUMENT(current_view); Inkscape::Extension::Effect *effect = Inkscape::Extension::Effect::get_last_effect(); @@ -2080,19 +2023,20 @@ EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/) return; } -/* *********** End Effect Last ********** */ +// *********** End Effect Last ********** -/* *********** Fit Canvas ********** */ +// *********** Fit Canvas ********** -/** \brief A class to represent the canvas fitting verbs */ +/** + * 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; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ FitCanvasVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -2102,30 +2046,26 @@ public: { set_default_sensitive(false); } -}; /* FitCanvasVerb class */ +}; // FitCanvasVerb class /** - * The vector to attach in the fit canvas verb. + * Create an action for a \c FitCanvasVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. */ -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 *FitCanvasVerb::make_action(Inkscape::UI::View::View *view) { - SPAction *action = make_action_helper(view, &vector); + SPAction *action = make_action_helper(view, &perform); return action; } -/** \brief Decode the verb code and take appropriate action */ -void -FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void FitCanvasVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) return; @@ -2148,20 +2088,21 @@ FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/) return; } -/* *********** End Fit Canvas ********** */ +// *********** End Fit Canvas ********** -/* *********** Lock'N'Hide ********** */ +// *********** Lock'N'Hide ********** -/** \brief A class to represent the object unlocking and unhiding verbs */ +/** + * A class to represent the object unlocking and unhiding verbs. + */ class LockAndHideVerb : public Verb { private: - static void perform(SPAction *action, void *mydata, void *otherdata); - static SPActionEventVector vector; + static void perform(SPAction *action, void *mydata); protected: virtual SPAction *make_action(Inkscape::UI::View::View *view); public: - /** \brief Use the Verb initializer with the same parameters. */ + /** Use the Verb initializer with the same parameters. */ LockAndHideVerb(unsigned int const code, gchar const *id, gchar const *name, @@ -2171,30 +2112,26 @@ public: { set_default_sensitive(true); } -}; /* LockAndHideVerb class */ +}; // LockAndHideVerb class /** - * The vector to attach in the lock'n'hide verb. + * Create an action for a \c LockAndHideVerb. + * + * Calls \c make_action_helper with the \c vector. + * + * @param view Which view the action should be created for. + * @return The built action. */ -SPActionEventVector LockAndHideVerb::vector = - {{NULL},LockAndHideVerb::perform, NULL, NULL, NULL, NULL}; - -/** \brief Create an action for a \c LockAndHideVerb - \param view Which view the action should be created for - \return The built action. - - Calls \c make_action_helper with the \c vector. -*/ -SPAction * -LockAndHideVerb::make_action(Inkscape::UI::View::View *view) +SPAction *LockAndHideVerb::make_action(Inkscape::UI::View::View *view) { - SPAction *action = make_action_helper(view, &vector); + SPAction *action = make_action_helper(view, &perform); return action; } -/** \brief Decode the verb code and take appropriate action */ -void -LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/) +/** + * Decode the verb code and take appropriate action. + */ +void LockAndHideVerb::perform(SPAction *action, void *data) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) return; @@ -2224,16 +2161,16 @@ LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/) return; } -/* *********** End Lock'N'Hide ********** */ +// *********** End Lock'N'Hide ********** -/* these must be in the same order as the SP_VERB_* enum in "verbs.h" */ +// these must be in the same order as the SP_VERB_* enum in "verbs.h" Verb *Verb::_base_verbs[] = { - /* Header */ + // Header new Verb(SP_VERB_INVALID, NULL, NULL, NULL, NULL), new Verb(SP_VERB_NONE, "None", N_("None"), N_("Does nothing"), NULL), - /* File */ + // File new FileVerb(SP_VERB_FILE_NEW, "FileNew", N_("Default"), N_("Create new document from the default template"), GTK_STOCK_NEW ), new FileVerb(SP_VERB_FILE_OPEN, "FileOpen", N_("_Open..."), @@ -2250,24 +2187,23 @@ Verb *Verb::_base_verbs[] = { GTK_STOCK_PRINT ), // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"), - INKSCAPE_ICON_DOCUMENT_CLEANUP ), - new FileVerb(SP_VERB_FILE_PRINT_PREVIEW, "FilePrintPreview", N_("Print Previe_w"), - N_("Preview document printout"), GTK_STOCK_PRINT_PREVIEW ), + INKSCAPE_ICON("document-cleanup") ), new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."), - N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON_DOCUMENT_IMPORT), + N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON("document-import")), new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), - N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON_DOCUMENT_EXPORT), - new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import Clip Art..."), N_("Import clipart from Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_IMPORT_OCAL), + N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), + new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import Clip Art..."), + N_("Import clipart from Open Clip Art Library"), INKSCAPE_ICON("document-import-ocal")), // new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"), - N_("Switch to the next document window"), INKSCAPE_ICON_WINDOW_NEXT), + N_("Switch to the next document window"), INKSCAPE_ICON("window-next")), new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"), - N_("Switch to the previous document window"), INKSCAPE_ICON_WINDOW_PREVIOUS), + N_("Switch to the previous document window"), INKSCAPE_ICON("window-previous")), new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"), N_("Close this document window"), GTK_STOCK_CLOSE), new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), GTK_STOCK_QUIT), - /* Edit */ + // Edit new EditVerb(SP_VERB_EDIT_UNDO, "EditUndo", N_("_Undo"), N_("Undo last action"), GTK_STOCK_UNDO), new EditVerb(SP_VERB_EDIT_REDO, "EditRedo", N_("_Redo"), @@ -2279,7 +2215,7 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"), N_("Paste objects from clipboard to mouse point, or paste text"), GTK_STOCK_PASTE), new EditVerb(SP_VERB_EDIT_PASTE_STYLE, "EditPasteStyle", N_("Paste _Style"), - N_("Apply the style of the copied object to selection"), INKSCAPE_ICON_EDIT_PASTE_STYLE), + N_("Apply the style of the copied object to selection"), INKSCAPE_ICON("edit-paste-style")), new EditVerb(SP_VERB_EDIT_PASTE_SIZE, "EditPasteSize", N_("Paste Si_ze"), N_("Scale selection to match the size of the copied object"), NULL), new EditVerb(SP_VERB_EDIT_PASTE_SIZE_X, "EditPasteWidth", N_("Paste _Width"), @@ -2293,25 +2229,25 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_Y, "EditPasteHeightSeparately", N_("Paste Height Separately"), N_("Scale each selected object vertically to match the height of the copied object"), NULL), new EditVerb(SP_VERB_EDIT_PASTE_IN_PLACE, "EditPasteInPlace", N_("Paste _In Place"), - N_("Paste objects from clipboard to the original location"), INKSCAPE_ICON_EDIT_PASTE_IN_PLACE), + N_("Paste objects from clipboard to the original location"), INKSCAPE_ICON("edit-paste-in-place")), new EditVerb(SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, "PasteLivePathEffect", N_("Paste Path _Effect"), N_("Apply the path effect of the copied object to selection"), NULL), new EditVerb(SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT, "RemoveLivePathEffect", N_("Remove Path _Effect"), N_("Remove any path effects from selected objects"), NULL), - new EditVerb(SP_VERB_EDIT_REMOVE_FILTER, "RemoveFilter", N_("Remove Filters"), + new EditVerb(SP_VERB_EDIT_REMOVE_FILTER, "RemoveFilter", N_("_Remove Filters"), N_("Remove any filters from selected objects"), NULL), new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"), N_("Delete selection"), GTK_STOCK_DELETE), new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), - N_("Duplicate selected objects"), INKSCAPE_ICON_EDIT_DUPLICATE), + N_("Duplicate selected objects"), INKSCAPE_ICON("edit-duplicate")), new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"), - N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON_EDIT_CLONE), + N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON("edit-clone")), new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"), - N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON_EDIT_CLONE_UNLINK), + N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON("edit-clone-unlink")), new EditVerb(SP_VERB_EDIT_RELINK_CLONE, "EditRelinkClone", N_("Relink to Copied"), N_("Relink the selected clones to the object currently on the clipboard"), NULL), new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"), - N_("Select the object to which the selected clone is linked"), INKSCAPE_ICON_EDIT_SELECT_ORIGINAL), + N_("Select the object to which the selected clone is linked"), INKSCAPE_ICON("edit-select-original")), new EditVerb(SP_VERB_EDIT_SELECTION_2_MARKER, "ObjectsToMarker", N_("Objects to _Marker"), N_("Convert selection to a line marker"), NULL), new EditVerb(SP_VERB_EDIT_SELECTION_2_GUIDES, "ObjectsToGuides", N_("Objects to Gu_ides"), @@ -2325,9 +2261,9 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"), N_("Select all objects or all nodes"), GTK_STOCK_SELECT_ALL), new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"), - N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON_EDIT_SELECT_ALL_LAYERS), + N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON("edit-select-all-layers")), new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"), - N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON_EDIT_SELECT_INVERT), + N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON("edit-select-invert")), new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"), N_("Invert selection in all visible and unlocked layers"), NULL), new EditVerb(SP_VERB_EDIT_SELECT_NEXT, "EditSelectNext", N_("Select Next"), @@ -2335,54 +2271,56 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_SELECT_PREV, "EditSelectPrev", N_("Select Previous"), N_("Select previous object or node"), NULL), new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"), - N_("Deselect any selected objects or nodes"), INKSCAPE_ICON_EDIT_SELECT_NONE), - new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("_Guides Around Page"), + N_("Deselect any selected objects or nodes"), INKSCAPE_ICON("edit-select-none")), + new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("Create _Guides Around the Page"), + N_("Create four guides aligned with the page borders"), NULL), + new EditVerb(SP_VERB_EDIT_DELETE_ALL_GUIDES, "EditRemoveAllGuides", N_("Delete All Guides"), 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 editable path effect parameter"), INKSCAPE_ICON_PATH_EFFECT_PARAMETER_NEXT), + N_("Show next editable path effect parameter"), INKSCAPE_ICON("path-effect-parameter-next")), - /* Selection */ + // Selection new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"), - N_("Raise selection to top"), INKSCAPE_ICON_SELECTION_TOP), + N_("Raise selection to top"), INKSCAPE_ICON("selection-top")), new SelectionVerb(SP_VERB_SELECTION_TO_BACK, "SelectionToBack", N_("Lower to _Bottom"), - N_("Lower selection to bottom"), INKSCAPE_ICON_SELECTION_BOTTOM), + N_("Lower selection to bottom"), INKSCAPE_ICON("selection-bottom")), new SelectionVerb(SP_VERB_SELECTION_RAISE, "SelectionRaise", N_("_Raise"), - N_("Raise selection one step"), INKSCAPE_ICON_SELECTION_RAISE), + N_("Raise selection one step"), INKSCAPE_ICON("selection-raise")), new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"), - N_("Lower selection one step"), INKSCAPE_ICON_SELECTION_LOWER), + N_("Lower selection one step"), INKSCAPE_ICON("selection-lower")), new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"), - N_("Group selected objects"), INKSCAPE_ICON_OBJECT_GROUP), + N_("Group selected objects"), INKSCAPE_ICON("object-group")), new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"), - N_("Ungroup selected groups"), INKSCAPE_ICON_OBJECT_UNGROUP), + N_("Ungroup selected groups"), INKSCAPE_ICON("object-ungroup")), new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), - N_("Put text on path"), INKSCAPE_ICON_TEXT_PUT_ON_PATH), + N_("Put text on path"), INKSCAPE_ICON("text-put-on-path")), new SelectionVerb(SP_VERB_SELECTION_TEXTFROMPATH, "SelectionTextFromPath", N_("_Remove from Path"), - N_("Remove text from path"), INKSCAPE_ICON_TEXT_REMOVE_FROM_PATH), + N_("Remove text from path"), INKSCAPE_ICON("text-remove-from-path")), new SelectionVerb(SP_VERB_SELECTION_REMOVE_KERNS, "SelectionTextRemoveKerns", N_("Remove Manual _Kerns"), // TRANSLATORS: "glyph": An image used in the visual representation of characters; // roughly speaking, how a character looks. A font is a set of glyphs. - N_("Remove all manual kerns and glyph rotations from a text object"), INKSCAPE_ICON_TEXT_UNKERN), + N_("Remove all manual kerns and glyph rotations from a text object"), INKSCAPE_ICON("text-unkern")), new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"), - N_("Create union of selected paths"), INKSCAPE_ICON_PATH_UNION), + N_("Create union of selected paths"), INKSCAPE_ICON("path-union")), new SelectionVerb(SP_VERB_SELECTION_INTERSECT, "SelectionIntersect", N_("_Intersection"), - N_("Create intersection of selected paths"), INKSCAPE_ICON_PATH_INTERSECTION), + N_("Create intersection of selected paths"), INKSCAPE_ICON("path-intersection")), new SelectionVerb(SP_VERB_SELECTION_DIFF, "SelectionDiff", N_("_Difference"), - N_("Create difference of selected paths (bottom minus top)"), INKSCAPE_ICON_PATH_DIFFERENCE), + N_("Create difference of selected paths (bottom minus top)"), INKSCAPE_ICON("path-difference")), new SelectionVerb(SP_VERB_SELECTION_SYMDIFF, "SelectionSymDiff", N_("E_xclusion"), - N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), INKSCAPE_ICON_PATH_EXCLUSION), + N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), INKSCAPE_ICON("path-exclusion")), new SelectionVerb(SP_VERB_SELECTION_CUT, "SelectionDivide", N_("Di_vision"), - N_("Cut the bottom path into pieces"), INKSCAPE_ICON_PATH_DIVISION), + N_("Cut the bottom path into pieces"), INKSCAPE_ICON("path-division")), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the // Advanced tutorial for more info new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"), - N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON_PATH_CUT), + N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON("path-cut")), // TRANSLATORS: "outset": expand a shape by offsetting the object's path, // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. new SelectionVerb(SP_VERB_SELECTION_OFFSET, "SelectionOffset", N_("Outs_et"), - N_("Outset selected paths"), INKSCAPE_ICON_PATH_OUTSET), + N_("Outset selected paths"), INKSCAPE_ICON("path-outset")), new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN, "SelectionOffsetScreen", N_("O_utset Path by 1 px"), N_("Outset selected paths by 1 px"), NULL), @@ -2393,7 +2331,7 @@ Verb *Verb::_base_verbs[] = { // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. new SelectionVerb(SP_VERB_SELECTION_INSET, "SelectionInset", N_("I_nset"), - N_("Inset selected paths"), INKSCAPE_ICON_PATH_INSET), + N_("Inset selected paths"), INKSCAPE_ICON("path-inset")), new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen", N_("I_nset Path by 1 px"), N_("Inset selected paths by 1 px"), NULL), @@ -2401,140 +2339,142 @@ Verb *Verb::_base_verbs[] = { N_("I_nset Path by 10 px"), N_("Inset selected paths by 10 px"), NULL), new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset", - N_("D_ynamic Offset"), N_("Create a dynamic offset object"), INKSCAPE_ICON_PATH_OFFSET_DYNAMIC), + N_("D_ynamic Offset"), N_("Create a dynamic offset object"), INKSCAPE_ICON("path-offset-dynamic")), new SelectionVerb(SP_VERB_SELECTION_LINKED_OFFSET, "SelectionLinkedOffset", N_("_Linked Offset"), N_("Create a dynamic offset object linked to the original path"), - INKSCAPE_ICON_PATH_OFFSET_LINKED), + INKSCAPE_ICON("path-offset-linked")), new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"), - N_("Convert selected object's stroke to paths"), INKSCAPE_ICON_STROKE_TO_PATH), + N_("Convert selected object's stroke to paths"), INKSCAPE_ICON("stroke-to-path")), new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"), - N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON_PATH_SIMPLIFY), + N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON("path-simplify")), new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"), - N_("Reverse the direction of selected paths (useful for flipping markers)"), INKSCAPE_ICON_PATH_REVERSE), + N_("Reverse the direction of selected paths (useful for flipping markers)"), INKSCAPE_ICON("path-reverse")), // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) new SelectionVerb(SP_VERB_SELECTION_TRACE, "SelectionTrace", N_("_Trace Bitmap..."), - N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON_BITMAP_TRACE), + N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON("bitmap-trace")), new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("_Make a Bitmap Copy"), - N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON_SELECTION_MAKE_BITMAP_COPY ), + N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON("selection-make-bitmap-copy") ), new SelectionVerb(SP_VERB_SELECTION_COMBINE, "SelectionCombine", N_("_Combine"), - N_("Combine several paths into one"), INKSCAPE_ICON_PATH_COMBINE), + N_("Combine several paths into one"), INKSCAPE_ICON("path-combine")), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the // Advanced tutorial for more info new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"), - N_("Break selected paths into subpaths"), INKSCAPE_ICON_PATH_BREAK_APART), + N_("Break selected paths into subpaths"), INKSCAPE_ICON("path-break-apart")), new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Ro_ws and Columns..."), - N_("Arrange selected objects in a table"), INKSCAPE_ICON_DIALOG_ROWS_AND_COLUMNS), - /* Layer */ + N_("Arrange selected objects in a table"), INKSCAPE_ICON("dialog-rows-and-columns")), + // Layer new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."), - N_("Create a new layer"), INKSCAPE_ICON_LAYER_NEW), + N_("Create a new layer"), INKSCAPE_ICON("layer-new")), new LayerVerb(SP_VERB_LAYER_RENAME, "LayerRename", N_("Re_name Layer..."), - N_("Rename the current layer"), INKSCAPE_ICON_LAYER_RENAME), + N_("Rename the current layer"), INKSCAPE_ICON("layer-rename")), new LayerVerb(SP_VERB_LAYER_NEXT, "LayerNext", N_("Switch to Layer Abov_e"), - N_("Switch to the layer above the current"), INKSCAPE_ICON_LAYER_PREVIOUS), + N_("Switch to the layer above the current"), INKSCAPE_ICON("layer-previous")), new LayerVerb(SP_VERB_LAYER_PREV, "LayerPrev", N_("Switch to Layer Belo_w"), - N_("Switch to the layer below the current"), INKSCAPE_ICON_LAYER_NEXT), + N_("Switch to the layer below the current"), INKSCAPE_ICON("layer-next")), new LayerVerb(SP_VERB_LAYER_MOVE_TO_NEXT, "LayerMoveToNext", N_("Move Selection to Layer Abo_ve"), - N_("Move selection to the layer above the current"), INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_ABOVE), + N_("Move selection to the layer above the current"), INKSCAPE_ICON("selection-move-to-layer-above")), new LayerVerb(SP_VERB_LAYER_MOVE_TO_PREV, "LayerMoveToPrev", N_("Move Selection to Layer Bel_ow"), - N_("Move selection to the layer below the current"), INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_BELOW), + N_("Move selection to the layer below the current"), INKSCAPE_ICON("selection-move-to-layer-below")), new LayerVerb(SP_VERB_LAYER_TO_TOP, "LayerToTop", N_("Layer to _Top"), - N_("Raise the current layer to the top"), INKSCAPE_ICON_LAYER_TOP), + N_("Raise the current layer to the top"), INKSCAPE_ICON("layer-top")), new LayerVerb(SP_VERB_LAYER_TO_BOTTOM, "LayerToBottom", N_("Layer to _Bottom"), - N_("Lower the current layer to the bottom"), INKSCAPE_ICON_LAYER_BOTTOM), + N_("Lower the current layer to the bottom"), INKSCAPE_ICON("layer-bottom")), new LayerVerb(SP_VERB_LAYER_RAISE, "LayerRaise", N_("_Raise Layer"), - N_("Raise the current layer"), INKSCAPE_ICON_LAYER_RAISE), + N_("Raise the current layer"), INKSCAPE_ICON("layer-raise")), new LayerVerb(SP_VERB_LAYER_LOWER, "LayerLower", N_("_Lower Layer"), - N_("Lower the current layer"), INKSCAPE_ICON_LAYER_LOWER), + N_("Lower the current layer"), INKSCAPE_ICON("layer-lower")), new LayerVerb(SP_VERB_LAYER_DUPLICATE, "LayerDuplicate", N_("D_uplicate Current Layer"), N_("Duplicate an existing layer"), NULL), new LayerVerb(SP_VERB_LAYER_DELETE, "LayerDelete", N_("_Delete Current Layer"), - N_("Delete the current layer"), INKSCAPE_ICON_LAYER_DELETE), + N_("Delete the current layer"), INKSCAPE_ICON("layer-delete")), new LayerVerb(SP_VERB_LAYER_SOLO, "LayerSolo", N_("_Show/hide other layers"), N_("Solo the current layer"), NULL), - /* Object */ + // Object new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CW, "ObjectRotate90", N_("Rotate _90° CW"), // This is shared between tooltips and statusbar, so they // must use UTF-8, not HTML entities for special characters. - N_("Rotate selection 90\xc2\xb0 clockwise"), INKSCAPE_ICON_OBJECT_ROTATE_RIGHT), + N_("Rotate selection 90\xc2\xb0 clockwise"), INKSCAPE_ICON("object-rotate-right")), new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0° CCW"), // This is shared between tooltips and statusbar, so they // must use UTF-8, not HTML entities for special characters. - N_("Rotate selection 90\xc2\xb0 counter-clockwise"), INKSCAPE_ICON_OBJECT_ROTATE_LEFT), + N_("Rotate selection 90\xc2\xb0 counter-clockwise"), INKSCAPE_ICON("object-rotate-left")), new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectRemoveTransform", N_("Remove _Transformations"), N_("Remove transformations from object"), NULL), new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToPath", N_("_Object to Path"), - N_("Convert selected object to path"), INKSCAPE_ICON_OBJECT_TO_PATH), + N_("Convert selected object to path"), INKSCAPE_ICON("object-to-path")), new ObjectVerb(SP_VERB_OBJECT_FLOW_TEXT, "ObjectFlowText", N_("_Flow into Frame"), N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), "text-flow-into-frame"), new ObjectVerb(SP_VERB_OBJECT_UNFLOW_TEXT, "ObjectUnFlowText", N_("_Unflow"), - N_("Remove text from frame (creates a single-line text object)"), INKSCAPE_ICON_TEXT_UNFLOW), + N_("Remove text from frame (creates a single-line text object)"), INKSCAPE_ICON("text-unflow")), new ObjectVerb(SP_VERB_OBJECT_FLOWTEXT_TO_TEXT, "ObjectFlowtextToText", N_("_Convert to Text"), - N_("Convert flowed text to regular text object (preserves appearance)"), INKSCAPE_ICON_TEXT_CONVERT_TO_REGULAR), + N_("Convert flowed text to regular text object (preserves appearance)"), INKSCAPE_ICON("text-convert-to-regular")), new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally", N_("Flip _Horizontal"), N_("Flip selected objects horizontally"), - INKSCAPE_ICON_OBJECT_FLIP_HORIZONTAL), + INKSCAPE_ICON("object-flip-horizontal")), new ObjectVerb(SP_VERB_OBJECT_FLIP_VERTICAL, "ObjectFlipVertically", N_("Flip _Vertical"), N_("Flip selected objects vertically"), - INKSCAPE_ICON_OBJECT_FLIP_VERTICAL), + INKSCAPE_ICON("object-flip-vertical")), new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"), N_("Apply mask to selection (using the topmost object as mask)"), NULL), new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"), - N_("Edit mask"), INKSCAPE_ICON_PATH_MASK_EDIT), + N_("Edit mask"), INKSCAPE_ICON("path-mask-edit")), new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"), N_("Remove mask from selection"), NULL), new ObjectVerb(SP_VERB_OBJECT_SET_CLIPPATH, "ObjectSetClipPath", N_("_Set"), N_("Apply clipping path to selection (using the topmost object as clipping path)"), NULL), new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"), - N_("Edit clipping path"), INKSCAPE_ICON_PATH_CLIP_EDIT), + N_("Edit clipping path"), INKSCAPE_ICON("path-clip-edit")), new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"), N_("Remove clipping path from selection"), NULL), - /* Tools */ + // Tools new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"), - N_("Select and transform objects"), INKSCAPE_ICON_TOOL_POINTER), + N_("Select and transform objects"), INKSCAPE_ICON("tool-pointer")), new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"), - N_("Edit paths by nodes"), INKSCAPE_ICON_TOOL_NODE_EDITOR), + N_("Edit paths by nodes"), INKSCAPE_ICON("tool-node-editor")), new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", N_("Tweak"), - N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON_TOOL_TWEAK), + N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON("tool-tweak")), new ContextVerb(SP_VERB_CONTEXT_SPRAY, "ToolSpray", N_("Spray"), - N_("Spray objects by sculpting or painting"), INKSCAPE_ICON_TOOL_SPRAY), + N_("Spray objects by sculpting or painting"), INKSCAPE_ICON("tool-spray")), new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"), - N_("Create rectangles and squares"), INKSCAPE_ICON_DRAW_RECTANGLE), + N_("Create rectangles and squares"), INKSCAPE_ICON("draw-rectangle")), new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", N_("3D Box"), - N_("Create 3D boxes"), INKSCAPE_ICON_DRAW_CUBOID), + N_("Create 3D boxes"), INKSCAPE_ICON("draw-cuboid")), new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", N_("Ellipse"), - N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON_DRAW_ELLIPSE), + N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON("draw-ellipse")), new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", N_("Star"), - N_("Create stars and polygons"), INKSCAPE_ICON_DRAW_POLYGON_STAR), + N_("Create stars and polygons"), INKSCAPE_ICON("draw-polygon-star")), new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", N_("Spiral"), - N_("Create spirals"), INKSCAPE_ICON_DRAW_SPIRAL), + N_("Create spirals"), INKSCAPE_ICON("draw-spiral")), new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", N_("Pencil"), - N_("Draw freehand lines"), INKSCAPE_ICON_DRAW_FREEHAND), + N_("Draw freehand lines"), INKSCAPE_ICON("draw-freehand")), new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"), - N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON_DRAW_PATH), + N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON("draw-path")), new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", N_("Calligraphy"), - N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON_DRAW_CALLIGRAPHIC), + N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON("draw-calligraphic")), new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"), - N_("Create and edit text objects"), INKSCAPE_ICON_DRAW_TEXT), + N_("Create and edit text objects"), INKSCAPE_ICON("draw-text")), new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"), - N_("Create and edit gradients"), INKSCAPE_ICON_COLOR_GRADIENT), + N_("Create and edit gradients"), INKSCAPE_ICON("color-gradient")), new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"), - N_("Zoom in or out"), INKSCAPE_ICON_ZOOM), + N_("Zoom in or out"), INKSCAPE_ICON("zoom")), + new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", N_("Measure"), + N_("Measurement tool"), INKSCAPE_ICON("tool-measure")), new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"), - N_("Pick colors from image"), INKSCAPE_ICON_COLOR_PICKER), + N_("Pick colors from image"), INKSCAPE_ICON("color-picker")), new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"), - N_("Create diagram connectors"), INKSCAPE_ICON_DRAW_CONNECTOR), + N_("Create diagram connectors"), INKSCAPE_ICON("draw-connector")), new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", N_("Paint Bucket"), - N_("Fill bounded areas"), INKSCAPE_ICON_COLOR_FILL), + N_("Fill bounded areas"), INKSCAPE_ICON("color-fill")), new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", N_("LPE Edit"), N_("Edit Path Effect parameters"), NULL), new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"), - N_("Erase existing paths"), INKSCAPE_ICON_DRAW_ERASER), + N_("Erase existing paths"), INKSCAPE_ICON("draw-eraser")), new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", N_("LPE Tool"), N_("Do geometric constructions"), "draw-geometry"), - /* Tool prefs */ + // 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"), @@ -2565,6 +2505,8 @@ Verb *Verb::_base_verbs[] = { N_("Open Preferences for the Gradient tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_ZOOM_PREFS, "ZoomPrefs", N_("Zoom Preferences"), N_("Open Preferences for the Zoom tool"), NULL), + new ContextVerb(SP_VERB_CONTEXT_MEASURE_PREFS, "MeasurePrefs", N_("Measure Preferences"), + N_("Open Preferences for the Measure tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_DROPPER_PREFS, "DropperPrefs", N_("Dropper Preferences"), N_("Open Preferences for the Dropper tool"), NULL), new ContextVerb(SP_VERB_CONTEXT_CONNECTOR_PREFS, "ConnectorPrefs", N_("Connector Preferences"), @@ -2576,32 +2518,32 @@ Verb *Verb::_base_verbs[] = { 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"), INKSCAPE_ICON_ZOOM_IN), - new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON_ZOOM_OUT), + // Zoom/View + new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), INKSCAPE_ICON("zoom-in")), + new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON("zoom-out")), new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), NULL), new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), NULL), - new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), INKSCAPE_ICON_SHOW_GRID), - new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON_SHOW_GUIDES), - new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON_SNAP), + new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), INKSCAPE_ICON("show-grid")), + new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON("show-guides")), + new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON("snap")), new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"), - INKSCAPE_ICON_ZOOM_NEXT), + INKSCAPE_ICON("zoom-next")), new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"), - INKSCAPE_ICON_ZOOM_PREVIOUS), + INKSCAPE_ICON("zoom-previous")), new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"), - INKSCAPE_ICON_ZOOM_ORIGINAL), + INKSCAPE_ICON("zoom-original")), new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"), - INKSCAPE_ICON_ZOOM_HALF_SIZE), + INKSCAPE_ICON("zoom-half-size")), new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"), - INKSCAPE_ICON_ZOOM_DOUBLE_SIZE), + INKSCAPE_ICON("zoom-double-size")), #ifdef HAVE_GTK_WINDOW_FULLSCREEN new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"), - INKSCAPE_ICON_VIEW_FULLSCREEN), -#endif /* HAVE_GTK_WINDOW_FULLSCREEN */ + INKSCAPE_ICON("view-fullscreen")), +#endif // HAVE_GTK_WINDOW_FULLSCREEN new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), N_("Remove excess toolbars to focus on drawing"), NULL), new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"), - INKSCAPE_ICON_WINDOW_NEW), + INKSCAPE_ICON("window-new")), new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"), N_("New View Preview"), NULL/*"view_new_preview"*/), @@ -2623,45 +2565,45 @@ Verb *Verb::_base_verbs[] = { N_("Toggle between normal and grayscale color display modes"), NULL), new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"), - N_("Toggle color-managed display for this document window"), INKSCAPE_ICON_COLOR_MANAGEMENT), + N_("Toggle color-managed display for this document window"), INKSCAPE_ICON("color-management")), new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."), - N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON_DIALOG_ICON_PREVIEW), + N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON("dialog-icon-preview")), new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"), - N_("Zoom to fit page in window"), INKSCAPE_ICON_ZOOM_FIT_PAGE), + N_("Zoom to fit page in window"), INKSCAPE_ICON("zoom-fit-page")), new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"), - N_("Zoom to fit page width in window"), INKSCAPE_ICON_ZOOM_FIT_WIDTH), + N_("Zoom to fit page width in window"), INKSCAPE_ICON("zoom-fit-width")), new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"), - N_("Zoom to fit drawing in window"), INKSCAPE_ICON_ZOOM_FIT_DRAWING), + N_("Zoom to fit drawing in window"), INKSCAPE_ICON("zoom-fit-drawing")), new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"), - N_("Zoom to fit selection in window"), INKSCAPE_ICON_ZOOM_FIT_SELECTION), + N_("Zoom to fit selection in window"), INKSCAPE_ICON("zoom-fit-selection")), - /* Dialogs */ + // Dialogs 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, "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)"), INKSCAPE_ICON_DOCUMENT_METADATA ), + N_("Edit document metadata (to be saved with the document)"), INKSCAPE_ICON("document-metadata") ), new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."), - N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON_DIALOG_FILL_AND_STROKE), - new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("Glyphs..."), + N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON("dialog-fill-and-stroke")), + new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("Gl_yphs..."), N_("Select characters from a glyphs palette"), GTK_STOCK_SELECT_FONT), // TRANSLATORS: "Swatches" means: color samples new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."), N_("Select colors from a swatches palette"), GTK_STOCK_SELECT_COLOR), new DialogVerb(SP_VERB_DIALOG_TRANSFORM, "DialogTransform", N_("Transfor_m..."), - N_("Precisely control objects' transformations"), INKSCAPE_ICON_DIALOG_TRANSFORM), + N_("Precisely control objects' transformations"), INKSCAPE_ICON("dialog-transform")), new DialogVerb(SP_VERB_DIALOG_ALIGN_DISTRIBUTE, "DialogAlignDistribute", N_("_Align and Distribute..."), - N_("Align and distribute objects"), INKSCAPE_ICON_DIALOG_ALIGN_AND_DISTRIBUTE), + N_("Align and distribute objects"), INKSCAPE_ICON("dialog-align-and-distribute")), new DialogVerb(SP_VERB_DIALOG_SPRAY_OPTION, "DialogSprayOption", N_("_Spray options..."), - N_("Some options for the spray"), INKSCAPE_ICON_DIALOG_SPRAY_OPTIONS), + N_("Some options for the spray"), INKSCAPE_ICON("dialog-spray-options")), new DialogVerb(SP_VERB_DIALOG_UNDO_HISTORY, "DialogUndoHistory", N_("Undo _History..."), - N_("Undo History"), INKSCAPE_ICON_EDIT_UNDO_HISTORY), + N_("Undo History"), INKSCAPE_ICON("edit-undo-history")), new DialogVerb(SP_VERB_DIALOG_TEXT, "DialogText", N_("_Text and Font..."), - N_("View and select font family, font size and other text properties"), INKSCAPE_ICON_DIALOG_TEXT_AND_FONT), + N_("View and select font family, font size and other text properties"), INKSCAPE_ICON("dialog-text-and-font")), new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."), - N_("View and edit the XML tree of the document"), INKSCAPE_ICON_DIALOG_XML_EDITOR), + N_("View and edit the XML tree of the document"), INKSCAPE_ICON("dialog-xml-editor")), new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find..."), N_("Find objects in document"), GTK_STOCK_FIND ), new DialogVerb(SP_VERB_DIALOG_FINDREPLACE, "DialogFindReplace", N_("Find and _Replace Text..."), @@ -2669,45 +2611,45 @@ Verb *Verb::_base_verbs[] = { new DialogVerb(SP_VERB_DIALOG_SPELLCHECK, "DialogSpellcheck", N_("Check Spellin_g..."), N_("Check spelling of text in document"), GTK_STOCK_SPELL_CHECK ), new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."), - N_("View debug messages"), INKSCAPE_ICON_DIALOG_MESSAGES), + N_("View debug messages"), INKSCAPE_ICON("dialog-messages")), new DialogVerb(SP_VERB_DIALOG_SCRIPT, "DialogScript", N_("S_cripts..."), - N_("Run scripts"), INKSCAPE_ICON_DIALOG_SCRIPTS), + N_("Run scripts"), INKSCAPE_ICON("dialog-scripts")), new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"), - N_("Show or hide all open dialogs"), INKSCAPE_ICON_SHOW_DIALOGS), + N_("Show or hide all open dialogs"), INKSCAPE_ICON("show-dialogs")), new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogClonetiler", N_("Create Tiled Clones..."), - N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), INKSCAPE_ICON_DIALOG_TILE_CLONES), + N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), INKSCAPE_ICON("dialog-tile-clones")), new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."), - N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON_DIALOG_OBJECT_PROPERTIES), + N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON("dialog-object-properties")), /*#ifdef WITH_INKBOARD new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient", N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL), #endif*/ new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."), - N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON_DIALOG_INPUT_DEVICES), + N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON("dialog-input-devices")), new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."), N_("Query information about extensions"), NULL), new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."), - N_("View Layers"), INKSCAPE_ICON_DIALOG_LAYERS), + N_("View Layers"), INKSCAPE_ICON("dialog-layers")), new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffect Editor..."), N_("Manage, edit, and apply path effects"), NULL), - new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter Editor..."), + new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter _Editor..."), N_("Manage, edit, and apply SVG filters"), NULL), new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Font Editor..."), N_("Edit SVG fonts"), NULL), new DialogVerb(SP_VERB_DIALOG_PRINT_COLORS_PREVIEW, "DialogPrintColorsPreview", N_("Print Colors..."), N_("Select which color separations to render in Print Colors Preview rendermode"), NULL), - /* Help */ + // Help new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"), N_("Information on Inkscape extensions"), NULL), new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"), - N_("Memory usage information"), INKSCAPE_ICON_DIALOG_MEMORY), + N_("Memory usage information"), INKSCAPE_ICON("dialog-memory")), new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"), - N_("Inkscape version, authors, license"), INKSCAPE_ICON_INKSCAPE), + N_("Inkscape version, authors, license"), INKSCAPE_ICON("inkscape-logo")), //new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), // N_("Distribution terms"), /*"show_license"*/"inkscape_options"), - /* Tutorials */ + // Tutorials new TutorialVerb(SP_VERB_TUTORIAL_BASIC, "TutorialsBasic", N_("Inkscape: _Basic"), N_("Getting started with Inkscape"), NULL/*"tutorial_basic"*/), new TutorialVerb(SP_VERB_TUTORIAL_SHAPES, "TutorialsShapes", N_("Inkscape: _Shapes"), @@ -2726,20 +2668,20 @@ Verb *Verb::_base_verbs[] = { new TutorialVerb(SP_VERB_TUTORIAL_TIPS, "TutorialsTips", N_("_Tips and Tricks"), N_("Miscellaneous tips and tricks"), NULL/*"tutorial_tips"*/), - /* Effect -- renamed Extension */ - new EffectLastVerb(SP_VERB_EFFECT_LAST, "EffectLast", N_("Previous Extension"), + // Effect -- renamed Extension + new EffectLastVerb(SP_VERB_EFFECT_LAST, "EffectLast", N_("Previous Exte_nsion"), N_("Repeat the last extension with the same settings"), NULL), - new EffectLastVerb(SP_VERB_EFFECT_LAST_PREF, "EffectLastPref", N_("Previous Extension Settings..."), + new EffectLastVerb(SP_VERB_EFFECT_LAST_PREF, "EffectLastPref", N_("_Previous Extension Settings..."), N_("Repeat the last extension with new settings"), NULL), - /* Fit Page */ + // 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), - /* LockAndHide */ + // LockAndHide new LockAndHideVerb(SP_VERB_UNLOCK_ALL, "UnlockAll", N_("Unlock All"), N_("Unlock all objects in the current layer"), NULL), new LockAndHideVerb(SP_VERB_UNLOCK_ALL_IN_ALL_LAYERS, "UnlockAllInAllLayers", N_("Unlock All in All Layers"), @@ -2748,12 +2690,12 @@ Verb *Verb::_base_verbs[] = { N_("Unhide all objects in the current layer"), NULL), new LockAndHideVerb(SP_VERB_UNHIDE_ALL_IN_ALL_LAYERS, "UnhideAllInAllLayers", N_("Unhide All in All Layers"), N_("Unhide all objects in all layers"), NULL), - /*Color Management*/ + // 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 */ + // Footer new Verb(SP_VERB_LAST, " '\"invalid id", NULL, NULL, NULL) }; @@ -2775,7 +2717,7 @@ Verb::list (void) { return; }; -} /* namespace Inkscape */ +} // namespace Inkscape /* Local Variables: |