[gimp] app, libgimp: replace GTK_STOCK_FOO by icon names
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app, libgimp: replace GTK_STOCK_FOO by icon names
- Date: Sun, 11 May 2014 20:51:56 +0000 (UTC)
commit 65a65947d947f76f64d2a4f0a28263c86ad38ceb
Author: Michael Natterer <mitch gimp org>
Date: Sun May 11 22:49:22 2014 +0200
app, libgimp: replace GTK_STOCK_FOO by icon names
unless it's a stock ID used for an action button, will address that
later.
app/actions/actions.c | 10 +++---
app/actions/brushes-actions.c | 22 ++++++++--------
app/actions/buffers-actions.c | 8 +++---
app/actions/channels-actions.c | 30 ++++++++++----------
app/actions/channels-commands.c | 2 +-
app/actions/colormap-actions.c | 6 ++--
app/actions/dialogs-actions.c | 8 +++---
app/actions/dock-actions.c | 2 +-
app/actions/dockable-actions.c | 4 +-
app/actions/documents-actions.c | 28 ++++++++++----------
app/actions/documents-commands.c | 2 +-
app/actions/dynamics-actions.c | 18 ++++++------
app/actions/edit-actions.c | 38 +++++++++++++-------------
app/actions/error-console-actions.c | 12 ++++----
app/actions/file-actions.c | 25 +++++++++--------
app/actions/file-commands.c | 2 +-
app/actions/fonts-actions.c | 4 +-
app/actions/gradient-editor-actions.c | 16 +++++-----
app/actions/gradients-actions.c | 22 ++++++++--------
app/actions/help-actions.c | 4 +-
app/actions/image-actions.c | 4 +-
app/actions/images-actions.c | 12 ++++----
app/actions/layers-actions.c | 38 +++++++++++++-------------
app/actions/layers-commands.c | 2 +-
app/actions/palette-editor-actions.c | 28 ++++++++++----------
app/actions/palettes-actions.c | 22 ++++++++--------
app/actions/patterns-actions.c | 22 ++++++++--------
app/actions/plug-in-actions.c | 2 +-
app/actions/templates-actions.c | 12 ++++----
app/actions/templates-commands.c | 4 +-
app/actions/text-editor-actions.c | 14 +++++-----
app/actions/text-tool-actions.c | 20 +++++++-------
app/actions/tool-options-actions.c | 14 +++++-----
app/actions/tool-presets-actions.c | 18 ++++++------
app/actions/vectors-actions.c | 38 +++++++++++++-------------
app/actions/vectors-commands.c | 2 +-
app/actions/view-actions.c | 32 +++++++++++-----------
app/actions/view-commands.c | 2 +-
app/actions/windows-actions.c | 8 +++---
app/dialogs/action-search-dialog.c | 6 ++--
app/dialogs/data-delete-dialog.c | 2 +-
app/dialogs/fade-dialog.c | 2 +-
app/dialogs/image-properties-dialog.c | 2 +-
app/dialogs/palette-import-dialog.c | 2 +-
app/dialogs/preferences-dialog.c | 18 ++++++------
app/dialogs/quit-dialog.c | 2 +-
app/dialogs/tips-dialog.c | 4 +-
app/display/gimpdisplayshell-close.c | 2 +-
app/display/gimpdisplayshell-handlers.c | 4 +-
app/display/gimpdisplayshell-scale-dialog.c | 2 +-
app/display/gimpstatusbar.c | 2 +-
app/tools/gimpcolorpickertool.c | 3 +-
app/tools/gimptextoptions.c | 2 +-
app/widgets/gimpactioneditor.c | 2 +-
app/widgets/gimpcolordisplayeditor.c | 8 +++---
app/widgets/gimpcombotagentry.c | 2 +-
app/widgets/gimpcontainerpopup.c | 4 +-
app/widgets/gimpcontrollereditor.c | 2 +-
app/widgets/gimpcontrollerlist.c | 10 +++---
app/widgets/gimpdataeditor.c | 4 +-
app/widgets/gimpdeviceeditor.c | 2 +-
app/widgets/gimpdevicestatus.c | 2 +-
app/widgets/gimpsettingsbox.c | 13 +++++----
app/widgets/gimpsettingseditor.c | 6 ++--
app/widgets/gimptextstyleeditor.c | 10 +++---
app/widgets/gimptooleditor.c | 4 +-
app/widgets/gimptooloptionseditor.c | 6 ++--
app/widgets/gimpviewrendererimagefile.c | 4 +-
app/widgets/gimpviewrendererlayer.c | 2 +-
libgimp/gimpexport.c | 6 ++--
libgimpwidgets/gimpbrowser.c | 2 +-
libgimpwidgets/gimpcolorselector.c | 2 +-
libgimpwidgets/gimpfileentry.c | 6 ++--
libgimpwidgets/gimppageselector.c | 2 +-
libgimpwidgets/gimppatheditor.c | 8 +++---
libgimpwidgets/gimpquerybox.c | 8 +++---
libgimpwidgets/gimpzoommodel.c | 4 +-
modules/color-selector-cmyk.c | 2 +-
78 files changed, 366 insertions(+), 365 deletions(-)
---
diff --git a/app/actions/actions.c b/app/actions/actions.c
index 72bf974..f931113 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -151,13 +151,13 @@ static const GimpActionFactoryEntry action_groups[] =
{ "dynamics-editor", N_("Paint Dynamics Editor"), GIMP_STOCK_DYNAMICS,
dynamics_editor_actions_setup,
dynamics_editor_actions_update },
- { "edit", N_("Edit"), GTK_STOCK_EDIT,
+ { "edit", N_("Edit"), "gtk-edit",
edit_actions_setup,
edit_actions_update },
{ "error-console", N_("Error Console"), GIMP_STOCK_WARNING,
error_console_actions_setup,
error_console_actions_update },
- { "file", N_("File"), GTK_STOCK_FILE,
+ { "file", N_("File"), "text-x-generic",
file_actions_setup,
file_actions_update },
{ "filters", N_("Filters"), GIMP_STOCK_GEGL,
@@ -178,7 +178,7 @@ static const GimpActionFactoryEntry action_groups[] =
{ "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET,
tool_preset_editor_actions_setup,
tool_preset_editor_actions_update },
- { "help", N_("Help"), GTK_STOCK_HELP,
+ { "help", N_("Help"), "help-browser",
help_actions_setup,
help_actions_update },
{ "image", N_("Image"), GIMP_STOCK_IMAGE,
@@ -214,10 +214,10 @@ static const GimpActionFactoryEntry action_groups[] =
{ "templates", N_("Templates"), GIMP_STOCK_TEMPLATE,
templates_actions_setup,
templates_actions_update },
- { "text-tool", N_("Text Tool"), GTK_STOCK_EDIT,
+ { "text-tool", N_("Text Tool"), "gtk-edit",
text_tool_actions_setup,
text_tool_actions_update },
- { "text-editor", N_("Text Editor"), GTK_STOCK_EDIT,
+ { "text-editor", N_("Text Editor"), "gtk-edit",
text_editor_actions_setup,
text_editor_actions_update },
{ "tool-options", N_("Tool Options"), GIMP_STOCK_TOOL_OPTIONS,
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index 964e1a1..e71d1ee 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -43,14 +43,14 @@ static const GimpActionEntry brushes_actions[] =
NC_("brushes-action", "Brushes Menu"), NULL, NULL, NULL,
GIMP_HELP_BRUSH_DIALOG },
- { "brushes-open-as-image", GTK_STOCK_OPEN,
- NC_("brushes-action", "_Open Brush as Image"), "",
+ { "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),
GIMP_HELP_BRUSH_OPEN_AS_IMAGE },
- { "brushes-new", GTK_STOCK_NEW,
- NC_("brushes-action", "_New Brush"), "",
+ { "brushes-new", "document-new",
+ NC_("brushes-action", "_New Brush"), NULL,
NC_("brushes-action", "Create a new brush"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_BRUSH_NEW },
@@ -61,20 +61,20 @@ static const GimpActionEntry brushes_actions[] =
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_BRUSH_DUPLICATE },
- { "brushes-copy-location", GTK_STOCK_COPY,
- NC_("brushes-action", "Copy Brush _Location"), "",
+ { "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),
GIMP_HELP_BRUSH_COPY_LOCATION },
- { "brushes-delete", GTK_STOCK_DELETE,
- NC_("brushes-action", "_Delete Brush"), "",
+ { "brushes-delete", "edit-delete",
+ NC_("brushes-action", "_Delete Brush"), NULL,
NC_("brushes-action", "Delete this brush"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_BRUSH_DELETE },
- { "brushes-refresh", GTK_STOCK_REFRESH,
- NC_("brushes-action", "_Refresh Brushes"), "",
+ { "brushes-refresh", "view-refresh",
+ NC_("brushes-action", "_Refresh Brushes"), NULL,
NC_("brushes-action", "Refresh brushes"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_BRUSH_REFRESH }
@@ -82,7 +82,7 @@ static const GimpActionEntry brushes_actions[] =
static const GimpStringActionEntry brushes_edit_actions[] =
{
- { "brushes-edit", GTK_STOCK_EDIT,
+ { "brushes-edit", "gtk-edit",
NC_("brushes-action", "_Edit Brush..."), NULL,
NC_("brushes-action", "Edit this brush"),
"gimp-brush-editor",
diff --git a/app/actions/buffers-actions.c b/app/actions/buffers-actions.c
index d45c509..0b39ffd 100644
--- a/app/actions/buffers-actions.c
+++ b/app/actions/buffers-actions.c
@@ -42,8 +42,8 @@ static const GimpActionEntry buffers_actions[] =
NC_("buffers-action", "Buffers Menu"), NULL, NULL, NULL,
GIMP_HELP_BUFFER_DIALOG },
- { "buffers-paste", GTK_STOCK_PASTE,
- NC_("buffers-action", "_Paste Buffer"), "",
+ { "buffers-paste", "edit-paste",
+ NC_("buffers-action", "_Paste Buffer"), NULL,
NC_("buffers-action", "Paste the selected buffer"),
G_CALLBACK (buffers_paste_cmd_callback),
GIMP_HELP_BUFFER_PASTE },
@@ -60,8 +60,8 @@ static const GimpActionEntry buffers_actions[] =
G_CALLBACK (buffers_paste_as_new_cmd_callback),
GIMP_HELP_BUFFER_PASTE_AS_NEW },
- { "buffers-delete", GTK_STOCK_DELETE,
- NC_("buffers-action", "_Delete Buffer"), "",
+ { "buffers-delete", "edit-delete",
+ NC_("buffers-action", "_Delete Buffer"), NULL,
NC_("buffers-action", "Delete the selected buffer"),
G_CALLBACK (buffers_delete_cmd_callback),
GIMP_HELP_BUFFER_DELETE }
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index e9a244c..573f8b5 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -44,20 +44,20 @@ static const GimpActionEntry channels_actions[] =
NC_("channels-action", "Channels Menu"), NULL, NULL, NULL,
GIMP_HELP_CHANNEL_DIALOG },
- { "channels-edit-attributes", GTK_STOCK_EDIT,
+ { "channels-edit-attributes", "gtk-edit",
NC_("channels-action", "_Edit Channel Attributes..."), NULL,
NC_("channels-action", "Edit the channel's name, color and opacity"),
G_CALLBACK (channels_edit_attributes_cmd_callback),
GIMP_HELP_CHANNEL_EDIT },
- { "channels-new", GTK_STOCK_NEW,
- NC_("channels-action", "_New Channel..."), "",
+ { "channels-new", "document-new",
+ NC_("channels-action", "_New Channel..."), NULL,
NC_("channels-action", "Create a new channel"),
G_CALLBACK (channels_new_cmd_callback),
GIMP_HELP_CHANNEL_NEW },
- { "channels-new-last-values", GTK_STOCK_NEW,
- NC_("channels-action", "_New Channel"), "",
+ { "channels-new-last-values", "document-new",
+ NC_("channels-action", "_New Channel"), NULL,
NC_("channels-action", "Create a new channel with last used values"),
G_CALLBACK (channels_new_last_vals_cmd_callback),
GIMP_HELP_CHANNEL_NEW },
@@ -69,33 +69,33 @@ static const GimpActionEntry channels_actions[] =
G_CALLBACK (channels_duplicate_cmd_callback),
GIMP_HELP_CHANNEL_DUPLICATE },
- { "channels-delete", GTK_STOCK_DELETE,
- NC_("channels-action", "_Delete Channel"), "",
+ { "channels-delete", "edit-delete",
+ NC_("channels-action", "_Delete Channel"), NULL,
NC_("channels-action", "Delete this channel"),
G_CALLBACK (channels_delete_cmd_callback),
GIMP_HELP_CHANNEL_DELETE },
- { "channels-raise", GTK_STOCK_GO_UP,
- NC_("channels-action", "_Raise Channel"), "",
+ { "channels-raise", "go-up",
+ NC_("channels-action", "_Raise Channel"), NULL,
NC_("channels-action", "Raise this channel one step in the channel stack"),
G_CALLBACK (channels_raise_cmd_callback),
GIMP_HELP_CHANNEL_RAISE },
- { "channels-raise-to-top", GTK_STOCK_GOTO_TOP,
- NC_("channels-action", "Raise Channel to _Top"), "",
+ { "channels-raise-to-top", "go-top",
+ NC_("channels-action", "Raise Channel to _Top"), NULL,
NC_("channels-action",
"Raise this channel to the top of the channel stack"),
G_CALLBACK (channels_raise_to_top_cmd_callback),
GIMP_HELP_CHANNEL_RAISE_TO_TOP },
- { "channels-lower", GTK_STOCK_GO_DOWN,
- NC_("channels-action", "_Lower Channel"), "",
+ { "channels-lower", "go-down",
+ NC_("channels-action", "_Lower Channel"), NULL,
NC_("channels-action", "Lower this channel one step in the channel stack"),
G_CALLBACK (channels_lower_cmd_callback),
GIMP_HELP_CHANNEL_LOWER },
- { "channels-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- NC_("channels-action", "Lower Channel to _Bottom"), "",
+ { "channels-lower-to-bottom", "go-bottom",
+ NC_("channels-action", "Lower Channel to _Bottom"), NULL,
NC_("channels-action",
"Lower this channel to the bottom of the channel stack"),
G_CALLBACK (channels_lower_to_bottom_cmd_callback),
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index 6a6acb1..d636b1f 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -84,7 +84,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
gimp_object_get_name (channel),
_("Channel Attributes"),
"gimp-channel-edit",
- GTK_STOCK_EDIT,
+ "gtk-edit",
_("Edit Channel Attributes"),
GIMP_HELP_CHANNEL_EDIT,
_("Edit Channel Color"),
diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c
index cec7881..b814548 100644
--- a/app/actions/colormap-actions.c
+++ b/app/actions/colormap-actions.c
@@ -44,7 +44,7 @@ static const GimpActionEntry colormap_actions[] =
NC_("colormap-action", "Colormap Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
- { "colormap-edit-color", GTK_STOCK_EDIT,
+ { "colormap-edit-color", "gtk-edit",
NC_("colormap-action", "_Edit Color..."), NULL,
NC_("colormap-action", "Edit this color"),
G_CALLBACK (colormap_edit_color_cmd_callback),
@@ -53,13 +53,13 @@ static const GimpActionEntry colormap_actions[] =
static const GimpEnumActionEntry colormap_add_color_actions[] =
{
- { "colormap-add-color-from-fg", GTK_STOCK_ADD,
+ { "colormap-add-color-from-fg", "list-add",
NC_("colormap-action", "_Add Color from FG"), "",
NC_("colormap-action", "Add current foreground color"),
FALSE, FALSE,
GIMP_HELP_INDEXED_PALETTE_ADD },
- { "colormap-add-color-from-bg", GTK_STOCK_ADD,
+ { "colormap-add-color-from-bg", "list-add",
NC_("colormap-action", "_Add Color from BG"), "",
NC_("colormap-action", "Add current background color"),
TRUE, FALSE,
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index 4064600..88a4555 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -228,7 +228,7 @@ gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
static const GimpStringActionEntry dialogs_toplevel_actions[] =
{
- { "dialogs-preferences", GTK_STOCK_PREFERENCES,
+ { "dialogs-preferences", "preferences-system",
NC_("dialogs-action", "_Preferences"), NULL,
NC_("dialogs-action", "Open the preferences dialog"),
"gimp-preferences-dialog",
@@ -246,7 +246,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
"gimp-keyboard-shortcuts-dialog",
GIMP_HELP_KEYBOARD_SHORTCUTS },
- { "dialogs-module-dialog", GTK_STOCK_EXECUTE,
+ { "dialogs-module-dialog", "system-run",
NC_("dialogs-action", "_Modules"), NULL,
NC_("dialogs-action", "Open the module manager dialog"),
"gimp-module-dialog",
@@ -258,7 +258,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
"gimp-tips-dialog",
GIMP_HELP_TIPS_DIALOG },
- { "dialogs-about", GTK_STOCK_ABOUT,
+ { "dialogs-about", "help-about",
#if defined(G_OS_WIN32) || defined(PLATFORM_OSX)
NC_("dialogs-action", "About GIMP"),
#else /* UNIX: use GNOME HIG */
@@ -269,7 +269,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
"gimp-about-dialog",
GIMP_HELP_ABOUT_DIALOG },
- { "help-action-search", GTK_STOCK_FIND,
+ { "help-action-search", "edit-find",
NC_("help-action", "_Search and Run a Command"), "slash",
NC_("help-action", "Search commands by keyword, and run them"),
"gimp-action-search-dialog",
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
index 51b4242..dfc41d6 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", GTK_STOCK_CLOSE,
+ { "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 6808e88..d6df3ac 100644
--- a/app/actions/dockable-actions.c
+++ b/app/actions/dockable-actions.c
@@ -49,7 +49,7 @@ static const GimpActionEntry dockable_actions[] =
NC_("dockable-action", "Dialogs Menu"), NULL, NULL, NULL,
GIMP_HELP_DOCK },
- { "dockable-menu", GTK_STOCK_MISSING_IMAGE, "" },
+ { "dockable-menu", "image-mising", "" },
{ "dockable-add-tab-menu", NULL, NC_("dockable-action",
"_Add Tab") },
{ "dockable-preview-size-menu", NULL, NC_("dockable-action",
@@ -57,7 +57,7 @@ static const GimpActionEntry dockable_actions[] =
{ "dockable-tab-style-menu", NULL, NC_("dockable-action",
"_Tab Style") },
- { "dockable-close-tab", GTK_STOCK_CLOSE,
+ { "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 79953a9..9aa21fe 100644
--- a/app/actions/documents-actions.c
+++ b/app/actions/documents-actions.c
@@ -42,56 +42,56 @@ static const GimpActionEntry documents_actions[] =
NC_("documents-action", "Documents Menu"), NULL, NULL, NULL,
GIMP_HELP_DOCUMENT_DIALOG },
- { "documents-open", GTK_STOCK_OPEN,
- NC_("documents-action", "_Open Image"), "",
+ { "documents-open", "document-open",
+ NC_("documents-action", "_Open Image"), NULL,
NC_("documents-action", "Open the selected entry"),
G_CALLBACK (documents_open_cmd_callback),
GIMP_HELP_DOCUMENT_OPEN },
{ "documents-raise-or-open", NULL,
- NC_("documents-action", "_Raise or Open Image"), "",
+ NC_("documents-action", "_Raise or Open Image"), NULL,
NC_("documents-action", "Raise window if already open"),
G_CALLBACK (documents_raise_or_open_cmd_callback),
GIMP_HELP_DOCUMENT_OPEN },
{ "documents-file-open-dialog", NULL,
- NC_("documents-action", "File Open _Dialog"), "",
+ NC_("documents-action", "File Open _Dialog"), NULL,
NC_("documents-action", "Open image dialog"),
G_CALLBACK (documents_file_open_dialog_cmd_callback),
GIMP_HELP_DOCUMENT_OPEN },
- { "documents-copy-location", GTK_STOCK_COPY,
- NC_("documents-action", "Copy Image _Location"), "",
+ { "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),
GIMP_HELP_DOCUMENT_COPY_LOCATION },
- { "documents-remove", GTK_STOCK_REMOVE,
- NC_("documents-action", "Remove _Entry"), "",
+ { "documents-remove", "list-remove",
+ NC_("documents-action", "Remove _Entry"), NULL,
NC_("documents-action", "Remove the selected entry"),
G_CALLBACK (documents_remove_cmd_callback),
GIMP_HELP_DOCUMENT_REMOVE },
- { "documents-clear", GTK_STOCK_CLEAR,
- NC_("documents-action", "_Clear History"), "",
+ { "documents-clear", "edit-clear",
+ NC_("documents-action", "_Clear History"), NULL,
NC_("documents-action", "Clear the entire document history"),
G_CALLBACK (documents_clear_cmd_callback),
GIMP_HELP_DOCUMENT_CLEAR },
- { "documents-recreate-preview", GTK_STOCK_REFRESH,
- NC_("documents-action", "Recreate _Preview"), "",
+ { "documents-recreate-preview", "view-refresh",
+ NC_("documents-action", "Recreate _Preview"), NULL,
NC_("documents-action", "Recreate preview"),
G_CALLBACK (documents_recreate_preview_cmd_callback),
GIMP_HELP_DOCUMENT_REFRESH },
{ "documents-reload-previews", NULL,
- NC_("documents-action", "Reload _all Previews"), "",
+ NC_("documents-action", "Reload _all Previews"), NULL,
NC_("documents-action", "Reload all previews"),
G_CALLBACK (documents_reload_previews_cmd_callback),
GIMP_HELP_DOCUMENT_REFRESH },
{ "documents-remove-dangling", NULL,
- NC_("documents-action", "Remove Dangling E_ntries"), "",
+ NC_("documents-action", "Remove Dangling E_ntries"), NULL,
NC_("documents-action",
"Remove entries for which the corresponding file is not available"),
G_CALLBACK (documents_remove_dangling_cmd_callback),
diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c
index 3b7a5f2..e4c4de2 100644
--- a/app/actions/documents-commands.c
+++ b/app/actions/documents-commands.c
@@ -192,7 +192,7 @@ documents_clear_cmd_callback (GtkAction *action,
GtkWidget *dialog;
dialog = gimp_message_dialog_new (_("Clear Document History"),
- GTK_STOCK_CLEAR,
+ "edit-clear",
GTK_WIDGET (editor),
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 4151ddc..72f61f1 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -43,8 +43,8 @@ static const GimpActionEntry dynamics_actions[] =
NC_("dynamics-action", "Paint Dynamics Menu"), NULL, NULL, NULL,
GIMP_HELP_DYNAMICS_DIALOG },
- { "dynamics-new", GTK_STOCK_NEW,
- NC_("dynamics-action", "_New Dynamics"), "",
+ { "dynamics-new", "document-new",
+ NC_("dynamics-action", "_New Dynamics"), NULL,
NC_("dynamics-action", "Create a new dynamics"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_DYNAMICS_NEW },
@@ -55,20 +55,20 @@ static const GimpActionEntry dynamics_actions[] =
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_DYNAMICS_DUPLICATE },
- { "dynamics-copy-location", GTK_STOCK_COPY,
- NC_("dynamics-action", "Copy Dynamics _Location"), "",
+ { "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),
GIMP_HELP_DYNAMICS_COPY_LOCATION },
- { "dynamics-delete", GTK_STOCK_DELETE,
- NC_("dynamics-action", "_Delete Dynamics"), "",
+ { "dynamics-delete", "edit-delete",
+ NC_("dynamics-action", "_Delete Dynamics"), NULL,
NC_("dynamics-action", "Delete this dynamics"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_DYNAMICS_DELETE },
- { "dynamics-refresh", GTK_STOCK_REFRESH,
- NC_("dynamics-action", "_Refresh Dynamics"), "",
+ { "dynamics-refresh", "view-refresh",
+ NC_("dynamics-action", "_Refresh Dynamics"), NULL,
NC_("dynamics-action", "Refresh dynamics"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_DYNAMICS_REFRESH }
@@ -76,7 +76,7 @@ static const GimpActionEntry dynamics_actions[] =
static const GimpStringActionEntry dynamics_edit_actions[] =
{
- { "dynamics-edit", GTK_STOCK_EDIT,
+ { "dynamics-edit", "gtk-edit",
NC_("dynamics-action", "_Edit Dynamics..."), NULL,
NC_("dynamics-action", "Edit dynamics"),
"gimp-dynamics-editor",
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index 77ce434..b90faca 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -67,54 +67,54 @@ static const GimpActionEntry edit_actions[] =
{ "edit-buffer-menu", NULL, NC_("edit-action", "_Buffer") },
{ "undo-popup",
- GTK_STOCK_UNDO, NC_("edit-action", "Undo History Menu"), NULL, NULL, NULL,
+ "edit-undo", NC_("edit-action", "Undo History Menu"), NULL, NULL, NULL,
GIMP_HELP_UNDO_DIALOG },
- { "edit-undo", GTK_STOCK_UNDO,
+ { "edit-undo", "edit-undo",
NC_("edit-action", "_Undo"), "<primary>Z",
NC_("edit-action", "Undo the last operation"),
G_CALLBACK (edit_undo_cmd_callback),
GIMP_HELP_EDIT_UNDO },
- { "edit-redo", GTK_STOCK_REDO,
+ { "edit-redo", "edit-redo",
NC_("edit-action", "_Redo"), "<primary>Y",
NC_("edit-action", "Redo the last operation that was undone"),
G_CALLBACK (edit_redo_cmd_callback),
GIMP_HELP_EDIT_REDO },
- { "edit-strong-undo", GTK_STOCK_UNDO,
+ { "edit-strong-undo", "edit-undo",
NC_("edit-action", "Strong Undo"), "<primary><shift>Z",
NC_("edit-action", "Undo the last operation, skipping visibility changes"),
G_CALLBACK (edit_strong_undo_cmd_callback),
GIMP_HELP_EDIT_STRONG_UNDO },
- { "edit-strong-redo", GTK_STOCK_REDO,
+ { "edit-strong-redo", "edit-redo",
NC_("edit-action", "Strong Redo"), "<primary><shift>Y",
NC_("edit-action",
"Redo the last operation that was undone, skipping visibility changes"),
G_CALLBACK (edit_strong_redo_cmd_callback),
GIMP_HELP_EDIT_STRONG_REDO },
- { "edit-undo-clear", GTK_STOCK_CLEAR,
- NC_("edit-action", "_Clear Undo History"), "",
+ { "edit-undo-clear", "edit-clear",
+ NC_("edit-action", "_Clear Undo History"), NULL,
NC_("edit-action", "Remove all operations from the undo history"),
G_CALLBACK (edit_undo_clear_cmd_callback),
GIMP_HELP_EDIT_UNDO_CLEAR },
- { "edit-fade", GTK_STOCK_UNDO,
- NC_("edit-action", "_Fade..."), "",
+ { "edit-fade", "edit-undo",
+ NC_("edit-action", "_Fade..."), NULL,
NC_("edit-action",
"Modify paint mode and opacity of the last pixel manipulation"),
G_CALLBACK (edit_fade_cmd_callback),
GIMP_HELP_EDIT_FADE },
- { "edit-cut", GTK_STOCK_CUT,
+ { "edit-cut", "edit-cut",
NC_("edit-action", "Cu_t"), "<primary>X",
NC_("edit-action", "Move the selected pixels to the clipboard"),
G_CALLBACK (edit_cut_cmd_callback),
GIMP_HELP_EDIT_CUT },
- { "edit-copy", GTK_STOCK_COPY,
+ { "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),
@@ -126,7 +126,7 @@ static const GimpActionEntry edit_actions[] =
G_CALLBACK (edit_copy_visible_cmd_callback),
GIMP_HELP_EDIT_COPY_VISIBLE },
- { "edit-paste", GTK_STOCK_PASTE,
+ { "edit-paste", "edit-paste",
NC_("edit-action", "_Paste"), "<primary>V",
NC_("edit-action", "Paste the content of the clipboard"),
G_CALLBACK (edit_paste_cmd_callback),
@@ -157,14 +157,14 @@ static const GimpActionEntry edit_actions[] =
G_CALLBACK (edit_paste_as_new_layer_cmd_callback),
GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER },
- { "edit-named-cut", GTK_STOCK_CUT,
- NC_("edit-action", "Cu_t Named..."), "",
+ { "edit-named-cut", "edit-cut",
+ NC_("edit-action", "Cu_t Named..."), NULL,
NC_("edit-action", "Move the selected pixels to a named buffer"),
G_CALLBACK (edit_named_cut_cmd_callback),
GIMP_HELP_BUFFER_CUT },
- { "edit-named-copy", GTK_STOCK_COPY,
- NC_("edit-action", "_Copy Named..."), "",
+ { "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),
GIMP_HELP_BUFFER_COPY },
@@ -176,13 +176,13 @@ static const GimpActionEntry edit_actions[] =
G_CALLBACK (edit_named_copy_visible_cmd_callback),
GIMP_HELP_BUFFER_COPY },
- { "edit-named-paste", GTK_STOCK_PASTE,
- NC_("edit-action", "_Paste Named..."), "",
+ { "edit-named-paste", "edit-paste",
+ NC_("edit-action", "_Paste Named..."), NULL,
NC_("edit-action", "Paste the content of a named buffer"),
G_CALLBACK (edit_named_paste_cmd_callback),
GIMP_HELP_BUFFER_PASTE },
- { "edit-clear", GTK_STOCK_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 d25fe13..a6bcb96 100644
--- a/app/actions/error-console-actions.c
+++ b/app/actions/error-console-actions.c
@@ -40,8 +40,8 @@ static const GimpActionEntry error_console_actions[] =
NC_("error-console-action", "Error Console Menu"), NULL, NULL, NULL,
GIMP_HELP_ERRORS_DIALOG },
- { "error-console-clear", GTK_STOCK_CLEAR,
- NC_("error-console-action", "_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),
GIMP_HELP_ERRORS_CLEAR },
@@ -55,14 +55,14 @@ static const GimpActionEntry error_console_actions[] =
static const GimpEnumActionEntry error_console_save_actions[] =
{
- { "error-console-save-all", GTK_STOCK_SAVE_AS,
- NC_("error-console-action", "_Save Error Log to File..."), "",
+ { "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", GTK_STOCK_SAVE_AS,
- NC_("error-console-action", "Save S_election to File..."), "",
+ { "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,
GIMP_HELP_ERRORS_SAVE }
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index e0df683..d02bfdf 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -72,8 +72,8 @@ static const GimpActionEntry file_actions[] =
{ "file-create-menu", NULL, NC_("file-action", "Crea_te") },
{ "file-open-recent-menu", NULL, NC_("file-action", "Open _Recent") },
- { "file-open", GTK_STOCK_OPEN,
- NC_("file-action", "_Open..."), NULL,
+ { "file-open", "document-open",
+ NC_("file-action", "_Open..."), "<primary>O",
NC_("file-action", "Open an image file"),
G_CALLBACK (file_open_cmd_callback),
GIMP_HELP_FILE_OPEN },
@@ -96,19 +96,19 @@ static const GimpActionEntry file_actions[] =
G_CALLBACK (file_create_template_cmd_callback),
GIMP_HELP_FILE_CREATE_TEMPLATE },
- { "file-revert", GTK_STOCK_REVERT_TO_SAVED,
+ { "file-revert", "document-revert",
NC_("file-action", "Re_vert"), NULL,
NC_("file-action", "Reload the image file from disk"),
G_CALLBACK (file_revert_cmd_callback),
GIMP_HELP_FILE_REVERT },
- { "file-close-all", GTK_STOCK_CLOSE,
+ { "file-close-all", "window-close",
NC_("file-action", "Close all"), "<primary><shift>W",
NC_("file-action", "Close all opened images"),
G_CALLBACK (file_close_all_cmd_callback),
GIMP_HELP_FILE_CLOSE_ALL },
- { "file-quit", GTK_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),
@@ -117,13 +117,13 @@ static const GimpActionEntry file_actions[] =
static const GimpEnumActionEntry file_save_actions[] =
{
- { "file-save", GTK_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", GTK_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,
@@ -132,7 +132,8 @@ static const GimpEnumActionEntry file_save_actions[] =
{ "file-save-a-copy", NULL,
NC_("file-action", "Save a Cop_y..."), NULL,
NC_("file-action",
- "Save a copy of this image, without affecting the source file (if any) or the current state of the
image"),
+ "Save a copy of this image, without affecting the source file "
+ "(if any) or the current state of the image"),
GIMP_SAVE_MODE_SAVE_A_COPY, FALSE,
GIMP_HELP_FILE_SAVE_A_COPY },
@@ -185,7 +186,7 @@ file_actions_setup (GimpActionGroup *group)
{
entries[i].name = g_strdup_printf ("file-open-recent-%02d",
i + 1);
- entries[i].icon_name = GTK_STOCK_OPEN;
+ entries[i].icon_name = "document-open";
entries[i].label = entries[i].name;
entries[i].tooltip = NULL;
entries[i].value = i;
@@ -194,9 +195,9 @@ file_actions_setup (GimpActionGroup *group)
if (i < 9)
entries[i].accelerator = g_strdup_printf ("<primary>%d", i + 1);
else if (i == 9)
- entries[i].accelerator = "<primary>0";
+ entries[i].accelerator = g_strdup ("<primary>0");
else
- entries[i].accelerator = "";
+ entries[i].accelerator = NULL;
}
gimp_action_group_add_enum_actions (group, NULL, entries, n_entries,
@@ -217,7 +218,7 @@ file_actions_setup (GimpActionGroup *group)
NULL);
g_free ((gchar *) entries[i].name);
- if (i < 9)
+ if (entries[i].accelerator)
g_free ((gchar *) entries[i].accelerator);
}
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index 738cb22..d7aa79a 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -419,7 +419,7 @@ file_revert_cmd_callback (GtkAction *action,
gchar *filename;
dialog =
- gimp_message_dialog_new (_("Revert Image"), GTK_STOCK_REVERT_TO_SAVED,
+ gimp_message_dialog_new (_("Revert Image"), "document-revert",
GTK_WIDGET (gimp_display_get_shell (display)),
0,
gimp_standard_help_func, GIMP_HELP_FILE_REVERT,
diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c
index 83a70a9..10b815b 100644
--- a/app/actions/fonts-actions.c
+++ b/app/actions/fonts-actions.c
@@ -44,8 +44,8 @@ static const GimpActionEntry fonts_actions[] =
NC_("fonts-action", "Fonts Menu"), NULL, NULL, NULL,
GIMP_HELP_FONT_DIALOG },
- { "fonts-refresh", GTK_STOCK_REFRESH,
- NC_("fonts-action", "_Rescan Font List"), "",
+ { "fonts-refresh", "view-refresh",
+ NC_("fonts-action", "_Rescan Font List"), NULL,
NC_("fonts-action", "Rescan the installed fonts"),
G_CALLBACK (fonts_refresh_cmd_callback),
GIMP_HELP_FONT_REFRESH }
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
index 268133a..ea8f97c 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", GTK_STOCK_REVERT_TO_SAVED,
+ { "gradient-editor-load-left-color", "document-revert",
NC_("gradient-editor-action", "_Load Left Color From") },
- { "gradient-editor-save-left-color", GTK_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", GTK_STOCK_REVERT_TO_SAVED,
+ { "gradient-editor-load-right-color", "document-revert",
NC_("gradient-editor-action", "Load Right Color Fr_om") },
- { "gradient-editor-save-right-color", GTK_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" },
@@ -93,7 +93,7 @@ static const GimpActionEntry gradient_editor_actions[] =
G_CALLBACK (gradient_editor_split_uniformly_cmd_callback),
GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM },
- { "gradient-editor-delete", GTK_STOCK_DELETE,
+ { "gradient-editor-delete", "edit-delete",
"delete", "", NULL,
G_CALLBACK (gradient_editor_delete_cmd_callback),
GIMP_HELP_GRADIENT_EDITOR_DELETE },
@@ -370,19 +370,19 @@ static const GimpRadioActionEntry gradient_editor_coloring_actions[] =
static const GimpEnumActionEntry gradient_editor_zoom_actions[] =
{
- { "gradient-editor-zoom-in", GTK_STOCK_ZOOM_IN,
+ { "gradient-editor-zoom-in", "zoom-in",
N_("Zoom In"), NULL,
N_("Zoom in"),
GIMP_ZOOM_IN, FALSE,
GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN },
- { "gradient-editor-zoom-out", GTK_STOCK_ZOOM_OUT,
+ { "gradient-editor-zoom-out", "zoom-out",
N_("Zoom Out"), NULL,
N_("Zoom out"),
GIMP_ZOOM_OUT, FALSE,
GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT },
- { "gradient-editor-zoom-all", GTK_STOCK_ZOOM_FIT,
+ { "gradient-editor-zoom-all", "zoom-fit-best",
N_("Zoom All"), NULL,
N_("Zoom all"),
GIMP_ZOOM_OUT_MAX, FALSE,
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index b9d4d89..5fa9e0e 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -44,8 +44,8 @@ static const GimpActionEntry gradients_actions[] =
NC_("gradients-action", "Gradients Menu"), NULL, NULL, NULL,
GIMP_HELP_GRADIENT_DIALOG },
- { "gradients-new", GTK_STOCK_NEW,
- NC_("gradients-action", "_New Gradient"), "",
+ { "gradients-new", "document-new",
+ NC_("gradients-action", "_New Gradient"), NULL,
NC_("gradients-action", "Create a new gradient"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_GRADIENT_NEW },
@@ -56,26 +56,26 @@ static const GimpActionEntry gradients_actions[] =
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_GRADIENT_DUPLICATE },
- { "gradients-copy-location", GTK_STOCK_COPY,
- NC_("gradients-action", "Copy Gradient _Location"), "",
+ { "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),
GIMP_HELP_GRADIENT_COPY_LOCATION },
- { "gradients-save-as-pov", GTK_STOCK_SAVE_AS,
- NC_("gradients-action", "Save as _POV-Ray..."), "",
+ { "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),
GIMP_HELP_GRADIENT_SAVE_AS_POV },
- { "gradients-delete", GTK_STOCK_DELETE,
- NC_("gradients-action", "_Delete Gradient"), "",
+ { "gradients-delete", "edit-delete",
+ NC_("gradients-action", "_Delete Gradient"), NULL,
NC_("gradients-action", "Delete this gradient"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_GRADIENT_DELETE },
- { "gradients-refresh", GTK_STOCK_REFRESH,
- NC_("gradients-action", "_Refresh Gradients"), "",
+ { "gradients-refresh", "view-refresh",
+ NC_("gradients-action", "_Refresh Gradients"), NULL,
NC_("gradients-action", "Refresh gradients"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_GRADIENT_REFRESH }
@@ -83,7 +83,7 @@ static const GimpActionEntry gradients_actions[] =
static const GimpStringActionEntry gradients_edit_actions[] =
{
- { "gradients-edit", GTK_STOCK_EDIT,
+ { "gradients-edit", "gtk-edit",
NC_("gradients-action", "_Edit Gradient..."), NULL,
NC_("gradients-action", "Edit gradient"),
"gimp-gradient-editor",
diff --git a/app/actions/help-actions.c b/app/actions/help-actions.c
index fecce13..2ddc74f 100644
--- a/app/actions/help-actions.c
+++ b/app/actions/help-actions.c
@@ -37,13 +37,13 @@ static const GimpActionEntry help_actions[] =
{
{ "help-menu", NULL, NC_("help-action", "_Help") },
- { "help-help", GTK_STOCK_HELP,
+ { "help-help", "help-browser",
NC_("help-action", "_Help"), "F1",
NC_("help-action", "Open the GIMP user manual"),
G_CALLBACK (help_help_cmd_callback),
GIMP_HELP_HELP },
- { "help-context-help", GTK_STOCK_HELP,
+ { "help-context-help", "help-browser",
NC_("help-action", "_Context Help"), "<shift>F1",
NC_("help-action", "Show the help for a specific user interface item"),
G_CALLBACK (help_context_help_cmd_callback),
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index 8918917..ca705ef 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -65,7 +65,7 @@ static const GimpActionEntry image_actions[] =
{ "colors-components-menu", NULL, NC_("image-action", "C_omponents") },
{ "colors-desaturate-menu", NULL, NC_("image-action", "D_esaturate") },
- { "image-new", GTK_STOCK_NEW,
+ { "image-new", "document-new",
NC_("image-action", "_New..."), "<primary>N",
NC_("image-action", "Create a new image"),
G_CALLBACK (image_new_cmd_callback),
@@ -137,7 +137,7 @@ static const GimpActionEntry image_actions[] =
G_CALLBACK (image_configure_grid_cmd_callback),
GIMP_HELP_IMAGE_GRID },
- { "image-properties", GTK_STOCK_INFO,
+ { "image-properties", "dialog-information",
NC_("image-action", "Image Pr_operties"), "<alt>Return",
NC_("image-action", "Display information about this image"),
G_CALLBACK (image_properties_cmd_callback),
diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c
index 87d939c..4e02a9b 100644
--- a/app/actions/images-actions.c
+++ b/app/actions/images-actions.c
@@ -43,20 +43,20 @@ static const GimpActionEntry images_actions[] =
NC_("images-action", "Images Menu"), NULL, NULL, NULL,
GIMP_HELP_IMAGE_DIALOG },
- { "images-raise-views", GTK_STOCK_GOTO_TOP,
- NC_("images-action", "_Raise Views"), "",
+ { "images-raise-views", "go-top",
+ NC_("images-action", "_Raise Views"), NULL,
NC_("images-action", "Raise this image's displays"),
G_CALLBACK (images_raise_views_cmd_callback),
NULL },
- { "images-new-view", GTK_STOCK_NEW,
- NC_("images-action", "_New View"), "",
+ { "images-new-view", "document-new",
+ NC_("images-action", "_New View"), NULL,
NC_("images-action", "Create a new display for this image"),
G_CALLBACK (images_new_view_cmd_callback),
NULL },
- { "images-delete", GTK_STOCK_DELETE,
- NC_("images-action", "_Delete Image"), "",
+ { "images-delete", "edit-delete",
+ NC_("images-action", "_Delete Image"), NULL,
NC_("images-action", "Delete this image"),
G_CALLBACK (images_delete_image_cmd_callback),
NULL }
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 4bf7080..4df1a47 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -59,7 +59,7 @@ static const GimpActionEntry layers_actions[] =
NC_("layers-action", "Tr_ansparency") },
{ "layers-transform-menu", NULL,
NC_("layers-action", "_Transform") },
- { "layers-properties-menu", GTK_STOCK_PROPERTIES,
+ { "layers-properties-menu", "document-properties",
NC_("layers-action", "_Properties") },
{ "layers-opacity-menu", GIMP_STOCK_TRANSPARENCY,
NC_("layers-action", "_Opacity") },
@@ -72,20 +72,20 @@ static const GimpActionEntry layers_actions[] =
G_CALLBACK (layers_text_tool_cmd_callback),
GIMP_HELP_TOOL_TEXT },
- { "layers-edit-attributes", GTK_STOCK_EDIT,
+ { "layers-edit-attributes", "gtk-edit",
NC_("layers-action", "_Edit Layer Attributes..."), NULL,
NC_("layers-action", "Edit the layer's name"),
G_CALLBACK (layers_edit_attributes_cmd_callback),
GIMP_HELP_LAYER_EDIT },
- { "layers-new", GTK_STOCK_NEW,
+ { "layers-new", "document-new",
NC_("layers-action", "_New Layer..."), "<primary><shift>N",
NC_("layers-action", "Create a new layer and add it to the image"),
G_CALLBACK (layers_new_cmd_callback),
GIMP_HELP_LAYER_NEW },
- { "layers-new-last-values", GTK_STOCK_NEW,
- NC_("layers-action", "_New Layer"), "",
+ { "layers-new-last-values", "document-new",
+ NC_("layers-action", "_New Layer"), NULL,
NC_("layers-action", "Create a new layer with last used values"),
G_CALLBACK (layers_new_last_vals_cmd_callback),
GIMP_HELP_LAYER_NEW },
@@ -97,7 +97,7 @@ static const GimpActionEntry layers_actions[] =
G_CALLBACK (layers_new_from_visible_cmd_callback),
GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
- { "layers-new-group", GTK_STOCK_DIRECTORY,
+ { "layers-new-group", "folder",
NC_("layers-action", "New Layer _Group"), NULL,
NC_("layers-action", "Create a new layer group and add it to the image"),
G_CALLBACK (layers_new_group_cmd_callback),
@@ -110,32 +110,32 @@ static const GimpActionEntry layers_actions[] =
G_CALLBACK (layers_duplicate_cmd_callback),
GIMP_HELP_LAYER_DUPLICATE },
- { "layers-delete", GTK_STOCK_DELETE,
- NC_("layers-action", "_Delete Layer"), "",
+ { "layers-delete", "edit-delete",
+ NC_("layers-action", "_Delete Layer"), NULL,
NC_("layers-action", "Delete this layer"),
G_CALLBACK (layers_delete_cmd_callback),
GIMP_HELP_LAYER_DELETE },
- { "layers-raise", GTK_STOCK_GO_UP,
- NC_("layers-action", "_Raise Layer"), "",
+ { "layers-raise", "go-up",
+ NC_("layers-action", "_Raise Layer"), NULL,
NC_("layers-action", "Raise this layer one step in the layer stack"),
G_CALLBACK (layers_raise_cmd_callback),
GIMP_HELP_LAYER_RAISE },
- { "layers-raise-to-top", GTK_STOCK_GOTO_TOP,
- NC_("layers-action", "Layer to _Top"), "",
+ { "layers-raise-to-top", "go-top",
+ NC_("layers-action", "Layer to _Top"), NULL,
NC_("layers-action", "Move this layer to the top of the layer stack"),
G_CALLBACK (layers_raise_to_top_cmd_callback),
GIMP_HELP_LAYER_RAISE_TO_TOP },
- { "layers-lower", GTK_STOCK_GO_DOWN,
- NC_("layers-action", "_Lower Layer"), "",
+ { "layers-lower", "go-down",
+ NC_("layers-action", "_Lower Layer"), NULL,
NC_("layers-action", "Lower this layer one step in the layer stack"),
G_CALLBACK (layers_lower_cmd_callback),
GIMP_HELP_LAYER_LOWER },
- { "layers-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- NC_("layers-action", "Layer to _Bottom"), "",
+ { "layers-lower-to-bottom", "go-bottom",
+ NC_("layers-action", "Layer to _Bottom"), NULL,
NC_("layers-action", "Move this layer to the bottom of the layer stack"),
G_CALLBACK (layers_lower_to_bottom_cmd_callback),
GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
@@ -248,7 +248,7 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
FALSE,
GIMP_HELP_LAYER_LOCK_ALPHA },
- { "layers-mask-edit", GTK_STOCK_EDIT,
+ { "layers-mask-edit", "gtk-edit",
NC_("layers-action", "_Edit Layer Mask"), NULL,
NC_("layers-action", "Work on the layer mask"),
G_CALLBACK (layers_mask_edit_cmd_callback),
@@ -277,8 +277,8 @@ static const GimpEnumActionEntry layers_mask_apply_actions[] =
GIMP_MASK_APPLY, FALSE,
GIMP_HELP_LAYER_MASK_APPLY },
- { "layers-mask-delete", GTK_STOCK_DELETE,
- NC_("layers-action", "Delete Layer Mas_k"), "",
+ { "layers-mask-delete", "edit-delete",
+ NC_("layers-action", "Delete Layer Mas_k"), NULL,
NC_("layers-action", "Remove the layer mask and its effect"),
GIMP_MASK_DISCARD, FALSE,
GIMP_HELP_LAYER_MASK_DELETE }
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index 90976ac..1ed7583 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -204,7 +204,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
layer_fill_type,
_("Layer Attributes"),
"gimp-layer-edit",
- GTK_STOCK_EDIT,
+ "gtk-edit",
_("Edit Layer Attributes"),
GIMP_HELP_LAYER_EDIT);
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
index 8f7d4c3..4ded581 100644
--- a/app/actions/palette-editor-actions.c
+++ b/app/actions/palette-editor-actions.c
@@ -44,14 +44,14 @@ static const GimpActionEntry palette_editor_actions[] =
NC_("palette-editor-action", "Palette Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_PALETTE_EDITOR_DIALOG },
- { "palette-editor-edit-color", GTK_STOCK_EDIT,
- NC_("palette-editor-action", "_Edit Color..."), "",
+ { "palette-editor-edit-color", "gtk-edit",
+ NC_("palette-editor-action", "_Edit Color..."), NULL,
NC_("palette-editor-action", "Edit this entry"),
G_CALLBACK (palette_editor_edit_color_cmd_callback),
GIMP_HELP_PALETTE_EDITOR_EDIT },
- { "palette-editor-delete-color", GTK_STOCK_DELETE,
- NC_("palette-editor-action", "_Delete Color"), "",
+ { "palette-editor-delete-color", "edit-delete",
+ NC_("palette-editor-action", "_Delete Color"), NULL,
NC_("palette-editor-action", "Delete this entry"),
G_CALLBACK (palette_editor_delete_color_cmd_callback),
GIMP_HELP_PALETTE_EDITOR_DELETE }
@@ -68,15 +68,15 @@ static const GimpToggleActionEntry palette_editor_toggle_actions[] =
static const GimpEnumActionEntry palette_editor_new_actions[] =
{
- { "palette-editor-new-color-fg", GTK_STOCK_NEW,
- NC_("palette-editor-action", "New Color from _FG"), "",
+ { "palette-editor-new-color-fg", "document-new",
+ NC_("palette-editor-action", "New Color from _FG"), NULL,
NC_("palette-editor-action",
"Create a new entry from the foreground color"),
FALSE, FALSE,
GIMP_HELP_PALETTE_EDITOR_NEW },
- { "palette-editor-new-color-bg", GTK_STOCK_NEW,
- NC_("palette-editor-action", "New Color from _BG"), "",
+ { "palette-editor-new-color-bg", "document-new",
+ NC_("palette-editor-action", "New Color from _BG"), NULL,
NC_("palette-editor-action",
"Create a new entry from the background color"),
TRUE, FALSE,
@@ -85,20 +85,20 @@ static const GimpEnumActionEntry palette_editor_new_actions[] =
static const GimpEnumActionEntry palette_editor_zoom_actions[] =
{
- { "palette-editor-zoom-in", GTK_STOCK_ZOOM_IN,
- N_("Zoom _In"), "",
+ { "palette-editor-zoom-in", "zoom-in",
+ N_("Zoom _In"), NULL,
N_("Zoom in"),
GIMP_ZOOM_IN, FALSE,
GIMP_HELP_PALETTE_EDITOR_ZOOM_IN },
- { "palette-editor-zoom-out", GTK_STOCK_ZOOM_OUT,
- N_("Zoom _Out"), "",
+ { "palette-editor-zoom-out", "zoom-out",
+ N_("Zoom _Out"), NULL,
N_("Zoom out"),
GIMP_ZOOM_OUT, FALSE,
GIMP_HELP_PALETTE_EDITOR_ZOOM_OUT },
- { "palette-editor-zoom-all", GTK_STOCK_ZOOM_FIT,
- N_("Zoom _All"), "",
+ { "palette-editor-zoom-all", "zoom-fit-best",
+ N_("Zoom _All"), NULL,
N_("Zoom all"),
GIMP_ZOOM_OUT_MAX, FALSE,
GIMP_HELP_PALETTE_EDITOR_ZOOM_ALL }
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index c30b1cf..a8235e0 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -44,14 +44,14 @@ static const GimpActionEntry palettes_actions[] =
NC_("palettes-action", "Palettes Menu"), NULL, NULL, NULL,
GIMP_HELP_PALETTE_DIALOG },
- { "palettes-new", GTK_STOCK_NEW,
- NC_("palettes-action", "_New Palette"), "",
+ { "palettes-new", "document-new",
+ NC_("palettes-action", "_New Palette"), NULL,
NC_("palettes-action", "Create a new palette"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_PALETTE_NEW },
- { "palettes-import", GTK_STOCK_CONVERT,
- NC_("palettes-action", "_Import Palette..."), "",
+ { "palettes-import", "gtk-convert",
+ NC_("palettes-action", "_Import Palette..."), NULL,
NC_("palettes-action", "Import palette"),
G_CALLBACK (palettes_import_cmd_callback),
GIMP_HELP_PALETTE_IMPORT },
@@ -68,20 +68,20 @@ static const GimpActionEntry palettes_actions[] =
G_CALLBACK (palettes_merge_cmd_callback),
GIMP_HELP_PALETTE_MERGE },
- { "palettes-copy-location", GTK_STOCK_COPY,
- NC_("palettes-action", "Copy Palette _Location"), "",
+ { "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),
GIMP_HELP_PALETTE_COPY_LOCATION },
- { "palettes-delete", GTK_STOCK_DELETE,
- NC_("palettes-action", "_Delete Palette"), "",
+ { "palettes-delete", "edit-delete",
+ NC_("palettes-action", "_Delete Palette"), NULL,
NC_("palettes-action", "Delete this palette"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_PALETTE_DELETE },
- { "palettes-refresh", GTK_STOCK_REFRESH,
- NC_("palettes-action", "_Refresh Palettes"), "",
+ { "palettes-refresh", "view-refresh",
+ NC_("palettes-action", "_Refresh Palettes"), NULL,
NC_("palettes-action", "Refresh palettes"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_PALETTE_REFRESH }
@@ -89,7 +89,7 @@ static const GimpActionEntry palettes_actions[] =
static const GimpStringActionEntry palettes_edit_actions[] =
{
- { "palettes-edit", GTK_STOCK_EDIT,
+ { "palettes-edit", "gtk-edit",
NC_("palettes-action", "_Edit Palette..."), NULL,
NC_("palettes-action", "Edit palette"),
"gimp-palette-editor",
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index 1100062..1fbac31 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -43,14 +43,14 @@ static const GimpActionEntry patterns_actions[] =
NC_("patterns-action", "Patterns Menu"), NULL, NULL, NULL,
GIMP_HELP_PATTERN_DIALOG },
- { "patterns-open-as-image", GTK_STOCK_OPEN,
- NC_("patterns-action", "_Open Pattern as Image"), "",
+ { "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),
GIMP_HELP_PATTERN_OPEN_AS_IMAGE },
- { "patterns-new", GTK_STOCK_NEW,
- NC_("patterns-action", "_New Pattern"), "",
+ { "patterns-new", "document-new",
+ NC_("patterns-action", "_New Pattern"), NULL,
NC_("patterns-action", "Create a new pattern"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_PATTERN_NEW },
@@ -61,20 +61,20 @@ static const GimpActionEntry patterns_actions[] =
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_PATTERN_DUPLICATE },
- { "patterns-copy-location", GTK_STOCK_COPY,
- NC_("patterns-action", "Copy Pattern _Location"), "",
+ { "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),
GIMP_HELP_PATTERN_COPY_LOCATION },
- { "patterns-delete", GTK_STOCK_DELETE,
- NC_("patterns-action", "_Delete Pattern"), "",
+ { "patterns-delete", "edit-delete",
+ NC_("patterns-action", "_Delete Pattern"), NULL,
NC_("patterns-action", "Delete this pattern"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_PATTERN_DELETE },
- { "patterns-refresh", GTK_STOCK_REFRESH,
- NC_("patterns-action", "_Refresh Patterns"), "",
+ { "patterns-refresh", "view-refresh",
+ NC_("patterns-action", "_Refresh Patterns"), NULL,
NC_("patterns-action", "Refresh patterns"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_PATTERN_REFRESH }
@@ -82,7 +82,7 @@ static const GimpActionEntry patterns_actions[] =
static const GimpStringActionEntry patterns_edit_actions[] =
{
- { "patterns-edit", GTK_STOCK_EDIT,
+ { "patterns-edit", "gtk-edit",
NC_("patterns-action", "_Edit Pattern..."), NULL,
NC_("patterns-action", "Edit pattern"),
"gimp-pattern-editor",
diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c
index 6225b1c..b483af8 100644
--- a/app/actions/plug-in-actions.c
+++ b/app/actions/plug-in-actions.c
@@ -129,7 +129,7 @@ static const GimpActionEntry plug_in_actions[] =
static const GimpEnumActionEntry plug_in_repeat_actions[] =
{
- { "plug-in-repeat", GTK_STOCK_EXECUTE,
+ { "plug-in-repeat", "system-run",
NC_("plug-in-action", "Re_peat Last"), "<primary>F",
NC_("plug-in-action",
"Rerun the last used plug-in using the same settings"),
diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c
index bb894ec..88449b5 100644
--- a/app/actions/templates-actions.c
+++ b/app/actions/templates-actions.c
@@ -48,8 +48,8 @@ static const GimpActionEntry templates_actions[] =
G_CALLBACK (templates_create_image_cmd_callback),
GIMP_HELP_TEMPLATE_IMAGE_NEW },
- { "templates-new", GTK_STOCK_NEW,
- NC_("templates-action", "_New Template..."), "",
+ { "templates-new", "document-new",
+ NC_("templates-action", "_New Template..."), NULL,
NC_("templates-action", "Create a new template"),
G_CALLBACK (templates_new_cmd_callback),
GIMP_HELP_TEMPLATE_NEW },
@@ -60,14 +60,14 @@ static const GimpActionEntry templates_actions[] =
G_CALLBACK (templates_duplicate_cmd_callback),
GIMP_HELP_TEMPLATE_DUPLICATE },
- { "templates-edit", GTK_STOCK_EDIT,
- NC_("templates-action", "_Edit Template..."), "",
+ { "templates-edit", "gtk-edit",
+ NC_("templates-action", "_Edit Template..."), NULL,
NC_("templates-action", "Edit this template"),
G_CALLBACK (templates_edit_cmd_callback),
GIMP_HELP_TEMPLATE_EDIT },
- { "templates-delete", GTK_STOCK_DELETE,
- NC_("templates-action", "_Delete Template"), "",
+ { "templates-delete", "edit-delete",
+ NC_("templates-action", "_Delete Template"), NULL,
NC_("templates-action", "Delete this template"),
G_CALLBACK (templates_delete_cmd_callback),
GIMP_HELP_TEMPLATE_DELETE }
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index 7ea6550..d4a0dd5 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -182,7 +182,7 @@ templates_edit_cmd_callback (GtkAction *action,
GTK_WIDGET (editor),
_("Edit Template"),
"gimp-template-edit",
- GTK_STOCK_EDIT,
+ "gtk-edit",
_("Edit Template"),
GIMP_HELP_TEMPLATE_EDIT);
@@ -218,7 +218,7 @@ templates_delete_cmd_callback (GtkAction *action,
delete_data->template = template;
dialog =
- gimp_message_dialog_new (_("Delete Template"), GTK_STOCK_DELETE,
+ gimp_message_dialog_new (_("Delete Template"), "edit-delete",
GTK_WIDGET (editor), 0,
gimp_standard_help_func, NULL,
diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c
index 506096d..c7f9e37 100644
--- a/app/actions/text-editor-actions.c
+++ b/app/actions/text-editor-actions.c
@@ -36,18 +36,18 @@
static const GimpActionEntry text_editor_actions[] =
{
- { "text-editor-toolbar", GTK_STOCK_EDIT,
+ { "text-editor-toolbar", "gtk-edit",
"Text Editor Toolbar", NULL, NULL, NULL,
GIMP_HELP_TEXT_EDITOR_DIALOG },
- { "text-editor-load", GTK_STOCK_OPEN,
- NC_("text-editor-action", "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", GTK_STOCK_CLEAR,
- NC_("text-editor-action", "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),
NULL }
@@ -56,13 +56,13 @@ static const GimpActionEntry text_editor_actions[] =
static const GimpRadioActionEntry text_editor_direction_actions[] =
{
{ "text-editor-direction-ltr", GIMP_STOCK_TEXT_DIR_LTR,
- NC_("text-editor-action", "LTR"), "",
+ NC_("text-editor-action", "LTR"), NULL,
NC_("text-editor-action", "From left to right"),
GIMP_TEXT_DIRECTION_LTR,
NULL },
{ "text-editor-direction-rtl", GIMP_STOCK_TEXT_DIR_RTL,
- NC_("text-editor-action", "RTL"), "",
+ NC_("text-editor-action", "RTL"), NULL,
NC_("text-editor-action", "From right to left"),
GIMP_TEXT_DIRECTION_RTL,
NULL }
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
index 5c480b3..f727593 100644
--- a/app/actions/text-tool-actions.c
+++ b/app/actions/text-tool-actions.c
@@ -54,33 +54,33 @@ static const GimpActionEntry text_tool_actions[] =
NC_("text-tool-action", "Input _Methods"), NULL, NULL, NULL,
NULL },
- { "text-tool-cut", GTK_STOCK_CUT,
- NC_("text-tool-action", "Cu_t"), NULL, NULL,
+ { "text-tool-cut", "edit-cut",
+ NC_("text-tool-action", "Cu_t"), NULL, "<primary>X",
G_CALLBACK (text_tool_cut_cmd_callback),
NULL },
- { "text-tool-copy", GTK_STOCK_COPY,
- NC_("text-tool-action", "_Copy"), NULL, NULL,
+ { "text-tool-copy", "edit-copy",
+ NC_("text-tool-action", "_Copy"), NULL, "<primary>C",
G_CALLBACK (text_tool_copy_cmd_callback),
NULL },
- { "text-tool-paste", GTK_STOCK_PASTE,
- NC_("text-tool-action", "_Paste"), NULL, NULL,
+ { "text-tool-paste", "edit-paste",
+ NC_("text-tool-action", "_Paste"), NULL, "<primary>V",
G_CALLBACK (text_tool_paste_cmd_callback),
NULL },
- { "text-tool-delete", GTK_STOCK_DELETE,
+ { "text-tool-delete", "edit-delete",
NC_("text-tool-action", "_Delete"), NULL, NULL,
G_CALLBACK (text_tool_delete_cmd_callback),
NULL },
- { "text-tool-load", GTK_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", GTK_STOCK_CLEAR,
- NC_("text-tool-action", "Cl_ear"), "",
+ { "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),
NULL },
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index cf2c87f..a463746 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -57,35 +57,35 @@ 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", GTK_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", GTK_STOCK_REVERT_TO_SAVED,
+ { "tool-options-restore-preset-menu", "document-revert",
NC_("tool-options-action", "_Restore Tool Preset"), "", NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_RESTORE },
- { "tool-options-edit-preset-menu", GTK_STOCK_EDIT,
+ { "tool-options-edit-preset-menu", "gtk-edit",
NC_("tool-options-action", "E_dit Tool Preset"), NULL, NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_EDIT },
- { "tool-options-delete-preset-menu", GTK_STOCK_DELETE,
+ { "tool-options-delete-preset-menu", "edit-delete",
NC_("tool-options-action", "_Delete Tool Preset"), "", NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_DELETE },
- { "tool-options-save-new-preset", GTK_STOCK_NEW,
+ { "tool-options-save-new-preset", "document-new",
NC_("tool-options-action", "_New Tool Preset..."), "", NULL,
G_CALLBACK (tool_options_save_new_preset_cmd_callback),
GIMP_HELP_TOOL_OPTIONS_SAVE },
{ "tool-options-reset", GIMP_STOCK_RESET,
- NC_("tool-options-action", "R_eset Tool Options"), "",
+ NC_("tool-options-action", "R_eset Tool Options"), NULL,
NC_("tool-options-action", "Reset to default values"),
G_CALLBACK (tool_options_reset_cmd_callback),
GIMP_HELP_TOOL_OPTIONS_RESET },
{ "tool-options-reset-all", GIMP_STOCK_RESET,
- NC_("tool-options-action", "Reset _all Tool Options"), "",
+ NC_("tool-options-action", "Reset _all Tool Options"), NULL,
NC_("tool-options-action", "Reset all tool options"),
G_CALLBACK (tool_options_reset_all_cmd_callback),
GIMP_HELP_TOOL_OPTIONS_RESET }
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
index e2c02a2..6e66d5f 100644
--- a/app/actions/tool-presets-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -45,8 +45,8 @@ static const GimpActionEntry tool_presets_actions[] =
NC_("tool-presets-action", "Tool Presets Menu"), NULL, NULL, NULL,
GIMP_HELP_TOOL_PRESET_DIALOG },
- { "tool-presets-new", GTK_STOCK_NEW,
- NC_("tool-presets-action", "_New Tool Preset"), "",
+ { "tool-presets-new", "document-new",
+ NC_("tool-presets-action", "_New Tool Preset"), NULL,
NC_("tool-presets-action", "Create a new tool preset"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_TOOL_PRESET_NEW },
@@ -57,20 +57,20 @@ static const GimpActionEntry tool_presets_actions[] =
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_TOOL_PRESET_DUPLICATE },
- { "tool-presets-copy-location", GTK_STOCK_COPY,
- NC_("tool-presets-action", "Copy Tool Preset _Location"), "",
+ { "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),
GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
- { "tool-presets-delete", GTK_STOCK_DELETE,
- NC_("tool-presets-action", "_Delete Tool Preset"), "",
+ { "tool-presets-delete", "edit-delete",
+ NC_("tool-presets-action", "_Delete Tool Preset"), NULL,
NC_("tool-presets-action", "Delete this tool preset"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_TOOL_PRESET_DELETE },
- { "tool-presets-refresh", GTK_STOCK_REFRESH,
- NC_("tool-presets-action", "_Refresh Tool Presets"), "",
+ { "tool-presets-refresh", "view-refresh",
+ NC_("tool-presets-action", "_Refresh Tool Presets"), NULL,
NC_("tool-presets-action", "Refresh tool presets"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_TOOL_PRESET_REFRESH }
@@ -78,7 +78,7 @@ static const GimpActionEntry tool_presets_actions[] =
static const GimpStringActionEntry tool_presets_edit_actions[] =
{
- { "tool-presets-edit", GTK_STOCK_EDIT,
+ { "tool-presets-edit", "gtk-edit",
NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
NC_("tool-presets-action", "Edit this tool preset"),
"gimp-tool-preset-editor",
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index 04c2a80..1c22289 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -49,20 +49,20 @@ static const GimpActionEntry vectors_actions[] =
G_CALLBACK (vectors_vectors_tool_cmd_callback),
GIMP_HELP_TOOL_VECTORS },
- { "vectors-edit-attributes", GTK_STOCK_EDIT,
+ { "vectors-edit-attributes", "gtk-edit",
NC_("vectors-action", "_Edit Path Attributes..."), NULL,
NC_("vectors-action", "Edit path attributes"),
G_CALLBACK (vectors_edit_attributes_cmd_callback),
GIMP_HELP_PATH_EDIT },
- { "vectors-new", GTK_STOCK_NEW,
- NC_("vectors-action", "_New Path..."), "",
+ { "vectors-new", "document-new",
+ NC_("vectors-action", "_New Path..."), NULL,
NC_("vectors-action", "Create a new path..."),
G_CALLBACK (vectors_new_cmd_callback),
GIMP_HELP_PATH_NEW },
- { "vectors-new-last-values", GTK_STOCK_NEW,
- NC_("vectors-action", "_New Path with last values"), "",
+ { "vectors-new-last-values", "document-new",
+ NC_("vectors-action", "_New Path with last values"), NULL,
NC_("vectors-action", "Create a new path with last used values"),
G_CALLBACK (vectors_new_last_vals_cmd_callback),
GIMP_HELP_PATH_NEW },
@@ -73,8 +73,8 @@ static const GimpActionEntry vectors_actions[] =
G_CALLBACK (vectors_duplicate_cmd_callback),
GIMP_HELP_PATH_DUPLICATE },
- { "vectors-delete", GTK_STOCK_DELETE,
- NC_("vectors-action", "_Delete Path"), "",
+ { "vectors-delete", "edit-delete",
+ NC_("vectors-action", "_Delete Path"), NULL,
NC_("vectors-action", "Delete this path"),
G_CALLBACK (vectors_delete_cmd_callback),
GIMP_HELP_PATH_DELETE },
@@ -84,26 +84,26 @@ static const GimpActionEntry vectors_actions[] =
G_CALLBACK (vectors_merge_visible_cmd_callback),
GIMP_HELP_PATH_MERGE_VISIBLE },
- { "vectors-raise", GTK_STOCK_GO_UP,
- NC_("vectors-action", "_Raise Path"), "",
+ { "vectors-raise", "go-up",
+ NC_("vectors-action", "_Raise Path"), NULL,
NC_("vectors-action", "Raise this path"),
G_CALLBACK (vectors_raise_cmd_callback),
GIMP_HELP_PATH_RAISE },
- { "vectors-raise-to-top", GTK_STOCK_GOTO_TOP,
- NC_("vectors-action", "Raise Path to _Top"), "",
+ { "vectors-raise-to-top", "go-top",
+ NC_("vectors-action", "Raise Path to _Top"), NULL,
NC_("vectors-action", "Raise this path to the top"),
G_CALLBACK (vectors_raise_to_top_cmd_callback),
GIMP_HELP_PATH_RAISE_TO_TOP },
- { "vectors-lower", GTK_STOCK_GO_DOWN,
- NC_("vectors-action", "_Lower Path"), "",
+ { "vectors-lower", "go-down",
+ NC_("vectors-action", "_Lower Path"), NULL,
NC_("vectors-action", "Lower this path"),
G_CALLBACK (vectors_lower_cmd_callback),
GIMP_HELP_PATH_LOWER },
- { "vectors-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- NC_("vectors-action", "Lower Path to _Bottom"), "",
+ { "vectors-lower-to-bottom", "go-bottom",
+ NC_("vectors-action", "Lower Path to _Bottom"), NULL,
NC_("vectors-action", "Lower this path to the bottom"),
G_CALLBACK (vectors_lower_to_bottom_cmd_callback),
GIMP_HELP_PATH_LOWER_TO_BOTTOM },
@@ -120,22 +120,22 @@ static const GimpActionEntry vectors_actions[] =
G_CALLBACK (vectors_stroke_last_vals_cmd_callback),
GIMP_HELP_PATH_STROKE },
- { "vectors-copy", GTK_STOCK_COPY,
+ { "vectors-copy", "edit-copy",
NC_("vectors-action", "Co_py Path"), "", NULL,
G_CALLBACK (vectors_copy_cmd_callback),
GIMP_HELP_PATH_COPY },
- { "vectors-paste", GTK_STOCK_PASTE,
+ { "vectors-paste", "edit-paste",
NC_("vectors-action", "Paste Pat_h"), "", NULL,
G_CALLBACK (vectors_paste_cmd_callback),
GIMP_HELP_PATH_PASTE },
- { "vectors-export", GTK_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", GTK_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/vectors-commands.c b/app/actions/vectors-commands.c
index 0880d4e..a11ea08 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -137,7 +137,7 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
gimp_object_get_name (vectors),
_("Path Attributes"),
"gimp-vectors-edit",
- GTK_STOCK_EDIT,
+ "gtk-edit",
_("Edit Path Attributes"),
GIMP_HELP_PATH_EDIT);
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index ea048c6..52c03aa 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -74,25 +74,25 @@ static const GimpActionEntry view_actions[] =
NC_("view-action", "Move to Screen"), NULL, NULL, NULL,
GIMP_HELP_VIEW_CHANGE_SCREEN },
- { "view-new", GTK_STOCK_NEW,
- NC_("view-action", "_New View"), "",
+ { "view-new", "window-new",
+ NC_("view-action", "_New View"), NULL,
NC_("view-action", "Create another view on this image"),
G_CALLBACK (view_new_cmd_callback),
GIMP_HELP_VIEW_NEW },
- { "view-close", GTK_STOCK_CLOSE,
+ { "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),
GIMP_HELP_FILE_CLOSE },
- { "view-zoom-fit-in", GTK_STOCK_ZOOM_FIT,
+ { "view-zoom-fit-in", "zoom-fit-best",
NC_("view-action", "_Fit Image in Window"), "<primary><shift>J",
NC_("view-action", "Adjust the zoom ratio so that the image becomes fully visible"),
G_CALLBACK (view_zoom_fit_in_cmd_callback),
GIMP_HELP_VIEW_ZOOM_FIT_IN },
- { "view-zoom-fill", GTK_STOCK_ZOOM_FIT,
+ { "view-zoom-fill", "zoom-fit-best",
NC_("view-action", "Fi_ll Window"), NULL,
NC_("view-action", "Adjust the zoom ratio so that the entire window is used"),
G_CALLBACK (view_zoom_fill_cmd_callback),
@@ -128,7 +128,7 @@ static const GimpActionEntry view_actions[] =
G_CALLBACK (view_display_filters_cmd_callback),
GIMP_HELP_DISPLAY_FILTER_DIALOG },
- { "view-shrink-wrap", GTK_STOCK_ZOOM_FIT,
+ { "view-shrink-wrap", "zoom-fit-best",
NC_("view-action", "Shrink _Wrap"), "<primary>J",
NC_("view-action", "Reduce the image window to the size of the image display"),
G_CALLBACK (view_shrink_wrap_cmd_callback),
@@ -241,7 +241,7 @@ static const GimpToggleActionEntry view_toggle_actions[] =
TRUE,
GIMP_HELP_VIEW_SHOW_STATUSBAR },
- { "view-fullscreen", GTK_STOCK_FULLSCREEN,
+ { "view-fullscreen", "view-fullscreen",
NC_("view-action", "Fullscr_een"), "F11",
NC_("view-action", "Toggle fullscreen view"),
G_CALLBACK (view_fullscreen_cmd_callback),
@@ -256,23 +256,23 @@ static const GimpEnumActionEntry view_zoom_actions[] =
GIMP_ACTION_SELECT_SET, TRUE,
NULL },
- { "view-zoom-minimum", GTK_STOCK_ZOOM_OUT,
+ { "view-zoom-minimum", "zoom-out",
"Zoom out as far as possible", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
GIMP_HELP_VIEW_ZOOM_OUT },
- { "view-zoom-maximum", GTK_STOCK_ZOOM_IN,
+ { "view-zoom-maximum", "zoom-in",
"Zoom in as far as possible", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
GIMP_HELP_VIEW_ZOOM_IN },
- { "view-zoom-out", GTK_STOCK_ZOOM_OUT,
+ { "view-zoom-out", "zoom-out",
NC_("view-zoom-action", "Zoom _Out"), "minus",
NC_("view-zoom-action", "Zoom out"),
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
GIMP_HELP_VIEW_ZOOM_OUT },
- { "view-zoom-in", GTK_STOCK_ZOOM_IN,
+ { "view-zoom-in", "zoom-in",
NC_("view-zoom-action", "Zoom _In"), "plus",
NC_("view-zoom-action", "Zoom in"),
GIMP_ACTION_SELECT_NEXT, FALSE,
@@ -290,12 +290,12 @@ static const GimpEnumActionEntry view_zoom_actions[] =
GIMP_ACTION_SELECT_NEXT, FALSE,
GIMP_HELP_VIEW_ZOOM_IN },
- { "view-zoom-out-skip", GTK_STOCK_ZOOM_OUT,
+ { "view-zoom-out-skip", "zoom-out",
"Zoom out a lot", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
GIMP_HELP_VIEW_ZOOM_OUT },
- { "view-zoom-in-skip", GTK_STOCK_ZOOM_IN,
+ { "view-zoom-in-skip", "zoom-in",
"Zoom in a lot", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
GIMP_HELP_VIEW_ZOOM_IN }
@@ -351,13 +351,13 @@ static const GimpRadioActionEntry view_zoom_explicit_actions[] =
20000,
GIMP_HELP_VIEW_ZOOM_IN },
- { "view-zoom-1-1", GTK_STOCK_ZOOM_100,
+ { "view-zoom-1-1", "zoom-original",
NC_("view-zoom-action", "_1:1 (100%)"), "1",
NC_("view-zoom-action", "Zoom 1:1"),
10000,
GIMP_HELP_VIEW_ZOOM_100 },
- { "view-zoom-1-1-accel", GTK_STOCK_ZOOM_100,
+ { "view-zoom-1-1-accel", "zoom-original",
NC_("view-zoom-action", "_1:1 (100%)"), "KP_1",
NC_("view-zoom-action", "Zoom 1:1"),
10000,
@@ -435,7 +435,7 @@ static const GimpEnumActionEntry view_padding_color_actions[] =
GIMP_CANVAS_PADDING_MODE_DARK_CHECK, FALSE,
GIMP_HELP_VIEW_PADDING_COLOR },
- { "view-padding-color-custom", GTK_STOCK_SELECT_COLOR,
+ { "view-padding-color-custom", "gtk-select-color",
NC_("view-padding-color", "Select _Custom Color..."), NULL,
NC_("view-padding-color", "Use an arbitrary color"),
GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index 918a9df..7c5b8eb 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -654,7 +654,7 @@ view_padding_color_cmd_callback (GtkAction *action,
gimp_color_dialog_new (GIMP_VIEWABLE (image),
action_data_get_context (data),
_("Set Canvas Padding Color"),
- GTK_STOCK_SELECT_COLOR,
+ "gtk-select-color",
_("Set Custom Canvas Padding Color"),
GTK_WIDGET (shell),
NULL, NULL,
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index 271ae9b..d3121c4 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -135,22 +135,22 @@ static const GimpToggleActionEntry windows_toggle_actions[] =
static const GimpRadioActionEntry windows_tabs_position_actions[] =
{
- { "windows-tabs-position-top", GTK_STOCK_GOTO_TOP,
+ { "windows-tabs-position-top", "to-top",
NC_("windows-tabs-position-action", "_Top"), NULL,
NC_("windows-tabs-position-action", "Position the tabs on the top"),
GIMP_POSITION_TOP, GIMP_HELP_WINDOWS_TABS_POSITION },
- { "windows-tabs-position-bottom", GTK_STOCK_GOTO_BOTTOM,
+ { "windows-tabs-position-bottom", "go-bottom",
NC_("windows-tabs-position-action", "_Bottom"), NULL,
NC_("windows-tabs-position-action", "Position the tabs on the bottom"),
GIMP_POSITION_BOTTOM, GIMP_HELP_WINDOWS_TABS_POSITION },
- { "windows-tabs-position-left", GTK_STOCK_GOTO_FIRST,
+ { "windows-tabs-position-left", "go-first",
NC_("windows-tabs-position-action", "_Left"), NULL,
NC_("windows-tabs-position-action", "Position the tabs on the left"),
GIMP_POSITION_LEFT, GIMP_HELP_WINDOWS_TABS_POSITION },
- { "windows-tabs-position-right", GTK_STOCK_GOTO_LAST,
+ { "windows-tabs-position-right", "go-last",
NC_("windows-tabs-position-action", "_Right"), NULL,
NC_("windows-tabs-position-action", "Position the tabs on the right"),
GIMP_POSITION_RIGHT, GIMP_HELP_WINDOWS_TABS_POSITION },
diff --git a/app/dialogs/action-search-dialog.c b/app/dialogs/action-search-dialog.c
index fd1c171..6d3be77 100644
--- a/app/dialogs/action-search-dialog.c
+++ b/app/dialogs/action-search-dialog.c
@@ -144,7 +144,7 @@ action_search_dialog_create (Gimp *gimp)
private->keyword_entry = gtk_entry_new ();
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (private->keyword_entry),
- GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
+ GTK_ENTRY_ICON_PRIMARY, "edit-find");
gtk_box_pack_start (GTK_BOX (main_vbox), private->keyword_entry,
FALSE, FALSE, 0);
gtk_widget_show (private->keyword_entry);
@@ -419,9 +419,9 @@ action_search_add_to_results_list (GtkAction *action,
if (GTK_IS_TOGGLE_ACTION (action))
{
if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
- icon_name = GTK_STOCK_OK;
+ icon_name = "gtk-ok";
else
- icon_name = GTK_STOCK_NO;
+ icon_name = "gtk-no";
}
else
{
diff --git a/app/dialogs/data-delete-dialog.c b/app/dialogs/data-delete-dialog.c
index 99ef22a..555f035 100644
--- a/app/dialogs/data-delete-dialog.c
+++ b/app/dialogs/data-delete-dialog.c
@@ -79,7 +79,7 @@ data_delete_dialog_new (GimpDataFactory *factory,
delete_data->context = context;
delete_data->parent = parent;
- dialog = gimp_message_dialog_new (_("Delete Object"), GTK_STOCK_DELETE,
+ dialog = gimp_message_dialog_new (_("Delete Object"), "edit-delete",
gtk_widget_get_toplevel (parent), 0,
gimp_standard_help_func, NULL,
diff --git a/app/dialogs/fade-dialog.c b/app/dialogs/fade-dialog.c
index ffc0176..455fac4 100644
--- a/app/dialogs/fade-dialog.c
+++ b/app/dialogs/fade-dialog.c
@@ -112,7 +112,7 @@ fade_dialog_new (GimpImage *image,
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable),
private->context,
title, "gimp-edit-fade",
- GTK_STOCK_UNDO, title,
+ "edit-undo", title,
parent,
gimp_standard_help_func,
GIMP_HELP_EDIT_FADE,
diff --git a/app/dialogs/image-properties-dialog.c b/app/dialogs/image-properties-dialog.c
index 70832b4..01c24e2 100644
--- a/app/dialogs/image-properties-dialog.c
+++ b/app/dialogs/image-properties-dialog.c
@@ -59,7 +59,7 @@ image_properties_dialog_new (GimpImage *image,
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
_("Image Properties"),
"gimp-image-properties",
- GTK_STOCK_INFO,
+ "dialog-information",
_("Image Properties"),
parent,
gimp_standard_help_func,
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index b4260f9..40138dc 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -163,7 +163,7 @@ palette_import_dialog_new (GimpContext *context)
button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog),
_("_Import"), GTK_RESPONSE_OK);
gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name (GTK_STOCK_CONVERT,
+ gtk_image_new_from_icon_name ("gtk-convert",
GTK_ICON_SIZE_BUTTON));
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index bdb4b97..2b967f4 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1440,7 +1440,7 @@ prefs_dialog_new (Gimp *gimp,
_("_Use dynamic keyboard shortcuts"),
GTK_BOX (vbox2));
- button = prefs_button_add (GTK_STOCK_PREFERENCES,
+ button = prefs_button_add ("preferences-system",
_("Configure _Keyboard Shortcuts..."),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -1451,7 +1451,7 @@ prefs_dialog_new (Gimp *gimp,
_("_Save keyboard shortcuts on exit"),
GTK_BOX (vbox2));
- button = prefs_button_add (GTK_STOCK_SAVE,
+ button = prefs_button_add ("document-save",
_("Save Keyboard Shortcuts _Now"),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -1467,7 +1467,7 @@ prefs_dialog_new (Gimp *gimp,
g_object_set_data (G_OBJECT (button), "clear-button", button2);
- button = prefs_button_add (GTK_STOCK_CLEAR,
+ button = prefs_button_add ("edit-clear",
_("Remove _All Keyboard Shortcuts"),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -1569,7 +1569,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
- button = prefs_button_add (GTK_STOCK_REFRESH,
+ button = prefs_button_add ("view-refresh",
_("Reload C_urrent Theme"),
GTK_BOX (hbox));
g_signal_connect (button, "clicked",
@@ -1667,7 +1667,7 @@ prefs_dialog_new (Gimp *gimp,
_("Maximum History Size:"),
GTK_TABLE (table), 0, size_group);
- button = prefs_button_add (GTK_STOCK_CLEAR,
+ button = prefs_button_add ("edit-clear",
_("Clear Action History"),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -1700,7 +1700,7 @@ prefs_dialog_new (Gimp *gimp,
_("_Save tool options on exit"),
GTK_BOX (vbox2));
- button = prefs_button_add (GTK_STOCK_SAVE,
+ button = prefs_button_add ("document-save",
_("Save Tool Options _Now"),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -2433,7 +2433,7 @@ prefs_dialog_new (Gimp *gimp,
vbox2 = prefs_frame_new (_("Extended Input Devices"),
GTK_CONTAINER (vbox), FALSE);
- button = prefs_button_add (GTK_STOCK_PREFERENCES,
+ button = prefs_button_add ("preferences-system",
_("Configure E_xtended Input Devices..."),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -2444,7 +2444,7 @@ prefs_dialog_new (Gimp *gimp,
_("_Save input device settings on exit"),
GTK_BOX (vbox2));
- button = prefs_button_add (GTK_STOCK_SAVE,
+ button = prefs_button_add ("document-save",
_("Save Input Device Settings _Now"),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -2519,7 +2519,7 @@ prefs_dialog_new (Gimp *gimp,
_("Open windows on the same _monitor they were open before"),
GTK_BOX (vbox2));
- button = prefs_button_add (GTK_STOCK_SAVE,
+ button = prefs_button_add ("document-save",
_("Save Window Positions _Now"),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 0f0d27e..10fdde0 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -336,7 +336,7 @@ quit_close_all_dialog_container_changed (GimpContainer *images,
gtk_widget_show (dialog->lost_label);
- icon = gtk_image_new_from_icon_name (GTK_STOCK_DELETE,
+ icon = gtk_image_new_from_icon_name ("edit-delete",
GTK_ICON_SIZE_BUTTON);
g_object_set (dialog->ok_button,
"label", _("_Discard Changes"),
diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c
index 6866db1..717098d 100644
--- a/app/dialogs/tips-dialog.c
+++ b/app/dialogs/tips-dialog.c
@@ -134,13 +134,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 (GTK_STOCK_GO_BACK,
+ 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 (GTK_STOCK_GO_FORWARD,
+ 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/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
index bc37295..aa51239 100644
--- a/app/display/gimpdisplayshell-close.c
+++ b/app/display/gimpdisplayshell-close.c
@@ -169,7 +169,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
title = g_strdup_printf (_("Close %s"), gimp_image_get_display_name (image));
shell->close_dialog =
- dialog = gimp_message_dialog_new (title, GTK_STOCK_SAVE,
+ dialog = gimp_message_dialog_new (title, "document-save",
GTK_WIDGET (shell),
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
diff --git a/app/display/gimpdisplayshell-handlers.c b/app/display/gimpdisplayshell-handlers.c
index 1d57e2b..44cf989 100644
--- a/app/display/gimpdisplayshell-handlers.c
+++ b/app/display/gimpdisplayshell-handlers.c
@@ -793,7 +793,7 @@ gimp_display_shell_saved_handler (GimpImage *image,
gchar *filename = file_utils_uri_display_name (uri);
gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
- GTK_STOCK_SAVE, _("Image saved to '%s'"),
+ "document-save", _("Image saved to '%s'"),
filename);
g_free (filename);
}
@@ -807,7 +807,7 @@ gimp_display_shell_exported_handler (GimpImage *image,
gchar *filename = file_utils_uri_display_name (uri);
gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
- GTK_STOCK_SAVE, _("Image exported to '%s'"),
+ "document-save", _("Image exported to '%s'"),
filename);
g_free (filename);
}
diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c
index 7ec5f21..a5aed8e 100644
--- a/app/display/gimpdisplayshell-scale-dialog.c
+++ b/app/display/gimpdisplayshell-scale-dialog.c
@@ -113,7 +113,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
gimp_get_user_context (shell->display->gimp),
_("Zoom Ratio"), "display_scale",
- GTK_STOCK_ZOOM_100,
+ "zoom-original",
_("Select Zoom Ratio"),
GTK_WIDGET (shell),
gimp_standard_help_func,
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 14082eb..5f4ffd0 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -258,7 +258,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 (GTK_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/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index d09dabb..d343b01 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -320,8 +320,7 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
gimp_widget_get_monitor (GTK_WIDGET (shell)),
FALSE,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index c633429..dc3b21c 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -576,7 +576,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++,
- GTK_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/gimpactioneditor.c b/app/widgets/gimpactioneditor.c
index 976eb14..8737c9c 100644
--- a/app/widgets/gimpactioneditor.c
+++ b/app/widgets/gimpactioneditor.c
@@ -78,7 +78,7 @@ gimp_action_editor_init (GimpActionEditor *editor)
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
- GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ GTK_ENTRY_ICON_SECONDARY, "edit-clear");
gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY, TRUE);
gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c
index e4fb41f..9d83bac 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 (GTK_STOCK_GO_FORWARD,
+ 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 (GTK_STOCK_GO_BACK,
+ 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);
@@ -217,7 +217,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
editor->up_button =
gimp_editor_add_button (GIMP_EDITOR (ed),
- GTK_STOCK_GO_UP,
+ "go-up",
_("Move the selected filter up"),
NULL,
G_CALLBACK (gimp_color_display_editor_up_clicked),
@@ -226,7 +226,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
editor->down_button =
gimp_editor_add_button (GIMP_EDITOR (ed),
- GTK_STOCK_GO_DOWN,
+ "go-down",
_("Move the selected filter down"),
NULL,
G_CALLBACK (gimp_color_display_editor_down_clicked),
diff --git a/app/widgets/gimpcombotagentry.c b/app/widgets/gimpcombotagentry.c
index 0636e73..db7822b 100644
--- a/app/widgets/gimpcombotagentry.c
+++ b/app/widgets/gimpcombotagentry.c
@@ -92,7 +92,7 @@ gimp_combo_tag_entry_init (GimpComboTagEntry *entry)
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
- GTK_STOCK_GO_DOWN);
+ "go-down");
g_signal_connect (entry, "icon-press",
G_CALLBACK (gimp_combo_tag_entry_icon_press),
diff --git a/app/widgets/gimpcontainerpopup.c b/app/widgets/gimpcontainerpopup.c
index a605a5c..533124f 100644
--- a/app/widgets/gimpcontainerpopup.c
+++ b/app/widgets/gimpcontainerpopup.c
@@ -593,12 +593,12 @@ gimp_container_popup_create_view (GimpContainerPopup *popup)
editor = GIMP_EDITOR (popup->editor->view);
- gimp_editor_add_button (editor, GTK_STOCK_ZOOM_OUT,
+ gimp_editor_add_button (editor, "zoom-out",
_("Smaller Previews"), NULL,
G_CALLBACK (gimp_container_popup_smaller_clicked),
NULL,
popup);
- gimp_editor_add_button (editor, GTK_STOCK_ZOOM_IN,
+ gimp_editor_add_button (editor, "zoom-in",
_("Larger Previews"), NULL,
G_CALLBACK (gimp_container_popup_larger_clicked),
NULL,
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index 63926eb..dd1e3ab 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -656,7 +656,7 @@ gimp_controller_editor_edit_clicked (GtkWidget *button,
gimp_viewable_dialog_new (GIMP_VIEWABLE (editor->info), editor->context,
_("Select Controller Event Action"),
"gimp-controller-action-dialog",
- GTK_STOCK_EDIT,
+ "gtk-edit",
title,
gtk_widget_get_toplevel (GTK_WIDGET (editor)),
gimp_standard_help_func,
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index 7aeef79..89bb930 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 (GTK_STOCK_GO_FORWARD,
+ 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 (GTK_STOCK_GO_BACK,
+ 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);
@@ -292,7 +292,7 @@ gimp_controller_list_init (GimpControllerList *list)
list->edit_button =
gimp_editor_add_button (GIMP_EDITOR (list->dest),
- GTK_STOCK_PROPERTIES,
+ "document-properties",
_("Configure the selected controller"),
NULL,
G_CALLBACK (gimp_controller_list_edit_clicked),
@@ -300,7 +300,7 @@ gimp_controller_list_init (GimpControllerList *list)
list);
list->up_button =
gimp_editor_add_button (GIMP_EDITOR (list->dest),
- GTK_STOCK_GO_UP,
+ "go-up",
_("Move the selected controller up"),
NULL,
G_CALLBACK (gimp_controller_list_up_clicked),
@@ -308,7 +308,7 @@ gimp_controller_list_init (GimpControllerList *list)
list);
list->down_button =
gimp_editor_add_button (GIMP_EDITOR (list->dest),
- GTK_STOCK_GO_DOWN,
+ "go-down",
_("Move the selected controller down"),
NULL,
G_CALLBACK (gimp_controller_list_down_clicked),
diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c
index 6d8521c..cba6869 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),
- GTK_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),
- GTK_STOCK_REVERT_TO_SAVED,
+ "document-revert",
_("Revert"), NULL,
G_CALLBACK (gimp_data_editor_revert_clicked),
NULL,
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index 6ad97c3..b3824ba 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -162,7 +162,7 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
private->delete_button =
gimp_editor_add_button (GIMP_EDITOR (private->treeview),
- GTK_STOCK_DELETE,
+ "edit-delete",
_("Delete the selected device"),
NULL,
G_CALLBACK (gimp_device_editor_delete_clicked),
diff --git a/app/widgets/gimpdevicestatus.c b/app/widgets/gimpdevicestatus.c
index 30abb6f..43269ea 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), GTK_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 d825584..b6a6519 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -284,7 +284,7 @@ gimp_settings_box_constructed (GObject *object)
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- image = gtk_image_new_from_icon_name (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@@ -315,20 +315,20 @@ gimp_settings_box_constructed (GObject *object)
private->import_item =
gimp_settings_box_menu_item_add (box,
- GTK_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,
- GTK_STOCK_SAVE,
+ "document-save",
_("_Export Settings to File..."),
G_CALLBACK (gimp_settings_box_export_activate));
gimp_settings_box_menu_item_add (box, NULL, NULL, NULL);
gimp_settings_box_menu_item_add (box,
- GTK_STOCK_EDIT,
+ "gtk-edit",
_("_Manage Settings..."),
G_CALLBACK (gimp_settings_box_manage_activate));
}
@@ -682,8 +682,9 @@ gimp_settings_box_manage_activate (GtkWidget *widget,
"gimp-settings-editor-dialog",
toplevel, 0,
NULL, NULL,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE,
+
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+
NULL);
g_object_add_weak_pointer (G_OBJECT (private->editor_dialog),
diff --git a/app/widgets/gimpsettingseditor.c b/app/widgets/gimpsettingseditor.c
index a48a182..94b9d29 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),
- GTK_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),
- GTK_STOCK_SAVE,
+ "document-save",
_("Export the selected settings to a file"),
NULL,
G_CALLBACK (gimp_settings_editor_export_clicked),
@@ -208,7 +208,7 @@ gimp_settings_editor_constructed (GObject *object)
private->delete_button =
gimp_editor_add_button (GIMP_EDITOR (tree_view),
- GTK_STOCK_DELETE,
+ "edit-delete",
_("Delete the selected settings"),
NULL,
G_CALLBACK (gimp_settings_editor_delete_clicked),
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
index 4d423c3..5f77ad8 100644
--- a/app/widgets/gimptextstyleeditor.c
+++ b/app/widgets/gimptextstyleeditor.c
@@ -239,7 +239,7 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
G_CALLBACK (gimp_text_style_editor_clear_tags),
editor);
- image = gtk_image_new_from_icon_name (GTK_STOCK_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);
@@ -323,16 +323,16 @@ gimp_text_style_editor_constructed (GObject *object)
editor->context);
gimp_text_style_editor_create_toggle (editor, editor->buffer->bold_tag,
- GTK_STOCK_BOLD,
+ "format-text-bold",
_("Bold"));
gimp_text_style_editor_create_toggle (editor, editor->buffer->italic_tag,
- GTK_STOCK_ITALIC,
+ "format-text-italic",
_("Italic"));
gimp_text_style_editor_create_toggle (editor, editor->buffer->underline_tag,
- GTK_STOCK_UNDERLINE,
+ "format-text-underline",
_("Underline"));
gimp_text_style_editor_create_toggle (editor, editor->buffer->strikethrough_tag,
- GTK_STOCK_STRIKETHROUGH,
+ "format-edit-strikethrough",
_("Strikethrough"));
g_signal_connect_swapped (editor->text, "notify::font",
diff --git a/app/widgets/gimptooleditor.c b/app/widgets/gimptooleditor.c
index 7379f2b..d73832f 100644
--- a/app/widgets/gimptooleditor.c
+++ b/app/widgets/gimptooleditor.c
@@ -291,7 +291,7 @@ gimp_tool_editor_new (GimpContainer *container,
/* buttons */
priv->raise_button =
- gimp_editor_add_button (GIMP_EDITOR (tree_view), GTK_STOCK_GO_UP,
+ gimp_editor_add_button (GIMP_EDITOR (tree_view), "go-up",
_("Raise this tool"),
_("Raise this tool to the top"),
G_CALLBACK (gimp_tool_editor_raise_clicked),
@@ -299,7 +299,7 @@ gimp_tool_editor_new (GimpContainer *container,
tool_editor);
priv->lower_button =
- gimp_editor_add_button (GIMP_EDITOR (tree_view), GTK_STOCK_GO_DOWN,
+ gimp_editor_add_button (GIMP_EDITOR (tree_view), "go-down",
_("Lower this tool"),
_("Lower this tool to the bottom"),
G_CALLBACK (gimp_tool_editor_lower_clicked),
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index e5fdde1..a4f999a 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), GTK_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), GTK_STOCK_REVERT_TO_SAVED,
+ 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),
@@ -214,7 +214,7 @@ gimp_tool_options_editor_constructed (GObject *object)
editor);
editor->p->delete_button =
- gimp_editor_add_button (GIMP_EDITOR (editor), GTK_STOCK_DELETE,
+ gimp_editor_add_button (GIMP_EDITOR (editor), "edit-delete",
_("Delete Tool Preset..."),
GIMP_HELP_TOOL_OPTIONS_DELETE,
G_CALLBACK (gimp_tool_options_editor_delete_clicked),
diff --git a/app/widgets/gimpviewrendererimagefile.c b/app/widgets/gimpviewrendererimagefile.c
index 0f09f9b..8dbece5 100644
--- a/app/widgets/gimpviewrendererimagefile.c
+++ b/app/widgets/gimpviewrendererimagefile.c
@@ -186,10 +186,10 @@ gimp_view_renderer_imagefile_get_icon (GimpImagefile *imagefile,
if (! pixbuf)
{
- const gchar *icon_name = GTK_STOCK_FILE;
+ const gchar *icon_name = "text-x-generic";
if (thumbnail->image_state == GIMP_THUMB_STATE_FOLDER)
- icon_name = GTK_STOCK_DIRECTORY;
+ icon_name = "folder";
pixbuf = gtk_icon_theme_load_icon (icon_theme,
icon_name, size,
diff --git a/app/widgets/gimpviewrendererlayer.c b/app/widgets/gimpviewrendererlayer.c
index a5a8856..a7ed71a 100644
--- a/app/widgets/gimpviewrendererlayer.c
+++ b/app/widgets/gimpviewrendererlayer.c
@@ -76,7 +76,7 @@ gimp_view_renderer_layer_render (GimpViewRenderer *renderer,
GimpContainer *children = gimp_viewable_get_children (renderer->viewable);
if (children && gimp_container_get_n_children (children) == 0)
- icon_name = GTK_STOCK_DIRECTORY;
+ icon_name = "folder";
}
if (icon_name)
diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c
index 4da8fe8..68945e8 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 (GTK_STOCK_DIALOG_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);
@@ -534,7 +534,7 @@ export_dialog (GSList *actions,
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_widget_show (hbox);
- image = gtk_image_new_from_icon_name (GTK_STOCK_DIALOG_INFO,
+ image = gtk_image_new_from_icon_name ("dialog-information",
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 (GTK_STOCK_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/libgimpwidgets/gimpbrowser.c b/libgimpwidgets/gimpbrowser.c
index c063256..dfdea23 100644
--- a/libgimpwidgets/gimpbrowser.c
+++ b/libgimpwidgets/gimpbrowser.c
@@ -125,7 +125,7 @@ gimp_browser_init (GimpBrowser *browser)
browser);
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (browser->search_entry),
- GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ GTK_ENTRY_ICON_SECONDARY, "edit-clear");
gtk_entry_set_icon_activatable (GTK_ENTRY (browser->search_entry),
GTK_ENTRY_ICON_SECONDARY, TRUE);
gtk_entry_set_icon_sensitive (GTK_ENTRY (browser->search_entry),
diff --git a/libgimpwidgets/gimpcolorselector.c b/libgimpwidgets/gimpcolorselector.c
index b801594..d685f80 100644
--- a/libgimpwidgets/gimpcolorselector.c
+++ b/libgimpwidgets/gimpcolorselector.c
@@ -96,7 +96,7 @@ gimp_color_selector_class_init (GimpColorSelectorClass *klass)
klass->name = "Unnamed";
klass->help_id = NULL;
- klass->icon_name = GTK_STOCK_SELECT_COLOR;
+ klass->icon_name = "gtk-select-color";
klass->set_toggles_visible = NULL;
klass->set_toggles_sensitive = NULL;
diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c
index 437f2e3..c403397 100644
--- a/libgimpwidgets/gimpfileentry.c
+++ b/libgimpwidgets/gimpfileentry.c
@@ -129,7 +129,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 (GTK_STOCK_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);
@@ -203,7 +203,7 @@ gimp_file_entry_new (const gchar *title,
if (check_valid)
{
- entry->file_exists = gtk_image_new_from_icon_name (GTK_STOCK_NO,
+ entry->file_exists = gtk_image_new_from_icon_name ("gtk-no",
GTK_ICON_SIZE_BUTTON);
gtk_box_pack_start (GTK_BOX (entry), entry->file_exists, FALSE, FALSE, 0);
gtk_widget_show (entry->file_exists);
@@ -431,6 +431,6 @@ gimp_file_entry_check_filename (GimpFileEntry *entry)
g_free (filename);
gtk_image_set_from_icon_name (GTK_IMAGE (entry->file_exists),
- exists ? GTK_STOCK_YES : GTK_STOCK_NO,
+ exists ? "gtk-yes" : "gtk-no",
GTK_ICON_SIZE_BUTTON);
}
diff --git a/libgimpwidgets/gimppageselector.c b/libgimpwidgets/gimppageselector.c
index d48a407..fc26b78 100644
--- a/libgimpwidgets/gimppageselector.c
+++ b/libgimpwidgets/gimppageselector.c
@@ -329,7 +329,7 @@ gimp_page_selector_init (GimpPageSelector *selector)
priv->default_thumbnail =
gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- GTK_STOCK_FILE, 32, 0, NULL);
+ "text-x-generic", 32, 0, NULL);
}
static void
diff --git a/libgimpwidgets/gimppatheditor.c b/libgimpwidgets/gimppatheditor.c
index 3a63530..579a91c 100644
--- a/libgimpwidgets/gimppatheditor.c
+++ b/libgimpwidgets/gimppatheditor.c
@@ -166,7 +166,7 @@ gimp_path_editor_init (GimpPathEditor *editor)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
- image = gtk_image_new_from_icon_name (GTK_STOCK_NEW, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("document-new", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@@ -179,7 +179,7 @@ gimp_path_editor_init (GimpPathEditor *editor)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
- image = gtk_image_new_from_icon_name (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("go-up", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@@ -192,7 +192,7 @@ gimp_path_editor_init (GimpPathEditor *editor)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
- image = gtk_image_new_from_icon_name (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@@ -205,7 +205,7 @@ gimp_path_editor_init (GimpPathEditor *editor)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
- image = gtk_image_new_from_icon_name (GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("edit-delete", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c
index c8a4a86..72db450 100644
--- a/libgimpwidgets/gimpquerybox.c
+++ b/libgimpwidgets/gimpquerybox.c
@@ -269,7 +269,7 @@ gimp_query_string_box (const gchar *title,
query_box = create_query_box (title, parent, help_func, help_id,
G_CALLBACK (string_query_box_response),
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@@ -329,7 +329,7 @@ gimp_query_int_box (const gchar *title,
query_box = create_query_box (title, parent, help_func, help_id,
G_CALLBACK (int_query_box_response),
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@@ -392,7 +392,7 @@ gimp_query_double_box (const gchar *title,
query_box = create_query_box (title, parent, help_func, help_id,
G_CALLBACK (double_query_box_response),
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@@ -465,7 +465,7 @@ gimp_query_size_box (const gchar *title,
query_box = create_query_box (title, parent, help_func, help_id,
G_CALLBACK (size_query_box_response),
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
diff --git a/libgimpwidgets/gimpzoommodel.c b/libgimpwidgets/gimpzoommodel.c
index efcb33d..c74356b 100644
--- a/libgimpwidgets/gimpzoommodel.c
+++ b/libgimpwidgets/gimpzoommodel.c
@@ -526,7 +526,7 @@ gimp_zoom_button_new (GimpZoomModel *model,
switch (zoom_type)
{
case GIMP_ZOOM_IN:
- button = zoom_button_new (GTK_STOCK_ZOOM_IN, icon_size);
+ button = zoom_button_new ("zoom-in", icon_size);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gimp_zoom_model_zoom_in),
model);
@@ -536,7 +536,7 @@ gimp_zoom_button_new (GimpZoomModel *model,
break;
case GIMP_ZOOM_OUT:
- button = zoom_button_new (GTK_STOCK_ZOOM_OUT, icon_size);
+ button = zoom_button_new ("zoom-out", icon_size);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gimp_zoom_model_zoom_out),
model);
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 3608f41..5906fad 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -117,7 +117,7 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass)
selector_class->name = _("CMYK");
selector_class->help_id = "gimp-colorselector-cmyk";
- selector_class->icon_name = GTK_STOCK_PRINT; /* FIXME */
+ selector_class->icon_name = "document-print"; /* FIXME */
selector_class->set_color = colorsel_cmyk_set_color;
selector_class->set_config = colorsel_cmyk_set_config;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
