update to trunk

(bzr r11950.1.233)

1 files changed, 29 insertions, 27 deletions

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 329e63115..8b333383f 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2353,19 +2353,19 @@ Verb *Verb::_base_verbs[] = {
 
     // File
     new FileVerb(SP_VERB_FILE_NEW, "FileNew", N_("Default"), N_("Create new document from the default template"),
-                 GTK_STOCK_NEW ),
+                 INKSCAPE_ICON("document-new")),
     new FileVerb(SP_VERB_FILE_OPEN, "FileOpen", N_("_Open..."),
-                 N_("Open an existing document"), GTK_STOCK_OPEN ),
+                 N_("Open an existing document"), INKSCAPE_ICON("document-open")),
     new FileVerb(SP_VERB_FILE_REVERT, "FileRevert", N_("Re_vert"),
-                 N_("Revert to the last saved version of document (changes will be lost)"), GTK_STOCK_REVERT_TO_SAVED ),
+                 N_("Revert to the last saved version of document (changes will be lost)"), INKSCAPE_ICON("document-revert")),
     new FileVerb(SP_VERB_FILE_SAVE, "FileSave", N_("_Save"), N_("Save document"),
-                 GTK_STOCK_SAVE ),
+                 INKSCAPE_ICON("document-save")),
     new FileVerb(SP_VERB_FILE_SAVE_AS, "FileSaveAs", N_("Save _As..."),
-                 N_("Save document under a new name"), GTK_STOCK_SAVE_AS ),
+                 N_("Save document under a new name"), INKSCAPE_ICON("document-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 ),
+                 INKSCAPE_ICON("document-print")),
     // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions)
     new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Clean _up document"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"),
                  INKSCAPE_ICON("document-cleanup") ),
@@ -2381,22 +2381,22 @@ Verb *Verb::_base_verbs[] = {
     new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),
                  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),
+                 N_("Close this document window"), INKSCAPE_ICON("window-close")),
+    new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), INKSCAPE_ICON("application-exit")),
     new FileVerb(SP_VERB_FILE_TEMPLATES, "FileTemplates", N_("_Templates..."),
                 N_("Create new project from template"), INKSCAPE_ICON("dialog-templates")),
 
     // Edit
     new EditVerb(SP_VERB_EDIT_UNDO, "EditUndo", N_("_Undo"), N_("Undo last action"),
-                 GTK_STOCK_UNDO),
+                 INKSCAPE_ICON("edit-undo")),
     new EditVerb(SP_VERB_EDIT_REDO, "EditRedo", N_("_Redo"),
-                 N_("Do again the last undone action"), GTK_STOCK_REDO),
+                 N_("Do again the last undone action"), INKSCAPE_ICON("edit-redo")),
     new EditVerb(SP_VERB_EDIT_CUT, "EditCut", N_("Cu_t"),
-                 N_("Cut selection to clipboard"), GTK_STOCK_CUT),
+                 N_("Cut selection to clipboard"), INKSCAPE_ICON("edit-cut")),
     new EditVerb(SP_VERB_EDIT_COPY, "EditCopy", N_("_Copy"),
-                 N_("Copy selection to clipboard"), GTK_STOCK_COPY),
+                 N_("Copy selection to clipboard"), INKSCAPE_ICON("edit-copy")),
     new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"),
-                 N_("Paste objects from clipboard to mouse point, or paste text"), GTK_STOCK_PASTE),
+                 N_("Paste objects from clipboard to mouse point, or paste text"), INKSCAPE_ICON("edit-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")),
     new EditVerb(SP_VERB_EDIT_PASTE_SIZE, "EditPasteSize", N_("Paste Si_ze"),
@@ -2420,7 +2420,7 @@ Verb *Verb::_base_verbs[] = {
     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),
+                 N_("Delete selection"), INKSCAPE_ICON("edit-delete")),
     new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"),
                  N_("Duplicate selected objects"), INKSCAPE_ICON("edit-duplicate")),
     new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"),
@@ -2448,19 +2448,19 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_CLEAR_ALL, "EditClearAll", N_("Clea_r All"),
                  N_("Delete all objects from document"), NULL),
     new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"),
-                 N_("Select all objects or all nodes"), GTK_STOCK_SELECT_ALL),
+                 N_("Select all objects or all nodes"), INKSCAPE_ICON("edit-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")),
     new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_STROKE, "EditSelectSameFillStroke", N_("Fill _and Stroke"),
-                 N_("Select all objects with the same fill and stroke as the selected objects"), GTK_STOCK_SELECT_ALL),
+                 N_("Select all objects with the same fill and stroke as the selected objects"), INKSCAPE_ICON("edit-select-all")),
     new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_COLOR, "EditSelectSameFillColor", N_("_Fill Color"),
-                N_("Select all objects with the same fill as the selected objects"), GTK_STOCK_SELECT_ALL),
+                N_("Select all objects with the same fill as the selected objects"), INKSCAPE_ICON("edit-select-all")),
     new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE_COLOR, "EditSelectSameStrokeColor", N_("_Stroke Color"),
-                N_("Select all objects with the same stroke as the selected objects"), GTK_STOCK_SELECT_ALL),
+                N_("Select all objects with the same stroke as the selected objects"), INKSCAPE_ICON("edit-select-all")),
     new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE_STYLE, "EditSelectSameStrokeStyle", N_("Stroke St_yle"),
-                N_("Select all objects with the same stroke style (width, dash, markers) as the selected objects"), GTK_STOCK_SELECT_ALL),
+                N_("Select all objects with the same stroke style (width, dash, markers) as the selected objects"), INKSCAPE_ICON("edit-select-all")),
     new EditVerb(SP_VERB_EDIT_SELECT_SAME_OBJECT_TYPE, "EditSelectSameObjectType", N_("_Object Type"),
-                N_("Select all objects with the same object type (rect, arc, text, path, bitmap etc) as the selected objects"), GTK_STOCK_SELECT_ALL),
+                N_("Select all objects with the same object type (rect, arc, text, path, bitmap etc) as the selected objects"), INKSCAPE_ICON("edit-select-all")),
     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")),
     new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"),
@@ -2808,18 +2808,20 @@ Verb *Verb::_base_verbs[] = {
 
     // Dialogs
     new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("P_references..."),
-                   N_("Edit global Inkscape preferences"), GTK_STOCK_PREFERENCES ),
+                   N_("Edit global Inkscape preferences"), INKSCAPE_ICON("preferences-system")),
     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 ),
+                   N_("Edit properties of this document (to be saved with the document)"), INKSCAPE_ICON("document-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") ),
     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")),
+    // FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon
     new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("Gl_yphs..."),
-                   N_("Select characters from a glyphs palette"), GTK_STOCK_SELECT_FONT),
+                   N_("Select characters from a glyphs palette"), INKSCAPE_ICON("gtk-select-font")),
+    // FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon
     // 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),
+                   N_("Select colors from a swatches palette"), INKSCAPE_ICON("gtk-select-color")),
     new DialogVerb(SP_VERB_DIALOG_SYMBOLS, "DialogSymbols", N_("S_ymbols..."),
                    N_("Select symbol from a symbols palette"), INKSCAPE_ICON("symbols")),
     new DialogVerb(SP_VERB_DIALOG_TRANSFORM, "DialogTransform", N_("Transfor_m..."),
@@ -2835,11 +2837,11 @@ Verb *Verb::_base_verbs[] = {
     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")),
     new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find/Replace..."),
-                   N_("Find objects in document"), GTK_STOCK_FIND ),
+                   N_("Find objects in document"), INKSCAPE_ICON("edit-find")),
     new DialogVerb(SP_VERB_DIALOG_FINDREPLACE, "DialogFindReplace", N_("Find and _Replace Text..."),
-                   N_("Find and replace text in document"), GTK_STOCK_FIND_AND_REPLACE ),
+                   N_("Find and replace text in document"), INKSCAPE_ICON("edit-find-replace")),
     new DialogVerb(SP_VERB_DIALOG_SPELLCHECK, "DialogSpellcheck", N_("Check Spellin_g..."),
-                   N_("Check spelling of text in document"), GTK_STOCK_SPELL_CHECK ),
+                   N_("Check spelling of text in document"), INKSCAPE_ICON("tools-check-spelling")),
     new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."),
                    N_("View debug messages"), INKSCAPE_ICON("dialog-messages")),
     new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"),