diff --git a/ChangeLog b/ChangeLog index 695e25a323..3f7d6f1a31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +2006-10-01 Michael Natterer + + * libgimpwidgets/gimpcolordisplay.[ch] + * libgimpwidgets/gimpcontroller.[ch]: added "const gchar *stock_id" + members to the class structs. + + * libgimpwidgets/gimpstock.[ch] + * themes/Default/images/Makefile.am + * themes/Default/images/stock-controller-16.png + * themes/Default/images/stock-controller-24.png + * themes/Default/images/stock-controller-keyboard-16.png + * themes/Default/images/stock-controller-keyboard-24.png + * themes/Default/images/stock-controller-linux-input-16.png + * themes/Default/images/stock-controller-linux-input-24.png + * themes/Default/images/stock-controller-midi-16.png + * themes/Default/images/stock-controller-midi-24.png + * themes/Default/images/stock-controller-wheel-16.png + * themes/Default/images/stock-controller-wheel-24.png + * themes/Default/images/stock-display-filter-colorblind-16.png + * themes/Default/images/stock-display-filter-colorblind-24.png + * themes/Default/images/stock-display-filter-contrast-16.png + * themes/Default/images/stock-display-filter-contrast-24.png + * themes/Default/images/stock-display-filter-gamma-16.png + * themes/Default/images/stock-display-filter-gamma-24.png + * themes/Default/images/stock-display-filter-lcms-16.png + * themes/Default/images/stock-display-filter-lcms-24.png + * themes/Default/images/stock-display-filter-proof-16.png + * themes/Default/images/stock-display-filter-proof-24.png: added + icons for the various display filters and controllers. Made them + as ugly as sin to trigger some replacement pain in the relevant + people ;) + + * modules/cdisplay_colorblind.c + * modules/cdisplay_gamma.c + * modules/cdisplay_highcontrast.c + * modules/cdisplay_lcms.c + * modules/cdisplay_proof.c + * modules/controller_linux_input.c + * modules/controller_midi.c + * app/widgets/gimpcontrollerkeyboard.c + * app/widgets/gimpcontrollerwheel.c: set icons. + + * app/widgets/gimpcolordisplayeditor.c + * app/widgets/gimpcontrollerinfo.c + * app/widgets/gimpcontrollerlist.c: show them in the display filter + and controller GUIs. + 2006-10-01 Michael Natterer * themes/Small/gtkrc: it makes little sense to set focus-line-width diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index a22070bfaf..9b01cac69b 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -33,13 +33,14 @@ #include "gimp-intl.h" -#define LIST_WIDTH 150 +#define LIST_WIDTH 200 #define LIST_HEIGHT 100 enum { SRC_COLUMN_NAME, + SRC_COLUMN_ICON, SRC_COLUMN_TYPE, N_SRC_COLUMNS }; @@ -48,6 +49,7 @@ enum { DEST_COLUMN_ENABLED, DEST_COLUMN_NAME, + DEST_COLUMN_ICON, DEST_COLUMN_FILTER, N_DEST_COLUMNS }; @@ -137,6 +139,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor) gtk_widget_show (scrolled_win); editor->src = gtk_list_store_new (N_SRC_COLUMNS, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_GTYPE); tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (editor->src)); @@ -145,11 +148,22 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor) gtk_widget_set_size_request (tv, LIST_WIDTH, LIST_HEIGHT); gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tv), FALSE); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tv), - 0, _("Available Filters"), - gtk_cell_renderer_text_new (), - "text", SRC_COLUMN_NAME, - NULL); + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (column, _("Available Filters")); + gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column); + + rend = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, rend, FALSE); + gtk_tree_view_column_set_attributes (column, rend, + "stock-id", SRC_COLUMN_ICON, + NULL); + + rend = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, rend, TRUE); + gtk_tree_view_column_set_attributes (column, rend, + "text", SRC_COLUMN_NAME, + NULL); + gtk_container_add (GTK_CONTAINER (scrolled_win), tv); gtk_widget_show (tv); @@ -226,6 +240,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor) editor->dest = gtk_list_store_new (N_DEST_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, + G_TYPE_STRING, GIMP_TYPE_COLOR_DISPLAY); tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (editor->dest)); g_object_unref (editor->dest); @@ -249,11 +264,21 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor) gtk_tree_view_column_set_widget (column, image); gtk_widget_show (image); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tv), - 1, _("Active Filters"), - gtk_cell_renderer_text_new (), - "text", DEST_COLUMN_NAME, - NULL); + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (column, _("Active Filters")); + gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column); + + rend = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, rend, FALSE); + gtk_tree_view_column_set_attributes (column, rend, + "stock-id", DEST_COLUMN_ICON, + NULL); + + rend = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, rend, TRUE); + gtk_tree_view_column_set_attributes (column, rend, + "text", DEST_COLUMN_NAME, + NULL); gtk_container_add (GTK_CONTAINER (scrolled_win), tv); gtk_widget_show (tv); @@ -342,6 +367,7 @@ gimp_color_display_editor_new (GimpColorDisplayStack *stack) gtk_list_store_append (editor->src, &iter); gtk_list_store_set (editor->src, &iter, + SRC_COLUMN_ICON, display_class->stock_id, SRC_COLUMN_NAME, display_class->name, SRC_COLUMN_TYPE, display_types[i], -1); @@ -357,15 +383,18 @@ gimp_color_display_editor_new (GimpColorDisplayStack *stack) GtkTreeIter iter; gboolean enabled; const gchar *name; + const gchar *stock_id; enabled = gimp_color_display_get_enabled (display); - name = GIMP_COLOR_DISPLAY_GET_CLASS (display)->name; + name = GIMP_COLOR_DISPLAY_GET_CLASS (display)->name; + stock_id = GIMP_COLOR_DISPLAY_GET_CLASS (display)->stock_id; gtk_list_store_append (editor->dest, &iter); gtk_list_store_set (editor->dest, &iter, DEST_COLUMN_ENABLED, enabled, + DEST_COLUMN_ICON, stock_id, DEST_COLUMN_NAME, name, DEST_COLUMN_FILTER, display, -1); @@ -554,15 +583,18 @@ gimp_color_display_editor_added (GimpColorDisplayStack *stack, GtkTreeIter iter; gboolean enabled; const gchar *name; + const gchar *stock_id; enabled = gimp_color_display_get_enabled (display); - name = GIMP_COLOR_DISPLAY_GET_CLASS (display)->name; + name = GIMP_COLOR_DISPLAY_GET_CLASS (display)->name; + stock_id = GIMP_COLOR_DISPLAY_GET_CLASS (display)->stock_id; gtk_list_store_insert (editor->dest, &iter, position); gtk_list_store_set (editor->dest, &iter, DEST_COLUMN_ENABLED, enabled, + DEST_COLUMN_ICON, stock_id, DEST_COLUMN_NAME, name, DEST_COLUMN_FILTER, display, -1); diff --git a/app/widgets/gimpcontrollerinfo.c b/app/widgets/gimpcontrollerinfo.c index f9117f23f3..651f7be5bf 100644 --- a/app/widgets/gimpcontrollerinfo.c +++ b/app/widgets/gimpcontrollerinfo.c @@ -100,11 +100,14 @@ static guint info_signals[LAST_SIGNAL] = { 0 }; static void gimp_controller_info_class_init (GimpControllerInfoClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass); - object_class->finalize = gimp_controller_info_finalize; - object_class->set_property = gimp_controller_info_set_property; - object_class->get_property = gimp_controller_info_get_property; + object_class->finalize = gimp_controller_info_finalize; + object_class->set_property = gimp_controller_info_set_property; + object_class->get_property = gimp_controller_info_get_property; + + viewable_class->default_stock_id = GIMP_STOCK_CONTROLLER; GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ENABLED, "enabled", NULL, @@ -206,6 +209,9 @@ gimp_controller_info_set_property (GObject *object, G_CALLBACK (gimp_controller_info_event), G_OBJECT (info), 0); + + gimp_viewable_set_stock_id (GIMP_VIEWABLE (info), + GIMP_CONTROLLER_GET_CLASS (info->controller)->stock_id); } break; case PROP_MAPPING: diff --git a/app/widgets/gimpcontrollerkeyboard.c b/app/widgets/gimpcontrollerkeyboard.c index 3f1d58f42b..76a67a0f63 100644 --- a/app/widgets/gimpcontrollerkeyboard.c +++ b/app/widgets/gimpcontrollerkeyboard.c @@ -178,6 +178,7 @@ gimp_controller_keyboard_class_init (GimpControllerKeyboardClass *klass) controller_class->name = _("Keyboard"); controller_class->help_id = GIMP_HELP_CONTROLLER_KEYBOARD; + controller_class->stock_id = GIMP_STOCK_CONTROLLER_KEYBOARD; controller_class->get_n_events = gimp_controller_keyboard_get_n_events; controller_class->get_event_name = gimp_controller_keyboard_get_event_name; diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c index 2fc60c6ee1..a7799e759d 100644 --- a/app/widgets/gimpcontrollerlist.c +++ b/app/widgets/gimpcontrollerlist.c @@ -223,7 +223,7 @@ gimp_controller_list_init (GimpControllerList *list) gtk_list_store_append (list->src, &iter); gtk_list_store_set (list->src, &iter, - COLUMN_ICON, "gimp-info", + COLUMN_ICON, controller_class->stock_id, COLUMN_NAME, controller_class->name, COLUMN_TYPE, controller_types[i], -1); diff --git a/app/widgets/gimpcontrollerwheel.c b/app/widgets/gimpcontrollerwheel.c index bffc6c8b5f..c20679fca0 100644 --- a/app/widgets/gimpcontrollerwheel.c +++ b/app/widgets/gimpcontrollerwheel.c @@ -177,6 +177,7 @@ gimp_controller_wheel_class_init (GimpControllerWheelClass *klass) controller_class->name = _("Mouse Wheel"); controller_class->help_id = GIMP_HELP_CONTROLLER_WHEEL; + controller_class->stock_id = GIMP_STOCK_CONTROLLER_WHEEL; controller_class->get_n_events = gimp_controller_wheel_get_n_events; controller_class->get_event_name = gimp_controller_wheel_get_event_name; diff --git a/libgimpwidgets/gimpcolordisplay.c b/libgimpwidgets/gimpcolordisplay.c index 8ed7f57996..560fd34c17 100644 --- a/libgimpwidgets/gimpcolordisplay.c +++ b/libgimpwidgets/gimpcolordisplay.c @@ -33,6 +33,7 @@ #include "gimpwidgetstypes.h" #include "gimpcolordisplay.h" +#include "gimpstock.h" enum @@ -91,6 +92,7 @@ gimp_color_display_class_init (GimpColorDisplayClass *klass) klass->name = "Unnamed"; klass->help_id = NULL; + klass->stock_id = GIMP_STOCK_DISPLAY_FILTER; klass->clone = NULL; klass->convert = NULL; diff --git a/libgimpwidgets/gimpcolordisplay.h b/libgimpwidgets/gimpcolordisplay.h index da6a40afac..63a3e703de 100644 --- a/libgimpwidgets/gimpcolordisplay.h +++ b/libgimpwidgets/gimpcolordisplay.h @@ -79,8 +79,9 @@ struct _GimpColorDisplayClass /* signals */ void (* changed) (GimpColorDisplay *display); + const gchar *stock_id; + /* Padding for future expansion */ - void (* _gimp_reserved1) (void); void (* _gimp_reserved2) (void); void (* _gimp_reserved3) (void); void (* _gimp_reserved4) (void); diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c index 80d81ea1d8..0c242bc810 100644 --- a/libgimpwidgets/gimpcontroller.c +++ b/libgimpwidgets/gimpcontroller.c @@ -33,6 +33,7 @@ #define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION #include "gimpcontroller.h" +#include "gimpstock.h" enum { @@ -95,6 +96,7 @@ gimp_controller_class_init (GimpControllerClass *klass) klass->name = "Unnamed"; klass->help_domain = NULL; klass->help_id = NULL; + klass->stock_id = GIMP_STOCK_CONTROLLER; klass->get_n_events = NULL; klass->get_event_name = NULL; diff --git a/libgimpwidgets/gimpcontroller.h b/libgimpwidgets/gimpcontroller.h index fc3d290b97..24c7d46c5f 100644 --- a/libgimpwidgets/gimpcontroller.h +++ b/libgimpwidgets/gimpcontroller.h @@ -111,8 +111,9 @@ struct _GimpControllerClass gboolean (* event) (GimpController *controller, const GimpControllerEvent *event); + const gchar *stock_id; + /* Padding for future expansion */ - void (* _gimp_reserved1) (void); void (* _gimp_reserved2) (void); void (* _gimp_reserved3) (void); void (* _gimp_reserved4) (void); diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 150600b382..a657ebbc58 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -199,7 +199,6 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_TOOLS, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_OPTIONS, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_DEVICE_STATUS, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_DISPLAY_FILTER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CURSOR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_SAMPLE_POINT, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -236,6 +235,20 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_QUICK_MASK_ON, NULL, 0, 0, LIBGIMP_DOMAIN }, { "gimp-qmask-off", /* compat */ NULL, 0, 0, LIBGIMP_DOMAIN }, { "gimp-qmask-on", /* compat */ NULL, 0, 0, LIBGIMP_DOMAIN }, + + { GIMP_STOCK_CONTROLLER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CONTROLLER_KEYBOARD, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CONTROLLER_LINUX_INPUT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CONTROLLER_MIDI, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CONTROLLER_WHEEL, NULL, 0, 0, LIBGIMP_DOMAIN }, + + { GIMP_STOCK_DISPLAY_FILTER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_DISPLAY_FILTER_CONTRAST, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_DISPLAY_FILTER_GAMMA, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_DISPLAY_FILTER_LCMS, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_DISPLAY_FILTER_PROOF, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_LIST, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRID, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -249,9 +262,11 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_SHAPE_CIRCLE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_SHAPE_DIAMOND, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_SHAPE_SQUARE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CAP_BUTT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CAP_ROUND, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CAP_SQUARE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_JOIN_MITER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_JOIN_ROUND, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_JOIN_BEVEL, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -375,10 +390,22 @@ gimp_stock_button_pixbufs[] = { GIMP_STOCK_TOOLS, stock_tools_24 }, { GIMP_STOCK_TOOL_OPTIONS, stock_tool_options_24 }, { GIMP_STOCK_DEVICE_STATUS, stock_device_status_24 }, - { GIMP_STOCK_DISPLAY_FILTER, stock_display_filter_24 }, { GIMP_STOCK_CURSOR, stock_cursor_24 }, { GIMP_STOCK_SAMPLE_POINT, stock_sample_point_24 }, + { GIMP_STOCK_CONTROLLER, stock_controller_24 }, + { GIMP_STOCK_CONTROLLER_KEYBOARD, stock_controller_keyboard_24 }, + { GIMP_STOCK_CONTROLLER_LINUX_INPUT, stock_controller_linux_input_24 }, + { GIMP_STOCK_CONTROLLER_MIDI, stock_controller_midi_24 }, + { GIMP_STOCK_CONTROLLER_WHEEL, stock_controller_wheel_24 }, + + { GIMP_STOCK_DISPLAY_FILTER, stock_display_filter_24 }, + { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, stock_display_filter_colorblind_24 }, + { GIMP_STOCK_DISPLAY_FILTER_CONTRAST, stock_display_filter_contrast_24 }, + { GIMP_STOCK_DISPLAY_FILTER_GAMMA, stock_display_filter_gamma_24 }, + { GIMP_STOCK_DISPLAY_FILTER_LCMS, stock_display_filter_lcms_24 }, + { GIMP_STOCK_DISPLAY_FILTER_PROOF, stock_display_filter_proof_24 }, + { GIMP_STOCK_CHANNEL, stock_channel_24 }, { GIMP_STOCK_CHANNEL_RED, stock_channel_red_24 }, { GIMP_STOCK_CHANNEL_GREEN, stock_channel_green_24 }, @@ -487,10 +514,22 @@ gimp_stock_menu_pixbufs[] = { GIMP_STOCK_TOOLS, stock_tools_16 }, { GIMP_STOCK_TOOL_OPTIONS, stock_tool_options_16 }, { GIMP_STOCK_DEVICE_STATUS, stock_device_status_16 }, - { GIMP_STOCK_DISPLAY_FILTER, stock_display_filter_16 }, { GIMP_STOCK_CURSOR, stock_cursor_16 }, { GIMP_STOCK_SAMPLE_POINT, stock_sample_point_16 }, + { GIMP_STOCK_CONTROLLER, stock_controller_16 }, + { GIMP_STOCK_CONTROLLER_KEYBOARD, stock_controller_keyboard_16 }, + { GIMP_STOCK_CONTROLLER_LINUX_INPUT, stock_controller_linux_input_16 }, + { GIMP_STOCK_CONTROLLER_MIDI, stock_controller_midi_16 }, + { GIMP_STOCK_CONTROLLER_WHEEL, stock_controller_wheel_16 }, + + { GIMP_STOCK_DISPLAY_FILTER, stock_display_filter_16 }, + { GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, stock_display_filter_colorblind_16 }, + { GIMP_STOCK_DISPLAY_FILTER_CONTRAST, stock_display_filter_contrast_16 }, + { GIMP_STOCK_DISPLAY_FILTER_GAMMA, stock_display_filter_gamma_16 }, + { GIMP_STOCK_DISPLAY_FILTER_LCMS, stock_display_filter_lcms_16 }, + { GIMP_STOCK_DISPLAY_FILTER_PROOF, stock_display_filter_proof_16 }, + { GIMP_STOCK_CHANNEL, stock_channel_16 }, { GIMP_STOCK_CHANNEL_RED, stock_channel_red_16 }, { GIMP_STOCK_CHANNEL_GREEN, stock_channel_green_16 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index 114cb9b424..4b069f8307 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -215,10 +215,22 @@ G_BEGIN_DECLS #define GIMP_STOCK_TOOLS "gimp-tools" #define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options" #define GIMP_STOCK_DEVICE_STATUS "gimp-device-status" -#define GIMP_STOCK_DISPLAY_FILTER "gimp-display-filter" #define GIMP_STOCK_CURSOR "gimp-cursor" #define GIMP_STOCK_SAMPLE_POINT "gimp-sample-point" +#define GIMP_STOCK_CONTROLLER "gimp-controller" +#define GIMP_STOCK_CONTROLLER_KEYBOARD "gimp-controller-keyboard" +#define GIMP_STOCK_CONTROLLER_LINUX_INPUT "gimp-controller-linux-input" +#define GIMP_STOCK_CONTROLLER_MIDI "gimp-controller-midi" +#define GIMP_STOCK_CONTROLLER_WHEEL "gimp-controller-wheel" + +#define GIMP_STOCK_DISPLAY_FILTER "gimp-display-filter" +#define GIMP_STOCK_DISPLAY_FILTER_COLORBLIND "gimp-display-filter-colorblind" +#define GIMP_STOCK_DISPLAY_FILTER_CONTRAST "gimp-display-filter-contrast" +#define GIMP_STOCK_DISPLAY_FILTER_GAMMA "gimp-display-filter-gamma" +#define GIMP_STOCK_DISPLAY_FILTER_LCMS "gimp-display-filter-lcms" +#define GIMP_STOCK_DISPLAY_FILTER_PROOF "gimp-display-filter-proof" + #define GIMP_STOCK_LIST "gimp-list" #define GIMP_STOCK_GRID "gimp-grid" @@ -231,9 +243,11 @@ G_BEGIN_DECLS #define GIMP_STOCK_SHAPE_CIRCLE "gimp-shape-circle" #define GIMP_STOCK_SHAPE_DIAMOND "gimp-shape-diamond" #define GIMP_STOCK_SHAPE_SQUARE "gimp-shape-square" + #define GIMP_STOCK_CAP_BUTT "gimp-cap-butt" #define GIMP_STOCK_CAP_ROUND "gimp-cap-round" #define GIMP_STOCK_CAP_SQUARE "gimp-cap-square" + #define GIMP_STOCK_JOIN_MITER "gimp-join-miter" #define GIMP_STOCK_JOIN_ROUND "gimp-join-round" #define GIMP_STOCK_JOIN_BEVEL "gimp-join-bevel" diff --git a/modules/cdisplay_colorblind.c b/modules/cdisplay_colorblind.c index a654f401b6..07bfa93744 100644 --- a/modules/cdisplay_colorblind.c +++ b/modules/cdisplay_colorblind.c @@ -289,6 +289,8 @@ cdisplay_colorblind_class_init (CdisplayColorblindClass *klass) display_class->name = _("Color Deficient Vision"); display_class->help_id = "gimp-colordisplay-colorblind"; + display_class->stock_id = GIMP_STOCK_DISPLAY_FILTER_COLORBLIND; + display_class->convert = cdisplay_colorblind_convert; display_class->configure = cdisplay_colorblind_configure; display_class->changed = cdisplay_colorblind_changed; diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index f2b09dafff..a314b2d57f 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -159,6 +159,8 @@ cdisplay_gamma_class_init (CdisplayGammaClass *klass) display_class->name = _("Gamma"); display_class->help_id = "gimp-colordisplay-gamma"; + display_class->stock_id = GIMP_STOCK_DISPLAY_FILTER_GAMMA; + display_class->convert = cdisplay_gamma_convert; display_class->configure = cdisplay_gamma_configure; } diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index 2daeaba7e1..a6b42c8c76 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -159,6 +159,8 @@ cdisplay_contrast_class_init (CdisplayContrastClass *klass) display_class->name = _("Contrast"); display_class->help_id = "gimp-colordisplay-contrast"; + display_class->stock_id = GIMP_STOCK_DISPLAY_FILTER_CONTRAST; + display_class->convert = cdisplay_contrast_convert; display_class->configure = cdisplay_contrast_configure; } diff --git a/modules/cdisplay_lcms.c b/modules/cdisplay_lcms.c index adb1c85b8b..e7b0bc1bc5 100644 --- a/modules/cdisplay_lcms.c +++ b/modules/cdisplay_lcms.c @@ -174,6 +174,8 @@ cdisplay_lcms_class_init (CdisplayLcmsClass *klass) display_class->name = _("Color Management"); display_class->help_id = "gimp-colordisplay-lcms"; + display_class->stock_id = GIMP_STOCK_DISPLAY_FILTER_LCMS; + display_class->configure = cdisplay_lcms_configure; display_class->convert = cdisplay_lcms_convert; display_class->changed = cdisplay_lcms_changed; diff --git a/modules/cdisplay_proof.c b/modules/cdisplay_proof.c index 5be5048eb3..57bb7cbb21 100644 --- a/modules/cdisplay_proof.c +++ b/modules/cdisplay_proof.c @@ -178,6 +178,8 @@ cdisplay_proof_class_init (CdisplayProofClass *klass) display_class->name = _("Color Proof"); display_class->help_id = "gimp-colordisplay-proof"; + display_class->stock_id = GIMP_STOCK_DISPLAY_FILTER_PROOF; + display_class->convert = cdisplay_proof_convert; display_class->configure = cdisplay_proof_configure; display_class->changed = cdisplay_proof_changed; diff --git a/modules/controller_linux_input.c b/modules/controller_linux_input.c index bd1ad902bb..5343ecb2b8 100644 --- a/modules/controller_linux_input.c +++ b/modules/controller_linux_input.c @@ -226,6 +226,7 @@ linux_input_class_init (ControllerLinuxInputClass *klass) controller_class->name = _("Linux Input"); controller_class->help_id = "gimp-controller-linux-input"; + controller_class->stock_id = GIMP_STOCK_CONTROLLER_LINUX_INPUT; controller_class->get_n_events = linux_input_get_n_events; controller_class->get_event_name = linux_input_get_event_name; diff --git a/modules/controller_midi.c b/modules/controller_midi.c index f9387a36a8..fda1edf8f8 100644 --- a/modules/controller_midi.c +++ b/modules/controller_midi.c @@ -259,6 +259,7 @@ midi_class_init (ControllerMidiClass *klass) controller_class->name = _("MIDI"); controller_class->help_id = "gimp-controller-midi"; + controller_class->stock_id = GIMP_STOCK_CONTROLLER_MIDI; controller_class->get_n_events = midi_get_n_events; controller_class->get_event_name = midi_get_event_name; diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index 665bd3192b..ef3cf078af 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -31,6 +31,11 @@ STOCK_MENU_IMAGES = \ stock-channels-16.png \ stock-close-12.png \ stock-colormap-16.png \ + stock-controller-16.png \ + stock-controller-keyboard-16.png \ + stock-controller-linux-input-16.png \ + stock-controller-midi-16.png \ + stock-controller-wheel-16.png \ stock-convert-grayscale-16.png \ stock-convert-indexed-16.png \ stock-convert-rgb-16.png \ @@ -38,6 +43,11 @@ STOCK_MENU_IMAGES = \ stock-default-colors-12.png \ stock-device-status-16.png \ stock-display-filter-16.png \ + stock-display-filter-colorblind-16.png \ + stock-display-filter-contrast-16.png \ + stock-display-filter-gamma-16.png \ + stock-display-filter-lcms-16.png \ + stock-display-filter-proof-16.png \ stock-eye-12.png \ stock-flip-horizontal-16.png \ stock-flip-vertical-16.png \ @@ -130,11 +140,21 @@ STOCK_BUTTON_IMAGES = \ stock-color-pick-from-screen-16.png \ stock-color-triangle-16.png \ stock-colormap-24.png \ + stock-controller-24.png \ + stock-controller-keyboard-24.png \ + stock-controller-linux-input-24.png \ + stock-controller-midi-24.png \ + stock-controller-wheel-24.png \ stock-cursor-24.png \ stock-curve-free-16.png \ stock-curve-smooth-16.png \ stock-device-status-24.png \ stock-display-filter-24.png \ + stock-display-filter-colorblind-24.png \ + stock-display-filter-contrast-24.png \ + stock-display-filter-gamma-24.png \ + stock-display-filter-lcms-24.png \ + stock-display-filter-proof-24.png \ stock-duplicate-16.png \ stock-edit-16.png \ stock-eye-20.png \ diff --git a/themes/Default/images/stock-controller-16.png b/themes/Default/images/stock-controller-16.png new file mode 100644 index 0000000000..84a801ed84 Binary files /dev/null and b/themes/Default/images/stock-controller-16.png differ diff --git a/themes/Default/images/stock-controller-24.png b/themes/Default/images/stock-controller-24.png new file mode 100644 index 0000000000..eaf8f684cc Binary files /dev/null and b/themes/Default/images/stock-controller-24.png differ diff --git a/themes/Default/images/stock-controller-keyboard-16.png b/themes/Default/images/stock-controller-keyboard-16.png new file mode 100644 index 0000000000..7d5d58e1d6 Binary files /dev/null and b/themes/Default/images/stock-controller-keyboard-16.png differ diff --git a/themes/Default/images/stock-controller-keyboard-24.png b/themes/Default/images/stock-controller-keyboard-24.png new file mode 100644 index 0000000000..efda180c8e Binary files /dev/null and b/themes/Default/images/stock-controller-keyboard-24.png differ diff --git a/themes/Default/images/stock-controller-linux-input-16.png b/themes/Default/images/stock-controller-linux-input-16.png new file mode 100644 index 0000000000..5a3d3658e7 Binary files /dev/null and b/themes/Default/images/stock-controller-linux-input-16.png differ diff --git a/themes/Default/images/stock-controller-linux-input-24.png b/themes/Default/images/stock-controller-linux-input-24.png new file mode 100644 index 0000000000..28864065af Binary files /dev/null and b/themes/Default/images/stock-controller-linux-input-24.png differ diff --git a/themes/Default/images/stock-controller-midi-16.png b/themes/Default/images/stock-controller-midi-16.png new file mode 100644 index 0000000000..595786957d Binary files /dev/null and b/themes/Default/images/stock-controller-midi-16.png differ diff --git a/themes/Default/images/stock-controller-midi-24.png b/themes/Default/images/stock-controller-midi-24.png new file mode 100644 index 0000000000..5a7d8dcbc3 Binary files /dev/null and b/themes/Default/images/stock-controller-midi-24.png differ diff --git a/themes/Default/images/stock-controller-wheel-16.png b/themes/Default/images/stock-controller-wheel-16.png new file mode 100644 index 0000000000..385a65e452 Binary files /dev/null and b/themes/Default/images/stock-controller-wheel-16.png differ diff --git a/themes/Default/images/stock-controller-wheel-24.png b/themes/Default/images/stock-controller-wheel-24.png new file mode 100644 index 0000000000..bac54aa272 Binary files /dev/null and b/themes/Default/images/stock-controller-wheel-24.png differ diff --git a/themes/Default/images/stock-display-filter-colorblind-16.png b/themes/Default/images/stock-display-filter-colorblind-16.png new file mode 100644 index 0000000000..fb3edfbe83 Binary files /dev/null and b/themes/Default/images/stock-display-filter-colorblind-16.png differ diff --git a/themes/Default/images/stock-display-filter-colorblind-24.png b/themes/Default/images/stock-display-filter-colorblind-24.png new file mode 100644 index 0000000000..5ed3b6647a Binary files /dev/null and b/themes/Default/images/stock-display-filter-colorblind-24.png differ diff --git a/themes/Default/images/stock-display-filter-contrast-16.png b/themes/Default/images/stock-display-filter-contrast-16.png new file mode 100644 index 0000000000..fd96cc92a2 Binary files /dev/null and b/themes/Default/images/stock-display-filter-contrast-16.png differ diff --git a/themes/Default/images/stock-display-filter-contrast-24.png b/themes/Default/images/stock-display-filter-contrast-24.png new file mode 100644 index 0000000000..2b43941c37 Binary files /dev/null and b/themes/Default/images/stock-display-filter-contrast-24.png differ diff --git a/themes/Default/images/stock-display-filter-gamma-16.png b/themes/Default/images/stock-display-filter-gamma-16.png new file mode 100644 index 0000000000..a997854943 Binary files /dev/null and b/themes/Default/images/stock-display-filter-gamma-16.png differ diff --git a/themes/Default/images/stock-display-filter-gamma-24.png b/themes/Default/images/stock-display-filter-gamma-24.png new file mode 100644 index 0000000000..6eb254d379 Binary files /dev/null and b/themes/Default/images/stock-display-filter-gamma-24.png differ diff --git a/themes/Default/images/stock-display-filter-lcms-16.png b/themes/Default/images/stock-display-filter-lcms-16.png new file mode 100644 index 0000000000..f1b14f969d Binary files /dev/null and b/themes/Default/images/stock-display-filter-lcms-16.png differ diff --git a/themes/Default/images/stock-display-filter-lcms-24.png b/themes/Default/images/stock-display-filter-lcms-24.png new file mode 100644 index 0000000000..ec25ebe9b3 Binary files /dev/null and b/themes/Default/images/stock-display-filter-lcms-24.png differ diff --git a/themes/Default/images/stock-display-filter-proof-16.png b/themes/Default/images/stock-display-filter-proof-16.png new file mode 100644 index 0000000000..e009672696 Binary files /dev/null and b/themes/Default/images/stock-display-filter-proof-16.png differ diff --git a/themes/Default/images/stock-display-filter-proof-24.png b/themes/Default/images/stock-display-filter-proof-24.png new file mode 100644 index 0000000000..1ab0a31cdb Binary files /dev/null and b/themes/Default/images/stock-display-filter-proof-24.png differ