Commit 6c674e97 authored by Jehan's avatar Jehan

app, libgimp*, plug-ins, icons: revert icon names into freedesktop...

... standard icon names and GTK+ icon names as second choice.
We should only use GIMP specific icon names as last resort, when there
is no standard or GTK+ names dedicated to the function.
This is made possible thanks to commit 3cc77b03.

s/gimp-document-recent/document-open-recent/
s/gimp-indent/format-indent-more/
s/gimp-next/go-next/
s/gimp-previous/go-previous/
s/gimp-save/document-save/
s/gimp-save-as/document-save-as/
s/gimp-revert/document-revert/
s/gimp-open/document-open/
s/gimp-document-recent/document-open-recent/
s/gimp-quit/window-close/ ou s/gimp-quit/application-exit/
s/gimp-warning/dialog-warning/
s/gimp-edit-clear/edit-clear/

s/gimp-justify-.*/gtk-justify-.*/
s/gimp-font/gtk-select-font/
s/gimp-color-palette/gtk-select-color/
s/gimp-cancel/gtk-cancel/
parent f40e36ff
......@@ -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,
......
......@@ -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),
......
......@@ -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 }
......
......@@ -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",
......
......@@ -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 },
......
......@@ -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 },
......
......@@ -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),
......
......@@ -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),
......
......@@ -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"), "<primary>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),
......
......@@ -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,
......
......@@ -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"), "<primary>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"), "<primary>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..."), "<primary><shift>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;
......
......@@ -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 },
......
......@@ -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" },
......
......@@ -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),
......
......@@ -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),
......
......@@ -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),
......
......@@ -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),
......
......@@ -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),
......
......@@ -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, "<primary>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),
......
......@@ -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 },
......
......@@ -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),
......
......@@ -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 }
......
......@@ -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"), "<primary>W",
NC_("view-action", "Close the active image view"),
G_CALLBACK (view_close_cmd_callback),
......
......@@ -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;
......
......@@ -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,
......
......@@ -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",
......
......@@ -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),
......
......@@ -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);
......
......@@ -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",
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
......@@ -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));
......
......@@ -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),
......
......@@ -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);
......
......@@ -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),
......
......@@ -527,7 +527,7 @@ font_box_new (GimpContainer *container,