diff --git a/docs/reference/xed-sections.txt b/docs/reference/xed-sections.txt index 8b8dd1a..8a789f0 100644 --- a/docs/reference/xed-sections.txt +++ b/docs/reference/xed-sections.txt @@ -275,7 +275,7 @@ XedProgressMessageAreaPrivate XedProgressMessageArea XedProgressMessageArea xed_progress_message_area_new -xed_progress_message_area_set_stock_image +xed_progress_message_area_set_image xed_progress_message_area_set_markup xed_progress_message_area_set_text xed_progress_message_area_set_fraction diff --git a/xed/xed-progress-message-area.c b/xed/xed-progress-message-area.c index 78cbdd2..cbb86e0 100644 --- a/xed/xed-progress-message-area.c +++ b/xed/xed-progress-message-area.c @@ -64,7 +64,7 @@ xed_progress_message_area_set_has_cancel_button (XedProgressMessageArea *area, { if (has_button) { - gtk_info_bar_add_button (GTK_INFO_BAR (area), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_info_bar_add_button (GTK_INFO_BAR (area), _("Cancel"), GTK_RESPONSE_CANCEL); } g_object_notify (G_OBJECT (area), "has-cancel-button"); @@ -141,7 +141,7 @@ xed_progress_message_area_init (XedProgressMessageArea *area) gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - area->priv->image = gtk_image_new_from_icon_name (GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_SMALL_TOOLBAR); + area->priv->image = gtk_image_new_from_icon_name ("image-missing", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_widget_show (area->priv->image); gtk_widget_set_halign (area->priv->image, GTK_ALIGN_CENTER); gtk_widget_set_valign (area->priv->image, GTK_ALIGN_CENTER); @@ -166,33 +166,33 @@ xed_progress_message_area_init (XedProgressMessageArea *area) } GtkWidget * -xed_progress_message_area_new (const gchar *stock_id, +xed_progress_message_area_new (const gchar *icon_name, const gchar *markup, gboolean has_cancel) { XedProgressMessageArea *area; - g_return_val_if_fail (stock_id != NULL, NULL); + g_return_val_if_fail (icon_name != NULL, NULL); g_return_val_if_fail (markup != NULL, NULL); area = XED_PROGRESS_MESSAGE_AREA (g_object_new (XED_TYPE_PROGRESS_MESSAGE_AREA, "has-cancel-button", has_cancel, NULL)); - xed_progress_message_area_set_stock_image (area, stock_id); + xed_progress_message_area_set_image (area, icon_name); xed_progress_message_area_set_markup (area, markup); return GTK_WIDGET (area); } void -xed_progress_message_area_set_stock_image (XedProgressMessageArea *area, - const gchar *stock_id) +xed_progress_message_area_set_image (XedProgressMessageArea *area, + const gchar *icon_name) { g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area)); - g_return_if_fail (stock_id != NULL); + g_return_if_fail (icon_name != NULL); - gtk_image_set_from_stock (GTK_IMAGE (area->priv->image), stock_id, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_image_set_from_icon_name (GTK_IMAGE (area->priv->image), icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); } void diff --git a/xed/xed-progress-message-area.h b/xed/xed-progress-message-area.h index 4b830db..35d4416 100644 --- a/xed/xed-progress-message-area.h +++ b/xed/xed-progress-message-area.h @@ -2,7 +2,7 @@ * xed-progress-message-area.h * This file is part of xed * - * Copyright (C) 2005 - Paolo Maggi + * Copyright (C) 2005 - Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. */ - + /* - * Modified by the xed Team, 2005. See the AUTHORS file for a - * list of people on the xed Team. - * See the ChangeLog files for a list of changes. + * Modified by the xed Team, 2005. See the AUTHORS file for a + * list of people on the xed Team. + * See the ChangeLog files for a list of changes. * * $Id$ */ @@ -53,12 +53,12 @@ typedef struct _XedProgressMessageAreaPrivate XedProgressMessageAreaPrivate; */ typedef struct _XedProgressMessageArea XedProgressMessageArea; -struct _XedProgressMessageArea +struct _XedProgressMessageArea { - GtkInfoBar parent; + GtkInfoBar parent; - /*< private > */ - XedProgressMessageAreaPrivate *priv; + /*< private > */ + XedProgressMessageAreaPrivate *priv; }; /* @@ -66,34 +66,34 @@ struct _XedProgressMessageArea */ typedef struct _XedProgressMessageAreaClass XedProgressMessageAreaClass; -struct _XedProgressMessageAreaClass +struct _XedProgressMessageAreaClass { - GtkInfoBarClass parent_class; + GtkInfoBarClass parent_class; }; /* * Public methods */ -GType xed_progress_message_area_get_type (void) G_GNUC_CONST; +GType xed_progress_message_area_get_type (void) G_GNUC_CONST; -GtkWidget *xed_progress_message_area_new (const gchar *stock_id, - const gchar *markup, - gboolean has_cancel); +GtkWidget *xed_progress_message_area_new (const gchar *icon_name, + const gchar *markup, + gboolean has_cancel); -void xed_progress_message_area_set_stock_image (XedProgressMessageArea *area, - const gchar *stock_id); +void xed_progress_message_area_set_image (XedProgressMessageArea *area, + const gchar *icon_name); -void xed_progress_message_area_set_markup (XedProgressMessageArea *area, - const gchar *markup); +void xed_progress_message_area_set_markup (XedProgressMessageArea *area, + const gchar *markup); -void xed_progress_message_area_set_text (XedProgressMessageArea *area, - const gchar *text); +void xed_progress_message_area_set_text (XedProgressMessageArea *area, + const gchar *text); -void xed_progress_message_area_set_fraction (XedProgressMessageArea *area, - gdouble fraction); +void xed_progress_message_area_set_fraction (XedProgressMessageArea *area, + gdouble fraction); + +void xed_progress_message_area_pulse (XedProgressMessageArea *area); -void xed_progress_message_area_pulse (XedProgressMessageArea *area); - G_END_DECLS diff --git a/xed/xed-tab.c b/xed/xed-tab.c index 77b9947..f33754b 100644 --- a/xed/xed-tab.c +++ b/xed/xed-tab.c @@ -657,7 +657,7 @@ show_loading_message_area (XedTab *tab) msg = g_strdup_printf (_("Reverting %s"), name_markup); } - area = xed_progress_message_area_new (GTK_STOCK_REVERT_TO_SAVED, msg, TRUE); + area = xed_progress_message_area_new ("document-revert-symbolic", msg, TRUE); } else { @@ -675,7 +675,7 @@ show_loading_message_area (XedTab *tab) msg = g_strdup_printf (_("Loading %s"), name_markup); } - area = xed_progress_message_area_new (GTK_STOCK_OPEN, msg, TRUE); + area = xed_progress_message_area_new ("document-open-symbolic", msg, TRUE); } g_signal_connect (area, "response", @@ -758,7 +758,7 @@ show_saving_message_area (XedTab *tab) msg = g_strdup_printf (_("Saving %s"), from_markup); } - area = xed_progress_message_area_new (GTK_STOCK_SAVE, msg, FALSE); + area = xed_progress_message_area_new ("document-save-symbolic", msg, FALSE); gtk_widget_show (area); @@ -2316,11 +2316,11 @@ show_printing_message_area (XedTab *tab, if (preview) { - area = xed_progress_message_area_new (GTK_STOCK_PRINT_PREVIEW, "", TRUE); + area = xed_progress_message_area_new ("document-print-preview-symbolic", "", TRUE); } else { - area = xed_progress_message_area_new (GTK_STOCK_PRINT, "", TRUE); + area = xed_progress_message_area_new ("document-print-symbolic", "", TRUE); } g_signal_connect (area, "response",