callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpwidgets: add GimpColorSelectorClass::icon_name

Browse Source 
and deprecate its stock_id.
This commit is contained in:
Michael Natterer
2014-05-10 08:33:29 +02:00
parent 23ec10b2c6
commit 1ec64abb8b
10 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/widgets/gimpcoloreditor.c
View File

@ -212,7 +212,7 @@ gimp_color_editor_init (GimpColorEditor *editor)
gtk_box_pack_start (GTK_BOX (editor->hbox), button, TRUE, TRUE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_icon_name (selector_class->stock_id,
image = gtk_image_new_from_icon_name (selector_class->icon_name,
GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);

2
app/widgets/gimpcolorselectorpalette.c
View File

@ -58,7 +58,7 @@ gimp_color_selector_palette_class_init (GimpColorSelectorPaletteClass *klass)
selector_class->name = _("Palette");
selector_class->help_id = "gimp-colorselector-palette";
selector_class->stock_id = GIMP_STOCK_PALETTE;
selector_class->icon_name = GIMP_STOCK_PALETTE;
selector_class->set_color = gimp_color_selector_palette_set_color;
selector_class->set_config = gimp_color_selector_palette_set_config;
}

7
libgimpwidgets/gimpcolornotebook.c
View File

@ -203,7 +203,8 @@ gimp_color_notebook_style_set (GtkWidget *widget,
selector_class = GIMP_COLOR_SELECTOR_GET_CLASS (list->data);
image = gtk_image_new_from_icon_name (selector_class->stock_id, icon_size);
image = gtk_image_new_from_icon_name (selector_class->icon_name,
icon_size);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook->notebook),
GTK_WIDGET (list->data),
@ -392,7 +393,7 @@ gimp_color_notebook_add_page (GimpColorNotebook *notebook,
menu_widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
image = gtk_image_new_from_icon_name (selector_class->stock_id,
image = gtk_image_new_from_icon_name (selector_class->icon_name,
GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (menu_widget), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@ -401,7 +402,7 @@ gimp_color_notebook_add_page (GimpColorNotebook *notebook,
gtk_box_pack_start (GTK_BOX (menu_widget), label, FALSE, FALSE, 0);
gtk_widget_show (label);
image = gtk_image_new_from_icon_name (selector_class->stock_id,
image = gtk_image_new_from_icon_name (selector_class->icon_name,
DEFAULT_TAB_ICON_SIZE);
gtk_notebook_append_page_menu (GTK_NOTEBOOK (notebook->notebook),

2
libgimpwidgets/gimpcolorscales.c
View File

@ -108,7 +108,7 @@ gimp_color_scales_class_init (GimpColorScalesClass *klass)
selector_class->name = _("Scales");
selector_class->help_id = "gimp-colorselector-scales";
selector_class->stock_id = GIMP_STOCK_TOOL_OPTIONS;
selector_class->icon_name = GIMP_STOCK_TOOL_OPTIONS;
selector_class->set_toggles_visible = gimp_color_scales_togg_visible;
selector_class->set_toggles_sensitive = gimp_color_scales_togg_sensitive;
selector_class->set_show_alpha = gimp_color_scales_set_show_alpha;

2
libgimpwidgets/gimpcolorselect.c
View File

@ -238,7 +238,7 @@ gimp_color_select_class_init (GimpColorSelectClass *klass)
selector_class->name = "GIMP";
selector_class->help_id = "gimp-colorselector-gimp";
selector_class->stock_id = GIMP_STOCK_WILBER;
selector_class->icon_name = GIMP_STOCK_WILBER;
selector_class->set_toggles_visible = gimp_color_select_togg_visible;
selector_class->set_toggles_sensitive = gimp_color_select_togg_sensitive;
selector_class->set_color = gimp_color_select_set_color;

2
libgimpwidgets/gimpcolorselector.c
View File

@ -96,7 +96,7 @@ gimp_color_selector_class_init (GimpColorSelectorClass *klass)
klass->name = "Unnamed";
klass->help_id = NULL;
klass->stock_id = GTK_STOCK_SELECT_COLOR;
klass->icon_name = GTK_STOCK_SELECT_COLOR;
klass->set_toggles_visible = NULL;
klass->set_toggles_sensitive = NULL;

8
libgimpwidgets/gimpcolorselector.h
View File

@ -82,7 +82,11 @@ struct _GimpColorSelectorClass
const gchar *name;
const gchar *help_id;
#ifdef GIMP_DISABLE_DEPRECATED
gpointer deprecated_stock_id;
#else
const gchar *stock_id;
#endif
/* virtual functions */
void (* set_toggles_visible) (GimpColorSelector *selector,
@ -108,8 +112,10 @@ struct _GimpColorSelectorClass
void (* set_config) (GimpColorSelector *selector,
GimpColorConfig *config);
/* icon name */
const gchar *icon_name;
/* Padding for future expansion */
void (* _gimp_reserved2) (void);
void (* _gimp_reserved3) (void);
void (* _gimp_reserved4) (void);
};

2
modules/color-selector-cmyk.c
View File

@ -117,7 +117,7 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass)
selector_class->name = _("CMYK");
selector_class->help_id = "gimp-colorselector-cmyk";
selector_class->stock_id = GTK_STOCK_PRINT; /* FIXME */
selector_class->icon_name = GTK_STOCK_PRINT; /* FIXME */
selector_class->set_color = colorsel_cmyk_set_color;
selector_class->set_config = colorsel_cmyk_set_config;
}

6
modules/color-selector-water.c
View File

@ -115,9 +115,9 @@ colorsel_water_class_init (ColorselWaterClass *klass)
{
GimpColorSelectorClass *selector_class = GIMP_COLOR_SELECTOR_CLASS (klass);
selector_class->name = _("Watercolor");
selector_class->help_id = "gimp-colorselector-watercolor";
selector_class->stock_id = GIMP_STOCK_TOOL_PAINTBRUSH;
selector_class->name = _("Watercolor");
selector_class->help_id = "gimp-colorselector-watercolor";
selector_class->icon_name = GIMP_STOCK_TOOL_PAINTBRUSH;
}
static void

2
modules/color-selector-wheel.c
View File

@ -101,7 +101,7 @@ colorsel_wheel_class_init (ColorselWheelClass *klass)
selector_class->name = _("Wheel");
selector_class->help_id = "gimp-colorselector-triangle";
selector_class->stock_id = GIMP_STOCK_COLOR_TRIANGLE;
selector_class->icon_name = GIMP_STOCK_COLOR_TRIANGLE;
selector_class->set_color = colorsel_wheel_set_color;
}