Skip to content

GitLab

GIMP
GIMP
Commit 0d2d1c37 authored by Michael Natterer's avatar Michael Natterer 😴
Browse files
Options

app: port most of app's GUI from stock IDs to icon names 

There is still quite some stock ID rendering around, stay tuned...
parent b7e50079
Hide whitespace changes
Inline Side-by-side
Showing with 379 additions and 392 deletions
app/dialogs/channel-options-dialog.c
View file @ 0d2d1c37
......@@ -57,7 +57,7 @@ channel_options_dialog_new (GimpImage *image,
const gchar *channel_name,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id,
const gchar *color_label,
......@@ -78,7 +78,7 @@ channel_options_dialog_new (GimpImage *image,
g_return_val_if_fail (channel_color != NULL, NULL);
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (role != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (icon_name != NULL, NULL);
g_return_val_if_fail (desc != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL);
g_return_val_if_fail (color_label != NULL, NULL);
......@@ -104,7 +104,7 @@ channel_options_dialog_new (GimpImage *image,
options->dialog =
gimp_viewable_dialog_new (viewable, context,
title, role, stock_id, desc,
title, role, icon_name, desc,
parent,
gimp_standard_help_func, help_id,
......
app/dialogs/channel-options-dialog.h
View file @ 0d2d1c37
......@@ -42,7 +42,7 @@ ChannelOptionsDialog * channel_options_dialog_new (GimpImage *image,
const gchar *channel_name,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id,
const gchar *color_label,
......
app/dialogs/convert-precision-dialog.c
View file @ 0d2d1c37
......@@ -132,8 +132,8 @@ convert_precision_dialog_new (GimpImage *image,
button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog),
_("C_onvert"), GTK_RESPONSE_OK);
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_stock (GIMP_STOCK_CONVERT_PRECISION,
GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_icon_name (GIMP_STOCK_CONVERT_PRECISION,
GTK_ICON_SIZE_BUTTON));
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
GTK_RESPONSE_OK,
......
app/dialogs/convert-type-dialog.c
View file @ 0d2d1c37
......@@ -140,8 +140,8 @@ convert_type_dialog_new (GimpImage *image,
button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog),
_("C_onvert"), GTK_RESPONSE_OK);
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_stock (GIMP_STOCK_CONVERT_INDEXED,
GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_icon_name (GIMP_STOCK_CONVERT_INDEXED,
GTK_ICON_SIZE_BUTTON));
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
GTK_RESPONSE_OK,
......
app/dialogs/dialogs.c
View file @ 0d2d1c37
......@@ -62,7 +62,7 @@ GimpContainer *global_recent_docks = NULL;
{ id /* identifier */, \
NULL /* name */, \
NULL /* blurb */, \
NULL /* stock_id */, \
NULL /* icon_name */, \
NULL /* help_id */, \
NULL /* new_func */, \
dialogs_restore_dialog /* restore_func */, \
......@@ -79,7 +79,7 @@ GimpContainer *global_recent_docks = NULL;
{ id /* identifier */, \
NULL /* name */, \
NULL /* blurb */, \
NULL /* stock_id */, \
NULL /* icon_name */, \
NULL /* help_id */, \
NULL /* new_func */, \
dialogs_restore_window /* restore_func */, \
......@@ -96,7 +96,7 @@ GimpContainer *global_recent_docks = NULL;
{ id /* identifier */, \
NULL /* name */, \
NULL /* blurb */, \
NULL /* stock_id */, \
NULL /* icon_name */, \
NULL /* help_id */, \
new_func /* new_func */, \
dialogs_restore_dialog /* restore_func */, \
......@@ -109,11 +109,11 @@ GimpContainer *global_recent_docks = NULL;
FALSE /* image_window */, \
FALSE /* dockable */}
#define DOCKABLE(id, name, blurb, stock_id, help_id, new_func, view_size, singleton) \
#define DOCKABLE(id, name, blurb, icon_name, help_id, new_func, view_size, singleton) \
{ id /* identifier */, \
name /* name */, \
blurb /* blurb */, \
stock_id /* stock_id */, \
icon_name /* icon_name */, \
help_id /* help_id */, \
new_func /* new_func */, \
NULL /* restore_func */, \
......@@ -130,7 +130,7 @@ GimpContainer *global_recent_docks = NULL;
{ id /* identifier */, \
NULL /* name */, \
NULL /* blurb */, \
NULL /* stock_id */, \
NULL /* icon_name */, \
NULL /* help_id */, \
new_func /* new_func */, \
dialogs_restore_dialog /* restore_func */, \
......@@ -147,7 +147,7 @@ GimpContainer *global_recent_docks = NULL;
{ id /* identifier */, \
NULL /* name */, \
NULL /* blurb */, \
NULL /* stock_id */, \
NULL /* icon_name */, \
NULL /* help_id */, \
new_func /* new_func */, \
dialogs_restore_dialog /* restore_func */, \
......@@ -160,11 +160,11 @@ GimpContainer *global_recent_docks = NULL;
FALSE /* image_window */, \
FALSE /* dockable */}
#define LISTGRID(id, name, blurb, stock_id, help_id, view_size) \
#define LISTGRID(id, name, blurb, icon_name, help_id, view_size) \
{ "gimp-"#id"-list" /* identifier */, \
name /* name */, \
blurb /* blurb */, \
stock_id /* stock_id */, \
icon_name /* icon_name */, \
help_id /* help_id */, \
dialogs_##id##_list_view_new /* new_func */, \
NULL /* restore_func */, \
......@@ -179,7 +179,7 @@ GimpContainer *global_recent_docks = NULL;
{ "gimp-"#id"-grid" /* identifier */, \
name /* name */, \
blurb /* blurb */, \
stock_id /* stock_id */, \
icon_name /* icon_name */, \
help_id /* help_id */, \
dialogs_##id##_grid_view_new /* new_func */, \
NULL /* restore_func */, \
......@@ -192,11 +192,11 @@ GimpContainer *global_recent_docks = NULL;
FALSE /* image_window */, \
TRUE /* dockable */}
#define LIST(id, new_func, name, blurb, stock_id, help_id, view_size) \
#define LIST(id, new_func, name, blurb, icon_name, help_id, view_size) \
{ "gimp-"#id"-list" /* identifier */, \
name /* name */, \
blurb /* blurb */, \
stock_id /* stock_id */, \
icon_name /* icon_name */, \
help_id /* help_id */, \
dialogs_##new_func##_list_view_new /* new_func */, \
NULL /* restore_func */, \
......@@ -513,7 +513,7 @@ dialogs_init (Gimp *gimp,
entries[i].identifier,
gettext (entries[i].name),
gettext (entries[i].blurb),
entries[i].stock_id,
entries[i].icon_name,
entries[i].help_id,
entries[i].new_func,
entries[i].restore_func,
......
app/dialogs/layer-options-dialog.c
View file @ 0d2d1c37
......@@ -59,7 +59,7 @@ layer_options_dialog_new (GimpImage *image,
GimpFillType layer_fill_type,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id)
{
......@@ -92,7 +92,7 @@ layer_options_dialog_new (GimpImage *image,
options->dialog =
gimp_viewable_dialog_new (viewable, context,
title, role, stock_id, desc,
title, role, icon_name, desc,
parent,
gimp_standard_help_func, help_id,
......
app/dialogs/layer-options-dialog.h
View file @ 0d2d1c37
......@@ -46,7 +46,7 @@ LayerOptionsDialog * layer_options_dialog_new (GimpImage *image,
GimpFillType layer_fill_type,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id);
......
app/dialogs/module-dialog.c
View file @ 0d2d1c37
......@@ -205,7 +205,7 @@ module_dialog_new (Gimp *gimp)
dialog->error_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (vbox), dialog->error_box, FALSE, FALSE, 0);
image = gtk_image_new_from_stock (GIMP_STOCK_WARNING, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_icon_name (GIMP_STOCK_WARNING, GTK_ICON_SIZE_BUTTON);
gtk_box_pack_start (GTK_BOX (dialog->error_box), image, FALSE, FALSE, 0);
gtk_widget_show (image);
......
app/dialogs/palette-import-dialog.c
View file @ 0d2d1c37
......@@ -163,8 +163,8 @@ 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_stock (GTK_STOCK_CONVERT,
GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_icon_name (GTK_STOCK_CONVERT,
GTK_ICON_SIZE_BUTTON));
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
GTK_RESPONSE_OK,
......
app/dialogs/preferences-dialog.c
View file @ 0d2d1c37
......@@ -845,13 +845,13 @@ prefs_profile_combo_box_new (GObject *config,
}
static GtkWidget *
prefs_button_add (const gchar *stock_id,
prefs_button_add (const gchar *icon_name,
const gchar *label,
GtkBox *box)
{
GtkWidget *button;
button = gimp_stock_button_new (stock_id, label);
button = gimp_icon_button_new (icon_name, label);
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
gtk_widget_show (button);
......@@ -881,7 +881,7 @@ static GtkWidget *
prefs_check_button_add_with_icon (GObject *config,
const gchar *property_name,
const gchar *label,
const gchar *stock_id,
const gchar *icon_name,
GtkBox *vbox,
GtkSizeGroup *group)
{
......@@ -897,7 +897,7 @@ prefs_check_button_add_with_icon (GObject *config,
gtk_box_pack_start (vbox, hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_misc_set_padding (GTK_MISC (image), 2, 2);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
......@@ -1633,7 +1633,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 1, 2);
gtk_widget_show (hbox);
image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_BUTTON);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
......
app/dialogs/quit-dialog.c
View file @ 0d2d1c37
......@@ -336,8 +336,8 @@ quit_close_all_dialog_container_changed (GimpContainer *images,
gtk_widget_show (dialog->lost_label);
icon = gtk_image_new_from_stock (GTK_STOCK_DELETE,
GTK_ICON_SIZE_BUTTON);
icon = gtk_image_new_from_icon_name (GTK_STOCK_DELETE,
GTK_ICON_SIZE_BUTTON);
g_object_set (dialog->ok_button,
"label", _("_Discard Changes"),
"use-stock", FALSE,
......
app/dialogs/stroke-dialog.c
View file @ 0d2d1c37
......@@ -60,7 +60,7 @@ GtkWidget *
stroke_dialog_new (GimpItem *item,
GimpContext *context,
const gchar *title,
const gchar *stock_id,
const gchar *icon_name,
const gchar *help_id,
GtkWidget *parent)
{
......@@ -77,7 +77,7 @@ stroke_dialog_new (GimpItem *item,
g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (icon_name != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL);
g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
......@@ -93,7 +93,7 @@ stroke_dialog_new (GimpItem *item,
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (item), context,
title, "gimp-stroke-options",
stock_id,
icon_name,
_("Choose Stroke Style"),
parent,
gimp_standard_help_func,
......@@ -101,7 +101,7 @@ stroke_dialog_new (GimpItem *item,
GIMP_STOCK_RESET, RESPONSE_RESET,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
stock_id, GTK_RESPONSE_OK,
icon_name, GTK_RESPONSE_OK,
NULL);
......
app/dialogs/stroke-dialog.h
View file @ 0d2d1c37
......@@ -24,7 +24,7 @@
GtkWidget * stroke_dialog_new (GimpItem *item,
GimpContext *context,
const gchar *title,
const gchar *stock_id,
const gchar *icon_name,
const gchar *help_id,
GtkWidget *parent);
......
app/dialogs/template-options-dialog.c
View file @ 0d2d1c37
......@@ -48,7 +48,7 @@ template_options_dialog_new (GimpTemplate *template,
GtkWidget *parent,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id)
{
......@@ -61,7 +61,7 @@ template_options_dialog_new (GimpTemplate *template,
g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (role != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (icon_name != NULL, NULL);
g_return_val_if_fail (desc != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL);
......@@ -86,7 +86,7 @@ template_options_dialog_new (GimpTemplate *template,
options->dialog =
gimp_viewable_dialog_new (viewable, context,
title, role, stock_id, desc,
title, role, icon_name, desc,
parent,
gimp_standard_help_func, help_id,
......
app/dialogs/template-options-dialog.h
View file @ 0d2d1c37
......@@ -36,7 +36,7 @@ TemplateOptionsDialog * template_options_dialog_new (GimpTemplate *template,
GtkWidget *parent,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id);
......
app/dialogs/tips-dialog.c
View file @ 0d2d1c37
......@@ -134,14 +134,14 @@ 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_stock (GTK_STOCK_GO_BACK,
GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_icon_name (GTK_STOCK_GO_BACK,
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_stock (GTK_STOCK_GO_FORWARD,
GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_icon_name (GTK_STOCK_GO_FORWARD,
GTK_ICON_SIZE_BUTTON));
gtk_dialog_set_response_sensitive (GTK_DIALOG (tips_dialog),
RESPONSE_NEXT, tips_count > 1);
......@@ -170,7 +170,7 @@ tips_dialog_create (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
image = gtk_image_new_from_stock (GIMP_STOCK_INFO, GTK_ICON_SIZE_DIALOG);
image = gtk_image_new_from_icon_name (GIMP_STOCK_INFO, 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);
gtk_widget_show (image);
......
app/dialogs/vectors-options-dialog.c
View file @ 0d2d1c37
......@@ -49,7 +49,7 @@ vectors_options_dialog_new (GimpImage *image,
const gchar *vectors_name,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id)
{
......@@ -65,7 +65,7 @@ vectors_options_dialog_new (GimpImage *image,
g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (role != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (icon_name != NULL, NULL);
g_return_val_if_fail (desc != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL);
......@@ -81,7 +81,7 @@ vectors_options_dialog_new (GimpImage *image,
options->dialog =
gimp_viewable_dialog_new (viewable, context,
title, role, stock_id, desc,
title, role, icon_name, desc,
parent,
gimp_standard_help_func,
help_id,
......
app/dialogs/vectors-options-dialog.h
View file @ 0d2d1c37
......@@ -38,7 +38,7 @@ VectorsOptionsDialog * vectors_options_dialog_new (GimpImage *image,
const gchar *vectors_name,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id);
......
app/display/gimpdisplayshell-handlers.c
View file @ 0d2d1c37
......@@ -591,11 +591,11 @@ gimp_display_shell_quick_mask_changed_handler (GimpImage *image,
quick_mask_state);
if (quick_mask_state)
gtk_image_set_from_stock (gtk_image, GIMP_STOCK_QUICK_MASK_ON,
GTK_ICON_SIZE_MENU);
gtk_image_set_from_icon_name (gtk_image, GIMP_STOCK_QUICK_MASK_ON,
GTK_ICON_SIZE_MENU);
else
gtk_image_set_from_stock (gtk_image, GIMP_STOCK_QUICK_MASK_OFF,
GTK_ICON_SIZE_MENU);
gtk_image_set_from_icon_name (gtk_image, GIMP_STOCK_QUICK_MASK_OFF,
GTK_ICON_SIZE_MENU);
g_signal_handlers_unblock_by_func (shell->quick_mask_button,
gimp_display_shell_quick_mask_toggled,
......
app/display/gimpdisplayshell.c
View file @ 0d2d1c37
......@@ -521,8 +521,8 @@ gimp_display_shell_constructed (GObject *object)
/* the menu popup button */
shell->origin = gtk_event_box_new ();
gtk_image = gtk_image_new_from_stock (GIMP_STOCK_MENU_RIGHT,
GTK_ICON_SIZE_MENU);
gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_MENU_RIGHT,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (shell->origin), gtk_image);
gtk_widget_show (gtk_image);
......@@ -636,8 +636,8 @@ gimp_display_shell_constructed (GObject *object)
NULL);
gtk_widget_set_can_focus (shell->zoom_button, FALSE);
gtk_image = gtk_image_new_from_stock (GIMP_STOCK_ZOOM_FOLLOW_WINDOW,
GTK_ICON_SIZE_MENU);
gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_ZOOM_FOLLOW_WINDOW,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (shell->zoom_button), gtk_image);
gtk_widget_show (gtk_image);
......@@ -660,8 +660,8 @@ gimp_display_shell_constructed (GObject *object)
NULL);
gtk_widget_set_can_focus (shell->quick_mask_button, FALSE);
gtk_image = gtk_image_new_from_stock (GIMP_STOCK_QUICK_MASK_OFF,
GTK_ICON_SIZE_MENU);
gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_QUICK_MASK_OFF,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (shell->quick_mask_button), gtk_image);
gtk_widget_show (gtk_image);
......@@ -684,8 +684,8 @@ gimp_display_shell_constructed (GObject *object)
/* the navigation window button */
shell->nav_ebox = gtk_event_box_new ();
gtk_image = gtk_image_new_from_stock (GIMP_STOCK_NAVIGATION,
GTK_ICON_SIZE_MENU);
gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_NAVIGATION,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (shell->nav_ebox), gtk_image);
gtk_widget_show (gtk_image);
......
app/display/gimpimagewindow.c
View file @ 0d2d1c37
......@@ -2208,8 +2208,8 @@ gimp_image_window_create_tab_label (GimpImageWindow *window,
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
gtk_image = gtk_image_new_from_stock (GIMP_STOCK_CLOSE,
GTK_ICON_SIZE_MENU);
gtk_image = gtk_image_new_from_icon_name (GIMP_STOCK_CLOSE,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), gtk_image);
gtk_widget_show (gtk_image);
......
app/display/gimpstatusbar.c
View file @ 0d2d1c37
......@@ -63,7 +63,7 @@ typedef struct _GimpStatusbarMsg GimpStatusbarMsg;
struct _GimpStatusbarMsg
{
guint context_id;
gchar *stock_id;
gchar *icon_name;
gchar *text;
};
......@@ -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_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
image = gtk_image_new_from_icon_name (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox2), image, FALSE, FALSE, 2);
gtk_widget_show (image);
......@@ -524,7 +524,7 @@ gimp_statusbar_progress_message (GimpProgress *progress,
{
GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
PangoLayout *layout;
const gchar *stock_id;
const gchar *icon_name;
gboolean handle_msg = FALSE;
/* don't accept a message if we are already displaying a more severe one */
......@@ -534,7 +534,7 @@ gimp_statusbar_progress_message (GimpProgress *progress,
/* we can only handle short one-liners */
layout = gtk_widget_create_pango_layout (statusbar->label, message);
stock_id = gimp_get_message_stock_id (severity);
icon_name = gimp_get_message_icon_name (severity);
if (pango_layout_get_line_count (layout) == 1)
{
......@@ -547,11 +547,11 @@ gimp_statusbar_progress_message (GimpProgress *progress,
if (width < label_allocation.width)
{
if (stock_id)
if (icon_name)
{
GdkPixbuf *pixbuf;
pixbuf = gtk_widget_render_icon (statusbar->label, stock_id,
pixbuf = gtk_widget_render_icon (statusbar->label, icon_name,
GTK_ICON_SIZE_MENU, NULL);
width += ICON_SPACING + gdk_pixbuf_get_width (pixbuf);
......@@ -570,7 +570,7 @@ gimp_statusbar_progress_message (GimpProgress *progress,
g_object_unref (layout);
if (handle_msg)
gimp_statusbar_push_temp (statusbar, severity, stock_id, "%s", message);
gimp_statusbar_push_temp (statusbar, severity, icon_name, "%s", message);
return handle_msg;
}
......@@ -585,7 +585,7 @@ gimp_statusbar_progress_canceled (GtkWidget *button,
static void
gimp_statusbar_set_text (GimpStatusbar *statusbar,
const gchar *stock_id,
const gchar *icon_name,
const gchar *text)
{
if (statusbar->progress_active)
......@@ -598,9 +598,9 @@ gimp_statusbar_set_text (GimpStatusbar *statusbar,
if (statusbar->icon)
g_object_unref (statusbar->icon);
if (stock_id)
if (icon_name)
statusbar->icon = gtk_widget_render_icon (statusbar->label,
stock_id,
icon_name,
GTK_ICON_SIZE_MENU, NULL);
else
statusbar->icon = NULL;
......@@ -662,7 +662,7 @@ gimp_statusbar_update (GimpStatusbar *statusbar)
if (msg && msg->text)
{
gimp_statusbar_set_text (statusbar, msg->stock_id, msg->text);
gimp_statusbar_set_text (statusbar, msg->icon_name, msg->text);
}
else
{
......@@ -796,7 +796,7 @@ gimp_statusbar_restore_window_title (GimpStatusbar *statusbar)
void
gimp_statusbar_push (GimpStatusbar *statusbar,
const gchar *context,
const gchar *stock_id,
const gchar *icon_name,
const gchar *format,
...)
{
......@@ -807,14 +807,14 @@ gimp_statusbar_push (GimpStatusbar *statusbar,
g_return_if_fail (format != NULL);
va_start (args, format);
gimp_statusbar_push_valist (statusbar, context, stock_id, format, args);
gimp_statusbar_push_valist (statusbar, context, icon_name, format, args);
va_end (args);
}
void
gimp_statusbar_push_valist (GimpStatusbar *statusbar,
const gchar *context,
const gchar *stock_id,
const gchar *icon_name,