diff --git a/app/actions/actions.c b/app/actions/actions.c index 3df9c240b3..51075d0465 100644 --- a/app/actions/actions.c +++ b/app/actions/actions.c @@ -191,7 +191,7 @@ static const GimpActionFactoryEntry action_groups[] = { "layers", N_("Layers"), GIMP_STOCK_LAYER, layers_actions_setup, layers_actions_update }, - { "mypaint-brushes", N_("MyPaint Brushes"), GIMP_STOCK_MYPAINT_BRUSH, + { "mypaint-brushes", N_("MyPaint Brushes"), GIMP_ICON_MYPAINT_BRUSH, mypaint_brushes_actions_setup, mypaint_brushes_actions_update }, { "palette-editor", N_("Palette Editor"), GIMP_STOCK_PALETTE, diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c index 4646ca3212..ccb1446488 100644 --- a/app/actions/brushes-actions.c +++ b/app/actions/brushes-actions.c @@ -67,7 +67,7 @@ static const GimpActionEntry brushes_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_BRUSH_COPY_LOCATION }, - { "brushes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "brushes-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("brushes-action", "Show in _File Manager"), NULL, NC_("brushes-action", "Show brush file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c index a43e527f5e..eeb2541cb7 100644 --- a/app/actions/dialogs-actions.c +++ b/app/actions/dialogs-actions.c @@ -61,7 +61,7 @@ const GimpStringActionEntry dialogs_dockable_actions[] = "gimp-device-status", GIMP_HELP_DEVICE_STATUS_DIALOG }, - { "dialogs-symmetry", GIMP_STOCK_SYMMETRY, + { "dialogs-symmetry", GIMP_ICON_SYMMETRY, NC_("dialogs-action", "_Symmetry Painting"), NULL, NC_("dialogs-action", "Open the symmetry dialog"), "gimp-symmetry-editor", @@ -157,7 +157,7 @@ const GimpStringActionEntry dialogs_dockable_actions[] = "gimp-dynamics-editor", GIMP_HELP_DYNAMICS_EDITOR_DIALOG }, - { "dialogs-mypaint-brushes", GIMP_STOCK_MYPAINT_BRUSH, + { "dialogs-mypaint-brushes", GIMP_ICON_MYPAINT_BRUSH, NC_("dialogs-action", "_MyPaint Brushes"), NULL, NC_("dialogs-action", "Open the mypaint brushes dialog"), "gimp-mypaint-brush-grid|gimp-mapyint-brush-list", diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c index a62aa4e260..42571c902c 100644 --- a/app/actions/documents-actions.c +++ b/app/actions/documents-actions.c @@ -66,7 +66,7 @@ static const GimpActionEntry documents_actions[] = G_CALLBACK (documents_copy_location_cmd_callback), GIMP_HELP_DOCUMENT_COPY_LOCATION }, - { "documents-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "documents-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("documents-action", "Show in _File Manager"), NULL, NC_("documents-action", "Show image location in the file manager"), G_CALLBACK (documents_show_in_file_manager_cmd_callback), @@ -78,7 +78,7 @@ static const GimpActionEntry documents_actions[] = G_CALLBACK (documents_remove_cmd_callback), GIMP_HELP_DOCUMENT_REMOVE }, - { "documents-clear", GIMP_STOCK_SHRED, + { "documents-clear", GIMP_ICON_SHRED, NC_("documents-action", "_Clear History"), NULL, NC_("documents-action", "Clear the entire document history"), G_CALLBACK (documents_clear_cmd_callback), diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c index f2373295e9..8689a33f8c 100644 --- a/app/actions/documents-commands.c +++ b/app/actions/documents-commands.c @@ -221,7 +221,7 @@ documents_clear_cmd_callback (GtkAction *action, GtkWidget *dialog; dialog = gimp_message_dialog_new (_("Clear Document History"), - GIMP_STOCK_SHRED, + GIMP_ICON_SHRED, 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 7c47b0d792..6ad1819fdf 100644 --- a/app/actions/dynamics-actions.c +++ b/app/actions/dynamics-actions.c @@ -61,7 +61,7 @@ static const GimpActionEntry dynamics_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_DYNAMICS_COPY_LOCATION }, - { "dynamics-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "dynamics-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("dynamics-action", "Show in _File Manager"), NULL, NC_("dynamics-action", "Show dynamics file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c index f58ed24b61..b49c4f622f 100644 --- a/app/actions/edit-actions.c +++ b/app/actions/edit-actions.c @@ -95,7 +95,7 @@ static const GimpActionEntry edit_actions[] = G_CALLBACK (edit_strong_redo_cmd_callback), GIMP_HELP_EDIT_STRONG_REDO }, - { "edit-undo-clear", GIMP_STOCK_SHRED, + { "edit-undo-clear", GIMP_ICON_SHRED, NC_("edit-action", "_Clear Undo History"), NULL, NC_("edit-action", "Remove all operations from the undo history"), G_CALLBACK (edit_undo_clear_cmd_callback), diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c index 300a3cfab6..2167bcfe9f 100644 --- a/app/actions/file-actions.c +++ b/app/actions/file-actions.c @@ -72,7 +72,7 @@ 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", GIMP_STOCK_IMAGE_OPEN, + { "file-open", GIMP_ICON_IMAGE_OPEN, NC_("file-action", "_Open..."), "O", NC_("file-action", "Open an image file"), G_CALLBACK (file_open_cmd_callback), @@ -96,13 +96,13 @@ static const GimpActionEntry file_actions[] = G_CALLBACK (file_create_template_cmd_callback), GIMP_HELP_FILE_CREATE_TEMPLATE }, - { "file-revert", GIMP_STOCK_IMAGE_RELOAD, + { "file-revert", GIMP_ICON_IMAGE_RELOAD, 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", GIMP_STOCK_CLOSE_ALL, + { "file-close-all", GIMP_ICON_CLOSE_ALL, NC_("file-action", "Close all"), "W", NC_("file-action", "Close all opened images"), G_CALLBACK (file_close_all_cmd_callback), @@ -114,7 +114,7 @@ static const GimpActionEntry file_actions[] = G_CALLBACK (file_copy_location_cmd_callback), GIMP_HELP_FILE_COPY_LOCATION }, - { "file-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "file-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("file-action", "Show in _File Manager"), "F", NC_("file-action", "Show image file location in the file manager"), G_CALLBACK (file_show_in_file_manager_cmd_callback), diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c index 7879588255..9df9b7696a 100644 --- a/app/actions/gradients-actions.c +++ b/app/actions/gradients-actions.c @@ -62,7 +62,7 @@ static const GimpActionEntry gradients_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_GRADIENT_COPY_LOCATION }, - { "gradients-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "gradients-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("gradients-action", "Show in _File Manager"), NULL, NC_("gradients-action", "Show gradient file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c index f8e3b0618d..e25a25a8ba 100644 --- a/app/actions/mypaint-brushes-actions.c +++ b/app/actions/mypaint-brushes-actions.c @@ -39,7 +39,7 @@ static const GimpActionEntry mypaint_brushes_actions[] = { - { "mypaint-brushes-popup", GIMP_STOCK_MYPAINT_BRUSH, + { "mypaint-brushes-popup", GIMP_ICON_MYPAINT_BRUSH, NC_("mypaint-brushes-action", "MyPaint Brushes Menu"), NULL, NULL, NULL, GIMP_HELP_MYPAINT_BRUSH_DIALOG }, @@ -61,7 +61,7 @@ static const GimpActionEntry mypaint_brushes_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_MYPAINT_BRUSH_COPY_LOCATION }, - { "mypaint-brushes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "mypaint-brushes-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("mypaint-brushes-action", "Show in _File Manager"), NULL, NC_("mypaint-brushes-action", "Show MyPaint brush file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c index 2747329251..6b2cf3fefd 100644 --- a/app/actions/palettes-actions.c +++ b/app/actions/palettes-actions.c @@ -74,7 +74,7 @@ static const GimpActionEntry palettes_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_PALETTE_COPY_LOCATION }, - { "palettes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "palettes-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("palettes-action", "Show in _File Manager"), NULL, NC_("palettes-action", "Show palette file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c index 4b71b10e02..49ddbbe915 100644 --- a/app/actions/patterns-actions.c +++ b/app/actions/patterns-actions.c @@ -67,7 +67,7 @@ static const GimpActionEntry patterns_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_PATTERN_COPY_LOCATION }, - { "patterns-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "patterns-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("patterns-action", "Show in _File Manager"), NULL, NC_("patterns-action", "Show pattern file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c index 4870955b94..70a8a60eb1 100644 --- a/app/actions/tool-presets-actions.c +++ b/app/actions/tool-presets-actions.c @@ -64,7 +64,7 @@ static const GimpActionEntry tool_presets_actions[] = G_CALLBACK (data_copy_location_cmd_callback), GIMP_HELP_TOOL_PRESET_COPY_LOCATION }, - { "tool-presets-show-in-file-manager", GIMP_STOCK_FILE_MANAGER, + { "tool-presets-show-in-file-manager", GIMP_ICON_FILE_MANAGER, NC_("tool-presets-action", "Show in _File Manager"), NULL, NC_("tool-presets-action", "Show tool preset file location in the file manager"), G_CALLBACK (data_show_in_file_manager_cmd_callback), diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c index efdad1be73..7def2180eb 100644 --- a/app/actions/tools-actions.c +++ b/app/actions/tools-actions.c @@ -211,7 +211,7 @@ static const GimpEnumActionEntry tools_airbrush_flow_actions[] = static const GimpEnumActionEntry tools_mybrush_radius_actions[] = { - { "tools-mypaint-brush-radius-set", GIMP_STOCK_TOOL_MYPAINT_BRUSH, + { "tools-mypaint-brush-radius-set", GIMP_ICON_TOOL_MYPAINT_BRUSH, "Set MyPaint Brush Radius", NULL, NULL, GIMP_ACTION_SELECT_SET, TRUE, NULL } @@ -219,7 +219,7 @@ static const GimpEnumActionEntry tools_mybrush_radius_actions[] = static const GimpEnumActionEntry tools_mybrush_hardness_actions[] = { - { "tools-mypaint-brush-hardness-set", GIMP_STOCK_TOOL_MYPAINT_BRUSH, + { "tools-mypaint-brush-hardness-set", GIMP_ICON_TOOL_MYPAINT_BRUSH, "Set MyPaint Brush Hardness", NULL, NULL, GIMP_ACTION_SELECT_SET, TRUE, NULL } @@ -244,8 +244,7 @@ static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] = static const GimpEnumActionEntry tools_warp_effect_size_actions[] = { - { "tools-warp-effect-size-set", - GIMP_STOCK_TOOL_WARP, + { "tools-warp-effect-size-set", GIMP_ICON_TOOL_WARP, "Set Warp Effect Size", NULL, NULL, GIMP_ACTION_SELECT_SET, TRUE, NULL } @@ -253,8 +252,7 @@ static const GimpEnumActionEntry tools_warp_effect_size_actions[] = static const GimpEnumActionEntry tools_warp_effect_hardness_actions[] = { - { "tools-warp-effect-hardness-set", - GIMP_STOCK_TOOL_WARP, + { "tools-warp-effect-hardness-set", GIMP_ICON_TOOL_WARP, "Set Warp Effect Hardness", NULL, NULL, GIMP_ACTION_SELECT_SET, TRUE, NULL } diff --git a/app/dialogs/convert-precision-dialog.c b/app/dialogs/convert-precision-dialog.c index 0b50932f5d..97dff9289b 100644 --- a/app/dialogs/convert-precision-dialog.c +++ b/app/dialogs/convert-precision-dialog.c @@ -156,7 +156,7 @@ convert_precision_dialog_new (GimpImage *image, dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context, _("Precision Conversion"), "gimp-image-convert-precision", - GIMP_STOCK_CONVERT_PRECISION, + GIMP_ICON_CONVERT_PRECISION, blurb, parent, gimp_standard_help_func, diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c index bfcd5b5299..2cb9f407fc 100644 --- a/app/dialogs/dialogs.c +++ b/app/dialogs/dialogs.c @@ -331,7 +331,7 @@ static const GimpDialogFactoryEntry entries[] = N_("Paint Dynamics"), NULL, GIMP_STOCK_DYNAMICS, GIMP_HELP_DYNAMICS_DIALOG, GIMP_VIEW_SIZE_MEDIUM), LISTGRID (mypaint-brush, mypaint_brush, - N_("MyPaint Brushes"), NULL, GIMP_STOCK_MYPAINT_BRUSH, + N_("MyPaint Brushes"), NULL, GIMP_ICON_MYPAINT_BRUSH, GIMP_HELP_MYPAINT_BRUSH_DIALOG, GIMP_VIEW_SIZE_LARGE), LISTGRID (pattern, pattern, N_("Patterns"), NULL, GIMP_STOCK_PATTERN, @@ -384,7 +384,7 @@ static const GimpDialogFactoryEntry entries[] = GIMP_HELP_SELECTION_DIALOG, dialogs_selection_editor_new, 0, FALSE), DOCKABLE ("gimp-symmetry-editor", - N_("Symmetry Painting"), NULL, GIMP_STOCK_SYMMETRY, + N_("Symmetry Painting"), NULL, GIMP_ICON_SYMMETRY, GIMP_HELP_SYMMETRY_DIALOG, dialogs_symmetry_editor_new, 0, FALSE), DOCKABLE ("gimp-undo-history", diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 1410ab5167..989bea4253 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -2211,7 +2211,7 @@ prefs_dialog_new (Gimp *gimp, _("Maximum History Size:"), GTK_TABLE (table), 0, size_group); - button = prefs_button_add (GIMP_STOCK_SHRED, + button = prefs_button_add (GIMP_ICON_SHRED, _("Clear Action History"), GTK_BOX (vbox2)); g_signal_connect (button, "clicked", diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c index f10de3d485..f84fba11d3 100644 --- a/app/tools/gimpalignoptions.c +++ b/app/tools/gimpalignoptions.c @@ -233,10 +233,10 @@ gimp_align_options_button_new (GimpAlignOptions *options, icon_name = GIMP_STOCK_GRAVITY_SOUTH; break; case GIMP_ARRANGE_HFILL: - icon_name = GIMP_STOCK_HFILL; + icon_name = GIMP_ICON_HFILL; break; case GIMP_ARRANGE_VFILL: - icon_name = GIMP_STOCK_VFILL; + icon_name = GIMP_ICON_VFILL; break; default: g_return_val_if_reached (NULL); diff --git a/app/tools/gimphandletransformtool.c b/app/tools/gimphandletransformtool.c index 33dfdd2606..7e1255678a 100644 --- a/app/tools/gimphandletransformtool.c +++ b/app/tools/gimphandletransformtool.c @@ -166,7 +166,7 @@ gimp_handle_transform_tool_register (GimpToolRegisterCallback callback, "Deform the layer, selection or path with handles"), N_("_Handle Transform"), "H", NULL, GIMP_HELP_TOOL_HANDLE_TRANSFORM, - GIMP_STOCK_TOOL_HANDLE_TRANSFORM, + GIMP_ICON_TOOL_HANDLE_TRANSFORM, data); } diff --git a/app/tools/gimpmybrushtool.c b/app/tools/gimpmybrushtool.c index 78bbad55a1..5203681ef7 100644 --- a/app/tools/gimpmybrushtool.c +++ b/app/tools/gimpmybrushtool.c @@ -74,7 +74,7 @@ gimp_mybrush_tool_register (GimpToolRegisterCallback callback, _("MyPaint Brush Tool: Use MyPaint brushes in GIMP"), N_("M_yPaint Brush"), "Y", NULL, GIMP_HELP_TOOL_MYPAINT_BRUSH, - GIMP_STOCK_TOOL_MYPAINT_BRUSH, + GIMP_ICON_TOOL_MYPAINT_BRUSH, data); } diff --git a/app/tools/gimpnpointdeformationtool.c b/app/tools/gimpnpointdeformationtool.c index 8c35534494..e2a6d3e119 100644 --- a/app/tools/gimpnpointdeformationtool.c +++ b/app/tools/gimpnpointdeformationtool.c @@ -160,7 +160,7 @@ gimp_n_point_deformation_tool_register (GimpToolRegisterCallback callback, "image using points"), N_("_N-Point Deformation"), "N", NULL, GIMP_HELP_TOOL_N_POINT_DEFORMATION, - GIMP_STOCK_TOOL_N_POINT_DEFORMATION, + GIMP_ICON_TOOL_N_POINT_DEFORMATION, data); } diff --git a/app/tools/gimpseamlessclonetool.c b/app/tools/gimpseamlessclonetool.c index 9238ff3688..e0562fd877 100644 --- a/app/tools/gimpseamlessclonetool.c +++ b/app/tools/gimpseamlessclonetool.c @@ -191,7 +191,7 @@ gimp_seamless_clone_tool_register (GimpToolRegisterCallback callback, _("Seamless Clone: Seamlessly paste one image into another"), N_("_Seamless Clone"), NULL, NULL, GIMP_HELP_TOOL_SEAMLESS_CLONE, - GIMP_STOCK_TOOL_SEAMLESS_CLONE, + GIMP_ICON_TOOL_SEAMLESS_CLONE, data); } @@ -762,7 +762,7 @@ gimp_seamless_clone_tool_create_filter (GimpSeamlessCloneTool *sc, sc->filter = gimp_drawable_filter_new (drawable, _("Seamless Clone"), sc->render_node, - GIMP_STOCK_TOOL_SEAMLESS_CLONE); + GIMP_ICON_TOOL_SEAMLESS_CLONE); gimp_drawable_filter_set_region (sc->filter, GIMP_FILTER_REGION_DRAWABLE); diff --git a/app/tools/gimpunifiedtransformtool.c b/app/tools/gimpunifiedtransformtool.c index 6141338057..7be8a4066a 100644 --- a/app/tools/gimpunifiedtransformtool.c +++ b/app/tools/gimpunifiedtransformtool.c @@ -106,7 +106,7 @@ gimp_unified_transform_tool_register (GimpToolRegisterCallback callback, "Transform the layer, selection or path"), N_("_Unified Transform"), "L", NULL, GIMP_HELP_TOOL_UNIFIED_TRANSFORM, - GIMP_STOCK_TOOL_UNIFIED_TRANSFORM, + GIMP_ICON_TOOL_UNIFIED_TRANSFORM, data); } diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c index 68aed1e73f..23af7a59ec 100644 --- a/app/tools/gimpwarptool.c +++ b/app/tools/gimpwarptool.c @@ -143,7 +143,7 @@ gimp_warp_tool_register (GimpToolRegisterCallback callback, _("Warp Transform: Deform with different tools"), N_("_Warp Transform"), "W", NULL, GIMP_HELP_TOOL_WARP, - GIMP_STOCK_TOOL_WARP, + GIMP_ICON_TOOL_WARP, data); } @@ -751,7 +751,7 @@ gimp_warp_tool_create_filter (GimpWarpTool *wt, wt->filter = gimp_drawable_filter_new (drawable, _("Warp transform"), wt->graph, - GIMP_STOCK_TOOL_WARP); + GIMP_ICON_TOOL_WARP); gimp_drawable_filter_set_region (wt->filter, GIMP_FILTER_REGION_DRAWABLE); diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index d8e7b1f0de..de66428a69 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -139,7 +139,7 @@ gimp_file_entry_init (GimpFileEntry *entry) gtk_widget_set_sensitive (button, FALSE); - image = gtk_image_new_from_icon_name (GIMP_STOCK_FILE_MANAGER, + image = gtk_image_new_from_icon_name (GIMP_ICON_FILE_MANAGER, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (button), image); gtk_widget_show (image); diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c index 0bec46e149..eb9a6bc9c2 100644 --- a/libgimpwidgets/gimpicons.c +++ b/libgimpwidgets/gimpicons.c @@ -67,13 +67,6 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_RESET, N_("_Reset"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_IMAGE_OPEN, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_IMAGE_RELOAD, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_CLOSE_ALL, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_CLIPBOARD, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_FILE_MANAGER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_SHRED, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_GRADIENT_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRADIENT_BILINEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRADIENT_RADIAL, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -98,9 +91,6 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_HCENTER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_VCENTER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_HFILL, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_VFILL, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_HCHAIN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_VCHAIN, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -124,8 +114,6 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_COLOR_PICKER_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_PICKER_WHITE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_COLOR_CMYK, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_COLOR_WATER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_PICK_FROM_SCREEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -266,15 +254,12 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_TOOL_FOREGROUND_SELECT, N_("_Select"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_FUZZY_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_HUE_SATURATION, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_HANDLE_TRANSFORM,N_("_Transform"),0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_HEAL, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_INK, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_ISCISSORS, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_LEVELS, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_MEASURE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_MOVE, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_MYPAINT_BRUSH, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_N_POINT_DEFORMATION, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_PAINTBRUSH, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_PATH, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_PENCIL, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -284,13 +269,10 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_TOOL_RECT_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_ROTATE, N_("_Rotate"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_SCALE, N_("_Scale"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_SEAMLESS_CLONE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_SHEAR, N_("_Shear"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_SMUDGE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_TEXT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_THRESHOLD, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_UNIFIED_TRANSFORM, N_("_Transform"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_WARP, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_ZOOM, NULL, 0, 0, LIBGIMP_DOMAIN } }; diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index 4d82e5c77e..be0dec069d 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -31,6 +31,31 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ +#define GIMP_ICON_IMAGE_OPEN "gimp-image-open" +#define GIMP_ICON_IMAGE_RELOAD "gimp-image-reload" +#define GIMP_ICON_CLOSE_ALL "gimp-close-all" +#define GIMP_ICON_FILE_MANAGER "gimp-file-manager" +#define GIMP_ICON_SHRED "gimp-shred" + +#define GIMP_ICON_HFILL "gimp-hfill" +#define GIMP_ICON_VFILL "gimp-vfill" + +#define GIMP_ICON_COLOR_CMYK "gimp-color-cmyk" +#define GIMP_ICON_COLOR_WATER "gimp-color-water" + +#define GIMP_ICON_TOOL_HANDLE_TRANSFORM "gimp-tool-handle-transform" +#define GIMP_ICON_TOOL_MYPAINT_BRUSH "gimp-tool-mypaint-brush" +#define GIMP_ICON_TOOL_N_POINT_DEFORMATION "gimp-tool-n-point-deformation" +#define GIMP_ICON_TOOL_SEAMLESS_CLONE "gimp-tool-seamless-clone" +#define GIMP_ICON_TOOL_UNIFIED_TRANSFORM "gimp-tool-unified-transform" +#define GIMP_ICON_TOOL_WARP "gimp-tool-warp" + +#define GIMP_ICON_SYMMETRY "gimp-symmetry" + +#define GIMP_ICON_MYPAINT_BRUSH GIMP_ICON_TOOL_MYPAINT_BRUSH +#define GIMP_ICON_CONVERT_PRECISION GIMP_STOCK_CONVERT_RGB + + /* in button size: */ #define GIMP_STOCK_ANCHOR "gimp-anchor" @@ -42,13 +67,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_RESET "gimp-reset" #define GIMP_STOCK_VISIBLE "gimp-visible" -#define GIMP_STOCK_IMAGE_OPEN "gimp-image-open" -#define GIMP_STOCK_IMAGE_RELOAD "gimp-image-reload" -#define GIMP_STOCK_CLOSE_ALL "gimp-close-all" -#define GIMP_STOCK_CLIPBOARD "gimp-clipboard" -#define GIMP_STOCK_FILE_MANAGER "gimp-file-manager" -#define GIMP_STOCK_SHRED "gimp-shred" - #define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear" #define GIMP_STOCK_GRADIENT_BILINEAR "gimp-gradient-bilinear" #define GIMP_STOCK_GRADIENT_RADIAL "gimp-gradient-radial" @@ -73,9 +91,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_HCENTER "gimp-hcenter" #define GIMP_STOCK_VCENTER "gimp-vcenter" -#define GIMP_STOCK_HFILL "gimp-hfill" -#define GIMP_STOCK_VFILL "gimp-vfill" - #define GIMP_STOCK_HCHAIN "gimp-hchain" #define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken" #define GIMP_STOCK_VCHAIN "gimp-vchain" @@ -99,8 +114,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_COLOR_PICKER_GRAY "gimp-color-picker-gray" #define GIMP_STOCK_COLOR_PICKER_WHITE "gimp-color-picker-white" #define GIMP_STOCK_COLOR_TRIANGLE "gimp-color-triangle" -#define GIMP_STOCK_COLOR_CMYK "gimp-color-cmyk" -#define GIMP_STOCK_COLOR_WATER "gimp-color-water" #define GIMP_STOCK_COLOR_PICK_FROM_SCREEN "gimp-color-pick-from-screen" #define GIMP_STOCK_CHAR_PICKER "gimp-char-picker" @@ -133,7 +146,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_TOOL_FREE_SELECT "gimp-tool-free-select" #define GIMP_STOCK_TOOL_FOREGROUND_SELECT "gimp-tool-foreground-select" #define GIMP_STOCK_TOOL_FUZZY_SELECT "gimp-tool-fuzzy-select" -#define GIMP_STOCK_TOOL_HANDLE_TRANSFORM "gimp-tool-handle-transform" #define GIMP_STOCK_TOOL_HEAL "gimp-tool-heal" #define GIMP_STOCK_TOOL_HUE_SATURATION "gimp-tool-hue-saturation" #define GIMP_STOCK_TOOL_INK "gimp-tool-ink" @@ -141,8 +153,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_TOOL_LEVELS "gimp-tool-levels" #define GIMP_STOCK_TOOL_MEASURE "gimp-tool-measure" #define GIMP_STOCK_TOOL_MOVE "gimp-tool-move" -#define GIMP_STOCK_TOOL_MYPAINT_BRUSH "gimp-tool-mypaint-brush" -#define GIMP_STOCK_TOOL_N_POINT_DEFORMATION "gimp-tool-n-point-deformation" #define GIMP_STOCK_TOOL_PAINTBRUSH "gimp-tool-paintbrush" #define GIMP_STOCK_TOOL_PATH "gimp-tool-path" #define GIMP_STOCK_TOOL_PENCIL "gimp-tool-pencil" @@ -152,13 +162,10 @@ G_BEGIN_DECLS #define GIMP_STOCK_TOOL_RECT_SELECT "gimp-tool-rect-select" #define GIMP_STOCK_TOOL_ROTATE "gimp-tool-rotate" #define GIMP_STOCK_TOOL_SCALE "gimp-tool-scale" -#define GIMP_STOCK_TOOL_SEAMLESS_CLONE "gimp-tool-seamless-clone" #define GIMP_STOCK_TOOL_SHEAR "gimp-tool-shear" #define GIMP_STOCK_TOOL_SMUDGE "gimp-tool-smudge" #define GIMP_STOCK_TOOL_TEXT "gimp-tool-text" #define GIMP_STOCK_TOOL_THRESHOLD "gimp-tool-threshold" -#define GIMP_STOCK_TOOL_UNIFIED_TRANSFORM "gimp-tool-unified-transform" -#define GIMP_STOCK_TOOL_WARP "gimp-tool-warp" #define GIMP_STOCK_TOOL_ZOOM "gimp-tool-zoom" @@ -200,7 +207,7 @@ G_BEGIN_DECLS #ifndef GIMP_DISABLE_DEPRECATED #define GIMP_STOCK_INDEXED_PALETTE "gimp-colormap" -#endif +#endif /* GIMP_DISABLE_DEPRECATED */ #define GIMP_STOCK_IMAGES "gimp-images" #define GIMP_STOCK_LAYERS "gimp-layers" @@ -220,7 +227,7 @@ G_BEGIN_DECLS #ifndef GIMP_DISABLE_DEPRECATED #define GIMP_STOCK_QMASK_OFF "gimp-quick-mask-off" #define GIMP_STOCK_QMASK_ON "gimp-quick-mask-on" -#endif +#endif /* GIMP_DISABLE_DEPRECATED */ #define GIMP_STOCK_HISTOGRAM "gimp-histogram" #define GIMP_STOCK_HISTOGRAM_LINEAR "gimp-histogram-linear" @@ -240,7 +247,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_INPUT_DEVICE "gimp-input-device" #define GIMP_STOCK_CURSOR "gimp-cursor" #define GIMP_STOCK_SAMPLE_POINT "gimp-sample-point" -#define GIMP_STOCK_SYMMETRY "gimp-symmetry" #define GIMP_STOCK_DYNAMICS "gimp-dynamics" #define GIMP_STOCK_TOOL_PRESET "gimp-tool-preset" @@ -297,11 +303,10 @@ G_BEGIN_DECLS #define GIMP_STOCK_BRUSH GIMP_STOCK_TOOL_PAINTBRUSH #define GIMP_STOCK_BUFFER "edit-paste" #define GIMP_STOCK_DETACH GTK_STOCK_CONVERT +#define GIMP_STOCK_FONT GTK_STOCK_SELECT_FONT #define GIMP_STOCK_GRADIENT GIMP_STOCK_TOOL_BLEND -#define GIMP_STOCK_MYPAINT_BRUSH GIMP_STOCK_TOOL_MYPAINT_BRUSH #define GIMP_STOCK_PALETTE GTK_STOCK_SELECT_COLOR #define GIMP_STOCK_CONTROLLER_MOUSE GIMP_STOCK_CURSOR -#define GIMP_STOCK_CONVERT_PRECISION GIMP_STOCK_CONVERT_RGB #define GIMP_STOCK_PRINT_RESOLUTION "document-print" /* Deprecated icons: */ diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c index e6f3c9813c..53a76ca308 100644 --- a/modules/color-selector-cmyk.c +++ b/modules/color-selector-cmyk.c @@ -115,7 +115,7 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass) selector_class->name = _("CMYK"); selector_class->help_id = "gimp-colorselector-cmyk"; - selector_class->icon_name = GIMP_STOCK_COLOR_CMYK; + selector_class->icon_name = GIMP_ICON_COLOR_CMYK; selector_class->set_color = colorsel_cmyk_set_color; selector_class->set_config = colorsel_cmyk_set_config; } diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c index ab67e1482c..de48b7226c 100644 --- a/modules/color-selector-water.c +++ b/modules/color-selector-water.c @@ -129,7 +129,7 @@ colorsel_water_class_init (ColorselWaterClass *klass) selector_class->name = _("Watercolor"); selector_class->help_id = "gimp-colorselector-watercolor"; - selector_class->icon_name = GIMP_STOCK_COLOR_WATER; + selector_class->icon_name = GIMP_ICON_COLOR_WATER; selector_class->set_config = colorsel_water_set_config; }