[balsa/gtk3] Clean up deprecation of stock icons
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Clean up deprecation of stock icons
- Date: Thu, 18 Jul 2013 19:30:51 +0000 (UTC)
commit 6a87fed325ad1d8dcbcd73f42fd765b9a6e9e65a
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Thu Jul 18 15:30:30 2013 -0400
Clean up deprecation of stock icons
* libbalsa/html.c (lbh_info_bar), (lbh_show_info_bar):
* libbalsa/identity.c (libbalsa_identity_select_dialog),
(libbalsa_identity_config_dialog):
* libbalsa/information.c (libbalsa_information_varg):
* libbalsa/libbalsa-gpgme-cb.c (lb_gpgme_select_key),
(get_passphrase_real):
* libbalsa/send.c (ensure_send_progress_dialog):
* libbalsa/smtp-server.c (libbalsa_smtp_server_dialog):
* libbalsa/source-viewer.c:
* src/ab-main.c (bab_get_edit_button_box), (bab_get_filter_box):
* src/ab-window.c (balsa_ab_window_new), (balsa_ab_window_init):
* src/address-book-config.c (create_local_dialog),
(create_generic_dialog):
* src/balsa-app.c (ask_password_real):
* src/balsa-icons.c (load_balsa_pixmap), (balsa_register_pixbufs):
* src/balsa-icons.h:
* src/balsa-index.c (bndx_popup_menu_create), (balsa_index_pipe):
* src/balsa-mblist.c (bmbl_mru_show_tree):
* src/balsa-message.c (part_context_dump_all_cb):
* src/balsa-mime-widget-callbacks.c
(balsa_mime_widget_ctx_menu_save):
* src/balsa-mime-widget-image.c (balsa_mime_widget_new_image):
* src/balsa-mime-widget-text.c (bmwt_populate_popup_menu):
* src/filter-edit-callbacks.c (fe_edit_condition):
* src/filter-edit-dialog.c (build_left_side), (build_action_page),
(build_right_side), (filters_edit_dialog):
* src/filter-export-dialog.c (filters_export_dialog):
* src/filter-run-dialog.c (balsa_filter_run_dialog_init):
* src/folder-conf.c (folder_conf_imap_node), (browse_button_cb),
(folder_conf_imap_sub_node):
* src/information-dialog.c (balsa_information_list):
* src/mailbox-conf.c (mailbox_conf_delete),
(create_local_mailbox_dialog), (create_generic_dialog):
* src/main-window.c:
* src/message-window.c:
* src/pref-manager.c (open_preferences_manager):
* src/sendmsg-window.c (delete_handler), (sw_get_user_codeset),
(add_urlref_attachment), (sw_attach_dialog),
(quote_parts_select_dlg), (include_file_cb), (subject_not_empty),
(check_suggest_encryption), (bsmsg_check_format_compatibility):
* src/spell-check.c (balsa_spell_check_init):
* src/store-address.c (store_address_dialog):
* src/toolbar-factory.c:
* src/toolbar-prefs.c (customize_dialog_cb), (create_toolbar_page):
ChangeLog | 49 ++++++++++++++++++
libbalsa/html.c | 4 +-
libbalsa/identity.c | 12 ++--
libbalsa/information.c | 6 +-
libbalsa/libbalsa-gpgme-cb.c | 12 ++--
libbalsa/send.c | 3 +-
libbalsa/smtp-server.c | 6 +-
libbalsa/source-viewer.c | 4 +-
src/ab-main.c | 24 +++++-----
src/ab-window.c | 14 +++---
src/address-book-config.c | 18 +++---
src/balsa-app.c | 4 +-
src/balsa-icons.c | 13 +++--
src/balsa-icons.h | 2 +-
src/balsa-index.c | 8 ++--
src/balsa-mblist.c | 3 +-
src/balsa-message.c | 5 +-
src/balsa-mime-widget-callbacks.c | 5 +-
src/balsa-mime-widget-image.c | 2 +-
src/balsa-mime-widget-text.c | 8 ++--
src/filter-edit-callbacks.c | 6 +-
src/filter-edit-dialog.c | 21 +++-----
src/filter-export-dialog.c | 6 +-
src/filter-run-dialog.c | 18 +++---
src/folder-conf.c | 13 +++--
src/information-dialog.c | 4 +-
src/mailbox-conf.c | 10 ++--
src/main-window.c | 100 ++++++++++++++++++------------------
src/message-window.c | 28 +++++-----
src/pref-manager.c | 8 ++--
src/sendmsg-window.c | 76 ++++++++++++++--------------
src/spell-check.c | 8 ++--
src/store-address.c | 6 +-
src/toolbar-factory.c | 24 +++++-----
src/toolbar-prefs.c | 12 ++--
35 files changed, 296 insertions(+), 246 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 102e170..521a203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2013-07-18 Peter Bloomfield
+
+ Clean up deprecation of stock icons
+
+ * libbalsa/html.c (lbh_info_bar), (lbh_show_info_bar):
+ * libbalsa/identity.c (libbalsa_identity_select_dialog),
+ (libbalsa_identity_config_dialog):
+ * libbalsa/information.c (libbalsa_information_varg):
+ * libbalsa/libbalsa-gpgme-cb.c (lb_gpgme_select_key),
+ (get_passphrase_real):
+ * libbalsa/send.c (ensure_send_progress_dialog):
+ * libbalsa/smtp-server.c (libbalsa_smtp_server_dialog):
+ * libbalsa/source-viewer.c:
+ * src/ab-main.c (bab_get_edit_button_box), (bab_get_filter_box):
+ * src/ab-window.c (balsa_ab_window_new), (balsa_ab_window_init):
+ * src/address-book-config.c (create_local_dialog),
+ (create_generic_dialog):
+ * src/balsa-app.c (ask_password_real):
+ * src/balsa-icons.c (load_balsa_pixmap), (balsa_register_pixbufs):
+ * src/balsa-icons.h:
+ * src/balsa-index.c (bndx_popup_menu_create), (balsa_index_pipe):
+ * src/balsa-mblist.c (bmbl_mru_show_tree):
+ * src/balsa-message.c (part_context_dump_all_cb):
+ * src/balsa-mime-widget-callbacks.c
+ (balsa_mime_widget_ctx_menu_save):
+ * src/balsa-mime-widget-image.c (balsa_mime_widget_new_image):
+ * src/balsa-mime-widget-text.c (bmwt_populate_popup_menu):
+ * src/filter-edit-callbacks.c (fe_edit_condition):
+ * src/filter-edit-dialog.c (build_left_side), (build_action_page),
+ (build_right_side), (filters_edit_dialog):
+ * src/filter-export-dialog.c (filters_export_dialog):
+ * src/filter-run-dialog.c (balsa_filter_run_dialog_init):
+ * src/folder-conf.c (folder_conf_imap_node), (browse_button_cb),
+ (folder_conf_imap_sub_node):
+ * src/information-dialog.c (balsa_information_list):
+ * src/mailbox-conf.c (mailbox_conf_delete),
+ (create_local_mailbox_dialog), (create_generic_dialog):
+ * src/main-window.c:
+ * src/message-window.c:
+ * src/pref-manager.c (open_preferences_manager):
+ * src/sendmsg-window.c (delete_handler), (sw_get_user_codeset),
+ (add_urlref_attachment), (sw_attach_dialog),
+ (quote_parts_select_dlg), (include_file_cb), (subject_not_empty),
+ (check_suggest_encryption), (bsmsg_check_format_compatibility):
+ * src/spell-check.c (balsa_spell_check_init):
+ * src/store-address.c (store_address_dialog):
+ * src/toolbar-factory.c:
+ * src/toolbar-prefs.c (customize_dialog_cb), (create_toolbar_page):
+
2013-07-14 Peter Bloomfield
Fix bgo #704159 (Igor Pashev)
diff --git a/libbalsa/html.c b/libbalsa/html.c
index dd922fd..ad24f5e 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -343,7 +343,7 @@ lbh_info_bar(LibBalsaWebKitInfo * info)
info_bar_widget =
gtk_info_bar_new_with_buttons(_("_Download images"),
GTK_RESPONSE_OK,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
info_bar = GTK_INFO_BAR(info_bar_widget);
@@ -986,7 +986,7 @@ lbh_show_info_bar(LibBalsaWebKitInfo * info)
info_bar_widget =
gtk_info_bar_new_with_buttons(_("_Download images"),
GTK_RESPONSE_OK,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_box_pack_start(GTK_BOX(info->vbox), info_bar_widget,
FALSE, FALSE, 0);
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index bb8d880..3eb4752 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -483,8 +483,8 @@ libbalsa_identity_select_dialog(GtkWindow * parent,
sdi->dialog = dialog =
gtk_dialog_new_with_buttons(prompt, parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, parent);
@@ -1723,10 +1723,10 @@ libbalsa_identity_config_dialog(GtkWindow *parent, GList **identities,
gtk_dialog_new_with_buttons(_("Manage Identities"),
parent, /* must NOT be modal */
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP, IDENTITY_RESPONSE_HELP,
- GTK_STOCK_NEW, IDENTITY_RESPONSE_NEW,
- GTK_STOCK_REMOVE, IDENTITY_RESPONSE_REMOVE,
- GTK_STOCK_CLOSE, IDENTITY_RESPONSE_CLOSE,
+ _("_Help"), IDENTITY_RESPONSE_HELP,
+ _("_New"), IDENTITY_RESPONSE_NEW,
+ _("_Remove"), IDENTITY_RESPONSE_REMOVE,
+ _("_Close"), IDENTITY_RESPONSE_CLOSE,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, parent);
diff --git a/libbalsa/information.c b/libbalsa/information.c
index c6c6a63..227077b 100644
--- a/libbalsa/information.c
+++ b/libbalsa/information.c
@@ -93,13 +93,13 @@ libbalsa_information_varg(GtkWindow *parent, LibBalsaInformationType type,
switch (type) {
case LIBBALSA_INFORMATION_MESSAGE:
- icon_str = GTK_STOCK_DIALOG_INFO;
+ icon_str = "dialog-information";
break;
case LIBBALSA_INFORMATION_WARNING:
- icon_str = GTK_STOCK_DIALOG_WARNING;
+ icon_str = "dialog-warning";
break;
case LIBBALSA_INFORMATION_ERROR:
- icon_str = GTK_STOCK_DIALOG_ERROR;
+ icon_str = "dialog-error";
break;
default:
icon_str = NULL;
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index 1ecd43a..4a22e02 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -161,9 +161,9 @@ lb_gpgme_select_key(const gchar * user_name, gboolean secret, GList * keys,
dialog = gtk_dialog_new_with_buttons(_("Select key"),
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, NULL);
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, parent);
#endif
@@ -344,9 +344,9 @@ get_passphrase_real(const gchar * uid_hint, const gchar * passphrase_info,
/* FIXME: create dialog according to the Gnome HIG */
dialog = gtk_dialog_new_with_buttons(_("Enter Passphrase"), parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, NULL);
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, parent);
#endif
diff --git a/libbalsa/send.c b/libbalsa/send.c
index 7bf28cf..b62ca2b 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -255,8 +255,7 @@ ensure_send_progress_dialog()
send_dialog = gtk_dialog_new_with_buttons(_("Sending Mail..."),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
- _("_Hide"),
- GTK_RESPONSE_CLOSE,
+ _("_Hide"), GTK_RESPONSE_CLOSE,
NULL);
gtk_window_set_wmclass(GTK_WINDOW(send_dialog), "send_dialog", "Balsa");
label = gtk_label_new(_("Sending Mail..."));
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 8c9b04f..252fd39 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -540,9 +540,9 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
gtk_dialog_new_with_buttons(_("SMTP Server"),
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, parent);
diff --git a/libbalsa/source-viewer.c b/libbalsa/source-viewer.c
index d824785..f7cf983 100644
--- a/libbalsa/source-viewer.c
+++ b/libbalsa/source-viewer.c
@@ -47,9 +47,9 @@ static GtkActionEntry entries[] = {
{"EditMenu", NULL, N_("_Edit")},
{"ViewMenu", NULL, N_("_View")},
/* Items */
- {"Close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+ {"Close", "window-close", N_("_Close"), "<control>W",
N_("Close the window"), G_CALLBACK(close_cb)},
- {"Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
+ {"Copy", "edit-copy", N_("_Copy"), "<control>C",
N_("Copy text"), G_CALLBACK(copy_cb)},
{"Select", NULL, N_("_Select Text"), "<control>A",
N_("Select entire mail"), G_CALLBACK(select_all_cb)},
diff --git a/src/ab-main.c b/src/ab-main.c
index 7c4e474..9c7e0db 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -538,7 +538,7 @@ static GtkActionEntry entries[] = {
{"FileMenu", NULL, N_("_File")},
{"EntryMenu", NULL, N_("_Entry")},
{"HelpMenu", NULL, N_("_Help")},
- {"New", GTK_STOCK_NEW, N_("_New")},
+ {"New", "document-new", N_("_New")},
{"NewVcard", NULL, N_("VCard Address Book (GnomeCard)"), NULL, NULL,
G_CALLBACK(file_new_vcard_cb)},
{"NewExtern", NULL, N_("External query (a program)"), NULL, NULL,
@@ -557,17 +557,17 @@ static GtkActionEntry entries[] = {
{"NewRubrica", NULL, N_("Rubrica Address Book"), NULL, NULL,
G_CALLBACK(file_new_rubrica_cb)},
#endif /* HAVE_RUBRICA */
- {"Properties", GTK_STOCK_PROPERTIES, N_("_Properties"), NULL,
+ {"Properties", "document-properties", N_("_Properties"), NULL,
N_("Edit address book properties"), G_CALLBACK(file_properties_cb)},
- {"Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
+ {"Delete", "edit-delete", N_("_Delete"), NULL,
N_("Delete address book"), G_CALLBACK(file_delete_cb)},
- {"Quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Exit the program"),
+ {"Quit", "application-exit", N_("_Quit"), NULL, N_("Exit the program"),
gtk_main_quit},
- {"NewEntry", GTK_STOCK_NEW, N_("_New Entry"), "<shift><control>N",
+ {"NewEntry", "document-new", N_("_New Entry"), "<shift><control>N",
N_("Add new entry"), G_CALLBACK(edit_new_entry_cb)},
- {"DeleteEntry", GTK_STOCK_NEW, N_("_Delete Entry"), NULL,
+ {"DeleteEntry", "edit-delete", N_("_Delete Entry"), NULL,
N_("Delete entry"), G_CALLBACK(edit_delete_entry_cb)},
- {"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, NULL}
+ {"About", "help-about", N_("_About"), NULL, NULL, NULL}
};
static const char *ui_description =
@@ -903,17 +903,17 @@ bab_get_edit_button_box(struct ABMainWindow *abmw)
box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_container_add(GTK_CONTAINER(box),
abmw->apply_button =
- gtk_button_new_from_stock(GTK_STOCK_APPLY));
+ gtk_button_new_with_mnemonic(_("_Apply")));
g_signal_connect(G_OBJECT(abmw->apply_button), "clicked",
G_CALLBACK(apply_button_cb), (gpointer) NULL);
gtk_container_add(GTK_CONTAINER(box),
- abmw->remove_button
- =gtk_button_new_from_stock(GTK_STOCK_REMOVE));
+ abmw->remove_button =
+ gtk_button_new_with_mnemonic(_("_Remove")));
g_signal_connect(G_OBJECT(abmw->remove_button), "clicked",
G_CALLBACK(remove_button_cb), (gpointer) NULL);
gtk_container_add(GTK_CONTAINER(box),
abmw->cancel_button =
- gtk_button_new_from_stock(GTK_STOCK_CANCEL));
+ gtk_button_new_with_mnemonic(_("_Cancel")));
g_signal_connect(G_OBJECT(abmw->cancel_button), "clicked",
G_CALLBACK(cancel_button_cb), abmw);
return box;
@@ -951,7 +951,7 @@ bab_get_filter_box(void)
gtk_label_set_mnemonic_widget(GTK_LABEL(find_label), find_entry);
button = gtk_button_new();
gtk_container_add(GTK_CONTAINER(button),
- gtk_image_new_from_stock(GTK_STOCK_OK,
+ gtk_image_new_from_stock("gtk-ok",
GTK_ICON_SIZE_BUTTON));
gtk_box_pack_start(GTK_BOX(search_hbox), button, FALSE, FALSE, 1);
diff --git a/src/ab-window.c b/src/ab-window.c
index 847c37b..0bb7cc4 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -124,15 +124,15 @@ balsa_ab_window_new(gboolean composing, GtkWindow* parent)
if ( composing ) {
gtk_dialog_add_buttons(GTK_DIALOG(ret),
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
gtk_widget_show(GTK_WIDGET(BALSA_AB_WINDOW(ret)->send_to_label));
gtk_widget_show(GTK_WIDGET(BALSA_AB_WINDOW(ret)->send_to_list));
gtk_widget_show(GTK_WIDGET(BALSA_AB_WINDOW(ret)->arrow_box));
} else {
gtk_dialog_add_buttons(GTK_DIALOG(ret),
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_widget_hide(GTK_WIDGET(BALSA_AB_WINDOW(ret)->send_to_label));
gtk_widget_hide(GTK_WIDGET(BALSA_AB_WINDOW(ret)->send_to_list));
@@ -311,14 +311,14 @@ balsa_ab_window_init(BalsaAbWindow *ab)
gtk_grid_attach(GTK_GRID(grid), hbox, 0, 2, 1, 1);
gtk_widget_show(GTK_WIDGET(hbox));
- w = balsa_stock_button_with_label(GTK_STOCK_OPEN,
+ w = balsa_stock_button_with_label("document-open",
_("Run Editor"));
g_signal_connect(w, "clicked",
G_CALLBACK(balsa_ab_window_run_editor), NULL);
gtk_container_add(GTK_CONTAINER(hbox), w);
gtk_widget_show(GTK_WIDGET(w));
- w = balsa_stock_button_with_label(GTK_STOCK_ADD,
+ w = balsa_stock_button_with_label("list-add",
_("_Re-Import"));
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(balsa_ab_window_reload),
@@ -335,14 +335,14 @@ balsa_ab_window_init(BalsaAbWindow *ab)
gtk_grid_attach(GTK_GRID(grid), ab->arrow_box, 1, 1, 1, 1);
gtk_widget_show(ab->arrow_box);
- w = balsa_stock_button_with_label(GTK_STOCK_GO_FORWARD, "");
+ w = balsa_stock_button_with_label("go-next", "");
gtk_box_pack_start(GTK_BOX(ab->arrow_box), w, TRUE, FALSE, 0);
gtk_widget_show(w);
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(balsa_ab_window_move_to_recipient_list),
ab);
- w = balsa_stock_button_with_label(GTK_STOCK_GO_BACK, "");
+ w = balsa_stock_button_with_label("go-previous", "");
gtk_box_pack_start(GTK_BOX(ab->arrow_box), w, TRUE, FALSE, 0);
gtk_widget_show(w);
g_signal_connect(G_OBJECT(w), "clicked",
diff --git a/src/address-book-config.c b/src/address-book-config.c
index 1e2c8e0..4c07c24 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -223,20 +223,20 @@ create_local_dialog(AddressBookConfig * abc, const gchar * type)
ab = abc->address_book;
if (ab) {
title = g_strdup_printf(_("Modify %s Address Book"), type);
- action = GTK_STOCK_APPLY;
+ action = _("_Apply");
name = ab->name;
} else {
title = g_strdup_printf(_("Add %s Address Book"), type);
- action = GTK_STOCK_ADD;
+ action = _("_Add");
name = NULL;
}
dialog =
gtk_file_chooser_dialog_new(title, abc->parent,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- action, GTK_RESPONSE_APPLY,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
+ action, GTK_RESPONSE_APPLY,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
g_free(title);
#if HAVE_MACOSX_DESKTOP
@@ -324,17 +324,17 @@ create_generic_dialog(AddressBookConfig * abc, const gchar * type)
ab = abc->address_book;
if (ab) {
title = g_strdup_printf(_("Modify %s Address Book"), type);
- action = GTK_STOCK_APPLY;
+ action = _("_Apply");
} else {
title = g_strdup_printf(_("Add %s Address Book"), type);
- action = GTK_STOCK_ADD;
+ action = _("_Add");
}
dialog =
gtk_dialog_new_with_buttons(title, abc->parent, 0,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_Help"), GTK_RESPONSE_HELP,
action, GTK_RESPONSE_APPLY,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
g_free(title);
#if HAVE_MACOSX_DESKTOP
diff --git a/src/balsa-app.c b/src/balsa-app.c
index db0da42..dbff7b9 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -87,8 +87,8 @@ ask_password_real(LibBalsaServer * server, LibBalsaMailbox * mbox)
dialog = gtk_dialog_new_with_buttons(_("Password needed"),
GTK_WINDOW(balsa_app.main_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, GTK_WINDOW(balsa_app.main_window));
diff --git a/src/balsa-icons.c b/src/balsa-icons.c
index 5a60c86..2cbf46b 100644
--- a/src/balsa-icons.c
+++ b/src/balsa-icons.c
@@ -68,14 +68,14 @@ load_balsa_pixmap(GtkIconTheme *icon_theme, GtkIconFactory *factory,
gint n, width, height;
const gchar * use_id;
static pixmap_fallback_t fallback_id[] = {
- { "user-trash", GTK_STOCK_DELETE },
- { "user-trash-full", GTK_STOCK_DELETE },
+ { "user-trash", "edit-delete" },
+ { "user-trash-full", "edit-delete" },
{ "emblem-important", "stock_mail-flag-for-followup"},
{ "mail-reply-sender", "mail-replied"},
{ "stock_mail-reply-to-all", "mail-replied"},
{ "mail-forward", "mail-replied"},
- { "folder-drag-accept", GTK_STOCK_OPEN},
- { "folder", GTK_STOCK_DIRECTORY},
+ { "folder-drag-accept", "document-open"},
+ { "folder", "folder"},
{ NULL, NULL } };
GtkSettings *settings;
@@ -94,7 +94,7 @@ load_balsa_pixmap(GtkIconTheme *icon_theme, GtkIconFactory *factory,
bpixmap->stock_id, use_id);
} else {
BICONS_ERR("icon %s unknown, no fallback", bpixmap->stock_id);
- use_id = GTK_STOCK_MISSING_IMAGE;
+ use_id = "image-missing";
}
} else
use_id = bpixmap->stock_id;
@@ -327,7 +327,8 @@ balsa_register_pixbufs(GtkWidget * widget)
#endif
{
libbalsa_address_view_set_book_icon, BALSA_PIXMAP_BOOK_RED}, {
- libbalsa_address_view_set_close_icon, GTK_STOCK_CLOSE}, {
+ /* standard icon name is "window-close": */
+ libbalsa_address_view_set_close_icon, "gtk-close"}, {
libbalsa_address_view_set_drop_down_icon, BALSA_PIXMAP_DROP_DOWN},
};
guint i;
diff --git a/src/balsa-icons.h b/src/balsa-icons.h
index b028433..12c13f1 100644
--- a/src/balsa-icons.h
+++ b/src/balsa-icons.h
@@ -73,7 +73,7 @@
#define BALSA_PIXMAP_INFO_REPLIED "balsa_info_replied"
#define BALSA_PIXMAP_INFO_NEW "balsa_info_new"
#define BALSA_PIXMAP_INFO_ATTACHMENT BALSA_PIXMAP_ATTACHMENT
-#define BALSA_PIXMAP_INFO_DELETED GTK_STOCK_DELETE
+#define BALSA_PIXMAP_INFO_DELETED "edit-delete"
#ifdef HAVE_GPGME
# define BALSA_PIXMAP_GPG_SIGN "balsa_gpg_sign"
# define BALSA_PIXMAP_GPG_ENCRYPT "balsa_gpg_encrypt"
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 2453754..fa6b143 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -1842,17 +1842,17 @@ bndx_popup_menu_create(BalsaIndex * index)
gtk_menu_shell_append(GTK_MENU_SHELL(menu),
gtk_separator_menu_item_new());
index->delete_item =
- create_stock_menu_item(menu, GTK_STOCK_DELETE,
+ create_stock_menu_item(menu, "edit-delete",
_("_Delete"),
G_CALLBACK(bi_toggle_deleted_cb),
index);
index->undelete_item =
- create_stock_menu_item(menu, GTK_STOCK_UNDELETE,
+ create_stock_menu_item(menu, "gtk-undelete",
_("_Undelete"),
G_CALLBACK(bi_toggle_deleted_cb),
index);
index->move_to_trash_item =
- create_stock_menu_item(menu, GTK_STOCK_DELETE,
+ create_stock_menu_item(menu, "edit-delete",
_("Move To _Trash"),
G_CALLBACK
(balsa_message_move_to_trash), index);
@@ -2656,7 +2656,7 @@ balsa_index_pipe(BalsaIndex * index)
GTK_WINDOW(balsa_app.main_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
_("_Run"), GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, GTK_WINDOW(balsa_app.main_window));
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index d3860cd..a48229f 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -1882,8 +1882,7 @@ bmbl_mru_show_tree(GtkWidget * widget, gpointer data)
gtk_dialog_new_with_buttons(_("Choose destination folder"),
mru->window,
GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, mru->window);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 0e5c7bb..ef3a76a 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -1739,8 +1739,9 @@ part_context_dump_all_cb(GtkWidget * menu_item, GList * info_list)
gtk_file_chooser_dialog_new(_("Select folder for saving selected parts"),
balsa_get_parent_window(menu_item),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dump_dialog, balsa_get_parent_window(menu_item));
#endif
diff --git a/src/balsa-mime-widget-callbacks.c b/src/balsa-mime-widget-callbacks.c
index d0896b1..41dcd4b 100644
--- a/src/balsa-mime-widget-callbacks.c
+++ b/src/balsa-mime-widget-callbacks.c
@@ -84,8 +84,9 @@ balsa_mime_widget_ctx_menu_save(GtkWidget * parent_widget,
gtk_file_chooser_dialog_new(title,
balsa_get_parent_window(parent_widget),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(save_dialog, balsa_get_parent_window(parent_widget));
#endif
diff --git a/src/balsa-mime-widget-image.c b/src/balsa-mime-widget-image.c
index 3c9d542..fd66f8e 100644
--- a/src/balsa-mime-widget-image.c
+++ b/src/balsa-mime-widget-image.c
@@ -131,7 +131,7 @@ balsa_mime_widget_new_image(BalsaMessage * bm,
g_signal_connect(mwi->context, "changed",
G_CALLBACK(bmwi_context_changed_cb), mw);
- image = gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE,
+ image = gtk_image_new_from_stock("image-missing",
GTK_ICON_SIZE_BUTTON);
g_object_set_data(G_OBJECT(image), "orig-width",
GINT_TO_POINTER(gdk_pixbuf_get_width(pixbuf)));
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 0575a02..fd61f11 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -1041,19 +1041,19 @@ bmwt_populate_popup_menu(BalsaMessage * bm,
GtkWidget *menuitem;
gpointer mime_body = g_object_get_data(G_OBJECT(html), "mime-body");
- menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_IN, NULL);
+ menuitem = gtk_image_menu_item_new_from_stock("zoom-in", NULL);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
G_CALLBACK(bm_zoom_in), bm);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem =
- gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_OUT, NULL);
+ gtk_image_menu_item_new_from_stock("zoom-out", NULL);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
G_CALLBACK(bm_zoom_out), bm);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem =
- gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_100, NULL);
+ gtk_image_menu_item_new_from_stock("zoom-original", NULL);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
G_CALLBACK(bm_zoom_reset), bm);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1086,7 +1086,7 @@ bmwt_populate_popup_menu(BalsaMessage * bm,
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem =
- gtk_image_menu_item_new_from_stock(GTK_STOCK_PRINT, NULL);
+ gtk_image_menu_item_new_from_stock("document-print", NULL);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
G_CALLBACK(libbalsa_html_print), html);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index 6534e1b..d2f6a3d 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -1237,9 +1237,9 @@ fe_edit_condition(GtkWidget * throwaway,gpointer is_new_cnd)
gtk_dialog_new_with_buttons("",
GTK_WINDOW(fe_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(condition_dialog, GTK_WINDOW(fe_window));
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index 49136b3..e3c7fa3 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -223,13 +223,13 @@ build_left_side(void)
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 2);
/* new button */
- fe_new_button = balsa_stock_button_with_label(GTK_STOCK_NEW, _("_New"));
+ fe_new_button = balsa_stock_button_with_label("document-new", _("_New"));
g_signal_connect(G_OBJECT(fe_new_button), "clicked",
G_CALLBACK(fe_new_pressed), NULL);
gtk_container_add(GTK_CONTAINER(bbox), fe_new_button);
/* delete button */
fe_delete_button =
- balsa_stock_button_with_label(GTK_STOCK_DELETE, _("_Delete"));
+ balsa_stock_button_with_label("edit-delete", _("_Delete"));
g_signal_connect(G_OBJECT(fe_delete_button), "clicked",
G_CALLBACK(fe_delete_pressed), NULL);
gtk_container_add(GTK_CONTAINER(bbox), fe_delete_button);
@@ -402,8 +402,8 @@ build_action_page(GtkWindow * window)
dialog =
gtk_file_chooser_dialog_new(_("Use Sound..."), NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT);
@@ -501,13 +501,13 @@ build_right_side(GtkWindow * window)
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(rightside), bbox, FALSE, FALSE, 0);
- fe_apply_button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+ fe_apply_button = gtk_button_new_with_mnemonic(_("_Apply"));
g_signal_connect(G_OBJECT(fe_apply_button), "clicked",
G_CALLBACK(fe_apply_pressed), NULL);
gtk_container_add(GTK_CONTAINER(bbox), fe_apply_button);
fe_revert_button =
- balsa_stock_button_with_label(GTK_STOCK_UNDO, _("Revert"));
+ balsa_stock_button_with_label("edit-undo", _("Revert"));
g_signal_connect(G_OBJECT(fe_revert_button), "clicked",
G_CALLBACK(fe_revert_pressed), NULL);
gtk_container_add(GTK_CONTAINER(bbox), fe_revert_button);
@@ -573,12 +573,9 @@ filters_edit_dialog(void)
fe_window = gtk_dialog_new_with_buttons(_("Balsa Filters"),
NULL, 0, /* FIXME */
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP,
- GTK_RESPONSE_HELP,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
g_signal_connect(G_OBJECT(fe_window), "response",
diff --git a/src/filter-export-dialog.c b/src/filter-export-dialog.c
index f5352f9..3471b1c 100644
--- a/src/filter-export-dialog.c
+++ b/src/filter-export-dialog.c
@@ -76,9 +76,9 @@ filters_export_dialog(void)
fex_window =
gtk_dialog_new_with_buttons(_("Balsa Filters Export"),
NULL, 0, /* FIXME */
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
gtk_window_set_wmclass(GTK_WINDOW(fex_window), "filter-export",
"Balsa");
diff --git a/src/filter-run-dialog.c b/src/filter-run-dialog.c
index 4c69577..8ebee14 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -275,9 +275,9 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
*/
gtk_dialog_add_buttons(GTK_DIALOG(p),
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
g_signal_connect(G_OBJECT(p), "response",
@@ -314,7 +314,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 2);
/* "Apply selected" button */
- button = balsa_stock_button_with_label(GTK_STOCK_APPLY,
+ button = balsa_stock_button_with_label("gtk-apply",
_("Apply Selected"));
g_signal_connect_swapped(G_OBJECT(button), "clicked",
G_CALLBACK(fr_apply_selected_pressed), p);
@@ -326,12 +326,12 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
/* Right/Add button */
- button = balsa_stock_button_with_label(GTK_STOCK_GO_FORWARD, _("A_dd"));
+ button = balsa_stock_button_with_label("go-next", _("A_dd"));
g_signal_connect_swapped(G_OBJECT(button), "clicked",
G_CALLBACK(fr_add_pressed), G_OBJECT(p));
gtk_container_add(GTK_CONTAINER(bbox), button);
/* Left/Remove button */
- button = balsa_stock_button_with_label(GTK_STOCK_GO_BACK, _("_Remove"));
+ button = balsa_stock_button_with_label("go-previous", _("_Remove"));
g_signal_connect_swapped(G_OBJECT(button), "clicked",
G_CALLBACK(fr_remove_pressed), G_OBJECT(p));
gtk_container_add(GTK_CONTAINER(bbox), button);
@@ -363,17 +363,17 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 2);
/* up button */
- button = balsa_stock_button_with_label(GTK_STOCK_GO_UP, _("_Up"));
+ button = balsa_stock_button_with_label("go-up", _("_Up"));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(fr_up_pressed), p);
gtk_container_add(GTK_CONTAINER(bbox), button);
/* down button */
- button = balsa_stock_button_with_label(GTK_STOCK_GO_DOWN, _("Do_wn"));
+ button = balsa_stock_button_with_label("go-down", _("Do_wn"));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(fr_down_pressed), p);
gtk_container_add(GTK_CONTAINER(bbox), button);
- button = balsa_stock_button_with_label(GTK_STOCK_APPLY,
+ button = balsa_stock_button_with_label("gtk-apply",
_("A_pply Now!"));
g_signal_connect_swapped(G_OBJECT(button), "clicked",
G_CALLBACK(fr_apply_now_pressed), G_OBJECT(p));
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 6219126..44f3e28 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -304,8 +304,9 @@ folder_conf_imap_node(BalsaMailboxNode *mn)
GTK_WINDOW(balsa_app.main_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
mn ? _("_Update") : _("C_reate"), GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP, NULL));
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
+ NULL));
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(GTK_WIDGET(fcw->dialog), GTK_WINDOW(balsa_app.main_window));
#endif
@@ -567,8 +568,8 @@ browse_button_cb(GtkWidget * widget, SubfolderDialogData * sdd)
gtk_dialog_new_with_buttons(_("Select parent folder"),
GTK_WINDOW(sdd->dialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, GTK_WINDOW(sdd->dialog));
@@ -799,8 +800,8 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
GTK_WINDOW(balsa_app.main_window),
GTK_DIALOG_DESTROY_WITH_PARENT, /* must NOT be modal */
mn ? _("_Update") : _("_Create"), GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL));
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(GTK_WIDGET(sdd->dialog), GTK_WINDOW(balsa_app.main_window));
diff --git a/src/information-dialog.c b/src/information-dialog.c
index 42326b9..ae34a7b 100644
--- a/src/information-dialog.c
+++ b/src/information-dialog.c
@@ -233,8 +233,8 @@ balsa_information_list(GtkWindow *parent, LibBalsaInformationType type,
gtk_dialog_new_with_buttons(_("Information - Balsa"),
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLEAR, GTK_RESPONSE_APPLY,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Clear"), GTK_RESPONSE_APPLY,
+ _("Cl_ose"), GTK_RESPONSE_CLOSE,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(information_dialog, parent);
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 972ab8c..ce8f89c 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -416,7 +416,7 @@ mailbox_conf_delete(BalsaMailboxNode * mbnode)
gtk_dialog_add_buttons(GTK_DIALOG(ask),
_("Remove from _list"), 0,
_("Remove from list and _disk"), 1,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
} else if (LIBBALSA_IS_MAILBOX_IMAP(mailbox) && !mailbox->config_prefix) {
/* deleting remote IMAP mailbox in a folder set */
@@ -437,7 +437,7 @@ mailbox_conf_delete(BalsaMailboxNode * mbnode)
mailbox->name, mailbox->name);
gtk_dialog_add_buttons(GTK_DIALOG(ask),
_("_Remove from server"), 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
} else { /* deleting other remote mailbox */
ask = gtk_message_dialog_new(GTK_WINDOW(balsa_app.main_window), 0,
@@ -453,7 +453,7 @@ mailbox_conf_delete(BalsaMailboxNode * mbnode)
mailbox->name);
gtk_dialog_add_buttons(GTK_DIALOG(ask),
_("_Remove from list"), 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
}
@@ -1136,7 +1136,7 @@ create_local_mailbox_dialog(MailboxConfWindow *mcw)
GTK_WINDOW(balsa_app.main_window),
action,
mcw->ok_button_name, MCW_RESPONSE,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
g_free(title);
#if HAVE_MACOSX_DESKTOP
@@ -1172,7 +1172,7 @@ create_generic_dialog(MailboxConfWindow * mcw)
GTK_WINDOW(balsa_app.main_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
mcw->ok_button_name, MCW_RESPONSE,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, GTK_WINDOW(balsa_app.main_window));
diff --git a/src/main-window.c b/src/main-window.c
index 073e366..7afdf12 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -346,7 +346,7 @@ static const GtkActionEntry entries[] = {
{"MessageMoreMenu", NULL, N_("_More")},
{"ToolsMenu", NULL, N_("_Tools")},
{"ToolsFiltersMenu", NULL, N_("_Filters")},
- {"ManageFilters", GTK_STOCK_PROPERTIES, N_("F_ilters"), NULL,
+ {"ManageFilters", "document-properties", N_("F_ilters"), NULL,
N_("Manage filters"), G_CALLBACK(bw_filter_dlg_cb)},
#endif /* ENABLE_TOUCH_UI */
/* File menu items */
@@ -368,46 +368,46 @@ static const GtkActionEntry entries[] = {
N_("Set up page for printing"), G_CALLBACK(bw_page_setup_cb)},
{"AddressBook", BALSA_PIXMAP_BOOK_RED, N_("_Address Book..."), MAC_MODIFIER "B",
N_("Open the address book"), G_CALLBACK(bw_address_book_cb)},
- {"Quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", N_("Quit Balsa"),
+ {"Quit", "application-exit", N_("_Quit"), "<control>Q", N_("Quit Balsa"),
G_CALLBACK(bw_quit_nicely)},
/* File:New submenu items */
{"NewMessage", BALSA_PIXMAP_COMPOSE, N_("_Message..."), MAC_MODIFIER "M",
N_("Compose a new message"), G_CALLBACK(bw_new_message_cb)},
#if !defined(ENABLE_TOUCH_UI)
- {"NewMbox", GTK_STOCK_ADD, N_("Local mbox mailbox..."), NULL,
+ {"NewMbox", "list-add", N_("Local mbox mailbox..."), NULL,
N_("Add a new mbox style mailbox"),
G_CALLBACK(mailbox_conf_add_mbox_cb)},
- {"NewMaildir", GTK_STOCK_ADD, N_("Local Maildir mailbox..."), NULL,
+ {"NewMaildir", "list-add", N_("Local Maildir mailbox..."), NULL,
N_("Add a new Maildir style mailbox"),
G_CALLBACK(mailbox_conf_add_maildir_cb)},
- {"NewMH", GTK_STOCK_ADD, N_("Local MH mailbox..."), NULL,
+ {"NewMH", "list-add", N_("Local MH mailbox..."), NULL,
N_("Add a new MH style mailbox"), G_CALLBACK(mailbox_conf_add_mh_cb)},
#else /* ENABLE_TOUCH_UI */
- {"NewMbox", GTK_STOCK_ADD, N_("New mailbox..."), NULL,
+ {"NewMbox", "list-add", N_("New mailbox..."), NULL,
N_("Add a new mbox style mailbox"),
G_CALLBACK(mailbox_conf_add_mbox_cb)},
- {"NewMaildir", GTK_STOCK_ADD, N_("New \"Maildir\" mailbox..."), NULL,
+ {"NewMaildir", "list-add", N_("New \"Maildir\" mailbox..."), NULL,
N_("Add a new Maildir style mailbox"),
G_CALLBACK(mailbox_conf_add_maildir_cb)},
- {"NewMH", GTK_STOCK_ADD, N_("New \"MH\" mailbox..."), NULL,
+ {"NewMH", "list-add", N_("New \"MH\" mailbox..."), NULL,
N_("Add a new MH style mailbox"), G_CALLBACK(mailbox_conf_add_mh_cb)},
#endif /* ENABLE_TOUCH_UI */
- {"NewIMAPBox", GTK_STOCK_ADD, N_("Remote IMAP mailbox..."), NULL,
+ {"NewIMAPBox", "list-add", N_("Remote IMAP mailbox..."), NULL,
N_("Add a new IMAP mailbox"), G_CALLBACK(mailbox_conf_add_imap_cb)},
- {"NewIMAPFolder", GTK_STOCK_ADD, N_("Remote IMAP folder..."), NULL,
+ {"NewIMAPFolder", "list-add", N_("Remote IMAP folder..."), NULL,
N_("Add a new IMAP folder"), G_CALLBACK(folder_conf_add_imap_cb)},
- {"NewIMAPSubfolder", GTK_STOCK_ADD, N_("Remote IMAP subfolder..."),
+ {"NewIMAPSubfolder", "list-add", N_("Remote IMAP subfolder..."),
NULL, N_("Add a new IMAP subfolder"),
G_CALLBACK(folder_conf_add_imap_sub_cb)},
/* Edit menu items */
- {"Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C", NULL,
+ {"Copy", "edit-copy", N_("_Copy"), "<control>C", NULL,
G_CALLBACK(bw_copy_cb)},
- {"Filters", GTK_STOCK_PROPERTIES, N_("F_ilters..."), NULL,
+ {"Filters", "document-properties", N_("F_ilters..."), NULL,
N_("Manage filters"), G_CALLBACK(bw_filter_dlg_cb)},
/* Export selected filters to a text file. */
- {"ExportFilters", GTK_STOCK_PROPERTIES, N_("_Export Filters..."), NULL,
+ {"ExportFilters", "document-properties", N_("_Export Filters..."), NULL,
N_("Export filters as Sieve scripts"), G_CALLBACK(bw_filter_export_cb)},
- {"Preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, NULL,
+ {"Preferences", "preferences-system", N_("Prefere_nces"), NULL, NULL,
G_CALLBACK(open_preferences_manager)},
/* View menu items */
{"ExpandAll", NULL, N_("E_xpand All"), "<control>E",
@@ -415,30 +415,30 @@ static const GtkActionEntry entries[] = {
{"CollapseAll", NULL, N_("_Collapse All"), "<control>L",
N_("Collapse all expanded threads"), G_CALLBACK(bw_collapse_all_cb)},
#ifdef HAVE_HTML_WIDGET
- {"ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
+ {"ZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus",
N_("Increase magnification"), G_CALLBACK(bw_zoom_in_cb)},
- {"ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
+ {"ZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus",
N_("Decrease magnification"), G_CALLBACK(bw_zoom_out_cb)},
/* To warn msgfmt that the % sign isn't a format specifier: */
/* xgettext:no-c-format */
- {"Zoom100", GTK_STOCK_ZOOM_100, N_("Zoom _100%"), NULL,
+ {"Zoom100", "zoom-original", N_("Zoom _100%"), NULL,
N_("No magnification"), G_CALLBACK(bw_zoom_100_cb)},
#endif /* HAVE_HTML_WIDGET */
/* Mailbox menu item that does not require a mailbox */
{"NextUnread", BALSA_PIXMAP_NEXT_UNREAD, N_("Next Unread Message"),
"<control>N", N_("Next Unread Message"),
G_CALLBACK(bw_next_unread_message_cb)},
- {"EmptyTrash", GTK_STOCK_REMOVE, N_("Empty _Trash"), NULL,
+ {"EmptyTrash", "list-remove", N_("Empty _Trash"), NULL,
N_("Delete messages from the Trash mailbox"),
G_CALLBACK(bw_empty_trash_cb)},
/* Settings menu items */
- {"Toolbars", GTK_STOCK_EXECUTE, N_("_Toolbars..."), NULL,
+ {"Toolbars", "system-run", N_("_Toolbars..."), NULL,
N_("Customize toolbars"), G_CALLBACK(customize_dialog_cb)},
{"Identities", BALSA_PIXMAP_IDENTITY, N_("_Identities..."), NULL,
N_("Create and set current identities"),
G_CALLBACK(bw_ident_manage_dialog_cb)},
/* Help menu items */
- {"TableOfContents", GTK_STOCK_HELP, N_("_User's Guide"), "F1",
+ {"TableOfContents", "help-browser", N_("_User's Guide"), "F1",
N_("Table of Contents"), G_CALLBACK(bw_contents_cb)},
{"MailboxTab1", NULL, NULL, "<alt>1", NULL,
G_CALLBACK(bw_mailbox_tab_n_cb)},
@@ -460,7 +460,7 @@ static const GtkActionEntry entries[] = {
G_CALLBACK(bw_mailbox_tab_n_cb)},
{"MailboxTab0", NULL, NULL, "<alt>0", NULL,
G_CALLBACK(bw_mailbox_tab_n_cb)},
- {"About", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("About Balsa"),
+ {"About", "help-about", N_("_About"), NULL, N_("About Balsa"),
G_CALLBACK(bw_show_about_box)}
};
@@ -469,9 +469,9 @@ static const GtkActionEntry mailbox_entries[] = {
/* Edit menu items */
{"SelectAll", NULL, N_("Select _All"), "<control>A", NULL,
G_CALLBACK(bw_select_all_cb)},
- {"Find", GTK_STOCK_FIND, N_("_Find"), "<control>F", NULL,
+ {"Find", "edit-find", N_("_Find"), "<control>F", NULL,
G_CALLBACK(bw_find_cb)},
- {"FindNext", GTK_STOCK_FIND, N_("Find Ne_xt"), "<control>G", NULL,
+ {"FindNext", "edit-find", N_("Find Ne_xt"), "<control>G", NULL,
G_CALLBACK(bw_find_again_cb)},
/* Mailbox menu items */
{"NextMessage", BALSA_PIXMAP_NEXT, N_("Next Message"), MAC_MODIFIER "N",
@@ -482,31 +482,31 @@ static const GtkActionEntry mailbox_entries[] = {
"<control><alt>F", N_("Next Flagged Message"),
G_CALLBACK(bw_next_flagged_message_cb)},
{"MailboxHideMenu", NULL, N_("_Hide Messages")},
- {"ResetFilter", GTK_STOCK_CANCEL, N_("_Reset Filter"), NULL,
+ {"ResetFilter", "gtk-cancel", N_("_Reset Filter"), NULL,
N_("Reset mailbox filter"), G_CALLBACK(bw_reset_filter_cb)},
{"MailboxSelectAll", BALSA_PIXMAP_MARK_ALL, N_("_Select All"), NULL,
N_("Select all messages in current mailbox"),
G_CALLBACK(bw_mark_all_cb)},
- {"MailboxEdit", GTK_STOCK_PREFERENCES, N_("_Properties..."), NULL,
+ {"MailboxEdit", "preferences-system", N_("_Properties..."), NULL,
N_("Edit the selected mailbox"), G_CALLBACK(mailbox_conf_edit_cb)},
- {"MailboxDelete", GTK_STOCK_REMOVE, N_("_Delete..."), NULL,
+ {"MailboxDelete", "list-remove", N_("_Delete..."), NULL,
N_("Delete the selected mailbox"),
G_CALLBACK(mailbox_conf_delete_cb)},
#if !defined(ENABLE_TOUCH_UI)
- {"Expunge", GTK_STOCK_CLEAR, N_("E_xpunge Deleted Messages"), NULL,
+ {"Expunge", "edit-clear", N_("E_xpunge Deleted Messages"), NULL,
N_("Expunge messages marked as deleted in the current mailbox"),
#else /* ENABLE_TOUCH_UI */
- {"Expunge", GTK_STOCK_REMOVE, N_("E_xpunge Deleted Messages"), NULL,
+ {"Expunge", "list-remove", N_("E_xpunge Deleted Messages"), NULL,
N_("Expunge messages marked as deleted in the current mailbox"),
#endif /* ENABLE_TOUCH_UI */
G_CALLBACK(bw_mailbox_expunge_cb)},
- {"Close", GTK_STOCK_CLOSE, N_("_Close"), NULL, N_("Close mailbox"),
+ {"Close", "window-close", N_("_Close"), NULL, N_("Close mailbox"),
G_CALLBACK(bw_mailbox_close_cb)},
- {"SelectFilters", GTK_STOCK_PROPERTIES, N_("Select _Filters"), NULL,
+ {"SelectFilters", "document-properties", N_("Select _Filters"), NULL,
N_("Select filters to be applied automatically to current mailbox"),
G_CALLBACK(bw_filter_run_cb)},
#if !defined(ENABLE_TOUCH_UI)
- {"RemoveDuplicates", GTK_STOCK_REMOVE, N_("_Remove Duplicates"), NULL,
+ {"RemoveDuplicates", "list-remove", N_("_Remove Duplicates"), NULL,
N_("Remove duplicated messages from the current mailbox"),
G_CALLBACK(bw_remove_duplicates_cb)}
#endif /* ENABLE_TOUCH_UI */
@@ -555,9 +555,9 @@ static const GtkActionEntry message_entries[] = {
/* Actions that are sensitive only when some message is current: */
static const GtkActionEntry current_message_entries[] = {
/* File menu item */
- {"Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
+ {"Print", "document-print", N_("_Print..."), "<control>P",
N_("Print current message"), G_CALLBACK(bw_message_print_cb)},
- {"SavePart", GTK_STOCK_SAVE, N_("Save Current Part..."), "<control>S",
+ {"SavePart", "document-save", N_("Save Current Part..."), "<control>S",
N_("Save currently displayed part of message"),
G_CALLBACK(bw_save_current_part_cb)},
#if !defined(ENABLE_TOUCH_UI)
@@ -566,7 +566,7 @@ static const GtkActionEntry current_message_entries[] = {
{"PreviousPart", BALSA_PIXMAP_PREVIOUS_PART, N_("_Previous Part"),
"<control>comma", N_("Previous part in message"),
G_CALLBACK(bw_previous_part_cb)},
- {"CopyMessage", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
+ {"CopyMessage", "edit-copy", N_("_Copy"), "<control>C",
N_("Copy message"), G_CALLBACK(bw_message_copy_cb)},
{"SelectText", NULL, N_("_Select Text"), NULL,
N_("Select entire mail"), G_CALLBACK(bw_message_select_all_cb)},
@@ -581,11 +581,11 @@ static const GtkActionEntry current_message_entries[] = {
static const GtkActionEntry modify_message_entries[] = {
/* Message menu items */
#if !defined(ENABLE_TOUCH_UI)
- {"MoveToTrash", GTK_STOCK_DELETE, N_("_Move to Trash"), MAC_MODIFIER "D",
+ {"MoveToTrash", "edit-delete", N_("_Move to Trash"), MAC_MODIFIER "D",
N_("Move the current message to Trash mailbox"),
G_CALLBACK(bw_trash_message_cb)},
#else /* ENABLE_TOUCH_UI */
- {"MoveToTrash", GTK_STOCK_DELETE, N_("_Delete to Trash"), MAC_MODIFIER "D",
+ {"MoveToTrash", "edit-delete", N_("_Delete to Trash"), MAC_MODIFIER "D",
N_("Move the current message to Trash mailbox"),
G_CALLBACK(bw_trash_message_cb)},
{"ToolbarToggleNew", BALSA_PIXMAP_MARKED_NEW, N_("_New"), NULL,
@@ -595,7 +595,7 @@ static const GtkActionEntry modify_message_entries[] = {
/* Message:toggle-flag submenu items */
{"ToggleFlagged", BALSA_PIXMAP_INFO_FLAGGED, N_("_Flagged"), MAC_MODIFIER "X",
N_("Toggle flagged"), G_CALLBACK(bw_toggle_flagged_message_cb)},
- {"ToggleDeleted", GTK_STOCK_DELETE, N_("_Deleted"), "<control>D",
+ {"ToggleDeleted", "edit-delete", N_("_Deleted"), "<control>D",
N_("Toggle deleted flag"), G_CALLBACK(bw_toggle_deleted_message_cb)},
{"ToggleNew", BALSA_PIXMAP_INFO_NEW, N_("_New"), "<control>R",
N_("Toggle New"), G_CALLBACK(bw_toggle_new_message_cb)},
@@ -1261,7 +1261,7 @@ bw_create_index_widget(BalsaWindow *bw)
button = gtk_button_new(),
FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(button),
- gtk_image_new_from_stock(GTK_STOCK_OK,
+ gtk_image_new_from_stock("gtk-ok",
GTK_ICON_SIZE_BUTTON));
g_signal_connect(G_OBJECT(bw->sos_entry), "activate",
G_CALLBACK(bw_filter_entry_activate),
@@ -1465,14 +1465,14 @@ static const gchar* main_toolbar[] = {
BALSA_PIXMAP_REPLY_ALL,
BALSA_PIXMAP_FORWARD,
"",
- GTK_STOCK_DELETE,
+ "edit-delete",
"",
BALSA_PIXMAP_NEXT_UNREAD,
BALSA_PIXMAP_MARKED_NEW
#else /* defined(ENABLE_TOUCH_UI) */
BALSA_PIXMAP_RECEIVE,
"",
- GTK_STOCK_DELETE,
+ "edit-delete",
"",
BALSA_PIXMAP_COMPOSE,
BALSA_PIXMAP_CONTINUE,
@@ -1482,7 +1482,7 @@ static const gchar* main_toolbar[] = {
"",
BALSA_PIXMAP_NEXT_UNREAD,
"",
- GTK_STOCK_PRINT
+ "document-print"
#endif /* defined(ENABLE_TOUCH_UI) */
};
@@ -2373,8 +2373,8 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
g_signal_connect(but, "clicked",
G_CALLBACK(bw_mailbox_tab_close_cb), mbnode);
- close_pix = gtk_image_new_from_stock(GTK_STOCK_CLOSE,
- GTK_ICON_SIZE_MENU);
+ close_pix = gtk_image_new_from_icon_name("window-close",
+ GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(but), close_pix);
gtk_box_pack_start(GTK_BOX(box), but, FALSE, FALSE, 0);
@@ -3612,7 +3612,7 @@ bw_display_new_mail_notification(int num_new, int has_new)
msg = bw_get_new_message_notification_string(num_new, num_total);
if (balsa_app.main_window->new_mail_note) {
notify_notification_update(balsa_app.main_window->new_mail_note,
- "Balsa", msg, GTK_STOCK_DIALOG_INFO);
+ "Balsa", msg, "dialog-information");
/* 30 seconds: */
notify_notification_set_timeout(balsa_app.main_window->
new_mail_note, 30000);
@@ -4367,8 +4367,8 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
gtk_dialog_new_with_buttons(_("Search mailbox"),
GTK_WINDOW(window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Help"), GTK_RESPONSE_HELP,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
GtkWidget *reverse_button, *wrap_button;
GtkWidget *search_entry, *w, *page, *grid;
@@ -4425,12 +4425,12 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
/* Button box */
box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_container_set_border_width(GTK_CONTAINER(box), 6);
- button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+ button = gtk_button_new_with_mnemonic(_("_Apply"));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(bw_find_button_clicked),
GINT_TO_POINTER(FIND_RESPONSE_FILTER));
gtk_container_add(GTK_CONTAINER(box), button);
- button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ button = gtk_button_new_with_mnemonic(_("_Clear"));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(bw_find_button_clicked),
GINT_TO_POINTER(FIND_RESPONSE_RESET));
@@ -4461,7 +4461,7 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
wrap);
gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
- button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ button = gtk_button_new_with_mnemonic(_("_OK"));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(bw_find_button_clicked),
GINT_TO_POINTER(GTK_RESPONSE_OK));
diff --git a/src/message-window.c b/src/message-window.c
index 71ad7f8..7a8cc65 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -243,12 +243,12 @@ static const GtkActionEntry entries[] = {
{"MessageMenu", NULL, N_("_Message")},
{"PageSetup", NULL, N_("Page _Setup"), "<control>S",
N_("Set up page for printing"), G_CALLBACK(page_setup_cb)},
- {"Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
+ {"Print", "document-print", N_("_Print..."), "<control>P",
N_("Print current message"), G_CALLBACK(print_cb)},
- {"Close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+ {"Close", "window-close", N_("_Close"), "<control>W",
N_("Close the message window"),
G_CALLBACK(close_message_window_cb)},
- {"Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C", NULL,
+ {"Copy", "edit-copy", N_("_Copy"), "<control>C", NULL,
G_CALLBACK(copy_cb)},
{"SelectAll", NULL, N_("Select _All"), "<control>A", NULL,
G_CALLBACK(select_all_cb)},
@@ -256,13 +256,13 @@ static const GtkActionEntry entries[] = {
N_("Find a string in this message"),
G_CALLBACK(mw_find_in_message_cb)},
#ifdef HAVE_HTML_WIDGET
- {"ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
+ {"ZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus",
N_("Increase magnification"), G_CALLBACK(mw_zoom_in_cb)},
- {"ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
+ {"ZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus",
N_("Decrease magnification"), G_CALLBACK(mw_zoom_out_cb)},
/* To warn msgfmt that the % sign isn't a format specifier: */
/* xgettext:no-c-format */
- {"Zoom100", GTK_STOCK_ZOOM_100, N_("Zoom _100%"), NULL,
+ {"Zoom100", "zoom-original", N_("Zoom _100%"), NULL,
N_("No magnification"), G_CALLBACK(mw_zoom_100_cb)},
#endif /* HAVE_HTML_WIDGET */
{"Reply", BALSA_PIXMAP_REPLY, N_("_Reply..."), "R",
@@ -272,7 +272,7 @@ static const GtkActionEntry entries[] = {
G_CALLBACK(replytoall_message_cb)},
{"ReplyGroup", BALSA_PIXMAP_REPLY_GROUP, N_("Reply to _Group..."), "G",
N_("Reply to mailing list"), G_CALLBACK(replytogroup_message_cb)},
- {"SavePart", GTK_STOCK_SAVE, N_("Save Current Part..."), "<control>S",
+ {"SavePart", "document-save", N_("Save Current Part..."), "<control>S",
N_("Save currently displayed part of message"),
G_CALLBACK(save_current_part_cb)},
{"ViewSource", BALSA_PIXMAP_BOOK_OPEN, N_("_View Source..."),
@@ -305,7 +305,7 @@ static const GtkActionEntry entries[] = {
{"NextFlagged", BALSA_PIXMAP_NEXT_FLAGGED, N_("Next Flagged Message"),
"<control><alt>F", N_("Next Flagged Message"),
G_CALLBACK(next_flagged_cb)},
- {"MoveToTrash", GTK_STOCK_DELETE, N_("_Move to Trash"), "D",
+ {"MoveToTrash", "edit-delete", N_("_Move to Trash"), "D",
N_("Move the message to Trash mailbox"),
G_CALLBACK(trash_cb)}
};
@@ -427,11 +427,11 @@ static const gchar* message_toolbar[] = {
BALSA_PIXMAP_REPLY_ALL,
BALSA_PIXMAP_FORWARD,
"",
- GTK_STOCK_PRINT,
+ "document-print",
"",
- GTK_STOCK_DELETE,
+ "edit-delete",
"",
- GTK_STOCK_CLOSE
+ "window-close"
#else /* ENABLE_TOUCH_UI */
BALSA_PIXMAP_NEXT_UNREAD,
"",
@@ -442,11 +442,11 @@ static const gchar* message_toolbar[] = {
"",
BALSA_PIXMAP_PREVIOUS_PART,
BALSA_PIXMAP_NEXT_PART,
- GTK_STOCK_SAVE,
+ "document-save",
"",
- GTK_STOCK_PRINT,
+ "document-print",
"",
- GTK_STOCK_DELETE
+ "edit-delete"
#endif /* ENEBLE_TOUCH_UI */
};
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 83907aa..98b65a2 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -506,10 +506,10 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
gtk_dialog_new_with_buttons(_("Balsa Preferences"),
GTK_WINDOW(active_win),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Apply"), GTK_RESPONSE_APPLY,
+ _("_Close"), GTK_RESPONSE_CLOSE,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(property_box, GTK_WINDOW(active_win));
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 2a4be4b..1eb8461 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -331,7 +331,7 @@ static const GtkActionEntry entries[] = {
/* Less frequently used entries of the 'Tools' menu */
{"ToolsMoreMenu", NULL, N_("_More")},
#endif /* ENABLE_TOUCH_UI */
- {"IncludeFile", GTK_STOCK_OPEN, N_("_Include File..."), NULL,
+ {"IncludeFile", "document-open", N_("_Include File..."), NULL,
N_("Include a file"), G_CALLBACK(include_file_cb)},
{"AttachFile", BALSA_PIXMAP_ATTACHMENT, N_("_Attach File..."), NULL,
N_("Attach a file"), G_CALLBACK(attach_clicked)},
@@ -339,25 +339,25 @@ static const GtkActionEntry entries[] = {
N_("Include selected message(s)"), G_CALLBACK(include_message_cb)},
{"AttachMessages", NULL, N_("Attach _Message(s)"), NULL,
N_("Attach selected message(s)"), G_CALLBACK(attach_message_cb)},
- {"Save", GTK_STOCK_SAVE, N_("_Save"), "<control>S",
+ {"Save", "document-save", N_("_Save"), "<control>S",
N_("Save this message"), G_CALLBACK(save_message_cb)},
#if !defined(ENABLE_TOUCH_UI)
{"PageSetup", NULL, N_("Page _Setup"), NULL,
N_("Set up page for printing"), G_CALLBACK(page_setup_cb)},
#endif /* ENABLE_TOUCH_UI */
- {"Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
+ {"Print", "document-print", N_("_Print..."), "<control>P",
N_("Print the edited message"), G_CALLBACK(print_message_cb)},
- {"Close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+ {"Close", "window-close", N_("_Close"), "<control>W",
NULL, G_CALLBACK(close_window_cb)},
- {"Undo", GTK_STOCK_UNDO, N_("_Undo"), "<control>Z",
+ {"Undo", "edit-undo", N_("_Undo"), "<control>Z",
N_("Undo most recent change"), G_CALLBACK(sw_undo_cb)},
- {"Redo", GTK_STOCK_REDO, N_("_Redo"), "<shift><control>Z",
+ {"Redo", "edit-redo", N_("_Redo"), "<shift><control>Z",
N_("Redo most recent change"), G_CALLBACK(sw_redo_cb)},
- {"Cut", GTK_STOCK_CUT, N_("Cu_t"), "<control>X",
+ {"Cut", "edit-cut", N_("Cu_t"), "<control>X",
N_("Cut the selected text"), G_CALLBACK(cut_cb)},
- {"Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
+ {"Copy", "edit-copy", N_("_Copy"), "<control>C",
N_("Copy to the clipboard"), G_CALLBACK(copy_cb)},
- {"Paste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
+ {"Paste", "edit-paste", N_("_Paste"), "<control>V",
N_("Paste from the clipboard"), G_CALLBACK(paste_cb)},
{"SelectAll", NULL, N_("Select _All"), "<control>A",
NULL, G_CALLBACK(select_all_cb)},
@@ -370,7 +370,7 @@ static const GtkActionEntry entries[] = {
{"QuoteMessages", NULL, N_("_Quote Message(s)"), NULL,
NULL, G_CALLBACK(quote_messages_cb)},
#if !HAVE_GTKSPELL
- {"CheckSpelling", GTK_STOCK_SPELL_CHECK, N_("C_heck Spelling"), NULL,
+ {"CheckSpelling", "tools-check-spelling", N_("C_heck Spelling"), NULL,
N_("Check the spelling of the message"),
G_CALLBACK(spell_check_cb)},
#endif /* HAVE_GTKSPELL */
@@ -378,7 +378,7 @@ static const GtkActionEntry entries[] = {
NULL, N_("Select the Identity to use for the message"),
G_CALLBACK(change_identity_dialog_cb)},
#if !defined(ENABLE_TOUCH_UI)
- {"EditWithGnome", GTK_STOCK_EDIT, N_("_Edit with Gnome-Editor"),
+ {"EditWithGnome", "gtk-edit", N_("_Edit with Gnome-Editor"),
NULL, N_("Edit the current message with the default Gnome editor"),
G_CALLBACK(edit_with_gnome)},
#endif /* ENABLE_TOUCH_UI */
@@ -412,7 +412,7 @@ static const GtkActionEntry ready_entries[] = {
/* Toggle items */
static const GtkToggleActionEntry toggle_entries[] = {
#if HAVE_GTKSPELL
- {"CheckSpelling", GTK_STOCK_SPELL_CHECK, N_("C_heck Spelling"), NULL,
+ {"CheckSpelling", "tools-check-spelling", N_("C_heck Spelling"), NULL,
N_("Check the spelling of the message"),
G_CALLBACK(spell_check_menu_cb), FALSE},
#endif /* HAVE_GTKSPELL */
@@ -940,7 +940,7 @@ delete_handler(BalsaSendmsg * bsmsg)
g_object_unref(list);
gtk_dialog_set_default_response(GTK_DIALOG(d), GTK_RESPONSE_YES);
gtk_dialog_add_button(GTK_DIALOG(d),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ "gtk-cancel", GTK_RESPONSE_CANCEL);
reply = gtk_dialog_run(GTK_DIALOG(d));
gtk_widget_destroy(d);
@@ -1900,8 +1900,8 @@ sw_get_user_codeset(BalsaSendmsg * bsmsg, gboolean * change_type,
gtk_dialog_new_with_buttons(_("Choose charset"),
GTK_WINDOW(bsmsg->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
gchar *msg = g_strdup_printf
(_("File\n%s\nis not encoded in US-ASCII or UTF-8.\n"
@@ -2259,7 +2259,7 @@ add_urlref_attachment(BalsaSendmsg * bsmsg, gchar *url)
/* get the pixbuf for the attachment's content type */
pixbuf =
gtk_widget_render_icon_pixbuf(GTK_WIDGET(balsa_app.main_window),
- GTK_STOCK_JUMP_TO,
+ "go-jump",
GTK_ICON_SIZE_MENU);
/* create a new attachment info block */
@@ -2362,8 +2362,9 @@ sw_attach_dialog(BalsaSendmsg * bsmsg)
gtk_file_chooser_dialog_new(_("Attach file"),
GTK_WINDOW(bsmsg->window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(fsw, GTK_WINDOW(bsmsg->window));
#endif
@@ -3688,7 +3689,7 @@ quote_parts_select_dlg(GtkTreeStore *tree_store, GtkWindow * parent)
dialog = gtk_dialog_new_with_buttons(_("Select parts for quotation"),
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, parent);
@@ -3699,7 +3700,7 @@ quote_parts_select_dlg(GtkTreeStore *tree_store, GtkWindow * parent)
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
- image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+ image = gtk_image_new_from_stock("dialog-question",
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0);
@@ -4482,17 +4483,17 @@ create_lang_menu(GtkWidget * parent, BalsaSendmsg * bsmsg)
/* Standard buttons; "" means a separator. */
static const gchar* compose_toolbar[] = {
#if defined(ENABLE_TOUCH_UI)
- GTK_STOCK_UNDO,
- GTK_STOCK_REDO,
- GTK_STOCK_SPELL_CHECK,
+ "edit-undo",
+ "edit-redo",
+ "tools-check-spelling",
"",
BALSA_PIXMAP_ATTACHMENT,
"",
- GTK_STOCK_SAVE,
+ "document-save",
"",
BALSA_PIXMAP_SEND,
"",
- GTK_STOCK_CLOSE,
+ "window-close",
"",
BALSA_PIXMAP_IDENTITY,
#else /* ENABLE_TOUCH_UI */
@@ -4500,18 +4501,18 @@ static const gchar* compose_toolbar[] = {
"",
BALSA_PIXMAP_ATTACHMENT,
"",
- GTK_STOCK_SAVE,
+ "document-save",
"",
- GTK_STOCK_UNDO,
- GTK_STOCK_REDO,
+ "edit-undo",
+ "edit-redo",
"",
BALSA_PIXMAP_IDENTITY,
"",
- GTK_STOCK_SPELL_CHECK,
+ "tools-check-spelling",
"",
- GTK_STOCK_PRINT,
+ "document-print",
"",
- GTK_STOCK_CLOSE,
+ "window-close",
#endif /* ENABLE_TOUCH_UI */
};
@@ -5441,8 +5442,9 @@ include_file_cb(GtkAction * action, BalsaSendmsg * bsmsg)
gtk_file_chooser_dialog_new(_("Include file"),
GTK_WINDOW(bsmsg->window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
+ NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(file_selector, GTK_WINDOW(bsmsg->window));
#endif
@@ -5749,7 +5751,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_stock ("dialog-question", GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
@@ -5781,7 +5783,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
gtk_dialog_get_action_area(GTK_DIALOG(no_subj_dialog));
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
- cnclbutton = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ cnclbutton = gtk_button_new_with_mnemonic(_("_Cancel"));
gtk_dialog_add_action_widget (GTK_DIALOG (no_subj_dialog), cnclbutton, GTK_RESPONSE_CANCEL);
gtk_widget_set_can_default(cnclbutton, TRUE);
@@ -5919,7 +5921,7 @@ check_suggest_encryption(BalsaSendmsg * bsmsg)
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show_all(button);
- button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ button = gtk_button_new_with_mnemonic(_("_Cancel"));
gtk_widget_show(button);
gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button, GTK_RESPONSE_CANCEL);
gtk_widget_set_can_default(button, TRUE);
@@ -7173,7 +7175,7 @@ bsmsg_check_format_compatibility(GtkWindow *parent, const gchar *filename)
dialog = (GtkDialog*)gtk_dialog_new_with_buttons
("Compatibility check", parent,
GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "_Cancel", GTK_RESPONSE_CANCEL,
"_Attach it in the current format", GTK_RESPONSE_OK, NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(GTK_WIDGET(dialog), parent);
diff --git a/src/spell-check.c b/src/spell-check.c
index 34e5863..78cee08 100644
--- a/src/spell-check.c
+++ b/src/spell-check.c
@@ -334,7 +334,7 @@ balsa_spell_check_init(BalsaSpellCheck * spell_check)
gtk_grid_set_row_spacing(grid, padding);
gtk_grid_set_column_spacing(grid, padding);
- widget = balsa_stock_button_with_label(GTK_STOCK_REDO, _("C_hange"));
+ widget = balsa_stock_button_with_label("edit-redo", _("C_hange"));
gtk_widget_set_tooltip_text(widget,
_("Replace the current word "
"with the selected suggestion"));
@@ -351,7 +351,7 @@ balsa_spell_check_init(BalsaSpellCheck * spell_check)
G_CALLBACK(change_all_cb), spell_check);
gtk_grid_attach(grid, widget, 0, 1, 1, 1);
- widget = balsa_stock_button_with_label(GTK_STOCK_GO_FORWARD,
+ widget = balsa_stock_button_with_label("go-next",
_("_Ignore"));
gtk_widget_set_tooltip_text(widget,
_("Skip the current word"));
@@ -375,13 +375,13 @@ balsa_spell_check_init(BalsaSpellCheck * spell_check)
G_CALLBACK(learn_cb), spell_check);
gtk_grid_attach(grid, widget, 2, 0, 1, 1);
- widget = balsa_stock_button_with_label(GTK_STOCK_OK, _("_Done"));
+ widget = balsa_stock_button_with_label("gtk-ok", _("_Done"));
gtk_widget_set_tooltip_text(widget, _("Finish spell checking"));
g_signal_connect(widget, "clicked",
G_CALLBACK(done_cb), spell_check);
gtk_grid_attach(grid, widget, 3, 0, 1, 1);
- widget = balsa_stock_button_with_label(GTK_STOCK_CANCEL, _("_Cancel"));
+ widget = balsa_stock_button_with_label("gtk-cancel", _("_Cancel"));
gtk_widget_set_tooltip_text(widget,
_("Revert all changes and finish spell checking"));
g_signal_connect(widget, "clicked",
diff --git a/src/store-address.c b/src/store-address.c
index 726b020..5765d2d 100644
--- a/src/store-address.c
+++ b/src/store-address.c
@@ -204,9 +204,9 @@ store_address_dialog(StoreAddressInfo * info)
gtk_dialog_new_with_buttons(_("Store Address"),
GTK_WINDOW(balsa_app.main_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- GTK_STOCK_SAVE, SA_RESPONSE_SAVE,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_OK"), GTK_RESPONSE_OK,
+ _("_Save"), SA_RESPONSE_SAVE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
GtkWidget *vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
GtkWidget *frame, *label;
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index 17102af..680183c 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -133,7 +133,7 @@ balsa_toolbar_model_get_type()
/* The descriptions must be SHORT */
button_data toolbar_buttons[]={
{"", N_("Separator"), FALSE},
- {GTK_STOCK_QUIT, N_("Quit"), FALSE},
+ {"application-exit", N_("Quit"), FALSE},
{BALSA_PIXMAP_RECEIVE, N_("Check"), TRUE},
{BALSA_PIXMAP_COMPOSE, N_("Compose"), TRUE},
{BALSA_PIXMAP_CONTINUE, N_("Continue"), FALSE},
@@ -147,31 +147,31 @@ button_data toolbar_buttons[]={
{BALSA_PIXMAP_NEXT_FLAGGED, N_("Next\nflagged"), FALSE},
{BALSA_PIXMAP_PREVIOUS_PART, N_("Previous\npart"), FALSE},
{BALSA_PIXMAP_NEXT_PART, N_("Next\npart"), FALSE},
- {GTK_STOCK_DELETE, N_("Trash /\nDelete"), FALSE},
+ {"edit-delete", N_("Trash /\nDelete"), FALSE},
{BALSA_PIXMAP_POSTPONE, N_("Postpone"), FALSE},
- {GTK_STOCK_PRINT, N_("Print"), FALSE},
+ {"document-print", N_("Print"), FALSE},
{BALSA_PIXMAP_REQUEST_MDN, N_("Request\nMDN"), FALSE},
{BALSA_PIXMAP_SEND, N_("Send"), TRUE},
{BALSA_PIXMAP_SEND_RECEIVE, N_("Exchange"), FALSE},
{BALSA_PIXMAP_ATTACHMENT, N_("Attach"), TRUE},
- {GTK_STOCK_SAVE, N_("Save"), TRUE},
+ {"document-save", N_("Save"), TRUE},
{BALSA_PIXMAP_IDENTITY, N_("Identity"), FALSE},
- {GTK_STOCK_SPELL_CHECK, N_("Spelling"), TRUE},
- {GTK_STOCK_CLOSE, N_("Close"), FALSE},
+ {"tools-check-spelling", N_("Spelling"), TRUE},
+ {"window-close", N_("Close"), FALSE},
{BALSA_PIXMAP_MARKED_NEW, N_("Toggle\nnew"), FALSE},
{BALSA_PIXMAP_MARK_ALL, N_("Mark all"), FALSE},
{BALSA_PIXMAP_SHOW_HEADERS, N_("All\nheaders"), FALSE},
- {GTK_STOCK_CANCEL, N_("Reset\nFilter"), FALSE},
+ {"gtk-cancel", N_("Reset\nFilter"), FALSE},
{BALSA_PIXMAP_SHOW_PREVIEW, N_("Msg Preview"), FALSE},
#ifdef HAVE_GPGME
{BALSA_PIXMAP_GPG_SIGN, N_("Sign"), FALSE},
{BALSA_PIXMAP_GPG_ENCRYPT, N_("Encrypt"), FALSE},
#endif
- {GTK_STOCK_UNDO, N_("Undo"), FALSE},
- {GTK_STOCK_REDO, N_("Redo"), FALSE},
- {GTK_STOCK_CLEAR, N_("Expunge"), FALSE},
- {GTK_STOCK_REMOVE, N_("Empty\nTrash"), FALSE},
- {GTK_STOCK_EDIT, N_("Edit"), FALSE},
+ {"edit-undo", N_("Undo"), FALSE},
+ {"edit-redo", N_("Redo"), FALSE},
+ {"edit-clear", N_("Expunge"), FALSE},
+ {"list-remove", N_("Empty\nTrash"), FALSE},
+ {"gtk-edit", N_("Edit"), FALSE},
};
const int toolbar_button_count =
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index da4080c..866eb12 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -131,8 +131,8 @@ customize_dialog_cb(GtkWidget * widget, gpointer data)
gtk_dialog_new_with_buttons(_("Customize Toolbars"),
GTK_WINDOW(active_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_Close"), GTK_RESPONSE_CLOSE,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(customize_widget, GTK_WINDOW(active_window));
@@ -486,23 +486,23 @@ create_toolbar_page(BalsaToolbarModel * model, GtkUIManager * ui_manager)
FALSE, FALSE, 0);
page->back_button =
- balsa_stock_button_with_label(GTK_STOCK_GO_UP, _("Up"));
+ balsa_stock_button_with_label("go-up", _("Up"));
gtk_box_pack_start(GTK_BOX(button_box), page->back_button, FALSE, FALSE, 0);
move_button_box=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(button_box), move_button_box, FALSE, FALSE, 0);
page->remove_button =
- balsa_stock_button_with_label(GTK_STOCK_GO_BACK, "-");
+ balsa_stock_button_with_label("go-previous", "-");
gtk_box_pack_start(GTK_BOX(move_button_box), page->remove_button,
FALSE, FALSE, 0);
page->add_button =
- balsa_stock_button_with_label(GTK_STOCK_GO_FORWARD, "+");
+ balsa_stock_button_with_label("go-next", "+");
gtk_box_pack_start(GTK_BOX(move_button_box), page->add_button, FALSE, FALSE, 0);
page->forward_button =
- balsa_stock_button_with_label(GTK_STOCK_GO_DOWN, _("Down"));
+ balsa_stock_button_with_label("go-down", _("Down"));
gtk_box_pack_start(GTK_BOX(button_box), page->forward_button, FALSE, FALSE, 0);
/* Pack destination list */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
