diff --git a/app/actions/actions.c b/app/actions/actions.c index 4c6c1f217d..3df9c240b3 100644 --- a/app/actions/actions.c +++ b/app/actions/actions.c @@ -164,7 +164,7 @@ static const GimpActionFactoryEntry action_groups[] = { "filters", N_("Filters"), GIMP_STOCK_GEGL, filters_actions_setup, filters_actions_update }, - { "fonts", N_("Fonts"), GIMP_STOCK_FONT, + { "fonts", N_("Fonts"), "gtk-select-font", fonts_actions_setup, fonts_actions_update }, { "gradient-editor", N_("Gradient Editor"), GIMP_STOCK_GRADIENT, diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c index 78816bdb99..4646ca3212 100644 --- a/app/actions/brushes-actions.c +++ b/app/actions/brushes-actions.c @@ -43,7 +43,7 @@ static const GimpActionEntry brushes_actions[] = NC_("brushes-action", "Brushes Menu"), NULL, NULL, NULL, GIMP_HELP_BRUSH_DIALOG }, - { "brushes-open-as-image", GIMP_STOCK_OPEN, + { "brushes-open-as-image", "document-open", NC_("brushes-action", "_Open Brush as Image"), NULL, NC_("brushes-action", "Open brush as image"), G_CALLBACK (data_open_as_image_cmd_callback), @@ -61,7 +61,7 @@ static const GimpActionEntry brushes_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_BRUSH_DUPLICATE }, - { "brushes-copy-location", GIMP_STOCK_CLIPBOARD, + { "brushes-copy-location", "edit-copy", NC_("brushes-action", "Copy Brush _Location"), NULL, NC_("brushes-action", "Copy brush file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c index 4605f1c386..8c900c6532 100644 --- a/app/actions/context-actions.c +++ b/app/actions/context-actions.c @@ -61,7 +61,7 @@ static const GimpActionEntry context_actions[] = "_Palette") }, { "context-gradient-menu", GIMP_STOCK_GRADIENT, NC_("context-action", "_Gradient") }, - { "context-font-menu", GIMP_STOCK_FONT, NC_("context-action", + { "context-font-menu", "gtk-select-font", NC_("context-action", "_Font") }, { "context-brush-shape-menu", NULL, NC_("context-action", @@ -841,23 +841,23 @@ static const GimpEnumActionEntry context_gradient_select_actions[] = static const GimpEnumActionEntry context_font_select_actions[] = { - { "context-font-select-set", GIMP_STOCK_FONT, + { "context-font-select-set", "gtk-select-font", "Select Font by Index", NULL, NULL, GIMP_ACTION_SELECT_SET, TRUE, NULL }, - { "context-font-select-first", GIMP_STOCK_FONT, + { "context-font-select-first", "gtk-select-font", "First Font", NULL, NULL, GIMP_ACTION_SELECT_FIRST, FALSE, NULL }, - { "context-font-select-last", GIMP_STOCK_FONT, + { "context-font-select-last", "gtk-select-font", "Last Font", NULL, NULL, GIMP_ACTION_SELECT_LAST, FALSE, NULL }, - { "context-font-select-previous", GIMP_STOCK_FONT, + { "context-font-select-previous", "gtk-select-font", "Previous Font", NULL, NULL, GIMP_ACTION_SELECT_PREVIOUS, FALSE, NULL }, - { "context-font-select-next", GIMP_STOCK_FONT, + { "context-font-select-next", "gtk-select-font", "Next Font", NULL, NULL, GIMP_ACTION_SELECT_NEXT, FALSE, NULL } diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c index a16b6b62ce..ce88d83c9c 100644 --- a/app/actions/dialogs-actions.c +++ b/app/actions/dialogs-actions.c @@ -199,7 +199,7 @@ const GimpStringActionEntry dialogs_dockable_actions[] = "gimp-tool-preset-list", GIMP_HELP_TOOL_PRESET_DIALOG }, - { "dialogs-fonts", GIMP_STOCK_FONT, + { "dialogs-fonts", "gtk-select-font", NC_("dialogs-action", "_Fonts"), NULL, NC_("dialogs-action", "Open the fonts dialog"), "gimp-font-list|gimp-font-grid", @@ -217,7 +217,7 @@ const GimpStringActionEntry dialogs_dockable_actions[] = "gimp-image-list|gimp-image-grid", GIMP_HELP_IMAGE_DIALOG }, - { "dialogs-document-history", GIMP_STOCK_DOCUMENT_RECENT, + { "dialogs-document-history", "document-open-recent", NC_("dialogs-action", "Document Histor_y"), "", NC_("dialogs-action", "Open the document history dialog"), "gimp-document-list|gimp-document-grid", diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c index 097dd67382..dfc41d6b32 100644 --- a/app/actions/dock-actions.c +++ b/app/actions/dock-actions.c @@ -46,7 +46,7 @@ static const GimpActionEntry dock_actions[] = NC_("dock-action", "M_ove to Screen"), NULL, NULL, NULL, GIMP_HELP_DOCK_CHANGE_SCREEN }, - { "dock-close", GIMP_STOCK_QUIT, + { "dock-close", "window-close", NC_("dock-action", "Close Dock"), "", NULL, G_CALLBACK (window_close_cmd_callback), GIMP_HELP_DOCK_CLOSE }, diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c index 7ebe4fd8fd..e0e20647f2 100644 --- a/app/actions/dockable-actions.c +++ b/app/actions/dockable-actions.c @@ -57,7 +57,7 @@ static const GimpActionEntry dockable_actions[] = { "dockable-tab-style-menu", NULL, NC_("dockable-action", "_Tab Style") }, - { "dockable-close-tab", GIMP_STOCK_QUIT, + { "dockable-close-tab", "window-close", NC_("dockable-action", "_Close Tab"), "", NULL, G_CALLBACK (dockable_close_tab_cmd_callback), GIMP_HELP_DOCK_TAB_CLOSE }, diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c index 5609ff06bb..a62aa4e260 100644 --- a/app/actions/documents-actions.c +++ b/app/actions/documents-actions.c @@ -38,11 +38,11 @@ static const GimpActionEntry documents_actions[] = { - { "documents-popup", GIMP_STOCK_DOCUMENT_RECENT, + { "documents-popup", "document-open-recent", NC_("documents-action", "Documents Menu"), NULL, NULL, NULL, GIMP_HELP_DOCUMENT_DIALOG }, - { "documents-open", GIMP_STOCK_OPEN, + { "documents-open", "document-open", NC_("documents-action", "_Open Image"), NULL, NC_("documents-action", "Open the selected entry"), G_CALLBACK (documents_open_cmd_callback), @@ -60,7 +60,7 @@ static const GimpActionEntry documents_actions[] = G_CALLBACK (documents_file_open_dialog_cmd_callback), GIMP_HELP_DOCUMENT_OPEN }, - { "documents-copy-location", GIMP_STOCK_CLIPBOARD, + { "documents-copy-location", "edit-copy", NC_("documents-action", "Copy Image _Location"), NULL, NC_("documents-action", "Copy image location to clipboard"), G_CALLBACK (documents_copy_location_cmd_callback), diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c index 4885080ce6..7b4c7d2e95 100644 --- a/app/actions/dynamics-actions.c +++ b/app/actions/dynamics-actions.c @@ -55,7 +55,7 @@ static const GimpActionEntry dynamics_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_DYNAMICS_DUPLICATE }, - { "dynamics-copy-location", GIMP_STOCK_CLIPBOARD, + { "dynamics-copy-location", "edit-copy", NC_("dynamics-action", "Copy Dynamics _Location"), NULL, NC_("dynamics-action", "Copy dynamics file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c index b3f8a76db9..1dacc68ab0 100644 --- a/app/actions/edit-actions.c +++ b/app/actions/edit-actions.c @@ -114,7 +114,7 @@ static const GimpActionEntry edit_actions[] = G_CALLBACK (edit_cut_cmd_callback), GIMP_HELP_EDIT_CUT }, - { "edit-copy", GIMP_STOCK_CLIPBOARD, + { "edit-copy", "edit-copy", NC_("edit-action", "_Copy"), "C", NC_("edit-action", "Copy the selected pixels to the clipboard"), G_CALLBACK (edit_copy_cmd_callback), @@ -163,7 +163,7 @@ static const GimpActionEntry edit_actions[] = G_CALLBACK (edit_named_cut_cmd_callback), GIMP_HELP_BUFFER_CUT }, - { "edit-named-copy", GIMP_STOCK_DUPLICATE, + { "edit-named-copy", "edit-copy", NC_("edit-action", "_Copy Named..."), NULL, NC_("edit-action", "Copy the selected pixels to a named buffer"), G_CALLBACK (edit_named_copy_cmd_callback), @@ -182,7 +182,7 @@ static const GimpActionEntry edit_actions[] = G_CALLBACK (edit_named_paste_cmd_callback), GIMP_HELP_BUFFER_PASTE }, - { "edit-clear", GIMP_STOCK_EDIT_CLEAR, + { "edit-clear", "edit-clear", NC_("edit-action", "Cl_ear"), "Delete", NC_("edit-action", "Clear the selected pixels"), G_CALLBACK (edit_clear_cmd_callback), diff --git a/app/actions/error-console-actions.c b/app/actions/error-console-actions.c index f230a6ca96..a6bcb96967 100644 --- a/app/actions/error-console-actions.c +++ b/app/actions/error-console-actions.c @@ -40,7 +40,7 @@ static const GimpActionEntry error_console_actions[] = NC_("error-console-action", "Error Console Menu"), NULL, NULL, NULL, GIMP_HELP_ERRORS_DIALOG }, - { "error-console-clear", GIMP_STOCK_EDIT_CLEAR, + { "error-console-clear", "edit-clear", NC_("error-console-action", "_Clear"), NULL, NC_("error-console-action", "Clear error console"), G_CALLBACK (error_console_clear_cmd_callback), @@ -55,13 +55,13 @@ static const GimpActionEntry error_console_actions[] = static const GimpEnumActionEntry error_console_save_actions[] = { - { "error-console-save-all", GIMP_STOCK_SAVE_AS, + { "error-console-save-all", "document-save-as", NC_("error-console-action", "_Save Error Log to File..."), NULL, NC_("error-console-action", "Write all error messages to a file"), FALSE, FALSE, GIMP_HELP_ERRORS_SAVE }, - { "error-console-save-selection", GIMP_STOCK_SAVE_AS, + { "error-console-save-selection", "document-save-as", NC_("error-console-action", "Save S_election to File..."), NULL, NC_("error-console-action", "Write the selected error messages to a file"), TRUE, FALSE, diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c index a9145af3e2..905b43699a 100644 --- a/app/actions/file-actions.c +++ b/app/actions/file-actions.c @@ -108,7 +108,7 @@ static const GimpActionEntry file_actions[] = G_CALLBACK (file_close_all_cmd_callback), GIMP_HELP_FILE_CLOSE_ALL }, - { "file-copy-location", GIMP_STOCK_CLIPBOARD, + { "file-copy-location", "edit-copy", NC_("file-action", "Copy _Image Location"), NULL, NC_("file-action", "Copy image file location to clipboard"), G_CALLBACK (file_copy_location_cmd_callback), @@ -120,7 +120,7 @@ static const GimpActionEntry file_actions[] = G_CALLBACK (file_show_in_file_manager_cmd_callback), GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER }, - { "file-quit", GIMP_STOCK_QUIT, + { "file-quit", "application-exit", NC_("file-action", "_Quit"), "Q", NC_("file-action", "Quit the GNU Image Manipulation Program"), G_CALLBACK (file_quit_cmd_callback), @@ -129,13 +129,13 @@ static const GimpActionEntry file_actions[] = static const GimpEnumActionEntry file_save_actions[] = { - { "file-save", GIMP_STOCK_SAVE, + { "file-save", "document-save", NC_("file-action", "_Save"), "S", NC_("file-action", "Save this image"), GIMP_SAVE_MODE_SAVE, FALSE, GIMP_HELP_FILE_SAVE }, - { "file-save-as", GIMP_STOCK_SAVE_AS, + { "file-save-as", "document-save-as", NC_("file-action", "Save _As..."), "S", NC_("file-action", "Save this image with a different name"), GIMP_SAVE_MODE_SAVE_AS, FALSE, @@ -198,7 +198,7 @@ file_actions_setup (GimpActionGroup *group) { entries[i].name = g_strdup_printf ("file-open-recent-%02d", i + 1); - entries[i].icon_name = "gimp-open"; + entries[i].icon_name = "document-open"; entries[i].label = entries[i].name; entries[i].tooltip = NULL; entries[i].value = i; diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c index 10b815bce1..93724a99a4 100644 --- a/app/actions/fonts-actions.c +++ b/app/actions/fonts-actions.c @@ -40,7 +40,7 @@ static const GimpActionEntry fonts_actions[] = { - { "fonts-popup", GIMP_STOCK_FONT, + { "fonts-popup", "gtk-select-font", NC_("fonts-action", "Fonts Menu"), NULL, NULL, NULL, GIMP_HELP_FONT_DIALOG }, diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c index 50b173d496..ea8f97c4b8 100644 --- a/app/actions/gradient-editor-actions.c +++ b/app/actions/gradient-editor-actions.c @@ -48,16 +48,16 @@ static const GimpActionEntry gradient_editor_actions[] = { "gradient-editor-left-color-type", NULL, NC_("gradient-editor-action", "Left Color Type") }, - { "gradient-editor-load-left-color", GIMP_STOCK_REVERT, + { "gradient-editor-load-left-color", "document-revert", NC_("gradient-editor-action", "_Load Left Color From") }, - { "gradient-editor-save-left-color", GIMP_STOCK_SAVE, + { "gradient-editor-save-left-color", "document-save", NC_("gradient-editor-action", "_Save Left Color To") }, { "gradient-editor-right-color-type", NULL, NC_("gradient-editor-action", "Right Color Type") }, - { "gradient-editor-load-right-color", GIMP_STOCK_REVERT, + { "gradient-editor-load-right-color", "document-revert", NC_("gradient-editor-action", "Load Right Color Fr_om") }, - { "gradient-editor-save-right-color", GIMP_STOCK_SAVE, + { "gradient-editor-save-right-color", "document-save", NC_("gradient-editor-action", "Sa_ve Right Color To") }, { "gradient-editor-blending-func", NULL, "blending-function" }, diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c index 8b488cbdf2..f13323b72d 100644 --- a/app/actions/gradients-actions.c +++ b/app/actions/gradients-actions.c @@ -56,7 +56,7 @@ static const GimpActionEntry gradients_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_GRADIENT_DUPLICATE }, - { "gradients-copy-location", GIMP_STOCK_CLIPBOARD, + { "gradients-copy-location", "edit-copy", NC_("gradients-action", "Copy Gradient _Location"), NULL, NC_("gradients-action", "Copy gradient file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), @@ -68,7 +68,7 @@ static const GimpActionEntry gradients_actions[] = G_CALLBACK (data_show_in_file_manager_cmd_callback), GIMP_HELP_GRADIENT_SHOW_IN_FILE_MANAGER }, - { "gradients-save-as-pov", GIMP_STOCK_SAVE_AS, + { "gradients-save-as-pov", "document-save-as", NC_("gradients-action", "Save as _POV-Ray..."), NULL, NC_("gradients-action", "Save gradient as POV-Ray"), G_CALLBACK (gradients_save_as_pov_ray_cmd_callback), diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c index 6f48b12771..f8e3b0618d 100644 --- a/app/actions/mypaint-brushes-actions.c +++ b/app/actions/mypaint-brushes-actions.c @@ -55,7 +55,7 @@ static const GimpActionEntry mypaint_brushes_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_MYPAINT_BRUSH_DUPLICATE }, - { "mypaint-brushes-copy-location", GIMP_STOCK_CLIPBOARD, + { "mypaint-brushes-copy-location", "edit-copy", NC_("mypaint-brushes-action", "Copy MyPaint Brush _Location"), NULL, NC_("mypaint-brushes-action", "Copy MyPaint brush file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c index 6be5b2cc81..ebc0f359f4 100644 --- a/app/actions/palettes-actions.c +++ b/app/actions/palettes-actions.c @@ -68,7 +68,7 @@ static const GimpActionEntry palettes_actions[] = G_CALLBACK (palettes_merge_cmd_callback), GIMP_HELP_PALETTE_MERGE }, - { "palettes-copy-location", GIMP_STOCK_CLIPBOARD, + { "palettes-copy-location", "edit-copy", NC_("palettes-action", "Copy Palette _Location"), NULL, NC_("palettes-action", "Copy palette file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c index c0fdf978e1..4b71b10e02 100644 --- a/app/actions/patterns-actions.c +++ b/app/actions/patterns-actions.c @@ -43,7 +43,7 @@ static const GimpActionEntry patterns_actions[] = NC_("patterns-action", "Patterns Menu"), NULL, NULL, NULL, GIMP_HELP_PATTERN_DIALOG }, - { "patterns-open-as-image", GIMP_STOCK_OPEN, + { "patterns-open-as-image", "document-open", NC_("patterns-action", "_Open Pattern as Image"), NULL, NC_("patterns-action", "Open this pattern as an image"), G_CALLBACK (data_open_as_image_cmd_callback), @@ -61,7 +61,7 @@ static const GimpActionEntry patterns_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_PATTERN_DUPLICATE }, - { "patterns-copy-location", GIMP_STOCK_CLIPBOARD, + { "patterns-copy-location", "edit-copy", NC_("patterns-action", "Copy Pattern _Location"), NULL, NC_("patterns-action", "Copy pattern file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c index ad325e3099..c7f9e37aa7 100644 --- a/app/actions/text-editor-actions.c +++ b/app/actions/text-editor-actions.c @@ -40,13 +40,13 @@ static const GimpActionEntry text_editor_actions[] = "Text Editor Toolbar", NULL, NULL, NULL, GIMP_HELP_TEXT_EDITOR_DIALOG }, - { "text-editor-load", GIMP_STOCK_OPEN, + { "text-editor-load", "document-open", NC_("text-editor-action", "Open"), NULL, NC_("text-editor-action", "Load text from file"), G_CALLBACK (text_editor_load_cmd_callback), NULL }, - { "text-editor-clear", GIMP_STOCK_EDIT_CLEAR, + { "text-editor-clear", "edit-clear", NC_("text-editor-action", "Clear"), NULL, NC_("text-editor-action", "Clear all text"), G_CALLBACK (text_editor_clear_cmd_callback), diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c index 12e6eaaf1f..f72759360a 100644 --- a/app/actions/text-tool-actions.c +++ b/app/actions/text-tool-actions.c @@ -59,7 +59,7 @@ static const GimpActionEntry text_tool_actions[] = G_CALLBACK (text_tool_cut_cmd_callback), NULL }, - { "text-tool-copy", GIMP_STOCK_DUPLICATE, + { "text-tool-copy", "edit-copy", NC_("text-tool-action", "_Copy"), NULL, "C", G_CALLBACK (text_tool_copy_cmd_callback), NULL }, @@ -74,12 +74,12 @@ static const GimpActionEntry text_tool_actions[] = G_CALLBACK (text_tool_delete_cmd_callback), NULL }, - { "text-tool-load", GIMP_STOCK_OPEN, + { "text-tool-load", "document-open", NC_("text-tool-action", "_Open text file..."), NULL, NULL, G_CALLBACK (text_tool_load_cmd_callback), NULL }, - { "text-tool-clear", GIMP_STOCK_EDIT_CLEAR, + { "text-tool-clear", "edit-clear", NC_("text-tool-action", "Cl_ear"), NULL, NC_("text-tool-action", "Clear all text"), G_CALLBACK (text_tool_clear_cmd_callback), diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c index f251f5591b..ae39d1a87f 100644 --- a/app/actions/tool-options-actions.c +++ b/app/actions/tool-options-actions.c @@ -57,11 +57,11 @@ static const GimpActionEntry tool_options_actions[] = NC_("tool-options-action", "Tool Options Menu"), NULL, NULL, NULL, GIMP_HELP_TOOL_OPTIONS_DIALOG }, - { "tool-options-save-preset-menu", GIMP_STOCK_SAVE, + { "tool-options-save-preset-menu", "document-save", NC_("tool-options-action", "_Save Tool Preset"), "", NULL, NULL, GIMP_HELP_TOOL_OPTIONS_SAVE }, - { "tool-options-restore-preset-menu", GIMP_STOCK_REVERT, + { "tool-options-restore-preset-menu", "document-revert", NC_("tool-options-action", "_Restore Tool Preset"), "", NULL, NULL, GIMP_HELP_TOOL_OPTIONS_RESTORE }, diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c index 8d2eab0a0d..8b20dcbe4d 100644 --- a/app/actions/tool-presets-actions.c +++ b/app/actions/tool-presets-actions.c @@ -58,7 +58,7 @@ static const GimpActionEntry tool_presets_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_TOOL_PRESET_DUPLICATE }, - { "tool-presets-copy-location", GIMP_STOCK_CLIPBOARD, + { "tool-presets-copy-location", "edit-copy", NC_("tool-presets-action", "Copy Tool Preset _Location"), NULL, NC_("tool-presets-action", "Copy tool preset file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), @@ -70,7 +70,7 @@ static const GimpActionEntry tool_presets_actions[] = G_CALLBACK (data_show_in_file_manager_cmd_callback), GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER }, - { "tool-presets-restore", GIMP_STOCK_REVERT, + { "tool-presets-restore", "document-revert", NC_("tool-presets-action", "_Restore Tool Preset"), NULL, NC_("tool-presets-action", "Restore this tool preset"), G_CALLBACK (tool_presets_restore_cmd_callback), diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c index 50ed4db51c..537f1d6def 100644 --- a/app/actions/vectors-actions.c +++ b/app/actions/vectors-actions.c @@ -132,7 +132,7 @@ static const GimpActionEntry vectors_actions[] = G_CALLBACK (vectors_stroke_last_vals_cmd_callback), GIMP_HELP_PATH_STROKE }, - { "vectors-copy", GIMP_STOCK_CLIPBOARD, + { "vectors-copy", "edit-copy", NC_("vectors-action", "Co_py Path"), "", NULL, G_CALLBACK (vectors_copy_cmd_callback), GIMP_HELP_PATH_COPY }, @@ -142,12 +142,12 @@ static const GimpActionEntry vectors_actions[] = G_CALLBACK (vectors_paste_cmd_callback), GIMP_HELP_PATH_PASTE }, - { "vectors-export", GIMP_STOCK_SAVE, + { "vectors-export", "document-save", NC_("vectors-action", "E_xport Path..."), "", NULL, G_CALLBACK (vectors_export_cmd_callback), GIMP_HELP_PATH_EXPORT }, - { "vectors-import", GIMP_STOCK_OPEN, + { "vectors-import", "document-open", NC_("vectors-action", "I_mport Path..."), "", NULL, G_CALLBACK (vectors_import_cmd_callback), GIMP_HELP_PATH_IMPORT } diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c index 9e57083c6d..5323fdf5dc 100644 --- a/app/actions/view-actions.c +++ b/app/actions/view-actions.c @@ -91,7 +91,7 @@ static const GimpActionEntry view_actions[] = G_CALLBACK (view_new_cmd_callback), GIMP_HELP_VIEW_NEW }, - { "view-close", GIMP_STOCK_QUIT, + { "view-close", "window-close", NC_("view-action", "_Close View"), "W", NC_("view-action", "Close the active image view"), G_CALLBACK (view_close_cmd_callback), diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index c886df6b74..bfe7271ca6 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -94,7 +94,7 @@ gimp_palette_class_init (GimpPaletteClass *klass) gimp_object_class->get_memsize = gimp_palette_get_memsize; - viewable_class->default_icon_name = "gimp-color-palette"; + viewable_class->default_icon_name = "gtk-select-color"; viewable_class->get_preview_size = gimp_palette_get_preview_size; viewable_class->get_popup_size = gimp_palette_get_popup_size; viewable_class->get_new_preview = gimp_palette_get_new_preview; diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c index 36d3229695..b1e2ccdf10 100644 --- a/app/dialogs/dialogs.c +++ b/app/dialogs/dialogs.c @@ -340,13 +340,13 @@ static const GimpDialogFactoryEntry entries[] = N_("Palettes"), NULL, GIMP_STOCK_PALETTE, GIMP_HELP_PALETTE_DIALOG, GIMP_VIEW_SIZE_MEDIUM), LISTGRID (font, font, - N_("Fonts"), NULL, GIMP_STOCK_FONT, + N_("Fonts"), NULL, "gtk-select-font", GIMP_HELP_FONT_DIALOG, GIMP_VIEW_SIZE_MEDIUM), LISTGRID (buffer, buffer, N_("Buffers"), NULL, GIMP_STOCK_BUFFER, GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM), LISTGRID (document, document, - N_("History"), N_("Document History"), GIMP_STOCK_DOCUMENT_RECENT, + N_("History"), N_("Document History"), "document-open-recent", GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE), LISTGRID (template, template, N_("Templates"), N_("Image Templates"), GIMP_STOCK_TEMPLATE, diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index d062ffd011..aa53173bf5 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1573,7 +1573,7 @@ prefs_dialog_new (Gimp *gimp, _("_Save tool options on exit"), GTK_BOX (vbox2)); - button = prefs_button_add (GIMP_STOCK_SAVE, + button = prefs_button_add ("document-save", _("Save Tool Options _Now"), GTK_BOX (vbox2)); g_signal_connect (button, "clicked", @@ -1757,7 +1757,7 @@ prefs_dialog_new (Gimp *gimp, _("_Save keyboard shortcuts on exit"), GTK_BOX (vbox2)); - button = prefs_button_add (GIMP_STOCK_SAVE, + button = prefs_button_add ("document-save", _("Save Keyboard Shortcuts _Now"), GTK_BOX (vbox2)); g_signal_connect (button, "clicked", @@ -1773,7 +1773,7 @@ prefs_dialog_new (Gimp *gimp, g_object_set_data (G_OBJECT (button), "clear-button", button2); - button = prefs_button_add (GIMP_STOCK_EDIT_CLEAR, + button = prefs_button_add ("edit-clear", _("Remove _All Keyboard Shortcuts"), GTK_BOX (vbox2)); g_signal_connect (button, "clicked", @@ -2428,7 +2428,7 @@ prefs_dialog_new (Gimp *gimp, _("Open windows on the same _monitor they were open before"), GTK_BOX (vbox2)); - button = prefs_button_add (GIMP_STOCK_SAVE, + button = prefs_button_add ("document-save", _("Save Window Positions _Now"), GTK_BOX (vbox2)); g_signal_connect (button, "clicked", @@ -2726,7 +2726,7 @@ prefs_dialog_new (Gimp *gimp, _("_Save input device settings on exit"), GTK_BOX (vbox2)); - button = prefs_button_add (GIMP_STOCK_SAVE, + button = prefs_button_add ("document-save", _("Save Input Device Settings _Now"), GTK_BOX (vbox2)); g_signal_connect (button, "clicked", diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index b4ac70ac94..2072804a73 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -144,13 +144,13 @@ tips_dialog_create (Gimp *gimp) button = gtk_dialog_add_button (GTK_DIALOG (tips_dialog), _("_Previous Tip"), RESPONSE_PREVIOUS); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name (GIMP_STOCK_PREVIOUS, + gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON)); button = gtk_dialog_add_button (GTK_DIALOG (tips_dialog), _("_Next Tip"), RESPONSE_NEXT); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name (GIMP_STOCK_NEXT, + gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON)); gtk_dialog_set_response_sensitive (GTK_DIALOG (tips_dialog), diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c index c54c0c8804..28f2dd168a 100644 --- a/app/display/gimpstatusbar.c +++ b/app/display/gimpstatusbar.c @@ -278,7 +278,7 @@ gimp_statusbar_init (GimpStatusbar *statusbar) gtk_container_add (GTK_CONTAINER (statusbar->cancel_button), hbox2); gtk_widget_show (hbox2); - image = gtk_image_new_from_icon_name (GIMP_STOCK_CANCEL, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("gtk-cancel", GTK_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX (hbox2), image, FALSE, FALSE, 2); gtk_widget_show (image); diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c index b82572a64b..b76abfa57a 100644 --- a/app/text/gimpfont.c +++ b/app/text/gimpfont.c @@ -122,7 +122,7 @@ gimp_font_class_init (GimpFontClass *klass) viewable_class->get_popup_size = gimp_font_get_popup_size; viewable_class->get_new_preview = gimp_font_get_new_preview; - viewable_class->default_icon_name = "gimp-font"; + viewable_class->default_icon_name = "gtk-select-font"; g_object_class_install_property (object_class, PROP_PANGO_CONTEXT, g_param_spec_object ("pango-context", diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c index ee78465276..436b7d891d 100644 --- a/app/tools/gimptextoptions.c +++ b/app/tools/gimptextoptions.c @@ -612,7 +612,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options) spinbutton = gimp_prop_spin_button_new (config, "indent", 1.0, 10.0, 1); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5); gimp_table_attach_icon (GTK_TABLE (table), row++, - GIMP_STOCK_INDENT, spinbutton, 1, TRUE); + "format-indent-more", spinbutton, 1, TRUE); spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5); diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index bea599545d..f52fbb03ba 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -188,7 +188,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor) gtk_widget_set_sensitive (editor->add_button, FALSE); gtk_widget_show (editor->add_button); - image = gtk_image_new_from_icon_name (GIMP_STOCK_NEXT, + image = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (editor->add_button), image); gtk_widget_show (image); @@ -202,7 +202,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor) gtk_widget_set_sensitive (editor->remove_button, FALSE); gtk_widget_show (editor->remove_button); - image = gtk_image_new_from_icon_name (GIMP_STOCK_PREVIOUS, + image = gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (editor->remove_button), image); gtk_widget_show (image); diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c index 80044ab2d5..89bb930a5c 100644 --- a/app/widgets/gimpcontrollerlist.c +++ b/app/widgets/gimpcontrollerlist.c @@ -243,7 +243,7 @@ gimp_controller_list_init (GimpControllerList *list) gtk_widget_set_sensitive (list->add_button, FALSE); gtk_widget_show (list->add_button); - image = gtk_image_new_from_icon_name (GIMP_STOCK_NEXT, + image = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (list->add_button), image); gtk_widget_show (image); @@ -260,7 +260,7 @@ gimp_controller_list_init (GimpControllerList *list) gtk_widget_set_sensitive (list->remove_button, FALSE); gtk_widget_show (list->remove_button); - image = gtk_image_new_from_icon_name (GIMP_STOCK_PREVIOUS, + image = gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (list->remove_button), image); gtk_widget_show (image); diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c index 8152120863..a00c048401 100644 --- a/app/widgets/gimpdataeditor.c +++ b/app/widgets/gimpdataeditor.c @@ -211,7 +211,7 @@ gimp_data_editor_constructed (GObject *object) editor->save_button = gimp_editor_add_button (GIMP_EDITOR (editor), - GIMP_STOCK_SAVE, + "document-save", _("Save"), NULL, G_CALLBACK (gimp_data_editor_save_clicked), NULL, @@ -219,7 +219,7 @@ gimp_data_editor_constructed (GObject *object) editor->revert_button = gimp_editor_add_button (GIMP_EDITOR (editor), - GIMP_STOCK_REVERT, + "document-revert", _("Revert"), NULL, G_CALLBACK (gimp_data_editor_revert_clicked), NULL, diff --git a/app/widgets/gimpdevicestatus.c b/app/widgets/gimpdevicestatus.c index 02f6e64ef6..ec0f9c70b2 100644 --- a/app/widgets/gimpdevicestatus.c +++ b/app/widgets/gimpdevicestatus.c @@ -135,7 +135,7 @@ gimp_device_status_init (GimpDeviceStatus *status) gtk_widget_show (status->vbox); status->save_button = - gimp_editor_add_button (GIMP_EDITOR (status), GIMP_STOCK_SAVE, + gimp_editor_add_button (GIMP_EDITOR (status), "document-save", _("Save device status"), NULL, G_CALLBACK (gimp_device_status_save_clicked), NULL, diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c index d64a1725be..b37c44e208 100644 --- a/app/widgets/gimpsettingsbox.c +++ b/app/widgets/gimpsettingsbox.c @@ -315,13 +315,13 @@ gimp_settings_box_constructed (GObject *object) private->import_item = gimp_settings_box_menu_item_add (box, - GIMP_STOCK_OPEN, + "document-open", _("_Import Settings from File..."), G_CALLBACK (gimp_settings_box_import_activate)); private->export_item = gimp_settings_box_menu_item_add (box, - GIMP_STOCK_SAVE, + "document-save", _("_Export Settings to File..."), G_CALLBACK (gimp_settings_box_export_activate)); diff --git a/app/widgets/gimpsettingseditor.c b/app/widgets/gimpsettingseditor.c index 6893796eff..94b9d29e3c 100644 --- a/app/widgets/gimpsettingseditor.c +++ b/app/widgets/gimpsettingseditor.c @@ -190,7 +190,7 @@ gimp_settings_editor_constructed (GObject *object) private->import_button = gimp_editor_add_button (GIMP_EDITOR (tree_view), - GIMP_STOCK_OPEN, + "document-open", _("Import settings from a file"), NULL, G_CALLBACK (gimp_settings_editor_import_clicked), @@ -199,7 +199,7 @@ gimp_settings_editor_constructed (GObject *object) private->export_button = gimp_editor_add_button (GIMP_EDITOR (tree_view), - GIMP_STOCK_SAVE, + "document-save", _("Export the selected settings to a file"), NULL, G_CALLBACK (gimp_settings_editor_export_clicked), diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c index ec486c06b8..ac94a19035 100644 --- a/app/widgets/gimptextstyleeditor.c +++ b/app/widgets/gimptextstyleeditor.c @@ -240,7 +240,7 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor) G_CALLBACK (gimp_text_style_editor_clear_tags), editor); - image = gtk_image_new_from_icon_name (GIMP_STOCK_EDIT_CLEAR, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_MENU); gtk_container_add (GTK_CONTAINER (editor->clear_button), image); gtk_widget_show (image); diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c index 803b6621bc..da37b2d1e1 100644 --- a/app/widgets/gimptooloptionseditor.c +++ b/app/widgets/gimptooloptionseditor.c @@ -198,7 +198,7 @@ gimp_tool_options_editor_constructed (GObject *object) G_OBJECT_CLASS (parent_class)->constructed (object); editor->p->save_button = - gimp_editor_add_button (GIMP_EDITOR (editor), GIMP_STOCK_SAVE, + gimp_editor_add_button (GIMP_EDITOR (editor), "document-save", _("Save Tool Preset..."), GIMP_HELP_TOOL_OPTIONS_SAVE, G_CALLBACK (gimp_tool_options_editor_save_clicked), @@ -206,7 +206,7 @@ gimp_tool_options_editor_constructed (GObject *object) editor); editor->p->restore_button = - gimp_editor_add_button (GIMP_EDITOR (editor), GIMP_STOCK_REVERT, + gimp_editor_add_button (GIMP_EDITOR (editor), "document-revert", _("Restore Tool Preset..."), GIMP_HELP_TOOL_OPTIONS_RESTORE, G_CALLBACK (gimp_tool_options_editor_restore_clicked), diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c index ce4064497f..c79d78dcdb 100644 --- a/app/widgets/gimpviewablebox.c +++ b/app/widgets/gimpviewablebox.c @@ -527,7 +527,7 @@ font_box_new (GimpContainer *container, return gimp_viewable_box_new (container, context, label, spacing, view_type, GIMP_VIEW_SIZE_SMALL, view_size, "gimp-font-list|gimp-font-grid", - GIMP_STOCK_FONT, + "gtk-select-font", _("Open the font selection dialog"), NULL); } diff --git a/icons/Color/16/gimp-document-recent.png b/icons/Color/16/document-open-recent.png similarity index 100% rename from icons/Color/16/gimp-document-recent.png rename to icons/Color/16/document-open-recent.png diff --git a/icons/Color/16/gimp-revert.png b/icons/Color/16/document-revert.png similarity index 100% rename from icons/Color/16/gimp-revert.png rename to icons/Color/16/document-revert.png diff --git a/icons/Color/16/gimp-save-as.png b/icons/Color/16/document-save-as.png similarity index 100% rename from icons/Color/16/gimp-save-as.png rename to icons/Color/16/document-save-as.png diff --git a/icons/Color/16/gimp-save.png b/icons/Color/16/document-save.png similarity index 100% rename from icons/Color/16/gimp-save.png rename to icons/Color/16/document-save.png diff --git a/icons/Color/16/gimp-edit-clear.png b/icons/Color/16/edit-clear.png similarity index 100% rename from icons/Color/16/gimp-edit-clear.png rename to icons/Color/16/edit-clear.png diff --git a/icons/Color/16/gimp-next.png b/icons/Color/16/go-next.png similarity index 100% rename from icons/Color/16/gimp-next.png rename to icons/Color/16/go-next.png diff --git a/icons/Color/16/gimp-previous.png b/icons/Color/16/go-previous.png similarity index 100% rename from icons/Color/16/gimp-previous.png rename to icons/Color/16/go-previous.png diff --git a/icons/Color/16/gimp-cancel.png b/icons/Color/16/gtk-cancel.png similarity index 100% rename from icons/Color/16/gimp-cancel.png rename to icons/Color/16/gtk-cancel.png diff --git a/icons/Color/16/gimp-color-palette.png b/icons/Color/16/gtk-select-color.png similarity index 100% rename from icons/Color/16/gimp-color-palette.png rename to icons/Color/16/gtk-select-color.png diff --git a/icons/Color/16/gimp-font.png b/icons/Color/16/gtk-select-font.png similarity index 100% rename from icons/Color/16/gimp-font.png rename to icons/Color/16/gtk-select-font.png diff --git a/icons/Color/16/gimp-quit.png b/icons/Color/16/window-close.png similarity index 100% rename from icons/Color/16/gimp-quit.png rename to icons/Color/16/window-close.png diff --git a/icons/Color/22/gimp-indent.png b/icons/Color/22/format-indent-more.png similarity index 100% rename from icons/Color/22/gimp-indent.png rename to icons/Color/22/format-indent-more.png diff --git a/icons/Color/22/gimp-justify-center.png b/icons/Color/22/gtk-justify-center.png similarity index 100% rename from icons/Color/22/gimp-justify-center.png rename to icons/Color/22/gtk-justify-center.png diff --git a/icons/Color/22/gimp-justify-fill.png b/icons/Color/22/gtk-justify-fill.png similarity index 100% rename from icons/Color/22/gimp-justify-fill.png rename to icons/Color/22/gtk-justify-fill.png diff --git a/icons/Color/22/gimp-justify-left.png b/icons/Color/22/gtk-justify-left.png similarity index 100% rename from icons/Color/22/gimp-justify-left.png rename to icons/Color/22/gtk-justify-left.png diff --git a/icons/Color/22/gimp-justify-right.png b/icons/Color/22/gtk-justify-right.png similarity index 100% rename from icons/Color/22/gimp-justify-right.png rename to icons/Color/22/gtk-justify-right.png diff --git a/icons/Color/24/gimp-color-palette.png b/icons/Color/24/gtk-select-color.png similarity index 100% rename from icons/Color/24/gimp-color-palette.png rename to icons/Color/24/gtk-select-color.png diff --git a/icons/Color/24/gimp-color-palette.svg b/icons/Color/24/gtk-select-color.svg similarity index 100% rename from icons/Color/24/gimp-color-palette.svg rename to icons/Color/24/gtk-select-color.svg diff --git a/icons/Color/scalable/gimp-document-recent.svg b/icons/Color/scalable/document-open-recent.svg similarity index 100% rename from icons/Color/scalable/gimp-document-recent.svg rename to icons/Color/scalable/document-open-recent.svg diff --git a/icons/Color/scalable/gimp-open.svg b/icons/Color/scalable/document-open.svg similarity index 100% rename from icons/Color/scalable/gimp-open.svg rename to icons/Color/scalable/document-open.svg diff --git a/icons/Color/scalable/gimp-revert.svg b/icons/Color/scalable/document-revert.svg similarity index 100% rename from icons/Color/scalable/gimp-revert.svg rename to icons/Color/scalable/document-revert.svg diff --git a/icons/Color/scalable/gimp-save-as.svg b/icons/Color/scalable/document-save-as.svg similarity index 100% rename from icons/Color/scalable/gimp-save-as.svg rename to icons/Color/scalable/document-save-as.svg diff --git a/icons/Color/scalable/gimp-save.svg b/icons/Color/scalable/document-save.svg similarity index 100% rename from icons/Color/scalable/gimp-save.svg rename to icons/Color/scalable/document-save.svg diff --git a/icons/Color/scalable/gimp-edit-clear.svg b/icons/Color/scalable/edit-clear.svg similarity index 100% rename from icons/Color/scalable/gimp-edit-clear.svg rename to icons/Color/scalable/edit-clear.svg diff --git a/icons/Color/scalable/gimp-indent.svg b/icons/Color/scalable/format-indent-more.svg similarity index 100% rename from icons/Color/scalable/gimp-indent.svg rename to icons/Color/scalable/format-indent-more.svg diff --git a/icons/Color/scalable/gimp-next.svg b/icons/Color/scalable/go-next.svg similarity index 100% rename from icons/Color/scalable/gimp-next.svg rename to icons/Color/scalable/go-next.svg diff --git a/icons/Color/scalable/gimp-previous.svg b/icons/Color/scalable/go-previous.svg similarity index 100% rename from icons/Color/scalable/gimp-previous.svg rename to icons/Color/scalable/go-previous.svg diff --git a/icons/Color/scalable/gimp-cancel.svg b/icons/Color/scalable/gtk-cancel.svg similarity index 100% rename from icons/Color/scalable/gimp-cancel.svg rename to icons/Color/scalable/gtk-cancel.svg diff --git a/icons/Color/scalable/gimp-justify-center.svg b/icons/Color/scalable/gtk-justify-center.svg similarity index 100% rename from icons/Color/scalable/gimp-justify-center.svg rename to icons/Color/scalable/gtk-justify-center.svg diff --git a/icons/Color/scalable/gimp-justify-fill.svg b/icons/Color/scalable/gtk-justify-fill.svg similarity index 100% rename from icons/Color/scalable/gimp-justify-fill.svg rename to icons/Color/scalable/gtk-justify-fill.svg diff --git a/icons/Color/scalable/gimp-justify-left.svg b/icons/Color/scalable/gtk-justify-left.svg similarity index 100% rename from icons/Color/scalable/gimp-justify-left.svg rename to icons/Color/scalable/gtk-justify-left.svg diff --git a/icons/Color/scalable/gimp-justify-right.svg b/icons/Color/scalable/gtk-justify-right.svg similarity index 100% rename from icons/Color/scalable/gimp-justify-right.svg rename to icons/Color/scalable/gtk-justify-right.svg diff --git a/icons/Color/scalable/gimp-color-palette.svg b/icons/Color/scalable/gtk-select-color.svg similarity index 100% rename from icons/Color/scalable/gimp-color-palette.svg rename to icons/Color/scalable/gtk-select-color.svg diff --git a/icons/Color/scalable/gimp-font.svg b/icons/Color/scalable/gtk-select-font.svg similarity index 100% rename from icons/Color/scalable/gimp-font.svg rename to icons/Color/scalable/gtk-select-font.svg diff --git a/icons/Color/scalable/gimp-quit.svg b/icons/Color/scalable/window-close.svg similarity index 100% rename from icons/Color/scalable/gimp-quit.svg rename to icons/Color/scalable/window-close.svg diff --git a/icons/Symbolic/16/gimp-document-recent.png b/icons/Symbolic/16/document-open-recent.png similarity index 100% rename from icons/Symbolic/16/gimp-document-recent.png rename to icons/Symbolic/16/document-open-recent.png diff --git a/icons/Symbolic/16/gimp-revert.png b/icons/Symbolic/16/document-revert.png similarity index 100% rename from icons/Symbolic/16/gimp-revert.png rename to icons/Symbolic/16/document-revert.png diff --git a/icons/Symbolic/16/gimp-save-as.png b/icons/Symbolic/16/document-save-as.png similarity index 100% rename from icons/Symbolic/16/gimp-save-as.png rename to icons/Symbolic/16/document-save-as.png diff --git a/icons/Symbolic/16/gimp-save.png b/icons/Symbolic/16/document-save.png similarity index 100% rename from icons/Symbolic/16/gimp-save.png rename to icons/Symbolic/16/document-save.png diff --git a/icons/Symbolic/16/gimp-edit-clear.png b/icons/Symbolic/16/edit-clear.png similarity index 100% rename from icons/Symbolic/16/gimp-edit-clear.png rename to icons/Symbolic/16/edit-clear.png diff --git a/icons/Symbolic/16/gimp-next.png b/icons/Symbolic/16/go-next.png similarity index 100% rename from icons/Symbolic/16/gimp-next.png rename to icons/Symbolic/16/go-next.png diff --git a/icons/Symbolic/16/gimp-previous.png b/icons/Symbolic/16/go-previous.png similarity index 100% rename from icons/Symbolic/16/gimp-previous.png rename to icons/Symbolic/16/go-previous.png diff --git a/icons/Symbolic/16/gimp-cancel.png b/icons/Symbolic/16/gtk-cancel.png similarity index 100% rename from icons/Symbolic/16/gimp-cancel.png rename to icons/Symbolic/16/gtk-cancel.png diff --git a/icons/Symbolic/16/gimp-color-palette.png b/icons/Symbolic/16/gtk-select-color.png similarity index 100% rename from icons/Symbolic/16/gimp-color-palette.png rename to icons/Symbolic/16/gtk-select-color.png diff --git a/icons/Symbolic/16/gimp-font.png b/icons/Symbolic/16/gtk-select-font.png similarity index 100% rename from icons/Symbolic/16/gimp-font.png rename to icons/Symbolic/16/gtk-select-font.png diff --git a/icons/Symbolic/16/gimp-quit.png b/icons/Symbolic/16/window-close.png similarity index 100% rename from icons/Symbolic/16/gimp-quit.png rename to icons/Symbolic/16/window-close.png diff --git a/icons/Symbolic/22/gimp-indent.png b/icons/Symbolic/22/format-indent-more.png similarity index 100% rename from icons/Symbolic/22/gimp-indent.png rename to icons/Symbolic/22/format-indent-more.png diff --git a/icons/Symbolic/22/gimp-justify-center.png b/icons/Symbolic/22/gtk-justify-center.png similarity index 100% rename from icons/Symbolic/22/gimp-justify-center.png rename to icons/Symbolic/22/gtk-justify-center.png diff --git a/icons/Symbolic/22/gimp-justify-fill.png b/icons/Symbolic/22/gtk-justify-fill.png similarity index 100% rename from icons/Symbolic/22/gimp-justify-fill.png rename to icons/Symbolic/22/gtk-justify-fill.png diff --git a/icons/Symbolic/22/gimp-justify-left.png b/icons/Symbolic/22/gtk-justify-left.png similarity index 100% rename from icons/Symbolic/22/gimp-justify-left.png rename to icons/Symbolic/22/gtk-justify-left.png diff --git a/icons/Symbolic/22/gimp-justify-right.png b/icons/Symbolic/22/gtk-justify-right.png similarity index 100% rename from icons/Symbolic/22/gimp-justify-right.png rename to icons/Symbolic/22/gtk-justify-right.png diff --git a/icons/Symbolic/24/gimp-color-palette.png b/icons/Symbolic/24/gtk-select-color.png similarity index 100% rename from icons/Symbolic/24/gimp-color-palette.png rename to icons/Symbolic/24/gtk-select-color.png diff --git a/icons/Symbolic/24/gimp-color-palette.svg b/icons/Symbolic/24/gtk-select-color.svg similarity index 100% rename from icons/Symbolic/24/gimp-color-palette.svg rename to icons/Symbolic/24/gtk-select-color.svg diff --git a/icons/Symbolic/scalable/gimp-document-recent.svg b/icons/Symbolic/scalable/document-open-recent.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-document-recent.svg rename to icons/Symbolic/scalable/document-open-recent.svg diff --git a/icons/Symbolic/scalable/gimp-open.svg b/icons/Symbolic/scalable/document-open.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-open.svg rename to icons/Symbolic/scalable/document-open.svg diff --git a/icons/Symbolic/scalable/gimp-revert.svg b/icons/Symbolic/scalable/document-revert.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-revert.svg rename to icons/Symbolic/scalable/document-revert.svg diff --git a/icons/Symbolic/scalable/gimp-save-as.svg b/icons/Symbolic/scalable/document-save-as.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-save-as.svg rename to icons/Symbolic/scalable/document-save-as.svg diff --git a/icons/Symbolic/scalable/gimp-save.svg b/icons/Symbolic/scalable/document-save.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-save.svg rename to icons/Symbolic/scalable/document-save.svg diff --git a/icons/Symbolic/scalable/gimp-edit-clear.svg b/icons/Symbolic/scalable/edit-clear.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-edit-clear.svg rename to icons/Symbolic/scalable/edit-clear.svg diff --git a/icons/Symbolic/scalable/gimp-indent.svg b/icons/Symbolic/scalable/format-indent-more.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-indent.svg rename to icons/Symbolic/scalable/format-indent-more.svg diff --git a/icons/Symbolic/scalable/gimp-next.svg b/icons/Symbolic/scalable/go-next.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-next.svg rename to icons/Symbolic/scalable/go-next.svg diff --git a/icons/Symbolic/scalable/gimp-previous.svg b/icons/Symbolic/scalable/go-previous.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-previous.svg rename to icons/Symbolic/scalable/go-previous.svg diff --git a/icons/Symbolic/scalable/gimp-cancel.svg b/icons/Symbolic/scalable/gtk-cancel.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-cancel.svg rename to icons/Symbolic/scalable/gtk-cancel.svg diff --git a/icons/Symbolic/scalable/gimp-justify-center.svg b/icons/Symbolic/scalable/gtk-justify-center.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-justify-center.svg rename to icons/Symbolic/scalable/gtk-justify-center.svg diff --git a/icons/Symbolic/scalable/gimp-justify-fill.svg b/icons/Symbolic/scalable/gtk-justify-fill.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-justify-fill.svg rename to icons/Symbolic/scalable/gtk-justify-fill.svg diff --git a/icons/Symbolic/scalable/gimp-justify-left.svg b/icons/Symbolic/scalable/gtk-justify-left.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-justify-left.svg rename to icons/Symbolic/scalable/gtk-justify-left.svg diff --git a/icons/Symbolic/scalable/gimp-justify-right.svg b/icons/Symbolic/scalable/gtk-justify-right.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-justify-right.svg rename to icons/Symbolic/scalable/gtk-justify-right.svg diff --git a/icons/Symbolic/scalable/gimp-color-palette.svg b/icons/Symbolic/scalable/gtk-select-color.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-color-palette.svg rename to icons/Symbolic/scalable/gtk-select-color.svg diff --git a/icons/Symbolic/scalable/gimp-font.svg b/icons/Symbolic/scalable/gtk-select-font.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-font.svg rename to icons/Symbolic/scalable/gtk-select-font.svg diff --git a/icons/Symbolic/scalable/gimp-quit.svg b/icons/Symbolic/scalable/window-close.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-quit.svg rename to icons/Symbolic/scalable/window-close.svg diff --git a/icons/icon-list.mk b/icons/icon-list.mk index 57fe0af590..adc17aae73 100644 --- a/icons/icon-list.mk +++ b/icons/icon-list.mk @@ -1,7 +1,25 @@ scalable_images = \ + scalable/document-open.svg \ + scalable/document-open-recent.svg \ + scalable/document-revert.svg \ + scalable/document-save.svg \ + scalable/document-save-as.svg \ + scalable/edit-clear.svg \ + scalable/format-indent-more.svg \ + scalable/go-next.svg \ + scalable/go-previous.svg \ + scalable/window-close.svg \ + \ + scalable/gtk-cancel.svg \ + scalable/gtk-justify-fill.svg \ + scalable/gtk-justify-center.svg \ + scalable/gtk-justify-left.svg \ + scalable/gtk-justify-right.svg \ + scalable/gtk-select-color.svg \ + scalable/gtk-select-font.svg \ + \ scalable/gimp-anchor.svg \ scalable/gimp-buffer.svg \ - scalable/gimp-cancel.svg \ scalable/gimp-cap-butt.svg \ scalable/gimp-cap-round.svg \ scalable/gimp-cap-square.svg \ @@ -24,7 +42,6 @@ scalable_images = \ scalable/gimp-color-picker-white.svg \ scalable/gimp-color-pick-from-screen.svg \ scalable/gimp-color-cmyk.svg \ - scalable/gimp-color-palette.svg \ scalable/gimp-color-triangle.svg \ scalable/gimp-color-water.svg \ scalable/gimp-controller-keyboard.svg \ @@ -46,17 +63,14 @@ scalable_images = \ scalable/gimp-display-filter-lcms.svg \ scalable/gimp-display-filter-proof.svg \ scalable/gimp-display-filter.svg \ - scalable/gimp-document-recent.svg \ scalable/gimp-duplicate.svg \ scalable/gimp-dynamics.svg \ scalable/gimp-edit.svg \ - scalable/gimp-edit-clear.svg \ scalable/gimp-error.svg \ scalable/gimp-file-manager.svg \ scalable/gimp-flip-horizontal.svg \ scalable/gimp-flip-vertical.svg \ scalable/gimp-floating-selection.svg \ - scalable/gimp-font.svg \ scalable/gimp-gegl.svg \ scalable/gimp-gradient-bilinear.svg \ scalable/gimp-gradient-conical-asymmetric.svg \ @@ -90,17 +104,12 @@ scalable_images = \ scalable/gimp-image.svg \ scalable/gimp-image-open.svg \ scalable/gimp-image-reload.svg \ - scalable/gimp-indent.svg \ scalable/gimp-info.svg \ scalable/gimp-input-device.svg \ scalable/gimp-invert.svg \ scalable/gimp-join-bevel.svg \ scalable/gimp-join-miter.svg \ scalable/gimp-join-round.svg \ - scalable/gimp-justify-fill.svg \ - scalable/gimp-justify-center.svg \ - scalable/gimp-justify-left.svg \ - scalable/gimp-justify-right.svg \ scalable/gimp-landscape.svg \ scalable/gimp-layer-mask.svg \ scalable/gimp-layers.svg \ @@ -115,8 +124,6 @@ scalable_images = \ scalable/gimp-merge-down.svg \ scalable/gimp-move-to-screen.svg \ scalable/gimp-navigation.svg \ - scalable/gimp-next.svg \ - scalable/gimp-open.svg \ scalable/gimp-paste-as-new.svg \ scalable/gimp-paste-into.svg \ scalable/gimp-path.svg \ @@ -168,22 +175,17 @@ scalable_images = \ scalable/gimp-prefs-toolbox.svg \ scalable/gimp-prefs-tool-options.svg \ scalable/gimp-prefs-window-management.svg \ - scalable/gimp-previous.svg \ scalable/gimp-print-resolution.svg \ scalable/gimp-question.svg \ scalable/gimp-quick-mask-off.svg \ scalable/gimp-quick-mask-on.svg \ - scalable/gimp-quit.svg \ scalable/gimp-reset.svg \ scalable/gimp-reshow-filter.svg \ scalable/gimp-resize.svg \ - scalable/gimp-revert.svg \ scalable/gimp-rotate-180.svg \ scalable/gimp-rotate-270.svg \ scalable/gimp-rotate-90.svg \ scalable/gimp-sample-point.svg \ - scalable/gimp-save.svg \ - scalable/gimp-save-as.svg \ scalable/gimp-scale.svg \ scalable/gimp-selection.svg \ scalable/gimp-selection-add.svg \ @@ -278,6 +280,8 @@ scalable_images = \ scalable/gimp-zoom-follow-window.svg vector24_images = \ + 24/gtk-select-color.svg \ + \ 24/gimp-center.svg \ 24/gimp-channel.svg \ 24/gimp-channel-alpha.svg \ @@ -289,7 +293,6 @@ vector24_images = \ 24/gimp-channels.svg \ 24/gimp-char-picker.svg \ 24/gimp-colormap.svg \ - 24/gimp-color-palette.svg \ 24/gimp-controller.svg \ 24/gimp-controller-keyboard.svg \ 24/gimp-controller-linux-input.svg \ @@ -443,226 +446,228 @@ icons12_images = \ 12/gimp-zoom-follow-window.png icons16_images = \ - 16/gimp-anchor.png \ - 16/gimp-buffer.png \ - 16/gimp-cancel.png \ - 16/gimp-cap-butt.png \ - 16/gimp-cap-round.png \ - 16/gimp-cap-square.png \ - 16/gimp-center.png \ - 16/gimp-channel-alpha.png \ - 16/gimp-channel-blue.png \ - 16/gimp-channel-gray.png \ - 16/gimp-channel-green.png \ - 16/gimp-channel-indexed.png \ - 16/gimp-channel-red.png \ - 16/gimp-channel.png \ - 16/gimp-channels.png \ - 16/gimp-char-picker.png \ - 16/gimp-clipboard.png \ - 16/gimp-close-all.png \ - 16/gimp-color-pick-from-screen.png \ - 16/gimp-color-cmyk.png \ - 16/gimp-color-palette.png \ - 16/gimp-color-triangle.png \ - 16/gimp-color-water.png \ - 16/gimp-colormap.png \ - 16/gimp-controller-keyboard.png \ - 16/gimp-controller-linux-input.png \ - 16/gimp-controller-midi.png \ - 16/gimp-controller-wheel.png \ - 16/gimp-controller.png \ - 16/gimp-convert-grayscale.png \ - 16/gimp-convert-indexed.png \ - 16/gimp-convert-rgb.png \ - 16/gimp-cursor.png \ - 16/gimp-curve-free.png \ - 16/gimp-curve-smooth.png \ - 16/gimp-device-status.png \ + 16/document-open.png \ + 16/document-open-recent.png \ + 16/document-revert.png \ + 16/document-save.png \ + 16/document-save-as.png \ + 16/edit-clear.png \ + 16/go-next.png \ + 16/go-previous.png \ + 16/window-close.png \ + \ + 16/gtk-cancel.png \ + 16/gtk-select-color.png \ + 16/gtk-select-font.png \ + \ + 16/gimp-anchor.png \ + 16/gimp-buffer.png \ + 16/gimp-cap-butt.png \ + 16/gimp-cap-round.png \ + 16/gimp-cap-square.png \ + 16/gimp-center.png \ + 16/gimp-channel-alpha.png \ + 16/gimp-channel-blue.png \ + 16/gimp-channel-gray.png \ + 16/gimp-channel-green.png \ + 16/gimp-channel-indexed.png \ + 16/gimp-channel-red.png \ + 16/gimp-channel.png \ + 16/gimp-channels.png \ + 16/gimp-char-picker.png \ + 16/gimp-clipboard.png \ + 16/gimp-close-all.png \ + 16/gimp-color-pick-from-screen.png \ + 16/gimp-color-cmyk.png \ + 16/gimp-color-triangle.png \ + 16/gimp-color-water.png \ + 16/gimp-colormap.png \ + 16/gimp-controller-keyboard.png \ + 16/gimp-controller-linux-input.png \ + 16/gimp-controller-midi.png \ + 16/gimp-controller-wheel.png \ + 16/gimp-controller.png \ + 16/gimp-convert-grayscale.png \ + 16/gimp-convert-indexed.png \ + 16/gimp-convert-rgb.png \ + 16/gimp-cursor.png \ + 16/gimp-curve-free.png \ + 16/gimp-curve-smooth.png \ + 16/gimp-device-status.png \ 16/gimp-display-filter-colorblind.png \ - 16/gimp-display-filter-contrast.png \ - 16/gimp-display-filter-gamma.png \ - 16/gimp-display-filter-lcms.png \ - 16/gimp-display-filter-proof.png \ - 16/gimp-display-filter.png \ - 16/gimp-document-recent.png \ - 16/gimp-duplicate.png \ - 16/gimp-dynamics.png \ - 16/gimp-edit.png \ - 16/gimp-edit-clear.png \ - 16/gimp-error.png \ - 16/gimp-file-manager.png \ - 16/gimp-flip-horizontal.png \ - 16/gimp-flip-vertical.png \ - 16/gimp-floating-selection.png \ - 16/gimp-font.png \ - 16/gimp-gegl.png \ - 16/gimp-gradient-bilinear.png \ + 16/gimp-display-filter-contrast.png \ + 16/gimp-display-filter-gamma.png \ + 16/gimp-display-filter-lcms.png \ + 16/gimp-display-filter-proof.png \ + 16/gimp-display-filter.png \ + 16/gimp-duplicate.png \ + 16/gimp-dynamics.png \ + 16/gimp-edit.png \ + 16/gimp-error.png \ + 16/gimp-file-manager.png \ + 16/gimp-flip-horizontal.png \ + 16/gimp-flip-vertical.png \ + 16/gimp-floating-selection.png \ + 16/gimp-gegl.png \ + 16/gimp-gradient-bilinear.png \ 16/gimp-gradient-conical-asymmetric.png \ 16/gimp-gradient-conical-symmetric.png \ - 16/gimp-gradient-linear.png \ - 16/gimp-gradient-radial.png \ + 16/gimp-gradient-linear.png \ + 16/gimp-gradient-radial.png \ 16/gimp-gradient-shapeburst-angular.png \ 16/gimp-gradient-shapeburst-dimpled.png \ 16/gimp-gradient-shapeburst-spherical.png \ 16/gimp-gradient-spiral-anticlockwise.png \ 16/gimp-gradient-spiral-clockwise.png \ - 16/gimp-gradient-square.png \ - 16/gimp-grid.png \ - 16/gimp-group-layer.png \ - 16/gimp-histogram-linear.png \ - 16/gimp-histogram-logarithmic.png \ - 16/gimp-histogram.png \ - 16/gimp-image.png \ - 16/gimp-images.png \ - 16/gimp-image-open.png \ - 16/gimp-image-reload.png \ - 16/gimp-info.png \ - 16/gimp-input-device.png \ - 16/gimp-invert.png \ - 16/gimp-join-bevel.png \ - 16/gimp-join-miter.png \ - 16/gimp-join-round.png \ - 16/gimp-landscape.png \ - 16/gimp-layer-mask.png \ - 16/gimp-layer-to-imagesize.png \ - 16/gimp-layer.png \ - 16/gimp-layers.png \ - 16/gimp-list.png \ - 16/gimp-merge-down.png \ - 16/gimp-move-to-screen.png \ - 16/gimp-navigation.png \ - 16/gimp-next.png \ - 16/gimp-open.png \ - 16/gimp-paste-as-new.png \ - 16/gimp-paste-into.png \ - 16/gimp-path-delete.png \ - 16/gimp-path-down.png \ - 16/gimp-path-new.png \ - 16/gimp-path-stroke.png \ - 16/gimp-path-up.png \ - 16/gimp-path.png \ - 16/gimp-paths.png \ - 16/gimp-pattern.png \ - 16/gimp-plugin.png \ - 16/gimp-portrait.png \ - 16/gimp-prefs-folders-brushes.png \ - 16/gimp-prefs-folders-dynamics.png \ - 16/gimp-prefs-folders-environ.png \ - 16/gimp-prefs-folders-fonts.png \ - 16/gimp-prefs-folders-gradients.png \ + 16/gimp-gradient-square.png \ + 16/gimp-grid.png \ + 16/gimp-group-layer.png \ + 16/gimp-histogram-linear.png \ + 16/gimp-histogram-logarithmic.png \ + 16/gimp-histogram.png \ + 16/gimp-image.png \ + 16/gimp-images.png \ + 16/gimp-image-open.png \ + 16/gimp-image-reload.png \ + 16/gimp-info.png \ + 16/gimp-input-device.png \ + 16/gimp-invert.png \ + 16/gimp-join-bevel.png \ + 16/gimp-join-miter.png \ + 16/gimp-join-round.png \ + 16/gimp-landscape.png \ + 16/gimp-layer-mask.png \ + 16/gimp-layer-to-imagesize.png \ + 16/gimp-layer.png \ + 16/gimp-layers.png \ + 16/gimp-list.png \ + 16/gimp-merge-down.png \ + 16/gimp-move-to-screen.png \ + 16/gimp-navigation.png \ + 16/gimp-paste-as-new.png \ + 16/gimp-paste-into.png \ + 16/gimp-path-delete.png \ + 16/gimp-path-down.png \ + 16/gimp-path-new.png \ + 16/gimp-path-stroke.png \ + 16/gimp-path-up.png \ + 16/gimp-path.png \ + 16/gimp-paths.png \ + 16/gimp-pattern.png \ + 16/gimp-plugin.png \ + 16/gimp-portrait.png \ + 16/gimp-prefs-folders-brushes.png \ + 16/gimp-prefs-folders-dynamics.png \ + 16/gimp-prefs-folders-environ.png \ + 16/gimp-prefs-folders-fonts.png \ + 16/gimp-prefs-folders-gradients.png \ 16/gimp-prefs-folders-icon-themes.png \ - 16/gimp-prefs-folders-interp.png \ - 16/gimp-prefs-folders-modules.png \ + 16/gimp-prefs-folders-interp.png \ + 16/gimp-prefs-folders-modules.png \ 16/gimp-prefs-folders-mypaint-brushes.png \ - 16/gimp-prefs-folders-palettes.png \ - 16/gimp-prefs-folders-patterns.png \ - 16/gimp-prefs-folders-plug-ins.png \ - 16/gimp-prefs-folders-scripts.png \ - 16/gimp-prefs-folders-themes.png \ + 16/gimp-prefs-folders-palettes.png \ + 16/gimp-prefs-folders-patterns.png \ + 16/gimp-prefs-folders-plug-ins.png \ + 16/gimp-prefs-folders-scripts.png \ + 16/gimp-prefs-folders-themes.png \ 16/gimp-prefs-folders-tool-plug-ins.png \ 16/gimp-prefs-folders-tool-presets.png \ - 16/gimp-prefs-folders-tools.png \ - 16/gimp-prefs-icon-theme.png \ - 16/gimp-prefs-image-windows.png \ - 16/gimp-prefs-interface.png \ - 16/gimp-prefs-theme.png \ - 16/gimp-prefs-toolbox.png \ - 16/gimp-prefs-window-management.png \ - 16/gimp-previous.png \ - 16/gimp-print-resolution.png \ - 16/gimp-question.png \ - 16/gimp-quit.png \ - 16/gimp-reset.png \ - 16/gimp-reshow-filter.png \ - 16/gimp-resize.png \ - 16/gimp-revert.png \ - 16/gimp-rotate-180.png \ - 16/gimp-rotate-270.png \ - 16/gimp-rotate-90.png \ - 16/gimp-sample-point.png \ - 16/gimp-save.png \ - 16/gimp-save-as.png \ - 16/gimp-scale.png \ - 16/gimp-selection-add.png \ - 16/gimp-selection-all.png \ - 16/gimp-selection-border.png \ - 16/gimp-selection-grow.png \ - 16/gimp-selection-intersect.png \ - 16/gimp-selection-none.png \ - 16/gimp-selection-replace.png \ - 16/gimp-selection-shrink.png \ - 16/gimp-selection-stroke.png \ - 16/gimp-selection-subtract.png \ - 16/gimp-selection-to-channel.png \ - 16/gimp-selection-to-path.png \ - 16/gimp-selection.png \ - 16/gimp-shape-circle.png \ - 16/gimp-shape-diamond.png \ - 16/gimp-shape-square.png \ - 16/gimp-shred.png \ - 16/gimp-symmetry.png \ - 16/gimp-template.png \ - 16/gimp-text-layer.png \ - 16/gimp-toilet-paper.png \ - 16/gimp-tool-airbrush.png \ - 16/gimp-tool-align.png \ - 16/gimp-tool-blend.png \ - 16/gimp-tool-blur.png \ + 16/gimp-prefs-folders-tools.png \ + 16/gimp-prefs-icon-theme.png \ + 16/gimp-prefs-image-windows.png \ + 16/gimp-prefs-interface.png \ + 16/gimp-prefs-theme.png \ + 16/gimp-prefs-toolbox.png \ + 16/gimp-prefs-window-management.png \ + 16/gimp-print-resolution.png \ + 16/gimp-question.png \ + 16/gimp-reset.png \ + 16/gimp-reshow-filter.png \ + 16/gimp-resize.png \ + 16/gimp-rotate-180.png \ + 16/gimp-rotate-270.png \ + 16/gimp-rotate-90.png \ + 16/gimp-sample-point.png \ + 16/gimp-scale.png \ + 16/gimp-selection-add.png \ + 16/gimp-selection-all.png \ + 16/gimp-selection-border.png \ + 16/gimp-selection-grow.png \ + 16/gimp-selection-intersect.png \ + 16/gimp-selection-none.png \ + 16/gimp-selection-replace.png \ + 16/gimp-selection-shrink.png \ + 16/gimp-selection-stroke.png \ + 16/gimp-selection-subtract.png \ + 16/gimp-selection-to-channel.png \ + 16/gimp-selection-to-path.png \ + 16/gimp-selection.png \ + 16/gimp-shape-circle.png \ + 16/gimp-shape-diamond.png \ + 16/gimp-shape-square.png \ + 16/gimp-shred.png \ + 16/gimp-symmetry.png \ + 16/gimp-template.png \ + 16/gimp-text-layer.png \ + 16/gimp-toilet-paper.png \ + 16/gimp-tool-airbrush.png \ + 16/gimp-tool-align.png \ + 16/gimp-tool-blend.png \ + 16/gimp-tool-blur.png \ 16/gimp-tool-brightness-contrast.png \ - 16/gimp-tool-bucket-fill.png \ - 16/gimp-tool-by-color-select.png \ - 16/gimp-tool-cage.png \ - 16/gimp-tool-clone.png \ - 16/gimp-tool-color-balance.png \ - 16/gimp-tool-color-picker.png \ - 16/gimp-tool-colorize.png \ - 16/gimp-tool-crop.png \ - 16/gimp-tool-curves.png \ - 16/gimp-tool-desaturate.png \ - 16/gimp-tool-dodge.png \ - 16/gimp-tool-ellipse-select.png \ - 16/gimp-tool-eraser.png \ - 16/gimp-tool-flip.png \ - 16/gimp-tool-foreground-select.png \ - 16/gimp-tool-free-select.png \ - 16/gimp-tool-fuzzy-select.png \ - 16/gimp-tool-handle-transform.png \ - 16/gimp-tool-heal.png \ - 16/gimp-tool-hue-saturation.png \ - 16/gimp-tool-ink.png \ - 16/gimp-tool-iscissors.png \ - 16/gimp-tool-levels.png \ - 16/gimp-tool-measure.png \ - 16/gimp-tool-move.png \ - 16/gimp-tool-mypaint-brush.png \ + 16/gimp-tool-bucket-fill.png \ + 16/gimp-tool-by-color-select.png \ + 16/gimp-tool-cage.png \ + 16/gimp-tool-clone.png \ + 16/gimp-tool-color-balance.png \ + 16/gimp-tool-color-picker.png \ + 16/gimp-tool-colorize.png \ + 16/gimp-tool-crop.png \ + 16/gimp-tool-curves.png \ + 16/gimp-tool-desaturate.png \ + 16/gimp-tool-dodge.png \ + 16/gimp-tool-ellipse-select.png \ + 16/gimp-tool-eraser.png \ + 16/gimp-tool-flip.png \ + 16/gimp-tool-foreground-select.png \ + 16/gimp-tool-free-select.png \ + 16/gimp-tool-fuzzy-select.png \ + 16/gimp-tool-handle-transform.png \ + 16/gimp-tool-heal.png \ + 16/gimp-tool-hue-saturation.png \ + 16/gimp-tool-ink.png \ + 16/gimp-tool-iscissors.png \ + 16/gimp-tool-levels.png \ + 16/gimp-tool-measure.png \ + 16/gimp-tool-move.png \ + 16/gimp-tool-mypaint-brush.png \ 16/gimp-tool-n-point-deformation.png \ - 16/gimp-tool-options.png \ - 16/gimp-tool-paintbrush.png \ - 16/gimp-tool-path.png \ - 16/gimp-tool-pencil.png \ - 16/gimp-tool-perspective-clone.png \ - 16/gimp-tool-perspective.png \ - 16/gimp-tool-posterize.png \ - 16/gimp-tool-preset.png \ - 16/gimp-tool-rect-select.png \ - 16/gimp-tool-rotate.png \ - 16/gimp-tool-scale.png \ - 16/gimp-tool-seamless-clone.png \ - 16/gimp-tool-shear.png \ - 16/gimp-tool-smudge.png \ - 16/gimp-tool-text.png \ - 16/gimp-tool-threshold.png \ - 16/gimp-tool-unified-transform.png \ - 16/gimp-tool-warp.png \ - 16/gimp-tool-zoom.png \ - 16/gimp-tools.png \ - 16/gimp-transparency.png \ - 16/gimp-undo-history.png \ - 16/gimp-user-manual.png \ - 16/gimp-video.png \ - 16/gimp-warning.png \ - 16/gimp-web.png \ + 16/gimp-tool-options.png \ + 16/gimp-tool-paintbrush.png \ + 16/gimp-tool-path.png \ + 16/gimp-tool-pencil.png \ + 16/gimp-tool-perspective-clone.png \ + 16/gimp-tool-perspective.png \ + 16/gimp-tool-posterize.png \ + 16/gimp-tool-preset.png \ + 16/gimp-tool-rect-select.png \ + 16/gimp-tool-rotate.png \ + 16/gimp-tool-scale.png \ + 16/gimp-tool-seamless-clone.png \ + 16/gimp-tool-shear.png \ + 16/gimp-tool-smudge.png \ + 16/gimp-tool-text.png \ + 16/gimp-tool-threshold.png \ + 16/gimp-tool-unified-transform.png \ + 16/gimp-tool-warp.png \ + 16/gimp-tool-zoom.png \ + 16/gimp-tools.png \ + 16/gimp-transparency.png \ + 16/gimp-undo-history.png \ + 16/gimp-user-manual.png \ + 16/gimp-video.png \ + 16/gimp-warning.png \ + 16/gimp-web.png \ 16/gimp-wilber.png icons18_images = \ @@ -675,15 +680,17 @@ icons20_images = \ 20/gimp-visible.png icons22_images = \ + 22/format-indent-more.png \ + \ + 22/gtk-justify-center.png \ + 22/gtk-justify-fill.png \ + 22/gtk-justify-left.png \ + 22/gtk-justify-right.png \ + \ 22/gimp-char-picker.png \ 22/gimp-dynamics.png \ 22/gimp-histogram.png \ - 22/gimp-indent.png \ 22/gimp-input-device.png \ - 22/gimp-justify-center.png \ - 22/gimp-justify-fill.png \ - 22/gimp-justify-left.png \ - 22/gimp-justify-right.png \ 22/gimp-landscape.png \ 22/gimp-letter-spacing.png \ 22/gimp-line-spacing.png \ @@ -732,6 +739,8 @@ icons22_images = \ 22/gimp-wilber.png icons24_images = \ + 24/gtk-select-color.png \ + \ 24/gimp-center.png \ 24/gimp-channel-alpha.png \ 24/gimp-channel-blue.png \ @@ -742,7 +751,6 @@ icons24_images = \ 24/gimp-channel.png \ 24/gimp-channels.png \ 24/gimp-colormap.png \ - 24/gimp-color-palette.png \ 24/gimp-controller-keyboard.png \ 24/gimp-controller-linux-input.png \ 24/gimp-controller-midi.png \ diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index 2fc31e3bee..8634812b46 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -451,7 +451,7 @@ confirm_save_dialog (const gchar *message, gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); gtk_widget_show (hbox); - image = gtk_image_new_from_icon_name ("gimp-warning", + image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); @@ -1012,7 +1012,7 @@ gimp_export_dialog_new (const gchar *format_name, button = gimp_dialog_add_button (GIMP_DIALOG (dialog), _("_Export"), GTK_RESPONSE_OK); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name ("gimp-save", + gtk_image_new_from_icon_name ("document-save", GTK_ICON_SIZE_BUTTON)); gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), diff --git a/libgimp/gimpfontselectbutton.c b/libgimp/gimpfontselectbutton.c index e1fe8d7cd6..def55edf68 100644 --- a/libgimp/gimpfontselectbutton.c +++ b/libgimp/gimpfontselectbutton.c @@ -447,7 +447,7 @@ gimp_font_select_button_create_inside (GimpFontSelectButton *font_button) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_add (GTK_CONTAINER (button), hbox); - image = gtk_image_new_from_icon_name (GIMP_STOCK_FONT, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name ("gtk-select-font", GTK_ICON_SIZE_BUTTON); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); priv->label = gtk_label_new (priv->font_name); diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index e57915707e..efff5b8496 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -155,7 +155,7 @@ gimp_file_entry_init (GimpFileEntry *entry) gtk_box_pack_end (GTK_BOX (entry), entry->browse_button, FALSE, FALSE, 0); gtk_widget_show (entry->browse_button); - image = gtk_image_new_from_icon_name ("gimp-open", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (entry->browse_button), image); gtk_widget_show (image); diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c index 9f78f3ce38..f04b1245b2 100644 --- a/libgimpwidgets/gimpicons.c +++ b/libgimpwidgets/gimpicons.c @@ -67,25 +67,13 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_PASTE_INTO, N_("Paste Into"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_RESET, N_("_Reset"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_NEXT, N_("Ne_xt"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_PREVIOUS, N_("Pre_vious"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_OPEN, N_("_Open"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_SAVE, N_("_Save"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_SAVE_AS, N_("Save as"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_CANCEL, N_("_Cancel"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_QUIT, N_("_Quit"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_IMAGE_OPEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_IMAGE_RELOAD, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_REVERT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CLOSE_ALL, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CLIPBOARD, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_FILE_MANAGER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_EDIT_CLEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_SHRED, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_DOCUMENT_RECENT, NULL, 0, 0, LIBGIMP_DOMAIN }, - - { GIMP_STOCK_GRADIENT_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRADIENT_BILINEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -143,22 +131,15 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_CMYK, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_WATER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_COLOR_PALETTE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_PICK_FROM_SCREEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_LETTER_SPACING, N_("L_etter Spacing"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_LINE_SPACING, N_("L_ine Spacing"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_INDENT, N_("I_ndent"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_JUSTIFY_CENTER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_JUSTIFY_FILL, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_JUSTIFY_LEFT, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_JUSTIFY_RIGHT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TEXT_DIR_LTR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TEXT_DIR_RTL, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_PRINT_RESOLUTION, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_FONT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_PATTERN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_BUFFER, NULL, 0, 0, LIBGIMP_DOMAIN }, diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index d6ed650b30..468e4199cf 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -42,24 +42,13 @@ G_BEGIN_DECLS #define GIMP_STOCK_PASTE_INTO "gimp-paste-into" #define GIMP_STOCK_RESET "gimp-reset" #define GIMP_STOCK_VISIBLE "gimp-visible" -#define GIMP_STOCK_NEXT "gimp-next" -#define GIMP_STOCK_PREVIOUS "gimp-previous" -#define GIMP_STOCK_OPEN "gimp-open" -#define GIMP_STOCK_SAVE "gimp-save" -#define GIMP_STOCK_SAVE_AS "gimp-save-as" -#define GIMP_STOCK_CANCEL "gimp-cancel" -#define GIMP_STOCK_QUIT "gimp-quit" #define GIMP_STOCK_IMAGE_OPEN "gimp-image-open" #define GIMP_STOCK_IMAGE_RELOAD "gimp-image-reload" #define GIMP_STOCK_CLOSE_ALL "gimp-close-all" -#define GIMP_STOCK_REVERT "gimp-revert" #define GIMP_STOCK_CLIPBOARD "gimp-clipboard" #define GIMP_STOCK_FILE_MANAGER "gimp-file-manager" -#define GIMP_STOCK_EDIT_CLEAR "gimp-edit-clear" #define GIMP_STOCK_SHRED "gimp-shred" -#define GIMP_STOCK_DOCUMENT_RECENT "gimp-document-recent" - #define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear" #define GIMP_STOCK_GRADIENT_BILINEAR "gimp-gradient-bilinear" @@ -117,19 +106,12 @@ G_BEGIN_DECLS #define GIMP_STOCK_COLOR_TRIANGLE "gimp-color-triangle" #define GIMP_STOCK_COLOR_CMYK "gimp-color-cmyk" #define GIMP_STOCK_COLOR_WATER "gimp-color-water" -#define GIMP_STOCK_COLOR_PALETTE "gimp-color-palette" #define GIMP_STOCK_COLOR_PICK_FROM_SCREEN "gimp-color-pick-from-screen" #define GIMP_STOCK_CHAR_PICKER "gimp-char-picker" #define GIMP_STOCK_LETTER_SPACING "gimp-letter-spacing" #define GIMP_STOCK_LINE_SPACING "gimp-line-spacing" -#define GIMP_STOCK_INDENT "gimp-indent" -#define GIMP_STOCK_JUSTIFY_CENTER "gimp-justify-center" -#define GIMP_STOCK_JUSTIFY_FILL "gimp-justify-fill" -#define GIMP_STOCK_JUSTIFY_LEFT "gimp-justify-left" -#define GIMP_STOCK_JUSTIFY_RIGHT "gimp-justify-right" #define GIMP_STOCK_PRINT_RESOLUTION "gimp-print-resolution" -#define GIMP_STOCK_FONT "gimp-font" #define GIMP_STOCK_PATTERN "gimp-pattern" #define GIMP_STOCK_BUFFER "gimp-buffer" @@ -323,7 +305,7 @@ G_BEGIN_DECLS #define GIMP_STOCK_DETACH GTK_STOCK_CONVERT #define GIMP_STOCK_GRADIENT GIMP_STOCK_TOOL_BLEND #define GIMP_STOCK_MYPAINT_BRUSH GIMP_STOCK_TOOL_MYPAINT_BRUSH -#define GIMP_STOCK_PALETTE GIMP_STOCK_COLOR_PALETTE +#define GIMP_STOCK_PALETTE GTK_STOCK_SELECT_COLOR #define GIMP_STOCK_CONTROLLER_MOUSE GIMP_STOCK_CURSOR #define GIMP_STOCK_CONVERT_PRECISION GIMP_STOCK_CONVERT_RGB diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index 052a8c2e61..0d4685bda1 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -1029,7 +1029,7 @@ create_presetpage (GtkNotebook *notebook) presetsavebutton = tmpw = gtk_button_new_with_label ( _("Save Current...")); gtk_button_set_image (GTK_BUTTON (presetsavebutton), - gtk_image_new_from_icon_name ("gimp-save", + gtk_image_new_from_icon_name ("document-save", GTK_ICON_SIZE_BUTTON)); gtk_box_pack_start (GTK_BOX (box1), tmpw, FALSE, FALSE, 0); gtk_widget_show (tmpw); diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c index 6c85067934..60b9edd7e4 100644 --- a/plug-ins/help-browser/dialog.c +++ b/plug-ins/help-browser/dialog.c @@ -1165,7 +1165,7 @@ build_searchbar (void) button = gtk_button_new_with_mnemonic (C_("search", "_Previous")); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name ("gimp-previous", + gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON)); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); @@ -1177,7 +1177,7 @@ build_searchbar (void) button = gtk_button_new_with_mnemonic (C_("search", "_Next")); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name ("gimp-next", + gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON)); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c index af569f87ad..e947bf0e37 100644 --- a/plug-ins/imagemap/imap_browse.c +++ b/plug-ins/imagemap/imap_browse.c @@ -140,7 +140,7 @@ browse_widget_new (const gchar *name) gtk_widget_show (browse->file); browse->button = button = gtk_button_new (); - icon = gtk_image_new_from_icon_name ("gimp-open", GTK_ICON_SIZE_BUTTON); + icon = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (button), icon); gtk_widget_show (icon);