[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-840-g1d37ede95
paul at claws-mail.org
paul at claws-mail.org
Wed Nov 20 17:15:02 CET 2019
The branch, gtk3 has been updated
via 1d37ede952396415a1e20ebaf1768963fce616fc (commit)
from 0db1fd2fdaff073b5c5504b36165c43d777f819b (commit)
Summary of changes:
src/account.c | 18 +++---
src/action.c | 8 +--
src/addrcustomattr.c | 16 ++---
src/addrduplicates.c | 18 +++---
src/addressadd.c | 8 +--
src/addressbook.c | 40 ++++++------
src/addressbook_foldersel.c | 6 +-
src/addrgather.c | 6 +-
src/addrindex.c | 4 +-
src/addrmerge.c | 8 +--
src/alertpanel.c | 24 ++++----
src/browseldap.c | 4 +-
src/compose.c | 38 ++++++------
src/editaddress.c | 28 ++++-----
src/editaddress_other_attributes_ldap.c | 8 +--
src/editbook.c | 6 +-
src/editgroup.c | 10 +--
src/editjpilot.c | 6 +-
src/editldap.c | 6 +-
src/editldap_basedn.c | 6 +-
src/edittags.c | 12 ++--
src/editvcard.c | 6 +-
src/exphtmldlg.c | 16 ++---
src/expldifdlg.c | 18 +++---
src/export.c | 6 +-
src/foldersel.c | 8 +--
src/folderview.c | 18 +++---
src/grouplistdialog.c | 8 +--
src/gtk/about.c | 2 +-
src/gtk/description_window.c | 4 +-
src/gtk/filesel.c | 7 ++-
src/gtk/foldersort.c | 10 +--
src/gtk/gtkaspell.c | 8 +--
src/gtk/gtkutils.c | 72 +++++++++++++++++++---
src/gtk/gtkutils.h | 3 +-
src/gtk/icon_legend.c | 4 +-
src/gtk/inputdialog.c | 10 +--
src/gtk/pluginwindow.c | 4 +-
src/gtk/prefswindow.c | 12 ++--
src/gtk/progressdialog.c | 4 +-
src/gtk/quicksearch.c | 30 ++++-----
src/gtk/sslcertwindow.c | 2 +-
src/imap.c | 4 +-
src/imap_gtk.c | 8 +--
src/import.c | 8 +--
src/importldif.c | 14 ++---
src/importmutt.c | 6 +-
src/importpine.c | 6 +-
src/inc.c | 8 +--
src/main.c | 6 +-
src/mainwindow.c | 13 ++--
src/mbox.c | 4 +-
src/message_search.c | 14 ++---
src/mh_gtk.c | 6 +-
src/mimeview.c | 10 +--
src/news.c | 4 +-
src/news_gtk.c | 6 +-
src/password_gtk.c | 8 +--
src/plugins/acpi_notifier/acpi_notifier.c | 7 ++-
src/plugins/archive/archiver_gtk.c | 18 +++---
src/plugins/att_remover/att_remover.c | 11 ++--
src/plugins/attachwarner/attachwarner.c | 4 +-
src/plugins/clamd/clamav_plugin_gtk.c | 8 +--
src/plugins/fancy/fancy_prefs.c | 4 +-
src/plugins/gdata/cm_gdata_contacts.c | 6 +-
src/plugins/libravatar/libravatar_prefs.c | 6 +-
src/plugins/mailmbox/plugin_gtk.c | 11 ++--
src/plugins/managesieve/sieve_editor.c | 20 +++---
src/plugins/managesieve/sieve_manager.c | 16 ++---
.../notification/notification_foldercheck.c | 6 +-
src/plugins/notification/notification_prefs.c | 6 +-
src/plugins/notification/notification_trayicon.c | 4 +-
src/plugins/pdf_viewer/poppler_viewer.c | 4 +-
src/plugins/pgpcore/passphrase.c | 8 +--
src/plugins/pgpcore/pgp_viewer.c | 6 +-
src/plugins/pgpcore/prefs_gpg.c | 4 +-
src/plugins/pgpcore/select-keys.c | 6 +-
src/plugins/pgpcore/sgpgme.c | 8 +--
src/plugins/rssyl/rssyl_cb_menu.c | 6 +-
src/plugins/rssyl/rssyl_feed_props.c | 14 +----
src/plugins/rssyl/rssyl_subscribe_gtk.c | 6 +-
src/plugins/vcalendar/vcal_folder.c | 4 +-
src/plugins/vcalendar/vcal_meeting_gtk.c | 42 ++++++-------
src/plugins/vcalendar/vcalendar.c | 12 ++--
src/prefs_account.c | 10 +--
src/prefs_actions.c | 34 +++++-----
src/prefs_customheader.c | 17 +++--
src/prefs_display_header.c | 19 +++---
src/prefs_filtering.c | 40 ++++++------
src/prefs_filtering_action.c | 18 +++---
src/prefs_folder_column.c | 14 ++---
src/prefs_folder_item.c | 4 +-
src/prefs_matcher.c | 20 +++---
src/prefs_message.c | 4 +-
src/prefs_migration.c | 4 +-
src/prefs_other.c | 4 +-
src/prefs_summaries.c | 12 ++--
src/prefs_summary_column.c | 14 ++---
src/prefs_summary_open.c | 15 +++--
src/prefs_template.c | 38 +++++-------
src/prefs_themes.c | 12 ++--
src/prefs_toolbar.c | 14 ++---
src/printing.c | 23 +++----
src/quote_fmt.c | 6 +-
src/send_message.c | 4 +-
src/ssl_manager.c | 10 +--
src/summary_search.c | 16 ++---
src/summaryview.c | 34 +++++-----
src/textview.c | 12 ++--
src/toolbar.c | 6 +-
src/uri_opener.c | 6 +-
src/wizard.c | 10 +--
112 files changed, 675 insertions(+), 649 deletions(-)
- Log -----------------------------------------------------------------
commit 1d37ede952396415a1e20ebaf1768963fce616fc
Author: paul <paul at claws-mail.org>
Date: Wed Nov 20 17:14:54 2019 +0000
replace deprecated GtkStock
diff --git a/src/account.c b/src/account.c
index d3d7d8241..44163c701 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -779,37 +779,37 @@ static void account_edit_create(void)
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
- add_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ add_btn = gtk_button_new_with_mnemonic("_New");
gtk_widget_show (add_btn);
gtk_box_pack_start (GTK_BOX (vbox2), add_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(add_btn), "clicked",
G_CALLBACK (account_add), NULL);
- edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+ edit_btn = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (edit_btn);
gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(edit_btn), "clicked",
G_CALLBACK (account_edit_prefs), NULL);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtkut_stock_button("edit-delete");
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (vbox2), del_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(del_btn), "clicked",
G_CALLBACK (account_delete), NULL);
- clone_btn = gtk_button_new_from_stock(GTK_STOCK_COPY);
+ clone_btn = gtkut_stock_button("edit-copy");
gtk_widget_show (clone_btn);
gtk_box_pack_start (GTK_BOX (vbox2), clone_btn, FALSE, FALSE, 4);
g_signal_connect(G_OBJECT(clone_btn), "clicked",
G_CALLBACK(account_clone), NULL);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show (down_btn);
gtk_box_pack_end (GTK_BOX (vbox2), down_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(down_btn), "clicked",
G_CALLBACK (account_down), NULL);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show (up_btn);
gtk_box_pack_end (GTK_BOX (vbox2), up_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(up_btn), "clicked",
@@ -827,7 +827,7 @@ static void account_edit_create(void)
G_CALLBACK (account_set_default), NULL);
gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
- &close_btn, GTK_STOCK_CLOSE,
+ &close_btn, _("_Close"),
NULL, NULL, NULL, NULL);
gtk_widget_show(confirm_area);
@@ -1120,7 +1120,7 @@ static void account_delete(GtkWidget *widget, gpointer data)
ac_prefs->account_name ? ac_prefs->account_name :
_("(Untitled)"));
if (alertpanel_full(_("Delete account"), buf,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return;
account_list_dirty = TRUE;
diff --git a/src/action.c b/src/action.c
index dda5dc7f9..afb1556e2 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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
@@ -1364,7 +1364,7 @@ static void create_io_dialog(Children *children)
}
gtk_widget_show(entry);
- send_button = gtk_button_new_from_stock(GTK_STOCK_EXECUTE);
+ send_button = gtkut_stock_button("system-run");
g_signal_connect(G_OBJECT(send_button), "clicked",
G_CALLBACK(send_input), children);
gtk_box_pack_start(GTK_BOX(input_hbox), send_button, FALSE,
@@ -1399,8 +1399,8 @@ static void create_io_dialog(Children *children)
gtk_widget_show(progress_bar);
}
- gtkut_stock_button_set_create(&hbox, &abort_button, GTK_STOCK_STOP,
- &close_button, GTK_STOCK_CLOSE, NULL, NULL);
+ gtkut_stock_button_set_create(&hbox, &abort_button, "process-stop",
+ &close_button, _("_Close"), NULL, NULL);
g_signal_connect(G_OBJECT(abort_button), "clicked",
G_CALLBACK(kill_children_cb), children);
g_signal_connect(G_OBJECT(close_button), "clicked",
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index 9861da995..a168a8fd9 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2018 The Claws Mail Team
+ * Copyright (C) 2007-2019 The Claws Mail Team
*
* 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
@@ -159,7 +159,7 @@ static void custom_attr_window_list_view_clear_list(GtkWidget *list_view, gboole
{
if (!warn || alertpanel(_("Delete all attribute names"),
_("Do you really want to delete all attribute names?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(list_view)));
gtk_list_store_clear(list_store);
@@ -184,7 +184,7 @@ static void custom_attr_popup_delete (void *obj, void *data)
if (alertpanel(_("Delete attribute name"),
_("Do you really want to delete this attribute name?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
dirty = TRUE;
}
@@ -194,7 +194,7 @@ static void custom_attr_popup_factory_defaults (void *obj, void *data)
{
if (alertpanel(_("Reset to default"),
_("Do you really want to replace all attribute names\nwith the default set?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
GList *tmp = custom_attr_default_list();
custom_attr_window_load_list(tmp);
if (tmp) {
@@ -488,14 +488,14 @@ static void custom_attr_window_create(void)
g_signal_connect(G_OBJECT(new_attr_entry), "key_press_event",
G_CALLBACK(custom_attr_window_add_key_pressed), NULL);
- add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ add_btn = gtkut_stock_button("list-add");
gtk_box_pack_start(GTK_BOX(hbox1), add_btn, FALSE, FALSE, 0);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtkut_stock_button("edit-delete");
gtk_box_pack_start(GTK_BOX(hbox1), del_btn, FALSE, FALSE, 0);
- gtkut_stock_button_set_create(&hbox2, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbox2, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show(new_attr_label);
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 7ca28fa84..938c7c14c 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -1,5 +1,5 @@
/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2012 Holger Berndt <hb at claws-mail.org>
+ * Copyright (C) 2007-2019 Holger Berndt <hb at claws-mail.org>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -144,8 +144,8 @@ static gboolean create_dialog()
val = alertpanel_full(_("Find address book email duplicates"),
_("Claws Mail will now search for duplicate email "
"addresses in the address book."),
- GTK_STOCK_CANCEL,GTK_STOCK_FIND, NULL,
- ALERTFOCUS_SECOND, FALSE, vbox, ALERT_NOTICE);
+ _("_Cancel"), "edit-find", NULL,
+ ALERTFOCUS_SECOND, FALSE, vbox, ALERT_NOTICE);
if(val == G_ALERTALTERNATE) {
want_search = TRUE;
@@ -388,15 +388,15 @@ static void present_finder_results(GtkWindow *parent)
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ edit_btn = gtk_button_new_with_mnemonic("_Edit");
gtk_box_pack_start(GTK_BOX(hbox), edit_btn, TRUE, TRUE, 0);
gtk_widget_set_sensitive(edit_btn, FALSE);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtkut_stock_button("edit-delete");
gtk_box_pack_start(GTK_BOX(hbox), del_btn, TRUE, TRUE, 0);
gtk_widget_set_sensitive(del_btn, FALSE);
- close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close = gtkut_stock_button("window-close");
gtk_box_pack_start(GTK_BOX(hbox), close, TRUE, TRUE, 0);
g_signal_connect(dialog, "destroy",
@@ -790,8 +790,8 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data)
aval = alertpanel(_("Delete address(es)"),
_("Really delete the address(es)?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
- ALERTFOCUS_SECOND);
+ _("_Cancel"), "edit-delete", NULL,
+ ALERTFOCUS_SECOND);
if(aval != G_ALERTALTERNATE)
return;
@@ -840,7 +840,7 @@ gboolean addrduplicates_delete_item_person(ItemPerson *item, AddressDataSource *
if( iface && iface->readOnly ) {
alertpanel( _("Delete address"),
_("This address data is readonly and cannot be deleted."),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
return FALSE;
}
diff --git a/src/addressadd.c b/src/addressadd.c
index 709ae4a52..8e5f84fc0 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 Match Grun and the Claws Mail team
*
* 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
@@ -297,8 +297,8 @@ static void addressadd_create( void ) {
G_CALLBACK(addressadd_tree_row_activated), NULL);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), HSPACING_NARROW );
@@ -597,7 +597,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address,
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
_("Can't add the specified address"),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
return server->retVal;
}
}
diff --git a/src/addressbook.c b/src/addressbook.c
index b4586934b..5d2d7c94e 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1161,18 +1161,18 @@ static void addressbook_create(void)
gtkut_stock_button_add_help(hbbox, &help_btn);
- edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ edit_btn = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_set_can_default(edit_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtk_button_new_with_mnemonic("_Delete");
gtk_widget_set_can_default(del_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
- reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ reg_btn = gtk_button_new_with_mnemonic("_New");
gtk_widget_set_can_default(reg_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
- lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
+ lup_btn = gtkut_stock_button("edit-find");
gtk_widget_set_can_default(lup_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
@@ -1202,7 +1202,7 @@ static void addressbook_create(void)
gtk_widget_set_can_default(bcc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
- close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close_btn = gtk_button_new_with_mnemonic("_Close");
gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
@@ -1444,7 +1444,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
if( iface->readOnly ) {
alertpanel( _("Delete address(es)"),
_("This address data is readonly and cannot be deleted."),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST);
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST);
return;
}
@@ -1490,14 +1490,14 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
aval = alertpanel( _("Delete group"),
_("Really delete the group(s)?\n"
"The addresses it contains will not be lost."),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
} else {
aval = alertpanel( _("Delete address(es)"),
_("Really delete the address(es)?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
@@ -2966,7 +2966,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
"results and addresses in '%s'?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND );
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ADDR;
@@ -2978,7 +2978,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
"If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
obj->name );
aval = alertpanel( _("Delete folder"), message,
- GTK_STOCK_CANCEL, _("Delete _folder only"), _("Delete folder and _addresses"), ALERTFOCUS_SECOND);
+ _("_Cancel"), _("Delete _folder only"), _("Delete folder and _addresses"), ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ONLY;
@@ -2991,15 +2991,15 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
else if( obj->type == ADDR_ITEM_GROUP ) {
message = g_strdup_printf(_("Do you want to delete '%s'?\n"
"The addresses it contains will not be lost."), obj->name);
- aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL,
- GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND);
+ aval = alertpanel(_("Delete"), message, _("_Cancel"),
+ "edit-delete", NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_FOLDER_ONLY;
} else {
message = g_strdup_printf(_("Do you want to delete '%s'?\n"
"The addresses it contains will be lost."), obj->name);
- aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL,
- GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND);
+ aval = alertpanel(_("Delete"), message, _("_Cancel"),
+ "edit-delete", NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
}
@@ -3267,7 +3267,7 @@ static void addressbook_new_address_cb( GtkAction *action, gpointer data ) {
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
addressbook_err2string(_lutErrorsLDAP_, server->retVal),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
server->retVal = LDAPRC_SUCCESS;
return;
}
@@ -3318,7 +3318,7 @@ static void addressbook_new_address_cb( GtkAction *action, gpointer data ) {
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
addressbook_err2string(_lutErrorsLDAP_, server->retVal),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
return;
}
}
@@ -4185,13 +4185,13 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
if( errFlag ) {
debug_print( "Error\n%s\n", msg );
alertpanel_full(_("Addressbook conversion error"), msg,
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_ERROR);
}
else if( msg ) {
debug_print( "Warning\n%s\n", msg );
alertpanel_full(_("Addressbook conversion error"), msg,
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
}
@@ -4307,7 +4307,7 @@ void addressbook_read_file( void ) {
addrindex_print_index( addrIndex, stdout );
alertpanel_full(_("Addressbook Error"),
_("Could not read address index"),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_ERROR);
}
debug_print( "done.\n" );
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index 7228b79ff..3965d0ae9 100644
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -209,8 +209,8 @@ static void addressbook_foldersel_create( void )
gtk_container_add( GTK_CONTAINER(tree_win), view );
/* Button panel */
- gtkut_stock_button_set_create( &hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create( &hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL );
gtk_box_pack_end( GTK_BOX(vbox), hbbox, FALSE, FALSE, 0 );
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
diff --git a/src/addrgather.c b/src/addrgather.c
index 9a43c8cc5..4fc254a51 100644
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2019 the Claws Mail team and Match Grun
*
* 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
@@ -553,8 +553,8 @@ static void addrgather_dlg_create(void)
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &btnCancel, GTK_STOCK_CANCEL,
- &btnOk, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &btnCancel, _("_Cancel"),
+ &btnOk, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
diff --git a/src/addrindex.c b/src/addrindex.c
index d44924c11..2b52c43d9 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -1833,7 +1833,7 @@ gint addrindex_save_data( AddressIndex *addrIndex ) {
if( abf->retVal != LDAPRC_SUCCESS ) {
alertpanel( _("Address(es) update"),
_("Update failed. Changes not written to Directory."),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
}
else {
abf->retVal = MGU_SUCCESS;
diff --git a/src/addrmerge.c b/src/addrmerge.c
index 767dc66f1..4933fe255 100644
--- a/src/addrmerge.c
+++ b/src/addrmerge.c
@@ -1,5 +1,5 @@
/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2014 Charles Lehner and the Claws Mail team
+ * Copyright (C) 2014-2019 Charles Lehner and the Claws Mail team
*
* 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
@@ -228,9 +228,9 @@ static void addrmerge_prompt( struct AddrMergePage *page )
_("Merge addresses"),
GTK_WINDOW(mainwin->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
- "_Merge",
+ _("_Merge"),
GTK_RESPONSE_ACCEPT,
NULL);
@@ -396,7 +396,7 @@ void addrmerge_merge(
if( ds->interface->readOnly ) {
alertpanel( _("Merge addresses"),
_("This address data is readonly and cannot be deleted."),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
return;
}
diff --git a/src/alertpanel.c b/src/alertpanel.c
index a8cd5b68a..22cc41dbf 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -126,7 +126,7 @@ static void alertpanel_message(const gchar *title, const gchar *message, gint ty
hooks_invoke(ALERTPANEL_OPENED_HOOKLIST, &alertpanel_is_open);
}
- alertpanel_create(title, message, GTK_STOCK_CLOSE, NULL, NULL,
+ alertpanel_create(title, message, _("_Close"), NULL, NULL,
ALERTFOCUS_FIRST, FALSE, NULL, type);
alertpanel_show();
}
@@ -190,7 +190,7 @@ void alertpanel_error_log(const gchar *format, ...)
if (mainwin && mainwin->logwin) {
mainwindow_clear_error(mainwin);
- val = alertpanel_full(_("Error"), buf, GTK_STOCK_CLOSE,
+ val = alertpanel_full(_("Error"), buf, _("_Close"),
_("_View log"), NULL, ALERTFOCUS_FIRST, FALSE, NULL,
ALERT_ERROR);
if (val == G_ALERTALTERNATE)
@@ -275,21 +275,21 @@ static void alertpanel_create(const gchar *title,
/* title icon */
switch (alert_type) {
case ALERT_QUESTION:
- image = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name
+ ("dialog-question", GTK_ICON_SIZE_DIALOG);
break;
case ALERT_WARNING:
- image = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name
+ ("dialog-warning", GTK_ICON_SIZE_DIALOG);
break;
case ALERT_ERROR:
- image = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name
+ ("dialog-error", GTK_ICON_SIZE_DIALOG);
break;
case ALERT_NOTICE:
default:
- image = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name
+ ("dialog-information", GTK_ICON_SIZE_DIALOG);
break;
}
gtk_widget_set_halign(image, GTK_ALIGN_CENTER);
@@ -356,7 +356,7 @@ static void alertpanel_create(const gchar *title,
/* for button(s) */
if (!button1_label)
- button1_label = GTK_STOCK_OK;
+ button1_label = _("_OK");
label2 = button2_label;
label3 = button3_label;
diff --git a/src/browseldap.c b/src/browseldap.c
index 85d6968d3..3e582b477 100644
--- a/src/browseldap.c
+++ b/src/browseldap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2003-2019 Match Grun and the Claws Mail team
*
* 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
@@ -297,7 +297,7 @@ static void browse_create( void ) {
gtk_container_add( GTK_CONTAINER(tree_win), view );
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &close_btn, GTK_STOCK_CLOSE,
+ gtkut_stock_button_set_create(&hbbox, &close_btn, _("_Close"),
NULL, NULL, NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
diff --git a/src/compose.c b/src/compose.c
index c422f5283..2dd16f41e 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3677,7 +3677,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
msg = g_strdup_printf(_("You are about to insert a file of %s "
"in the message body. Are you sure you want to do that?"),
to_human_readable(size));
- aval = alertpanel_full(_("Are you sure?"), msg, GTK_STOCK_CANCEL,
+ aval = alertpanel_full(_("Are you sure?"), msg, _("_Cancel"),
_("_Insert"), NULL, ALERTFOCUS_SECOND, TRUE,
NULL, ALERT_QUESTION);
g_free(msg);
@@ -3805,7 +3805,7 @@ static gboolean compose_attach_append(Compose *compose, const gchar *file,
if (size == 0 && !compose->batch) {
gchar * msg = g_strdup_printf(_("File %s is empty."), filename);
AlertValue aval = alertpanel_full(_("Empty file"), msg,
- GTK_STOCK_CANCEL, _("_Attach anyway"), NULL,
+ _("_Cancel"), _("_Attach anyway"), NULL,
ALERTFOCUS_SECOND, FALSE, NULL, ALERT_WARNING);
g_free(msg);
@@ -5111,7 +5111,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
prefs_common_translated_header_name("Cc"));
aval = alertpanel(_("Send"),
text,
- GTK_STOCK_CANCEL, _("_Send"), NULL, ALERTFOCUS_SECOND);
+ _("_Cancel"), _("_Send"), NULL, ALERTFOCUS_SECOND);
g_free(text);
if (aval != G_ALERTALTERNATE)
return FALSE;
@@ -5148,7 +5148,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
prefs_common_translated_header_name("Bcc"));
aval = alertpanel(_("Send"),
text,
- GTK_STOCK_CANCEL, _("_Send"), NULL, ALERTFOCUS_SECOND);
+ _("_Cancel"), _("_Send"), NULL, ALERTFOCUS_SECOND);
g_free(text);
if (aval != G_ALERTALTERNATE)
return FALSE;
@@ -5185,7 +5185,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
_("Queue it anyway?"));
aval = alertpanel_full(compose->sending?_("Send"):_("Send later"), message,
- GTK_STOCK_CANCEL, compose->sending?_("_Send"):_("_Queue"), NULL,
+ _("_Cancel"), compose->sending?_("_Send"):_("_Queue"), NULL,
ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION);
g_free(message);
if (aval & G_ALERTDISABLE) {
@@ -5228,7 +5228,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
_("Queue it anyway?"));
aval = alertpanel_full(compose->sending?_("Send"):_("Send later"), message,
- GTK_STOCK_CANCEL, compose->sending?_("_Send"):_("_Queue"), NULL,
+ _("_Cancel"), compose->sending?_("_Send"):_("_Queue"), NULL,
ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION);
g_free(message);
if (aval & G_ALERTDISABLE) {
@@ -5792,7 +5792,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gbool
msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
"to the specified %s charset.\n"
"Send it as %s?"), out_codeset, src_codeset);
- aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL,
+ aval = alertpanel_full(_("Error"), msg, _("_Cancel"),
_("_Send"), NULL, ALERTFOCUS_SECOND, FALSE,
NULL, ALERT_ERROR);
g_free(msg);
@@ -5855,7 +5855,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gbool
"The contents of the message might be broken on the way to the delivery.\n"
"\n"
"Send it anyway?"), line + 1);
- aval = alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL,
+ aval = alertpanel(_("Warning"), msg, _("_Cancel"), _("_OK"), NULL,
ALERTFOCUS_FIRST);
g_free(msg);
if (aval != G_ALERTALTERNATE) {
@@ -6087,7 +6087,7 @@ static gboolean compose_warn_encryption(Compose *compose)
return TRUE;
val = alertpanel_full(_("Encryption warning"), warning,
- GTK_STOCK_CANCEL, _("C_ontinue"), NULL, ALERTFOCUS_SECOND,
+ _("_Cancel"), _("C_ontinue"), NULL, ALERTFOCUS_SECOND,
TRUE, NULL, ALERT_WARNING);
if (val & G_ALERTDISABLE) {
val &= ~G_ALERTDISABLE;
@@ -7219,9 +7219,7 @@ static void compose_create_header_entry(Compose *compose)
G_CALLBACK(compose_grab_focus_cb), compose);
/* Entry field with cleanup button */
- button = gtk_button_new();
- gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU));
+ button = gtk_button_new_from_icon_name("edit-clear", GTK_ICON_SIZE_MENU);
gtk_widget_show(button);
CLAWS_SET_TIP(button,
_("Delete entry contents"));
@@ -9537,8 +9535,8 @@ static void compose_attach_property_create(gboolean *cancelled)
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
@@ -9791,7 +9789,7 @@ static gboolean compose_ext_editor_kill(Compose *compose)
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
- val = alertpanel_full(_("Notice"), msg, GTK_STOCK_NO, GTK_STOCK_YES,
+ val = alertpanel_full(_("Notice"), msg, _("_No"), _("_Yes"),
NULL, ALERTFOCUS_FIRST, FALSE, NULL,
ALERT_WARNING);
@@ -10761,12 +10759,12 @@ static void compose_close_cb(GtkAction *action, gpointer data)
if (!reedit || compose->folder->stype == F_DRAFT) {
val = alertpanel(_("Discard message"),
_("This message has been modified. Discard it?"),
- _("_Discard"), _("_Save to Drafts"), GTK_STOCK_CANCEL,
+ _("_Discard"), _("_Save to Drafts"), _("_Cancel"),
ALERTFOCUS_FIRST);
} else {
val = alertpanel(_("Save changes"),
_("This message has been modified. Save the latest changes?"),
- _("_Don't save"), _("_Save to Drafts"), GTK_STOCK_CANCEL,
+ _("_Don't save"), _("_Save to Drafts"), _("_Cancel"),
ALERTFOCUS_SECOND);
}
g_mutex_unlock(compose->mutex);
@@ -10840,7 +10838,7 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
msg = g_strdup_printf(_("Do you want to apply the template '%s'?"),
tmpl->name);
val = alertpanel(_("Apply template"), msg,
- _("_Replace"), _("_Insert"), GTK_STOCK_CANCEL, ALERTFOCUS_FIRST);
+ _("_Replace"), _("_Insert"), _("_Cancel"), ALERTFOCUS_FIRST);
g_free(msg);
if (val == G_ALERTDEFAULT)
@@ -11848,7 +11846,7 @@ static void compose_insert_drag_received_cb (GtkWidget *widget,
num_files),
num_files);
val = alertpanel_full(_("Insert or attach?"), msg,
- GTK_STOCK_CANCEL, _("_Insert"), _("_Attach"),
+ _("_Cancel"), _("_Insert"), _("_Attach"),
ALERTFOCUS_SECOND,
TRUE, NULL, ALERT_QUESTION);
g_free(msg);
@@ -12368,7 +12366,7 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
"want to continue?"),
g_slist_length(msginfo_list));
if (g_slist_length(msginfo_list) > 9
- && alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_YES, NULL,
+ && alertpanel(_("Warning"), msg, _("_Cancel"), _("_Yes"), NULL,
ALERTFOCUS_SECOND) != G_ALERTALTERNATE) {
g_free(msg);
return;
diff --git a/src/editaddress.c b/src/editaddress.c
index 08e881463..d0bccc21e 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
@@ -169,7 +169,7 @@ static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
"Click OK to keep editing this contact.\n"
"Click Cancel to close without saving."),
#endif
- GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_SECOND );
if( val == G_ALERTDEFAULT ) {
edit_person_cancel(widget, cancelled);
}
@@ -812,13 +812,13 @@ static GtkWidget* addressbook_edit_person_widgets_create( GtkWidget* container,
/* Button panel */
if (prefs_common.addressbook_use_editaddress_dialog)
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
else
gtkut_stock_with_text_button_set_create(&hbbox,
- &cancel_btn, GTK_STOCK_CANCEL, _("Discard"),
- &ok_btn, GTK_STOCK_OK, _("Apply"),
+ &cancel_btn, _("_Cancel"), _("Discard"),
+ &ok_btn, _("_OK"), _("Apply"),
NULL, NULL, NULL);
gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
@@ -1317,11 +1317,11 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
/* Buttons */
- buttonUp = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
- buttonDown = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
- buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
- buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
- buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ buttonUp = gtkut_stock_button("go-up");
+ buttonDown = gtkut_stock_button("go-down");
+ buttonDel = gtkut_stock_button("edit-delete");
+ buttonMod = gtkut_stock_button("document-save");
+ buttonAdd = gtkut_stock_button("list-add");
#ifndef GENERIC_UMPC
@@ -1547,13 +1547,13 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
/* Buttons */
- buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ buttonDel = gtkut_stock_button("edit-delete");
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
- buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+ buttonMod = gtkut_stock_button("document-save");
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
- buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ buttonAdd = gtkut_stock_button("list-add");
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
gtk_widget_set_sensitive(buttonDel,FALSE);
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
index 18b591fb2..c7a954cee 100644
--- a/src/editaddress_other_attributes_ldap.c
+++ b/src/editaddress_other_attributes_ldap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail team
+ * Copyright (C) 1999-2019 Michael Rasmussen and the Claws Mail team
*
* 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
@@ -427,13 +427,13 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
gtk_container_add(GTK_CONTAINER(vboxb), vbuttonbox);
/* Buttons */
- buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ buttonDel = gtkut_stock_button("edit-delete");
gtk_container_add(GTK_CONTAINER(vbuttonbox), buttonDel);
- buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+ buttonMod = gtkut_stock_button("document-save");
gtk_container_add(GTK_CONTAINER(vbuttonbox), buttonMod);
- buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ buttonAdd = gtkut_stock_button("list-add");
gtk_container_add(GTK_CONTAINER(vbuttonbox), buttonAdd);
gtk_widget_set_sensitive(buttonDel,FALSE);
diff --git a/src/editbook.c b/src/editbook.c
index fc7535ecc..bebe078e0 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -194,8 +194,8 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
diff --git a/src/editgroup.c b/src/editgroup.c
index 305278596..91c90abfd 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -343,7 +343,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(vboxl), hboxh, FALSE, FALSE, 0);
label = gtk_label_new(_("Addresses in Group"));
gtk_box_pack_start(GTK_BOX(hboxh), label, TRUE, TRUE, 0);
- buttonAvail = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ buttonAvail = gtkut_stock_button("list-remove");
gtk_box_pack_end(GTK_BOX(hboxh), buttonAvail, FALSE, FALSE, 0);
clist_swin = gtk_scrolled_window_new( NULL, NULL );
@@ -373,7 +373,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
hboxh = gtk_hbox_new( FALSE, 0 );
gtk_container_set_border_width( GTK_CONTAINER(hboxh), 4 );
gtk_box_pack_start(GTK_BOX(vboxl), hboxh, FALSE, FALSE, 0);
- buttonGroup = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ buttonGroup = gtkut_stock_button("list-add");
gtk_box_pack_start(GTK_BOX(hboxh), buttonGroup, FALSE, FALSE, 0);
label = gtk_label_new(_("Available Addresses"));
gtk_box_pack_end(GTK_BOX(hboxh), label, TRUE, TRUE, 0);
@@ -404,8 +404,8 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/editjpilot.c b/src/editjpilot.c
index 56fab21e8..d7f97f539 100644
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -302,8 +302,8 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
diff --git a/src/editldap.c b/src/editldap.c
index 4e025315c..66fd0b540 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -359,8 +359,8 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index 7dfe28775..e767679f5 100644
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -237,8 +237,8 @@ static void edit_ldap_bdn_create(void) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
- &cancel_btn, GTK_STOCK_CANCEL,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
diff --git a/src/edittags.c b/src/edittags.c
index d1ddabe01..7ea6b6c89 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2018 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2007-2019 Colin Leroy and The Claws Mail Team
*
* 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
@@ -219,7 +219,7 @@ static void apply_popup_delete (GtkAction *action, gpointer data)
if (alertpanel(_("Delete tag"),
_("Do you really want to delete this tag?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ _("_Cancel"), "edit-delete", NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -255,7 +255,7 @@ static void apply_popup_delete_all (GtkAction *action, gpointer data)
if (alertpanel(_("Delete all tags"),
_("Do you really want to delete all tags?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ _("_Cancel"), "edit-delete", NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -572,13 +572,13 @@ static void apply_window_create(void)
g_signal_connect(G_OBJECT(new_tag_entry), "key_press_event",
G_CALLBACK(apply_window_add_key_pressed), NULL);
- add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ add_btn = gtkut_stock_button("list-add");
gtk_box_pack_start(GTK_BOX(hbox1), add_btn, FALSE, FALSE, 0);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtkut_stock_button("edit-delete");
gtk_box_pack_start(GTK_BOX(hbox1), del_btn, FALSE, FALSE, 0);
- close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close_btn = gtk_button_new_with_mnemonic("_Close");
gtk_box_pack_end(GTK_BOX(hbox1), close_btn, FALSE, FALSE, 0);
gtk_widget_show(new_tag_label);
diff --git a/src/editvcard.c b/src/editvcard.c
index 0c52ef087..f84b66a96 100644
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -199,8 +199,8 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
index 76d686c27..fdd73883f 100644
--- a/src/exphtmldlg.c
+++ b/src/exphtmldlg.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2019 Match Grun and the Claws Mail team
*
* 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
@@ -178,7 +178,7 @@ static gboolean exp_html_move_file( void ) {
"does not exist. Do you want to create it?" ),
_exportCtl_->dirOutput );
aval = alertpanel( _("Create directory" ),
- msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST );
+ msg, _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST );
g_free( msg );
if( aval != G_ALERTALTERNATE ) return FALSE;
@@ -189,7 +189,7 @@ static gboolean exp_html_move_file( void ) {
"Could not create output directory for HTML file:\n%s" ),
reason );
aval = alertpanel_full(_("Failed to Create Directory"), msg,
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ "window-close", NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_ERROR);
g_free( msg );
return FALSE;
@@ -290,7 +290,7 @@ static void export_html_next( GtkWidget *widget ) {
gtk_notebook_set_current_page(
GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FINISH );
gtk_button_set_label(GTK_BUTTON(exphtml_dlg.btnCancel),
- GTK_STOCK_CLOSE);
+ _("_Close"));
exp_html_finish_show();
exporthtml_save_settings( _exportCtl_ );
export_html_message();
@@ -622,9 +622,9 @@ static void export_html_dialog_create( void ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &btnPrev, GTK_STOCK_GO_BACK,
- &btnNext, GTK_STOCK_GO_FORWARD,
- &btnCancel, GTK_STOCK_CANCEL);
+ gtkut_stock_button_set_create(&hbbox, &btnPrev, "go-previous",
+ &btnNext, "go-next",
+ &btnCancel, _("_Cancel"));
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
gtk_widget_grab_default(btnNext);
@@ -699,7 +699,7 @@ void addressbook_exp_html( AddressCache *cache ) {
export_html_create();
gtk_button_set_label(GTK_BUTTON(exphtml_dlg.btnCancel),
- GTK_STOCK_CANCEL);
+ _("_Cancel"));
exphtml_dlg.cancelled = FALSE;
gtk_widget_show(exphtml_dlg.window);
manage_window_set_transient(GTK_WINDOW(exphtml_dlg.window));
diff --git a/src/expldifdlg.c b/src/expldifdlg.c
index 1a58baf84..03b22c278 100644
--- a/src/expldifdlg.c
+++ b/src/expldifdlg.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2003-2019 the Claws Mail team and Match Grun
*
* 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
@@ -188,7 +188,7 @@ static gboolean exp_ldif_move_file( void ) {
"does not exist. OK to create new directory?" ),
_exportCtl_->dirOutput );
aval = alertpanel( _("Create Directory" ),
- msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST );
+ msg, _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST );
g_free( msg );
if( aval != G_ALERTALTERNATE ) return FALSE;
@@ -199,7 +199,7 @@ static gboolean exp_ldif_move_file( void ) {
"Could not create output directory for LDIF file:\n%s" ),
reason );
aval = alertpanel_full(_("Failed to Create Directory"), msg,
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_ERROR);
g_free( msg );
return FALSE;
@@ -244,7 +244,7 @@ static gboolean exp_ldif_move_dn( void ) {
"for an LDAP server. Are you sure you wish " \
"to proceed without a suffix?"
),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST );
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST );
if( aval != G_ALERTALTERNATE ) {
gtk_widget_grab_focus( expldif_dlg.entrySuffix );
errFlag = TRUE;
@@ -320,7 +320,7 @@ static void export_ldif_next( GtkWidget *widget ) {
gtk_notebook_set_current_page(
GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_FINISH );
gtk_button_set_label(GTK_BUTTON(expldif_dlg.btnCancel),
- GTK_STOCK_CLOSE);
+ _("_Close"));
exp_ldif_finish_show();
exportldif_save_settings( _exportCtl_ );
export_ldif_message();
@@ -686,9 +686,9 @@ static void export_ldif_dialog_create( void ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &btnPrev, GTK_STOCK_GO_BACK,
- &btnNext, GTK_STOCK_GO_FORWARD,
- &btnCancel, GTK_STOCK_CANCEL);
+ gtkut_stock_button_set_create(&hbbox, &btnPrev, "go-previous",
+ &btnNext, "go-next",
+ &btnCancel, _("_Cancel"));
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
gtk_widget_grab_default(btnNext);
@@ -764,7 +764,7 @@ void addressbook_exp_ldif( AddressCache *cache ) {
export_ldif_create();
gtk_button_set_label(GTK_BUTTON(expldif_dlg.btnCancel),
- GTK_STOCK_CANCEL);
+ _("_Cancel"));
expldif_dlg.cancelled = FALSE;
gtk_widget_show(expldif_dlg.window);
manage_window_set_transient(GTK_WINDOW(expldif_dlg.window));
diff --git a/src/export.c b/src/export.c
index 3fbabcc28..724476690 100644
--- a/src/export.c
+++ b/src/export.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -177,8 +177,8 @@ static void export_create(void)
G_CALLBACK(export_filesel_cb), NULL);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
diff --git a/src/foldersel.c b/src/foldersel.c
index 92786ecf6..928e4fec8 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -343,9 +343,9 @@ static void foldersel_create(const gchar *title)
G_CALLBACK(foldersel_entry_activated), NULL);
gtkut_stock_button_set_create(&confirm_area,
- &new_button, GTK_STOCK_NEW,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK);
+ &new_button, _("_New"),
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"));
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
diff --git a/src/folderview.c b/src/folderview.c
index 2a0462a3c..161ea7011 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -877,7 +877,7 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
}
if (prefs_common.ask_mark_all_read) {
val = alertpanel_full(title, message,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST,
TRUE, NULL, ALERT_QUESTION);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -1099,7 +1099,7 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
alertpanel_full(_("Rebuild folder tree"),
_("Rebuilding the folder tree will remove "
"local caches. Do you want to continue?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING)
!= G_ALERTALTERNATE) {
return;
@@ -2478,8 +2478,8 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
if (prefs_common.ask_on_clean) {
if (alertpanel(_("Empty trash"),
_("Delete all messages in trash?"),
- GTK_STOCK_CANCEL, _("_Empty trash"), NULL,
- ALERTFOCUS_SECOND) != G_ALERTALTERNATE)
+ _("_Cancel"), _("_Empty trash"), NULL,
+ ALERTFOCUS_SECOND) != G_ALERTALTERNATE)
return;
}
@@ -2524,7 +2524,7 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
- GTK_STOCK_NO, GTK_STOCK_YES,
+ _("_No"), _("_Yes"),
NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -2536,7 +2536,7 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data)
if (!prefs_common.work_offline) {
if (alertpanel(_("Send queued messages"),
_("Send all queued messages?"),
- GTK_STOCK_CANCEL, _("_Send"),
+ _("_Cancel"), _("_Send"),
NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
}
@@ -2626,8 +2626,8 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
_("Do you really want to make folder '%s' a subfolder of '%s'?"),
from_folder->name, to_folder->name);
status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
- TRUE, NULL, ALERT_QUESTION);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST,
+ TRUE, NULL, ALERT_QUESTION);
g_free(buf);
if ((status & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index cb8810137..141a86f66 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -237,9 +237,9 @@ static void grouplist_dialog_create(void)
gtk_container_add(GTK_CONTAINER(grid), status_label);
gtkut_stock_button_set_create(&confirm_area,
- &refresh_button, GTK_STOCK_REFRESH,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK);
+ &refresh_button, "view-refresh",
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"));
gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
confirm_area);
gtk_widget_grab_default(ok_button);
diff --git a/src/gtk/about.c b/src/gtk/about.c
index 8d75e234c..48532cf06 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -909,7 +909,7 @@ static void about_create(void)
gtk_grid_attach(GTK_GRID(grid1), notebook, 0, row, 2, 1);
row++;
- gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE,
+ gtkut_stock_button_set_create(&confirm_area, &close_button, _("_Close"),
NULL, NULL, NULL, NULL);
gtk_grid_attach(GTK_GRID(grid1), confirm_area, 0, row, 2, 1);
row++;
diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index 4fb3561f4..acb82f2ef 100644
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -150,7 +150,7 @@ static void description_create(DescriptionWindow * dwindow)
g_free(max_width);
width += 100;
- gtkut_stock_button_set_create(&hbbox, &close_btn, GTK_STOCK_CLOSE,
+ gtkut_stock_button_set_create(&hbbox, &close_btn, _("_Close"),
NULL, NULL, NULL, NULL);
vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index f694ea5b7..f8e36bcb1 100644
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -23,6 +23,7 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
@@ -81,10 +82,10 @@ static GList *filesel_create(const gchar *title, const gchar *path,
(folder_mode == TRUE ? GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
GTK_FILE_CHOOSER_ACTION_SAVE);
- gchar * action_btn = (open == TRUE) ? GTK_STOCK_OPEN:GTK_STOCK_SAVE;
+ gchar * action_btn = (open == TRUE) ? _("_Open"):_("_Save");
GtkWidget *chooser = gtk_file_chooser_dialog_new
(title, NULL, action,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
action_btn, GTK_RESPONSE_ACCEPT,
NULL);
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index ffeee23f7..fd583e7a1 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2018 the Claws Mail Team
+ * Copyright (C) 2004-2019 the Claws Mail Team
*
* 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
@@ -262,8 +262,8 @@ void foldersort_open()
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -330,11 +330,11 @@ void foldersort_open()
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox2), btn_vbox, FALSE, FALSE, 0);
- moveup_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ moveup_btn = gtkut_stock_button("go-up");
gtk_widget_show(moveup_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), moveup_btn, FALSE, FALSE, 0);
- movedown_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ movedown_btn = gtkut_stock_button("go-down");
gtk_widget_show(movedown_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), movedown_btn, FALSE, FALSE, 0);
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index da77f7270..8a3deb6d7 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1,7 +1,7 @@
/* gtkaspell - a spell-checking addon for GtkText
* Copyright (c) 2000 Evan Martin (original code for ispell).
* Copyright (c) 2002 Melvin Hadasht.
- * Copyright (C) 2001-2013 the Claws Mail Team
+ * Copyright (C) 2001-2019 the Claws Mail Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1467,7 +1467,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
_("Replace \"%s\" with: "), "</span>", NULL),
utf8buf);
- icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+ icon = gtk_image_new_from_icon_name("dialog-question",
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon, GTK_ALIGN_START);
@@ -1516,8 +1516,8 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
gtk_widget_show(label);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(action_area), confirm_area, FALSE, FALSE, 0);
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index beb3cc5f9..5fd1fd34a 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -59,6 +59,38 @@
#include "manual.h"
#include "combobox.h"
+static struct {
+ const gchar *icon_name;
+ const gchar *icon_label;
+} STOCK_BTNS[] __attribute__((unused)) = {
+ { "dialog-information", N_("_Information") },
+ { "document-open", N_("_Open") },
+ { "document-properties", N_("_Properties") },
+ { "document-save", N_("_Save") },
+ { "edit-clear", N_("C_lear") },
+ { "edit-copy", N_("_Copy") },
+ { "edit-delete", N_("D_elete") },
+ { "edit-find", N_("_Find") },
+ { "edit-find-replace", N_("Find and _Replace") },
+ { "edit-redo", N_("_Replace") },
+ { "edit-undo", N_("_Undo") },
+ { "folder", N_("_Browse") },
+ { "go-bottom", N_("_Bottom") },
+ { "go-down", N_("_Down") },
+ { "go-next", N_("_Next") },
+ { "go-previous", N_("_Previous") },
+ { "go-top", N_("_Top") },
+ { "go-up", N_("_Up") },
+ { "help-browser", N_("Help") },
+ { "list-add", N_("_Add") },
+ { "list-remove", N_("_Remove") },
+ { "process-stop", N_("_Stop") },
+ { "system-run", N_("_Execute") },
+ { "view-refresh", N_("_Refresh") },
+ { "window-close", N_("_Close") },
+ { NULL, NULL }
+};
+
gboolean gtkut_get_font_size(GtkWidget *widget,
gint *width, gint *height)
{
@@ -102,7 +134,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
{
cm_return_if_fail(bbox != NULL);
- *help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
+ *help_btn = gtkut_stock_button("help-browser");
gtk_widget_set_can_default(*help_btn, TRUE);
gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);
@@ -140,20 +172,20 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(*bbox), 5);
- *button1 = gtk_button_new_from_stock(label1);
+ *button1 = gtkut_stock_button(label1);
gtk_widget_set_can_default(*button1, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
gtk_widget_show(*button1);
if (button2) {
- *button2 = gtk_button_new_from_stock(label2);
+ *button2 = gtkut_stock_button(label2);
gtk_widget_set_can_default(*button2, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
gtk_widget_show(*button2);
}
if (button3) {
- *button3 = gtk_button_new_from_stock(label3);
+ *button3 = gtkut_stock_button(label3);
gtk_widget_set_can_default(*button3, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
gtk_widget_show(*button3);
@@ -898,7 +930,7 @@ GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label)
button = gtk_button_new_with_mnemonic(button_label);
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("folder", GTK_ICON_SIZE_BUTTON));
return button;
}
@@ -912,7 +944,7 @@ GtkWidget *gtkut_get_browse_directory_btn(const gchar *button_label)
button = gtk_button_new_with_mnemonic(button_label);
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("folder", GTK_ICON_SIZE_BUTTON));
return button;
}
@@ -923,11 +955,35 @@ GtkWidget *gtkut_get_replace_btn(const gchar *button_label)
button = gtk_button_new_with_mnemonic(button_label);
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_BUTTON));
return button;
}
+GtkWidget *gtkut_stock_button(const gchar *stock_image)
+{
+ GtkWidget *button;
+ const gchar *name = NULL;
+ const gchar *label = NULL;
+ gint i;
+
+ cm_return_val_if_fail(stock_image != NULL, NULL);
+
+ button = gtk_button_new_from_icon_name(stock_image, GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_use_underline(button, TRUE);
+ for (i=0;STOCK_BTNS[i].icon_name != NULL;i++) {
+ name = STOCK_BTNS[i].icon_name;
+ label = STOCK_BTNS[i].icon_label;
+ if (!strcmp(stock_image, name)) {
+ gtk_button_set_label(button, label);
+ return button;
+ }
+ }
+ button = gtk_button_new_with_mnemonic(stock_image);
+
+ return button;
+};
+
/**
* merge some part of code into one function : it creates a frame and add
* these into gtk box widget passed in param.
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 9230c4a47..0936aeb72 100644
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -173,6 +173,7 @@ GtkWidget *gtkut_get_focused_child (GtkContainer *parent);
GtkWidget *gtkut_get_browse_file_btn(const gchar *label);
GtkWidget *gtkut_get_browse_directory_btn(const gchar *label);
GtkWidget *gtkut_get_replace_btn(const gchar *label);
+GtkWidget *gtkut_stock_button(const gchar *stock_image);
GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **frame, const gchar *frame_label);
#if HAVE_LIBCOMPFACE
GtkWidget *xface_get_from_header(const gchar *o_xface);
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index e5aca030f..4ab55fc2d 100644
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2018 Paul Mangan and the Claws Mail team
+ * Copyright (C) 2005-2019 Paul Mangan and the Claws Mail team
*
* 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
@@ -176,7 +176,7 @@ static void legend_create(void)
PACK_FRAME(vbox, frame, NULL);
gtk_container_add(GTK_CONTAINER(frame), table);
- gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE,
+ gtkut_stock_button_set_create(&confirm_area, &close_button, _("_Close"),
NULL, NULL, NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 4);
gtk_widget_grab_default(close_button);
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index 442814800..680cdc885 100644
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -310,12 +310,12 @@ static void input_dialog_create(gboolean is_password)
FALSE, FALSE, 0);
/* for title label */
- icon_q = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+ icon_q = gtk_image_new_from_icon_name("dialog-question",
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon_q, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon_q, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), icon_q, FALSE, FALSE, 0);
- icon_p = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
+ icon_p = gtk_image_new_from_icon_name("dialog-password",
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon_p, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon_p, GTK_ALIGN_START);
@@ -365,8 +365,8 @@ static void input_dialog_create(gboolean is_password)
gtk_box_pack_start(GTK_BOX(vbox), remember_checkbtn, FALSE, FALSE, 0);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 2b351c64c..64102bb4a 100644
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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
@@ -386,7 +386,7 @@ void pluginwindow_create()
gtk_box_pack_start(GTK_BOX(vbox1), hbox_info, FALSE, FALSE, 0);
gtkut_stock_button_set_create_with_help(&hbuttonbox2, &help_btn,
- &close_btn, GTK_STOCK_CLOSE,
+ &close_btn, _("_Close"),
NULL, NULL, NULL, NULL);
gtk_box_set_spacing(GTK_BOX(hbuttonbox2), 6);
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 86befa163..5e62a312b 100644
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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
@@ -500,13 +500,13 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
#ifndef GENERIC_UMPC
gtkut_stock_button_set_create(&prefswindow->confirm_area,
- &prefswindow->apply_btn, GTK_STOCK_APPLY,
- &prefswindow->cancel_btn, GTK_STOCK_CANCEL,
- &prefswindow->ok_btn, GTK_STOCK_OK);
+ &prefswindow->apply_btn, _("_Apply"),
+ &prefswindow->cancel_btn, _("_Cancel"),
+ &prefswindow->ok_btn, _("_OK"));
#else
gtkut_stock_button_set_create(&prefswindow->confirm_area,
- &prefswindow->apply_btn, GTK_STOCK_APPLY,
- &prefswindow->ok_btn, GTK_STOCK_CLOSE,
+ &prefswindow->apply_btn, _("_Apply"),
+ &prefswindow->ok_btn, _("_Close"),
NULL, NULL);
#endif
gtk_widget_show_all(prefswindow->confirm_area);
diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c
index 4d0b7c20d..a44a2c764 100644
--- a/src/gtk/progressdialog.c
+++ b/src/gtk/progressdialog.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -94,7 +94,7 @@ ProgressDialog *progress_dialog_create(void)
_("_View log"),
GTK_RESPONSE_NONE);
cancel_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_NONE);
gtk_widget_grab_default(cancel_btn);
gtk_widget_grab_focus(cancel_btn);
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 08c823733..8768d8473 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team
+ * Copyright (C) 1999-2019 Colin Leroy and the Claws Mail team
*
* 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
@@ -563,8 +563,8 @@ static void quicksearch_set_button(GtkButton *button, const gchar *icon, const g
box = gtk_hbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(button), box);
- if (icon_visible || !text || !*text)
- gtk_box_pack_start(GTK_BOX(box), gtk_image_new_from_stock(icon,
+ if (icon_visible || !text || !*text || icon != NULL)
+ gtk_box_pack_start(GTK_BOX(box), gtk_image_new_from_icon_name(icon,
GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), gtk_label_new_with_mnemonic(text), FALSE, FALSE, 0);
gtk_widget_show_all(box);
@@ -926,7 +926,7 @@ QuickSearch *quicksearch_new()
gtk_widget_show(search_string_entry);
search_hbox = gtk_hbox_new(FALSE, 5);
- clear_search = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ clear_search = gtkut_stock_button("edit-clear");
gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(clear_search), "clicked",
@@ -935,7 +935,7 @@ QuickSearch *quicksearch_new()
_("Clear the current search"));
gtk_widget_show(clear_search);
- search_condition_expression = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ search_condition_expression = gtk_button_new_with_mnemonic("_Edit");
gtk_box_pack_start(GTK_BOX(search_hbox), search_condition_expression,
FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (search_condition_expression), "clicked",
@@ -945,7 +945,7 @@ QuickSearch *quicksearch_new()
_("Edit search criteria"));
gtk_widget_show(search_condition_expression);
- search_description = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ search_description = gtkut_stock_button("dialog-information");
gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(search_description), "clicked",
@@ -989,9 +989,9 @@ QuickSearch *quicksearch_new()
quicksearch->normal_search_strings = NULL;
quicksearch->extended_search_strings = NULL;
- quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
- quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("E_dit"));
- quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), "dialog-information", _("_Information"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), NULL, _("E_dit"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), "edit-clear", _("C_lear"));
update_extended_buttons(quicksearch);
@@ -1018,15 +1018,15 @@ void quicksearch_relayout(QuickSearch *quicksearch)
case NORMAL_LAYOUT:
case WIDE_LAYOUT:
case WIDE_MSGLIST_LAYOUT:
- quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
- quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("E_dit"));
- quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), "dialog-information", _("_Information"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), NULL, _("E_dit"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), "edit-clear", _("C_lear"));
break;
case SMALL_LAYOUT:
case VERTICAL_LAYOUT:
- quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, "");
- quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, "");
- quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, "");
+ quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), "dialog-information", "");
+ quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), NULL, _("E_dit"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), "edit-clear", "");
break;
}
}
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 349a2ec8b..6e9310f21 100644
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -324,7 +324,7 @@ void sslcertwindow_show_cert(SSLCertificate *cert)
gchar *buf;
buf = g_strdup_printf(_("SSL/TLS certificate for %s"), cert->host);
- alertpanel_full(buf, NULL, GTK_STOCK_CLOSE, NULL, NULL,
+ alertpanel_full(buf, NULL, _("_Close"), NULL, NULL,
ALERTFOCUS_FIRST, FALSE, cert_widget, ALERT_NOTICE);
g_free(buf);
}
diff --git a/src/imap.c b/src/imap.c
index 8d8876b72..5787d8840 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1162,7 +1162,7 @@ static IMAPSession *imap_session_new(Folder * folder,
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
- GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+ _("_Cancel"), _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return NULL;
}
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index e7b4a2070..e7bcbd91b 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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
@@ -366,7 +366,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
@@ -512,7 +512,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
G_CALLBACK(chk_update_val), &recurse);
avalue = alertpanel_full(_("Subscriptions"), message,
- GTK_STOCK_CANCEL, _("_Search"), NULL, ALERTFOCUS_SECOND,
+ _("_Cancel"), _("_Search"), NULL, ALERTFOCUS_SECOND,
FALSE, rec_chk, ALERT_QUESTION);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
@@ -571,7 +571,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
G_CALLBACK(chk_update_val), &recurse);
avalue = alertpanel_full(_("Subscriptions"), message,
- GTK_STOCK_CANCEL, action?_("_Subscribe"):_("_Unsubscribe"), NULL,
+ _("_Cancel"), action?_("_Subscribe"):_("_Unsubscribe"), NULL,
ALERTFOCUS_SECOND, FALSE, rec_chk, ALERT_QUESTION);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/import.c b/src/import.c
index 6896ce0d9..aefbc7546 100644
--- a/src/import.c
+++ b/src/import.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -175,8 +175,8 @@ static void import_create(void)
G_CALLBACK(import_destsel_cb), NULL);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
@@ -205,7 +205,7 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
}
if (destdir && !*destdir) {
if (alertpanel(_("Import mbox file"), _("Destination folder is not set.\nImport mbox file to the Inbox folder?"),
- GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL, ALERTFOCUS_FIRST)
+ _("_OK"), _("_Cancel"), NULL, ALERTFOCUS_FIRST)
== G_ALERTALTERNATE) {
gtk_widget_grab_focus(dest_entry);
return;
diff --git a/src/importldif.c b/src/importldif.c
index ae01a230b..98f2a6d26 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -435,7 +435,7 @@ static void imp_ldif_next( GtkWidget *widget ) {
gtk_notebook_set_current_page(
GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FINISH );
gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel),
- GTK_STOCK_CLOSE);
+ _("_Close"));
imp_ldif_finish_show();
}
}
@@ -933,13 +933,11 @@ static void imp_ldif_dialog_create() {
/* Button panel */
gtkut_stock_button_set_create(&hbbox,
- &btnCancel, GTK_STOCK_CANCEL,
- &btnPrev, GTK_STOCK_GO_BACK,
- &btnNext, GTK_STOCK_GO_FORWARD);
+ &btnPrev, "go-previous",
+ &btnNext, "go-next",
+ &btnCancel, _("_Cancel"));
btnProceed = gtk_button_new_with_mnemonic(_("Proceed"));
- gtk_button_set_image(GTK_BUTTON(btnProceed),
- gtk_image_new_from_stock(GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
gtk_widget_set_can_default(btnProceed, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), btnProceed, TRUE, TRUE, 0);
gtk_widget_hide(btnProceed);
@@ -1003,7 +1001,7 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel),
- GTK_STOCK_CANCEL);
+ _("_Cancel"));
gtk_widget_hide(impldif_dlg.btnProceed);
gtk_widget_show(impldif_dlg.btnNext);
diff --git a/src/importmutt.c b/src/importmutt.c
index ecfbb7217..95ed74d63 100644
--- a/src/importmutt.c
+++ b/src/importmutt.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Match Grun
*
* 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
@@ -246,8 +246,8 @@ static void imp_mutt_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 5);
diff --git a/src/importpine.c b/src/importpine.c
index caf6f82d3..5481c7de9 100644
--- a/src/importpine.c
+++ b/src/importpine.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2019 the Claws Mail team and Match Grun
*
* 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
@@ -245,8 +245,8 @@ static void imp_pine_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 5);
diff --git a/src/inc.c b/src/inc.c
index 44355f353..ad728247d 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -833,7 +833,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
gtk_window_set_title(GTK_WINDOW(inc_dialog->dialog->window),
fin_msg);
gtk_button_set_label(GTK_BUTTON(inc_dialog->dialog->cancel_btn),
- GTK_STOCK_CLOSE);
+ _("_Close"));
}
g_free(fin_msg);
@@ -880,7 +880,7 @@ static IncState inc_pop3_session_do(IncSession *session)
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
- GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+ _("_Cancel"), _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return INC_CANCEL;
}
@@ -1660,7 +1660,7 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
answer = alertpanel(_("Offline warning"),
tmp,
- GTK_STOCK_NO, GTK_STOCK_YES,
+ _("_No"), _("_Yes"),
!force_ask? _("On_ly once"):NULL, ALERTFOCUS_SECOND);
g_free(tmp);
if (answer == G_ALERTALTERNATE) {
diff --git a/src/main.c b/src/main.c
index 06cd115b5..04660c583 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
@@ -398,7 +398,7 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
G_CALLBACK(chk_update_val), &backup);
if (alertpanel_full(_("Migration of configuration"), message,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND, FALSE,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND, FALSE,
keep_backup_chk, ALERT_QUESTION) != G_ALERTALTERNATE) {
return FALSE;
}
@@ -2174,7 +2174,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
if (prefs_common.warn_queued_on_exit && procmsg_have_queued_mails_fast()) {
if (alertpanel(_("Queued messages"),
_("Some unsent messages are queued. Exit now?"),
- GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST)
+ _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_FIRST)
!= G_ALERTALTERNATE) {
main_window_popup(mainwin);
sc_exiting = FALSE;
diff --git a/src/mainwindow.c b/src/mainwindow.c
index a51a91af2..05985236e 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
/*
Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto
+ Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
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
@@ -1934,8 +1934,7 @@ MainWindow *main_window_create()
hbox_stat = gtk_hbox_new(FALSE, 2);
gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
- warning_icon = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ warning_icon = gtkut_stock_button("dialog-warning");
warning_btn = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(warning_btn), FALSE);
@@ -2878,12 +2877,12 @@ gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean
if (for_quit)
val = alertpanel(_("Empty trash"),
_("Delete all messages in trash folders?"),
- GTK_STOCK_NO, GTK_STOCK_YES, _("Don't quit"),
+ _("_No"), _("_Yes"), _("Don't quit"),
ALERTFOCUS_SECOND);
else
val = alertpanel(_("Empty trash"),
_("Delete all messages in trash folders?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+ _("_No"), _("_Yes"), NULL,
ALERTFOCUS_SECOND);
if (val == G_ALERTALTERNATE) {
debug_print("will empty trash\n");
@@ -4023,7 +4022,7 @@ static void app_exit_cb(GtkAction *action, gpointer data)
if (prefs_common.confirm_on_exit) {
if (alertpanel(_("Exit"), _("Exit Claws Mail?"),
- GTK_STOCK_CANCEL, GTK_STOCK_QUIT, NULL, ALERTFOCUS_FIRST)
+ _("_Cancel"), _("_Quit"), NULL, ALERTFOCUS_FIRST)
!= G_ALERTALTERNATE)
return;
manage_window_focus_in(mainwin->window, NULL, NULL);
@@ -4225,7 +4224,7 @@ static void mainwindow_check_synchronise(MainWindow *mainwin, gboolean ask)
if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
_("Do you want to synchronise your folders now?"),
- GTK_STOCK_CANCEL, _("_Synchronise"), NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE)
+ _("_Cancel"), _("_Synchronise"), NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE)
return;
if (offline_ask_sync)
diff --git a/src/mbox.c b/src/mbox.c
index 26fece154..d20a51b35 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -549,7 +549,7 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
if (g_file_test(mbox, G_FILE_TEST_EXISTS) == TRUE) {
if (alertpanel_full(_("Overwrite mbox file"),
_("This file already exists. Do you want to overwrite it?"),
- GTK_STOCK_CANCEL, _("Overwrite"), NULL,
+ _("_Cancel"), _("Overwrite"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING)
!= G_ALERTALTERNATE) {
return -2;
diff --git a/src/message_search.c b/src/message_search.c
index fab403bea..fd7ef80a8 100644
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -225,23 +225,23 @@ static void message_search_create(void)
gtkut_stock_button_add_help(confirm_area, &help_btn);
- prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
+ prev_btn = gtkut_stock_button("go-previous");
gtk_widget_set_can_default(prev_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
gtk_widget_show(prev_btn);
- next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+ next_btn = gtkut_stock_button("go-next");
gtk_widget_set_can_default(next_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
gtk_widget_show(next_btn);
- close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close_btn = gtk_button_new_with_mnemonic("_Close");
gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
gtk_widget_show(close_btn);
/* stop button hidden */
- stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
+ stop_btn = gtk_button_new_with_mnemonic("_Stop");
gtk_widget_set_can_default(stop_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
@@ -317,7 +317,7 @@ static void message_search_execute(gboolean backward)
if (all_searched) {
alertpanel_full(_("Search failed"),
_("Search string not found."),
- GTK_STOCK_CLOSE, NULL, NULL, FALSE,
+ _("_Close"), NULL, NULL, FALSE,
ALERTFOCUS_FIRST, NULL, ALERT_WARNING);
break;
}
@@ -332,7 +332,7 @@ static void message_search_execute(gboolean backward)
"continue from beginning?");
val = alertpanel(_("Search finished"), str,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
if (G_ALERTALTERNATE == val) {
manage_window_focus_in(search_window.window,
NULL, NULL);
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index b1a162360..d5867f751 100644
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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
@@ -204,7 +204,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
@@ -372,7 +372,7 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
(_("Really remove the mailbox '%s'?\n"
"(The messages are NOT deleted from the disk)"), name);
avalue = alertpanel_full(_("Remove mailbox"), message,
- GTK_STOCK_CANCEL, _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), "list-remove", NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
diff --git a/src/mimeview.c b/src/mimeview.c
index c43c0ad10..16764af4c 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1901,8 +1901,8 @@ static gboolean mimeview_write_part(const gchar *filename,
res = g_strdup_printf(_("Overwrite existing file '%s'?"),
tmp);
g_free(tmp);
- aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL,
- GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST);
+ aval = alertpanel(_("Overwrite"), res, _("_Cancel"),
+ _("_OK"), NULL, ALERTFOCUS_FIRST);
g_free(res);
if (G_ALERTALTERNATE != aval) return FALSE;
}
@@ -1926,7 +1926,7 @@ static AlertValue mimeview_save_all_error_ask(gint n)
"Do you want to cancel operation or skip error and "
"continue?"), n);
AlertValue av = alertpanel_full(_("Error saving all message parts"),
- message, GTK_STOCK_CANCEL, _("Skip"), _("Skip all"),
+ message, _("_Cancel"), _("Skip"), _("Skip all"),
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
g_free(message);
return av;
@@ -2351,7 +2351,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
_("This attachment is an executable file. Executing "
"untrusted binaries is dangerous and could compromise "
"your computer.\n\n"
- "Do you want to run this file?"), GTK_STOCK_CANCEL,
+ "Do you want to run this file?"), _("_Cancel"),
_("Run binary"),
NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
if (val == G_ALERTALTERNATE) {
diff --git a/src/news.c b/src/news.c
index 1cfb6f804..959f72d89 100644
--- a/src/news.c
+++ b/src/news.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -406,7 +406,7 @@ static Session *news_session_new_for_folder(Folder *folder)
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
- GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+ _("_Cancel"), _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return NULL;
}
diff --git a/src/news_gtk.c b/src/news_gtk.c
index 15e180420..78a31aa6f 100644
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -249,8 +249,8 @@ static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
name = trim_string(item->path, 32);
message = g_strdup_printf(_("Really unsubscribe newsgroup '%s'?"), name);
avalue = alertpanel_full(_("Unsubscribe newsgroup"), message,
- GTK_STOCK_CANCEL, _("_Unsubscribe"), NULL,
- ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
+ _("_Cancel"), _("_Unsubscribe"), NULL,
+ ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
g_free(message);
g_free(name);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/password_gtk.c b/src/password_gtk.c
index 1da713cc4..abe45e990 100644
--- a/src/password_gtk.c
+++ b/src/password_gtk.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2016-2018 Andrej Kacian and The Claws Mail Team
+ * Copyright (C) 2016-2019 the Claws Mail team and Andrej Kacian
*
* 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
@@ -131,7 +131,7 @@ void master_passphrase_change_dialog()
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
+ icon = gtk_image_new_from_icon_name("dialog-password",
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon, GTK_ALIGN_START);
@@ -213,8 +213,8 @@ void master_passphrase_change_dialog()
/* Dialog buttons */
gtkut_stock_button_set_create(&confirm_area,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
diff --git a/src/plugins/acpi_notifier/acpi_notifier.c b/src/plugins/acpi_notifier/acpi_notifier.c
index aaf1eaef0..d57074d5f 100644
--- a/src/plugins/acpi_notifier/acpi_notifier.c
+++ b/src/plugins/acpi_notifier/acpi_notifier.c
@@ -1,10 +1,11 @@
/*
* acpi_notifier -- for Claws Mail
*
- * Copyright (C) 2005 Colin Leroy <colin at colino.net>
+ * Copyright (C) 2005-2019 Colin Leroy <colin at colino.net>
+ * and the Claws Mail Team
*
* Sylpheed is a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto and the Claws Mail Team
+ * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail Team
*
* 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
@@ -411,7 +412,7 @@ static void acpi_prefs_create_widget_func(PrefsPage * _page,
warning_box = gtk_hbox_new(FALSE, 6);
- image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
+ image = gtk_button_new_from_icon_name("dialog-warning",
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_box_pack_start(GTK_BOX(warning_box), image, FALSE, FALSE, 0);
warning_label = gtk_label_new(
diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index 452be9280..30d132654 100644
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -2,7 +2,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2019 Michael Rasmussen and the Claws Mail Team
*
* 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
@@ -114,7 +114,7 @@ static void create_progress_dialog(struct ArchivePage* page) {
title,
GTK_WINDOW(mainwin->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
NULL);
@@ -572,7 +572,7 @@ static gboolean archiver_save_files(struct ArchivePage* page) {
AlertValue aval;
aval = alertpanel_full(_("Creating archive"), msg,
- GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(msg);
if (aval != G_ALERTALTERNATE)
@@ -619,7 +619,7 @@ static gboolean archiver_save_files(struct ArchivePage* page) {
"\nContinue anyway?"),
orig_file, g_slist_length(list));
aval = alertpanel_full(_("Creating archive"), msg,
- GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(msg);
if (aval != G_ALERTALTERNATE) {
@@ -746,7 +746,7 @@ static void show_result(struct ArchivePage* page) {
_("Archive result"),
GTK_WINDOW(mainwin->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_NONE,
NULL);
g_signal_connect_swapped(
@@ -942,8 +942,8 @@ static void filesel_cb(GtkWidget *widget, gpointer data)
_("Select file name for archive [suffix should reflect archive like .tgz]"),
NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Apply"), GTK_RESPONSE_APPLY,
NULL);
homedir = g_getenv("HOME");
if (!homedir)
@@ -1043,9 +1043,9 @@ void archiver_gtk_show() {
_("Create Archive"),
GTK_WINDOW(mainwin->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_ACCEPT,
NULL);
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index f98e0d8d1..9c2fca429 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -1,10 +1,11 @@
/*
* att_remover -- for Claws Mail
*
- * Copyright (C) 2005 Colin Leroy <colin at colino.net>
+ * Copyright (C) 2005=2019 Colin Leroy <colin at colino.net>
+ * and the Claws Mail Team
*
* Sylpheed is a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto and the Claws Mail Team
+ * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail Team
*
* 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
@@ -384,8 +385,8 @@ static void remove_attachments_dialog(AttRemover *attremover)
gtk_container_set_border_width(GTK_CONTAINER(scrollwin), 4);
gtk_box_pack_start(GTK_BOX(vbox), scrollwin, TRUE, TRUE, 0);
- gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbbox), HSPACING_NARROW);
@@ -426,7 +427,7 @@ static void remove_attachments(GSList *msglist)
_("Do you really want to remove all attachments from "
"the selected messages?\n\n"
"The deleted data will be unrecoverable."),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND,
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND,
FALSE, NULL, ALERT_QUESTION) != G_ALERTALTERNATE)
return;
diff --git a/src/plugins/attachwarner/attachwarner.c b/src/plugins/attachwarner/attachwarner.c
index 913260406..8a7dd9bb7 100644
--- a/src/plugins/attachwarner/attachwarner.c
+++ b/src/plugins/attachwarner/attachwarner.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2015 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2019 Ricardo Mones and the Claws Mail Team
*
* 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
@@ -214,7 +214,7 @@ static gboolean attwarn_before_send_hook(gpointer source, gpointer data)
bold_text,
compose->sending?_("Send it anyway?"):_("Queue it anyway?"));
aval = alertpanel(_("Attachment warning"), message,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
compose->sending ? _("_Send") : _("Queue"),
NULL,
ALERTFOCUS_SECOND);
diff --git a/src/plugins/clamd/clamav_plugin_gtk.c b/src/plugins/clamd/clamav_plugin_gtk.c
index 5547eb800..777dfcc90 100644
--- a/src/plugins/clamd/clamav_plugin_gtk.c
+++ b/src/plugins/clamd/clamav_plugin_gtk.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2017 the Claws Mail Team
+ * Copyright (C) 2003-2019 the Claws Mail Team
*
* 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
@@ -88,8 +88,8 @@ static void clamd_folder_cb(GtkWidget *widget, gpointer data)
"Select file with clamd configuration [clamd.conf]",
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Apply"), GTK_RESPONSE_APPLY,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), "/etc");
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_APPLY) {
@@ -345,7 +345,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
gtk_widget_show (blank);
gtk_box_pack_start (GTK_BOX (hbox_auto2), blank, TRUE, TRUE, 0);
- permission_select = gtk_button_new_from_stock(GTK_STOCK_FIND_AND_REPLACE);
+ permission_select = gtkut_stock_button("edit-find-replace");
/*gtk_button_new_with_mnemonic(_("_Check Permission"));*/
gtk_widget_show (permission_select);
gtk_box_pack_start (GTK_BOX (hbox_auto2), permission_select, FALSE, FALSE, 0);
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index f7c53cd6b..880f495d7 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -1,7 +1,7 @@
/*
* == Fancy Plugin ==
* Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Salvatore De Paolis and the Claws Mail Team
+ * Copyright (C) 1999-2019 Salvatore De Paolis and the Claws Mail Team
*
* 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
@@ -313,7 +313,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
g_signal_connect(G_OBJECT(stylesheet_browse_button), "clicked",
G_CALLBACK(fancy_prefs_stylesheet_browse_cb), stylesheet);
- stylesheet_edit_button = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ stylesheet_edit_button = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (stylesheet_edit_button);
gtk_box_pack_start(GTK_BOX(hbox_css), stylesheet_edit_button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(stylesheet_edit_button), "clicked",
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index c2aa1b694..7f9ac7b54 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -1,6 +1,6 @@
/* GData plugin for Claws Mail
* Copyright (C) 2011 Holger Berndt
- * Copyright (C) 2011-2016 the Claws Mail team
+ * Copyright (C) 2011-2019 the Claws Mail team
*
* 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
@@ -133,8 +133,8 @@ gchar* ask_user_for_auth_code(const gchar *auth_uri)
"\n\nVisit Google's authorization page by pressing the button below. After you "
"confirmed the authorization, you will get an authorization code. Enter that code "
"in the field below to grant Claws Mail access to your Google contact list."));
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- btn_ok = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+ btn_ok = gtk_dialog_add_button(GTK_DIALOG(dialog), _("_OK"), GTK_RESPONSE_OK);
gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index 89fd2e75e..baa0b35e7 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2014-2018 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2014-2019 Ricardo Mones and the Claws Mail Team
*
* 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
@@ -163,7 +163,7 @@ static void cache_clean_button_clicked_cb(GtkButton *button, gpointer data)
val = alertpanel_full(_("Clear icon cache"),
_("Are you sure you want to remove all cached avatar icons?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
if (val != G_ALERTALTERNATE)
return;
@@ -240,7 +240,7 @@ static GtkWidget *p_create_frame_cache(struct LibravatarPrefsPage *page)
g_free(markup);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ button = gtkut_stock_button("edit-clear");
gtk_widget_show(button);
g_signal_connect(button, "clicked",
G_CALLBACK(cache_clean_button_clicked_cb), label);
diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
index 166055c74..cecc93d2d 100644
--- a/src/plugins/mailmbox/plugin_gtk.c
+++ b/src/plugins/mailmbox/plugin_gtk.c
@@ -1,8 +1,9 @@
/*
* mailmbox Plugin -- mbox support for Sylpheed
- * Copyright (C) 2003-2005 Christoph Hohmann,
- * Hoa v. Dinh,
- * Alfons Hoogervorst
+ * Copyright (C) 2003-2019 the Claws Mail team,
+ * Christoph Hohmann,
+ * Hoa v. Dinh,
+ * Alfons Hoogervorst
*
* 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
@@ -298,7 +299,7 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
(_("Really remove the mailbox '%s'?\n"
"(The messages are NOT deleted from the disk)"), name);
avalue = alertpanel_full(_("Remove mailbox"), message,
- GTK_STOCK_CANCEL, _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
g_free(name);
@@ -330,7 +331,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
(_("All folders and messages under '%s' will be deleted.\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_NOTICE);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 3b03136b7..da779d8c2 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2015 the Claws Mail team
+ * Copyright (C) 2004-2019 the Claws Mail team
* Copyright (C) 2014-2015 Charles Lehner
*
* This program is free software; you can redistribute it and/or modify
@@ -153,7 +153,7 @@ static void sieve_editor_set_status_icon(SieveEditorPage *page, const gchar *img
{
GtkImage *img = GTK_IMAGE(page->status_icon);
if (img_id)
- gtk_image_set_from_stock(img, img_id, GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(img, img_id, GTK_ICON_SIZE_BUTTON);
else
gtk_image_clear(img);
}
@@ -176,7 +176,7 @@ static void sieve_editor_update_status(SieveEditorPage *page,
if (result->has_status) {
/* set status icon */
sieve_editor_set_status_icon(page,
- result->success ? GTK_STOCK_DIALOG_INFO : GTK_STOCK_DIALOG_ERROR);
+ result->success ? "dialog-information" : "dialog-error");
/* clear status text */
sieve_editor_set_status(page, "");
}
@@ -294,7 +294,7 @@ static void got_data_reverting(SieveSession *session, gboolean abort,
if (contents == (void *)-1) {
/* error */
sieve_editor_set_status(page, _("Unable to get script contents"));
- sieve_editor_set_status_icon(page, GTK_STOCK_DIALOG_ERROR);
+ sieve_editor_set_status_icon(page, "dialog-error");
return;
}
@@ -333,7 +333,7 @@ static void sieve_editor_revert_cb(GtkAction *action, SieveEditorPage *page)
if (!page->modified ||
alertpanel(_("Revert script"),
_("This script has been modified. Revert the unsaved changes?"),
- _("_Revert"), NULL, GTK_STOCK_CANCEL, ALERTFOCUS_FIRST) == G_ALERTDEFAULT)
+ _("_Revert"), NULL, _("_Cancel"), ALERTFOCUS_FIRST) == G_ALERTDEFAULT)
sieve_editor_revert(page);
}
@@ -431,7 +431,7 @@ static gboolean sieve_editor_confirm_close(SieveEditorPage *page)
if (page->modified) {
switch (alertpanel(_("Save changes"),
_("This script has been modified. Save the latest changes?"),
- _("_Discard"), _("_Save"), GTK_STOCK_CANCEL,
+ _("_Discard"), _("_Save"), _("_Cancel"),
ALERTFOCUS_SECOND)) {
case G_ALERTDEFAULT:
return TRUE;
@@ -628,9 +628,9 @@ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Filter", "Revert", "Filter/Revert", GT
/* buttons */
gtkut_stock_with_text_button_set_create(&hbox1,
- &close_btn, GTK_STOCK_CANCEL, _("_Close"),
- &check_btn, GTK_STOCK_OK, _("Chec_k Syntax"),
- &save_btn, GTK_STOCK_SAVE, _("_Save"));
+ &close_btn, _("_Cancel"), _("_Close"),
+ &check_btn, _("_OK"), _("Chec_k Syntax"),
+ &save_btn, "document-save", _("_Save"));
gtk_box_pack_end (GTK_BOX (hbox), hbox1, FALSE, FALSE, 0);
gtk_widget_grab_default (save_btn);
g_signal_connect (G_OBJECT (close_btn), "clicked",
@@ -722,7 +722,7 @@ static void got_data_loading(SieveSession *session, gboolean aborted,
} else {
/* partial failure. show error in editor window */
sieve_editor_set_status(page, _("Unable to get script contents"));
- sieve_editor_set_status_icon(page, GTK_STOCK_DIALOG_ERROR);
+ sieve_editor_set_status_icon(page, "dialog-error");
}
return;
}
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index a71abc406..d954087af 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2015 the Claws Mail team
+ * Copyright (C) 2004-2019 the Claws Mail team
* Copyright (C) 2014-2015 Charles Lehner
*
* This program is free software; you can redistribute it and/or modify
@@ -327,7 +327,7 @@ static void filter_delete(GtkWidget *widget, SieveManagerPage *page)
g_snprintf(buf, sizeof(buf),
_("Do you really want to delete the filter '%s'?"), filter_name);
if (alertpanel_full(_("Delete filter"), buf,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return;
@@ -750,31 +750,31 @@ static SieveManagerPage *sieve_manager_page_new()
gtk_box_pack_start (GTK_BOX (vbox_allbuttons), vbox_buttons, FALSE, FALSE, 0);
/* new */
- btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ btn = gtk_button_new_with_mnemonic("_New");
gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT(btn), "clicked",
G_CALLBACK (filter_add), page);
/* edit */
- btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+ btn = gtk_button_new_with_mnemonic("_Edit");
gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT(btn), "clicked",
G_CALLBACK (filter_edit), page);
/* delete */
- btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ btn = gtkut_stock_button("edit-delete");
gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT(btn), "clicked",
G_CALLBACK (filter_delete), page);
/* rename */
- btn = gtk_button_new_with_label(_("Rename"));
+ btn = gtk_button_new_with_mnemonic(_("_Rename"));
gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT(btn), "clicked",
G_CALLBACK (filter_rename), page);
/* refresh */
- btn = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ btn = gtkut_stock_button("view-refresh");
gtk_box_pack_end (GTK_BOX (vbox_allbuttons), btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT(btn), "clicked",
G_CALLBACK (account_changed), page);
@@ -782,7 +782,7 @@ static SieveManagerPage *sieve_manager_page_new()
/* bottom area stuff */
gtkut_stock_button_set_create(&hbox,
- &btn, GTK_STOCK_CLOSE,
+ &btn, _("_Close"),
NULL, NULL, NULL, NULL);
/* close */
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index 7e4d10ce9..e825fbc9d 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -1,6 +1,6 @@
/* Notification plugin for Claws Mail
- * Copyright (C) 2005-2007 Holger Berndt
+ * Copyright (C) 2005-2019 Holger Berndt and the Claws Mail Team
*
* 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
@@ -587,8 +587,8 @@ static void foldercheck_create_window(SpecificFolderArrayEntry *entry)
gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 10);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index 166410049..69f8f1cf1 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -1,7 +1,7 @@
/*
* Notification plugin for Claws-Mail
* Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2018 Holger Berndt and the Claws Mail team
+ * Copyright (C) 2005-2019 Holger Berndt and the Claws Mail team
*
* 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
@@ -800,7 +800,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("list-remove", GTK_ICON_SIZE_MENU));
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(notify_banner_slider_remove_cb), slider);
@@ -811,7 +811,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("list-add", GTK_ICON_SIZE_MENU));
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(notify_banner_slider_add_cb), slider);
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index f67d81d47..e9c75d090 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -1,5 +1,5 @@
/* Notification plugin for Claws Mail
- * Copyright (C) 2005-2007 Holger Berndt and the Claws Mail Team.
+ * Copyright (C) 2005-2019 Holger Berndt and the Claws Mail Team.
*
* 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
@@ -548,7 +548,7 @@ static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
if(prefs_common_get_prefs()->confirm_on_exit) {
if(alertpanel(_("Exit"), _("Exit Claws Mail?"),
- GTK_STOCK_CANCEL, GTK_STOCK_OK,
+ _("_Cancel"), _("_OK"),
NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) {
return;
}
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index 2c2ab5034..5ddef2ae9 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Salvatore De Paolis & the Claws Mail Team
+ * Copyright (C) 1999-2019 Salvatore De Paolis & the Claws Mail Team
*
* 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
@@ -1216,7 +1216,7 @@ static void pdf_viewer_button_print_cb(GtkButton *button, PdfViewer *viewer)
static void pdf_viewer_button_document_info_cb(GtkButton *button, PdfViewer *viewer)
{
- alertpanel_full(_("PDF properties"), NULL, GTK_STOCK_CLOSE, NULL, NULL,
+ alertpanel_full(_("PDF properties"), NULL, _("_Close"), NULL, NULL,
ALERTFOCUS_FIRST, FALSE,
GTK_WIDGET(pdf_viewer_fill_info_table(viewer)),
ALERT_NOTICE);
diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 3a809eec8..3cd1ffa2e 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -1,5 +1,5 @@
/* passphrase.c - GTK+ based passphrase callback
- * Copyright (C) 2001-2016 Werner Koch (dd9jn) and the Claws Mail team
+ * Copyright (C) 2001-2019 Werner Koch (dd9jn) and the Claws Mail team
*
* 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
@@ -102,7 +102,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
if (uid_hint || pass_hint) {
GtkWidget *label, *icon;
label = create_description (uid_hint, prev_bad, new_key);
- icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
+ icon = gtk_image_new_from_icon_name("dialog-password",
GTK_ICON_SIZE_DIALOG);
hbox = gtk_hbox_new (FALSE, 12);
@@ -119,8 +119,8 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
gtk_widget_grab_focus(pass_entry);
gtkut_stock_button_set_create(&confirm_box,
- &cancel_button, GTK_STOCK_CANCEL,
- &ok_button, GTK_STOCK_OK,
+ &cancel_button, _("_Cancel"),
+ &ok_button, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0);
diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index 45eef3ce7..c9216799e 100644
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team
* This file Copyright (C) 2006 Colin Leroy <colin at colino.net>
*
* This program is free software; you can redistribute it and/or modify
@@ -174,7 +174,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
_("This key is not in your keyring. Do you want "
"Claws Mail to try and import it from a "
"keyserver?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
GTK_EVENTS_FLUSH();
}
if (val == G_ALERTDEFAULT) {
@@ -290,7 +290,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
}
gpgme_data_release(sigdata);
gpgme_release(ctx);
- textview_show_icon(textview, GTK_STOCK_DIALOG_AUTHENTICATION);
+ textview_show_icon(textview, "dialog-password");
}
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 9ac4bbb81..985f9eaf3 100644
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2018 the Claws Mail team
+ * Copyright (C) 2004-2019 the Claws Mail team
*
* 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
@@ -434,7 +434,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
gtk_widget_show(new_key_box);
gtk_box_pack_start(GTK_BOX(hbox), new_key_box, FALSE, FALSE, 0);
- image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
+ image = gtk_button_new_from_icon_name("dialog-warning",
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_box_pack_start(GTK_BOX(new_key_box), image, FALSE, FALSE, 0);
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index cb9cb7847..a8119a715 100644
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -1,5 +1,5 @@
/* select-keys.c - GTK+ based key selection
- * Copyright (C) 2001-2016 Werner Koch (dd9jn) and the Claws Mail team
+ * Copyright (C) 2001-2019 Werner Koch (dd9jn) and the Claws Mail team
*
* 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
@@ -495,7 +495,7 @@ create_dialog (struct select_keys_s *sk)
&other_btn, _("_Other"),
&dont_encrypt_btn, _("Do_n't encrypt"));
- cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ cancel_btn = gtk_button_new_with_mnemonic("_Cancel");
gtk_widget_set_can_default(cancel_btn, TRUE);
gtk_box_pack_start(GTK_BOX(bbox), cancel_btn, TRUE, TRUE, 0);
gtk_widget_show(cancel_btn);
@@ -705,7 +705,7 @@ use_untrusted (gpgme_key_t key, gpgme_user_id_t uid, gpgme_protocol_t proto)
"Do you trust this key enough to use it anyway?"),
key->subkeys->keyid, key->uids->name, key->uids->email);
aval = alertpanel(title, buf,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST);
g_free(buf);
g_free(title);
if (aval == G_ALERTALTERNATE)
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 3d056e9be..7bfa2d96d 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team
*
* 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
@@ -812,7 +812,7 @@ void sgpgme_init()
_("GnuPG is not installed properly, or needs "
"to be upgraded.\n"
"OpenPGP support disabled."),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL,
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL,
ALERT_WARNING);
if (val & G_ALERTDISABLE)
prefs_gpg_get_config()->gpg_warning = FALSE;
@@ -896,7 +896,7 @@ void sgpgme_create_secret_key(PrefsAccount *account, gboolean ask_create)
"which means that you won't be able to sign "
"emails or receive encrypted emails.\n"
"Do you want to create a new key pair now?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
if (val == G_ALERTDEFAULT) {
return;
}
@@ -1018,7 +1018,7 @@ again:
"to a keyserver?"),
key->fpr ? key->fpr:"null");
AlertValue val = alertpanel(_("Key generated"), buf,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
g_free(buf);
if (val == G_ALERTALTERNATE) {
gchar *gpgbin = get_gpg_executable_name();
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index a527bf7b8..2b585a23a 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,7 +1,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005-2018 Andrej Kacian <andrej at kacian.sk> and the
+ * This file (C) 2005-2019 Andrej Kacian <andrej at kacian.sk> and the
* Claws Mail team
*
* - callback handler functions for folderview rssyl context menu items
@@ -154,7 +154,7 @@ void rssyl_remove_folder_cb(GtkAction *action,
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
@@ -320,7 +320,7 @@ void rssyl_remove_mailbox_cb(GtkAction *action, gpointer data)
n = trim_string(item->folder->name, 32);
message = g_strdup_printf(_("Really remove the feed tree `%s' ?\n"), n);
avalue = alertpanel_full(_("Remove feed tree"), message,
- GTK_STOCK_CANCEL, _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
g_free(n);
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 096cbbf40..2ad7bb3f2 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2016 the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
* - Plugin preferences
@@ -244,8 +244,8 @@ void rssyl_gtk_prop(RFolderItem *ritem)
GtkWidget *vbox, *frame, *label, *hbox,
*inner_vbox, *auth_hbox, *auth_user_label, *auth_pass_label,
*bbox, *cancel_button, *cancel_align,
- *cancel_hbox, *cancel_image, *cancel_label, *ok_button, *ok_align,
- *ok_hbox, *ok_image, *ok_label, *trim_button, *silent_update_label;
+ *cancel_hbox, *cancel_label, *ok_button, *ok_align,
+ *ok_hbox, *ok_label, *trim_button, *silent_update_label;
GtkAdjustment *adj;
gint refresh;
@@ -489,10 +489,6 @@ void rssyl_gtk_prop(RFolderItem *ritem)
cancel_hbox = gtk_hbox_new(FALSE, 2);
gtk_container_add(GTK_CONTAINER(cancel_align), cancel_hbox);
- cancel_image = gtk_image_new_from_stock(GTK_STOCK_CANCEL,
- GTK_ICON_SIZE_BUTTON);
- gtk_box_pack_start(GTK_BOX(cancel_hbox), cancel_image, FALSE, FALSE, 0);
-
cancel_label = gtk_label_new_with_mnemonic(_("_Cancel"));
gtk_box_pack_end(GTK_BOX(cancel_hbox), cancel_label, FALSE, FALSE, 0);
@@ -510,10 +506,6 @@ void rssyl_gtk_prop(RFolderItem *ritem)
ok_hbox = gtk_hbox_new(FALSE, 2);
gtk_container_add(GTK_CONTAINER(ok_align), ok_hbox);
- ok_image = gtk_image_new_from_stock(GTK_STOCK_OK,
- GTK_ICON_SIZE_BUTTON);
- gtk_box_pack_start(GTK_BOX(ok_hbox), ok_image, FALSE, FALSE, 0);
-
ok_label = gtk_label_new_with_mnemonic(_("_OK"));
gtk_box_pack_end(GTK_BOX(ok_hbox), ok_label, FALSE, FALSE, 0);
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index 72fe5023c..8ec3512f3 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2019 the Claws Mail team
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
* - Dialog which appears when manually subscribing a new feed.
@@ -47,8 +47,8 @@ void rssyl_subscribe_dialog(RSubCtx *ctx) {
win = gtk_dialog_new_with_buttons(_("Subscribe new feed?"),
GTK_WINDOW(mainwindow_get_mainwindow()->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_REJECT,
+ _("_OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response(GTK_DIALOG(win), GTK_RESPONSE_ACCEPT);
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 8ea78e510..7341343c3 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Colin Leroy <colin at colino.net> and
+ * Copyright (C) 1999-2019 Colin Leroy <colin at colino.net> and
* the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -1994,7 +1994,7 @@ static void unsubscribe_cal_cb(GtkAction *action, gpointer data)
message = g_strdup_printf
(_("Do you really want to unsubscribe?"));
avalue = alertpanel_full(_("Delete subscription"), message,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST,
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index 7f3105f06..9c89d4b5b 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Colin Leroy <colin at colino.net> and
+ * Copyright (C) 1999-2019 Colin Leroy <colin at colino.net> and
* the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -292,8 +292,8 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
attendee->address = gtk_entry_new();
attendee->cutype = gtk_combo_box_text_new();
attendee->avail_evtbox = gtk_event_box_new();
- attendee->avail_img = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ attendee->avail_img = gtk_image_new_from_icon_name
+ ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show(attendee->address);
gtk_widget_show(attendee->cutype);
@@ -668,12 +668,12 @@ static void meeting_end_changed(GtkWidget *widget, gpointer data)
static void att_update_icon(VCalMeeting *meet, VCalAttendee *attendee, gint avail, gchar *text)
{
- const gchar *icon = GTK_STOCK_DIALOG_INFO;
+ const gchar *icon = "dialog-information";
switch (avail) {
- case 0: icon = GTK_STOCK_DIALOG_WARNING; break;
- case 1: icon = GTK_STOCK_DIALOG_INFO; break;
- default: icon = GTK_STOCK_DIALOG_QUESTION; break;
+ case 0: icon = "dialog-warning"; break;
+ case 1: icon = "dialog-information"; break;
+ default: icon = "dialog-question"; break;
}
if (!gtk_entry_get_text(GTK_ENTRY(attendee->address))
|| strlen(gtk_entry_get_text(GTK_ENTRY(attendee->address)))==0) {
@@ -682,7 +682,7 @@ static void att_update_icon(VCalMeeting *meet, VCalAttendee *attendee, gint avai
}
CLAWS_SET_TIP(attendee->avail_evtbox, NULL);
} else if (attendee->avail_img) {
- gtk_image_set_from_stock
+ gtk_image_set_from_icon_name
(GTK_IMAGE(attendee->avail_img),
icon,
GTK_ICON_SIZE_SMALL_TOOLBAR);
@@ -928,15 +928,15 @@ static gboolean find_availability(const gchar *dtstart, const gchar *dtend, GSLi
msg = get_avail_msg(unavailable_persons, (total > 1), FALSE, offset_before, offset_after);
val = alertpanel_full(_("Not everyone is available"), msg,
- GTK_STOCK_CANCEL, _("Send anyway"), NULL, ALERTFOCUS_FIRST,
+ _("_Cancel"), _("Send anyway"), NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_QUESTION);
g_free(msg);
}
msg = get_avail_msg(unavailable_persons, TRUE, TRUE, offset_before, offset_after);
g_free(unavailable_persons);
- gtk_image_set_from_stock
+ gtk_image_set_from_icon_name
(GTK_IMAGE(meet->total_avail_img),
- GTK_STOCK_DIALOG_WARNING,
+ "dialog-warning",
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show(meet->total_avail_img);
gtk_label_set_text(GTK_LABEL(meet->total_avail_msg), _("Not everyone is available. "
@@ -1122,17 +1122,17 @@ static gboolean check_attendees_availability(VCalMeeting *meet, gboolean tell_if
if (for_send)
alertpanel_notice(_("Everyone is available."));
else if (!uncertain) {
- gtk_image_set_from_stock
+ gtk_image_set_from_icon_name
(GTK_IMAGE(meet->total_avail_img),
- GTK_STOCK_DIALOG_INFO,
+ "dialog-information",
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show(meet->total_avail_img);
gtk_label_set_text(GTK_LABEL(meet->total_avail_msg), _("Everyone is available."));
CLAWS_SET_TIP(meet->total_avail_evtbox, NULL);
} else {
- gtk_image_set_from_stock
+ gtk_image_set_from_icon_name
(GTK_IMAGE(meet->total_avail_img),
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show(meet->total_avail_img);
gtk_label_set_text(GTK_LABEL(meet->total_avail_msg), _("Everyone is available."));
@@ -1352,8 +1352,8 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
meet->end_c = gtk_calendar_new();
meet->avail_evtbox = gtk_event_box_new();
- meet->avail_img = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ meet->avail_img = gtk_image_new_from_icon_name
+ ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
meet->start_time = gtkut_time_select_combo_new();
@@ -1390,8 +1390,8 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
meet->avail_btn = gtk_button_new_with_label(_("Check availability"));
meet->total_avail_evtbox = gtk_event_box_new();
- meet->total_avail_img = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ meet->total_avail_img = gtk_image_new_from_icon_name
+ ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
meet->total_avail_msg = gtk_label_new("");
gtk_widget_set_size_request(meet->total_avail_evtbox, 18, 16);
@@ -1786,7 +1786,7 @@ gboolean vcal_meeting_alert_check(gpointer data)
postpone_min > 1 ? 2:1),
postpone_min);
aval = alertpanel_full(title, message,
- label, GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST, FALSE,
+ label, _("_OK"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_NOTICE);
g_free(label);
@@ -1910,7 +1910,7 @@ gboolean vcal_meeting_export_calendar(const gchar *path,
if (!automatic) {
alertpanel_full(_("Empty calendar"),
_("There is nothing to export."),
- GTK_STOCK_OK, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_OK"), NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_NOTICE);
return FALSE;
} else {
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index 1f2cae667..1dea32e67 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team
+ * Copyright (C) 1999-2019 Colin Leroy and the Claws Mail team
*
* 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
@@ -119,7 +119,7 @@ static void create_meeting_from_message_cb_ui(GtkAction *action, gpointer data)
"want to continue?"),
total);
if (total > 9
- && alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_YES, NULL,
+ && alertpanel(_("Warning"), msg, _("_Cancel"), _("_Yes"), NULL,
ALERTFOCUS_SECOND)
!= G_ALERTALTERNATE) {
g_free(msg);
@@ -956,7 +956,7 @@ void vcalendar_cancel_meeting(FolderItem *item, const gchar *uid)
val = alertpanel_full(_("Cancel meeting"),
_("Are you sure you want to cancel this meeting?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, FALSE,
send_notify_chkbtn, ALERT_WARNING);
if (val != G_ALERTALTERNATE)
@@ -1053,7 +1053,7 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
AlertValue val = alertpanel_full(_("No account found"),
_("You have no account matching any attendee.\n"
"Do you want to reply anyway?"),
- GTK_STOCK_CANCEL, _("Reply anyway"), NULL,
+ _("_Cancel"), _("Reply anyway"), NULL,
ALERTFOCUS_SECOND, FALSE, NULL, ALERT_QUESTION);
if (val == G_ALERTALTERNATE) {
account = account_get_default();
@@ -1188,8 +1188,8 @@ MimeViewer *vcal_viewer_create(void)
vcalviewer->cancel = gtk_button_new_with_label(_("Cancel meeting..."));
vcalviewer->uribtn = gtk_button_new_with_label(_("Launch website"));
vcalviewer->unavail_box = gtk_hbox_new(FALSE, 6);
- warning_img = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ warning_img = gtk_image_new_from_icon_name
+ ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
warning_label = gtk_label_new(_("You are already busy at this time."));
gtk_box_pack_start(GTK_BOX(vcalviewer->unavail_box), warning_img, FALSE, FALSE, 0);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 75ac7a05c..d058d25aa 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1238,8 +1238,8 @@ static void basic_create_widget_func(PrefsPage * _page,
G_CALLBACK (auto_configure_cb), NULL);
#endif
- no_imap_warn_icon = gtk_image_new_from_stock
- (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ no_imap_warn_icon = gtk_image_new_from_icon_name
+ ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
buf = g_strconcat("<span weight=\"bold\">",
_("Warning: this version of Claws Mail\n"
"has been built without IMAP and News support."), "</span>", NULL);
@@ -1904,7 +1904,7 @@ static void send_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON (hbox, customhdr_checkbtn,
_("Add user-defined header"));
- customhdr_edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+ customhdr_edit_btn = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (customhdr_edit_btn);
gtk_box_pack_start (GTK_BOX (hbox), customhdr_edit_btn,
FALSE, FALSE, 0);
@@ -2189,7 +2189,7 @@ static void compose_create_widget_func(PrefsPage * _page,
g_signal_connect(G_OBJECT(signature_browse_button), "clicked",
G_CALLBACK(prefs_account_signature_browse_cb), NULL);
- signature_edit_button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+ signature_edit_button = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (signature_edit_button);
gtk_box_pack_start (GTK_BOX (hbox2), signature_edit_button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(signature_edit_button), "clicked",
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index b8a99939a..87bf8268b 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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
@@ -214,8 +214,8 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_container_add(GTK_CONTAINER(window), vbox);
gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
- &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -319,7 +319,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_widget_show(btn_hbox);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_widget_show(reg_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
@@ -335,9 +335,7 @@ static void prefs_actions_create(MainWindow *mainwin)
CLAWS_SET_TIP(subst_btn,
_("Replace the selected action in list with the action above"));
- del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
- gtk_button_set_image(GTK_BUTTON(del_btn),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
+ del_btn = gtkut_stock_button("list-remove");
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
@@ -345,9 +343,7 @@ static void prefs_actions_create(MainWindow *mainwin)
CLAWS_SET_TIP(del_btn,
_("Delete the selected action from the list"));
- clear_btn = gtk_button_new_with_mnemonic (_("C_lear"));
- gtk_button_set_image(GTK_BUTTON(clear_btn),
- gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_BUTTON));
+ clear_btn = gtkut_stock_button("edit-clear");
gtk_widget_show (clear_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), clear_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (clear_btn), "clicked",
@@ -355,7 +351,7 @@ static void prefs_actions_create(MainWindow *mainwin)
CLAWS_SET_TIP(clear_btn,
_("Clear all the input fields in the dialog"));
- info_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ info_btn = gtkut_stock_button("dialog-information");
gtk_widget_show(info_btn);
gtk_box_pack_end(GTK_BOX(reg_hbox), info_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(info_btn), "clicked",
@@ -386,7 +382,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show(up_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(up_btn), "clicked",
@@ -394,7 +390,7 @@ static void prefs_actions_create(MainWindow *mainwin)
CLAWS_SET_TIP(up_btn,
_("Move the selected action up"));
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show(down_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(down_btn), "clicked",
@@ -707,7 +703,7 @@ static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data)
if (alertpanel(_("Delete action"),
_("Do you really want to delete this action?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
/* XXX: Here's the reason why we need to store the original
@@ -728,7 +724,7 @@ static void prefs_actions_delete_all_cb(gpointer gtk_action, gpointer data)
if (alertpanel(_("Delete all actions"),
_("Do you really want to delete all the actions?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST) != G_ALERTDEFAULT)
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) != G_ALERTDEFAULT)
return;
list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view)));
@@ -892,12 +888,12 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ _("_Close"), _("_Continue editing"), NULL,
ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
} else if (modified_list && alertpanel(_("Actions list not saved"),
_("The actions list has been modified. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ _("_Close"), _("_Continue editing"), NULL,
ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
}
@@ -923,7 +919,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"),
+ _("_Close"), _("_Continue editing"),
NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
}
@@ -1294,7 +1290,7 @@ static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data)
if(modified && alertpanel(_("Entry was modified"),
_("Opening the filter action dialog will clear current modifications "
"of the command line."),
- GTK_STOCK_CANCEL, _("_Continue editing"), NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT)
+ _("_Cancel"), _("_Continue editing"), NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT)
return;
*/
action_str = gtk_editable_get_chars(GTK_EDITABLE(actions.cmd_entry), 0, -1);
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 83d64aebb..cd74b4608 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -174,9 +174,8 @@ static void prefs_custom_header_create(void)
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
- NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"), NULL, NULL);
gtk_widget_show (confirm_area);
gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
@@ -255,14 +254,14 @@ static void prefs_custom_header_create(void)
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
- add_btn = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ add_btn = gtkut_stock_button("list-add");
gtk_widget_show (add_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), add_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (add_btn), "clicked",
G_CALLBACK (prefs_custom_header_add_cb),
NULL);
- del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+ del_btn = gtkut_stock_button("edit-delete");
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (del_btn), "clicked",
@@ -289,13 +288,13 @@ static void prefs_custom_header_create(void)
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (ch_hbox), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show (up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (up_btn), "clicked",
G_CALLBACK (prefs_custom_header_up), NULL);
- down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show (down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (down_btn), "clicked",
@@ -699,7 +698,7 @@ static void prefs_custom_header_delete_cb(void)
if (alertpanel(_("Delete header"),
_("Do you really want to delete this header?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
gtk_tree_model_get(model, &sel,
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index f179d0ddc..b9bbb770b 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -243,9 +243,8 @@ static void prefs_display_header_create(void)
gtk_widget_show (btn_hbox);
gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0);
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
- NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"), NULL, NULL);
gtk_widget_show (confirm_area);
gtk_box_pack_end (GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
@@ -319,14 +318,14 @@ static void prefs_display_header_create(void)
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (reg_btn), "clicked",
G_CALLBACK
(prefs_display_header_register_cb),
GINT_TO_POINTER(TRUE));
- del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+ del_btn = gtkut_stock_button("edit-delete");
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (del_btn), "clicked",
@@ -370,26 +369,26 @@ static void prefs_display_header_create(void)
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox1), btn_vbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (reg_btn), "clicked",
G_CALLBACK (prefs_display_header_register_cb),
GINT_TO_POINTER(FALSE));
- del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+ del_btn = gtkut_stock_button("list-remove");
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (del_btn), "clicked",
G_CALLBACK (prefs_display_header_delete_cb),
headers_list_view);
- up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show (up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (up_btn), "clicked",
G_CALLBACK (prefs_display_header_up), NULL);
- down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show (down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (down_btn), "clicked",
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index cd3ee5081..18dec94d3 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -348,8 +348,8 @@ static void prefs_filtering_create(void)
gtk_container_add (GTK_CONTAINER (window), vbox);
gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
- &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ &cancel_btn,_("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show (confirm_area);
gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -466,7 +466,7 @@ static void prefs_filtering_create(void)
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (reg_btn), "clicked",
@@ -474,7 +474,7 @@ static void prefs_filtering_create(void)
CLAWS_SET_TIP(reg_btn,
_("Append the new rule above to the list"));
- subst_btn = gtkut_get_replace_btn (_("_Replace"));
+ subst_btn = gtkut_stock_button("edit-redo");
gtk_widget_show (subst_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (subst_btn), "clicked",
@@ -483,18 +483,14 @@ static void prefs_filtering_create(void)
CLAWS_SET_TIP(subst_btn,
_("Replace the selected rule in list with the rule above"));
- del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
- gtk_button_set_image(GTK_BUTTON(del_btn),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
+ del_btn = gtkut_stock_button("edit-delete");
gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (del_btn), "clicked",
G_CALLBACK(prefs_filtering_delete_cb), NULL);
CLAWS_SET_TIP(del_btn,
_("Delete the selected rule from the list"));
- clear_btn = gtk_button_new_with_mnemonic (_("C_lear"));
- gtk_button_set_image(GTK_BUTTON(clear_btn),
- gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_BUTTON));
+ clear_btn = gtkut_stock_button("edit-clear");
gtk_widget_show (clear_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), clear_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (clear_btn), "clicked",
@@ -525,7 +521,7 @@ static void prefs_filtering_create(void)
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (cond_hbox), btn_vbox, FALSE, FALSE, 0);
- top_btn = gtk_button_new_from_stock (GTK_STOCK_GOTO_TOP);
+ top_btn = gtkut_stock_button("go-top");
gtk_widget_show (top_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), top_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (top_btn), "clicked",
@@ -536,7 +532,7 @@ static void prefs_filtering_create(void)
#ifndef GENERIC_UMPC
page_up_btn = gtk_button_new_with_mnemonic (_("Page u_p"));
gtk_button_set_image(GTK_BUTTON(page_up_btn),
- gtk_image_new_from_stock(GTK_STOCK_GO_UP,GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("go-up",GTK_ICON_SIZE_BUTTON));
gtk_widget_show (page_up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), page_up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (page_up_btn), "clicked",
@@ -545,7 +541,7 @@ static void prefs_filtering_create(void)
_("Move the selected rule one page up"));
#endif
- up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show (up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (up_btn), "clicked",
@@ -553,7 +549,7 @@ static void prefs_filtering_create(void)
CLAWS_SET_TIP(up_btn,
_("Move the selected rule up"));
- down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show (down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (down_btn), "clicked",
@@ -564,7 +560,7 @@ static void prefs_filtering_create(void)
#ifndef GENERIC_UMPC
page_down_btn = gtk_button_new_with_mnemonic (_("Page dow_n"));
gtk_button_set_image(GTK_BUTTON(page_down_btn),
- gtk_image_new_from_stock(GTK_STOCK_GO_DOWN,GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("go-down",GTK_ICON_SIZE_BUTTON));
gtk_widget_show (page_down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), page_down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (page_down_btn), "clicked",
@@ -573,7 +569,7 @@ static void prefs_filtering_create(void)
_("Move the selected rule one page down"));
#endif
- bottom_btn = gtk_button_new_from_stock (GTK_STOCK_GOTO_BOTTOM);
+ bottom_btn = gtkut_stock_button("go-bottom");
gtk_widget_show (bottom_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), bottom_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (bottom_btn), "clicked",
@@ -1209,7 +1205,7 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete rule"),
_("Do you really want to delete this rule?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
model = gtk_tree_view_get_model(list_view);
@@ -1228,7 +1224,7 @@ static void prefs_filtering_delete_all_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete all rules"),
_("Do you really want to delete all the rules?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view)));
@@ -1480,7 +1476,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
if (check_changed_list) {
if (modified && alertpanel(_("Filtering rules not saved"),
_("The list of filtering rules have been modified. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ _("_Close"), _("_Continue editing"), NULL,
ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return TRUE;
}
@@ -1502,7 +1498,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
if (!filtering_str) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL, ALERTFOCUS_SECOND);
+ _("_Close"), _("_Continue editing"), NULL, ALERTFOCUS_SECOND);
if (G_ALERTDEFAULT != val) {
g_free(filtering_str);
g_free(str); /* fixed two leaks: huzzah! */
@@ -1524,7 +1520,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
strlen(action)) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL, ALERTFOCUS_SECOND);
+ _("_Close"), _("_Continue editing"), NULL, ALERTFOCUS_SECOND);
if (G_ALERTDEFAULT != val) {
g_free(name);
g_free(condition);
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index cb77c1954..6cd9db23e 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2018 the Claws Mail team
+ * Copyright (C) 2003-2019 the Claws Mail team
*
* 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
@@ -389,8 +389,8 @@ static void prefs_filtering_action_create(void)
gtk_container_add(GTK_CONTAINER(window), vbox);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
@@ -553,7 +553,7 @@ static void prefs_filtering_action_create(void)
NULL);
#endif
- exec_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ exec_btn = gtkut_stock_button("dialog-information");
gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (exec_btn), "clicked",
G_CALLBACK(prefs_filtering_action_exec_info),
@@ -571,7 +571,7 @@ static void prefs_filtering_action_create(void)
btn_hbox = gtk_hbox_new(TRUE, 4);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
G_CALLBACK(prefs_filtering_action_register_cb), NULL);
@@ -582,9 +582,7 @@ static void prefs_filtering_action_create(void)
G_CALLBACK(prefs_filtering_action_substitute_cb),
NULL);
- del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
- gtk_button_set_image(GTK_BUTTON(del_btn),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
+ del_btn = gtkut_stock_button("list-remove");
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_filtering_action_delete_cb), NULL);
@@ -608,12 +606,12 @@ static void prefs_filtering_action_create(void)
btn_vbox = gtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(action_hbox), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(up_btn), "clicked",
G_CALLBACK(prefs_filtering_action_up), NULL);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(down_btn), "clicked",
G_CALLBACK(prefs_filtering_action_down), NULL);
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index 0261934b0..48ff9288c 100644
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -268,14 +268,14 @@ static void prefs_folder_column_create(void)
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
- add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ add_btn = gtkut_stock_button("list-add");
gtk_widget_show(add_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(add_btn), "clicked",
G_CALLBACK(prefs_folder_column_add), NULL);
- remove_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ remove_btn = gtkut_stock_button("list-remove");
gtk_widget_show(remove_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
@@ -309,11 +309,11 @@ static void prefs_folder_column_create(void)
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show(up_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show(down_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
@@ -338,8 +338,8 @@ static void prefs_folder_column_create(void)
NULL);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 79e464a16..06e16f422 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-209 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1780,7 +1780,7 @@ static void clean_cache_cb(GtkWidget *widget, gpointer data)
if (alertpanel_full(_("Discard cache"),
_("Do you really want to discard the local cached "
"data for this folder?"),
- GTK_STOCK_CANCEL, _("Discard"), NULL, ALERTFOCUS_SECOND,
+ _("_Cancel"), _("Discard"), NULL, ALERTFOCUS_SECOND,
FALSE, NULL, ALERT_WARNING)
!= G_ALERTALTERNATE)
return;
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 5f5109019..c12254d7a 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -569,8 +569,8 @@ static void prefs_matcher_create(void)
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(window), vbox);
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK, NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"), NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
@@ -769,7 +769,7 @@ static void prefs_matcher_create(void)
gtk_box_pack_start(GTK_BOX(date_hbox), time_label, FALSE, FALSE, 0);
/* test info button */
- test_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ test_btn = gtkut_stock_button("dialog-information");
gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (test_btn), "clicked",
G_CALLBACK(prefs_matcher_test_info),
@@ -786,7 +786,7 @@ static void prefs_matcher_create(void)
btn_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
G_CALLBACK(prefs_matcher_register_cb), NULL);
@@ -797,9 +797,7 @@ static void prefs_matcher_create(void)
G_CALLBACK(prefs_matcher_substitute_cb),
NULL);
- del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
- gtk_button_set_image(GTK_BUTTON(del_btn),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
+ del_btn = gtkut_stock_button("list-remove");
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_matcher_delete_cb), NULL);
@@ -823,12 +821,12 @@ static void prefs_matcher_create(void)
btn_vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(up_btn), "clicked",
G_CALLBACK(prefs_matcher_up), NULL);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(down_btn), "clicked",
G_CALLBACK(prefs_matcher_down), NULL);
@@ -2159,7 +2157,7 @@ static void prefs_matcher_ok(void)
if (!matcher_str || strcmp(matcher_str, str) != 0) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved.\nClose anyway?"),
- GTK_STOCK_CLOSE,
+ _("_Close"),
_("_Continue editing"),
NULL,
ALERTFOCUS_SECOND);
diff --git a/src/prefs_message.c b/src/prefs_message.c
index fb1447523..a1b26b8be 100644
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2018 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2005-2019 Colin Leroy and The Claws Mail Team
*
* 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
@@ -142,7 +142,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON(hbox1, checkbtn_disphdr,
_("Display headers in message view"));
- button_edit_disphdr = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ button_edit_disphdr = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (button_edit_disphdr);
gtk_box_pack_start (GTK_BOX (hbox1), button_edit_disphdr,
FALSE, TRUE, 0);
diff --git a/src/prefs_migration.c b/src/prefs_migration.c
index a508392dc..831121697 100644
--- a/src/prefs_migration.c
+++ b/src/prefs_migration.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2016 the Claws Mail team
+ * Copyright (C) 2016-2019 the Claws Mail team
*
* 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
@@ -58,7 +58,7 @@ gboolean _version_check(gint ver)
markup, "</span></a>");
g_free(markup);
av = alertpanel_full(_("Configuration warning"), msg,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND,
FALSE, NULL, ALERT_ERROR);
g_free(msg);
diff --git a/src/prefs_other.c b/src/prefs_other.c
index 4e154c119..30e6b4113 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -146,8 +146,8 @@ static void prefs_keybind_select(void)
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
- gtkut_stock_button_set_create (&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ gtkut_stock_button_set_create (&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_focus (ok_btn);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 7318d04f6..60518b2d7 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2018 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2005-2019 Colin Leroy and The Claws Mail Team
*
* 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
@@ -284,8 +284,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_LEFT);
gtk_label_set_xalign(GTK_LABEL(label3), 0.0);
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK, NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"), NULL, NULL);
gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0);
gtk_widget_show(confirm_area);
@@ -386,7 +386,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
label = gtk_label_new(_("Displayed columns"));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
- button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ button_dispitem = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (button_dispitem);
gtk_box_pack_start (GTK_BOX (hbox0), button_dispitem, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button_dispitem), "clicked",
@@ -451,7 +451,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
label = gtk_label_new(_("Displayed columns"));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
- button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+ button_dispitem = gtk_button_new_with_mnemonic("_Edit");
gtk_widget_show (button_dispitem);
gtk_box_pack_start (GTK_BOX (hbox0), button_dispitem, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button_dispitem), "clicked",
@@ -491,7 +491,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show (entry_datefmt);
gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
- button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ button_datefmt = gtkut_stock_button("dialog-information");
gtk_widget_show (button_datefmt);
gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0);
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 11ac67df5..7fe189030 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -282,14 +282,14 @@ static void prefs_summary_column_create(void)
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
- add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ add_btn = gtkut_stock_button("list-add");
gtk_widget_show(add_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(add_btn), "clicked",
G_CALLBACK(prefs_summary_column_add), NULL);
- remove_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ remove_btn = gtkut_stock_button("list-remove");
gtk_widget_show(remove_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
@@ -323,11 +323,11 @@ static void prefs_summary_column_create(void)
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show(up_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show(down_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
@@ -352,8 +352,8 @@ static void prefs_summary_column_create(void)
NULL);
gtkut_stock_button_set_create(&confirm_area,
- &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index a0072d5fc..49507ddd1 100644
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -178,9 +178,8 @@ static void prefs_summary_open_create(void)
gtk_widget_show (btn_hbox);
gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0);
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
- NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"), NULL, NULL);
gtk_widget_show (confirm_area);
gtk_box_pack_end (GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
@@ -239,13 +238,13 @@ static void prefs_summary_open_create(void)
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox1), btn_vbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (reg_btn), "clicked",
G_CALLBACK (prefs_summary_open_register_cb),
possible_actions_list_view);
- del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+ del_btn = gtkut_stock_button("list-remove");
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
@@ -287,13 +286,13 @@ static void prefs_summary_open_create(void)
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show (up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (up_btn), "clicked",
G_CALLBACK (prefs_summary_open_up), NULL);
- down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show (down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (down_btn), "clicked",
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 2684e3e9f..c79bae824 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1,7 +1,7 @@
/*
* Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2013 The Claws Mail team
+ * Copyright (C) 2001-2019 The Claws Mail team
*
* 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
@@ -298,7 +298,7 @@ static void prefs_template_window_create(void)
gtk_widget_show(hbox3);
gtk_box_pack_start(GTK_BOX(hbox2), hbox3, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ reg_btn = gtkut_stock_button("list-add");
gtk_widget_show(reg_btn);
gtk_box_pack_start(GTK_BOX(hbox3), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (reg_btn), "clicked",
@@ -306,7 +306,7 @@ static void prefs_template_window_create(void)
CLAWS_SET_TIP(reg_btn,
_("Append the new template above to the list"));
- subst_btn = gtkut_get_replace_btn(_("_Replace"));
+ subst_btn = gtkut_stock_button("edit-redo");
gtk_widget_show(subst_btn);
gtk_box_pack_start(GTK_BOX(hbox3), subst_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(subst_btn), "clicked",
@@ -315,9 +315,7 @@ static void prefs_template_window_create(void)
CLAWS_SET_TIP(subst_btn,
_("Replace the selected template in list with the template above"));
- del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
- gtk_button_set_image(GTK_BUTTON(del_btn),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
+ del_btn = gtkut_stock_button("edit-delete");
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(hbox3), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
@@ -325,9 +323,7 @@ static void prefs_template_window_create(void)
CLAWS_SET_TIP(del_btn,
_("Delete the selected template from the list"));
- clear_btn = gtk_button_new_with_mnemonic (_("C_lear"));
- gtk_button_set_image(GTK_BUTTON(clear_btn),
- gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_BUTTON));
+ clear_btn = gtkut_stock_button("edit-clear");
gtk_widget_show (clear_btn);
gtk_box_pack_start (GTK_BOX (hbox3), clear_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (clear_btn), "clicked",
@@ -335,7 +331,7 @@ static void prefs_template_window_create(void)
CLAWS_SET_TIP(clear_btn,
_("Clear all the input fields in the dialog"));
- desc_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ desc_btn = gtkut_stock_button("dialog-information");
gtk_widget_show(desc_btn);
gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(desc_btn), "clicked",
@@ -359,7 +355,7 @@ static void prefs_template_window_create(void)
gtk_widget_show(vbox3);
gtk_box_pack_start(GTK_BOX(hbox4), vbox3, FALSE, FALSE, 0);
- top_btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_TOP);
+ top_btn = gtkut_stock_button("go-top");
gtk_widget_show(top_btn);
gtk_box_pack_start(GTK_BOX(vbox3), top_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(top_btn), "clicked",
@@ -369,7 +365,7 @@ static void prefs_template_window_create(void)
PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show(up_btn);
gtk_box_pack_start (GTK_BOX(vbox3), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(up_btn), "clicked",
@@ -377,7 +373,7 @@ static void prefs_template_window_create(void)
CLAWS_SET_TIP(up_btn,
_("Move the selected template up"));
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show (down_btn);
gtk_box_pack_start(GTK_BOX (vbox3), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (down_btn), "clicked",
@@ -387,7 +383,7 @@ static void prefs_template_window_create(void)
PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
- bottom_btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_BOTTOM);
+ bottom_btn = gtkut_stock_button("go-bottom");
gtk_widget_show(bottom_btn);
gtk_box_pack_start(GTK_BOX(vbox3), bottom_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(bottom_btn), "clicked",
@@ -402,8 +398,8 @@ static void prefs_template_window_create(void)
/* help | cancel | ok */
gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
- &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, _("_Cancel"),
+ &ok_btn, _("_OK"),
NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -569,7 +565,7 @@ static void prefs_template_ok_cb(gpointer action, gpointer data)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ _("_Close"), _("_Continue editing"), NULL,
ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
}
@@ -594,12 +590,12 @@ static void prefs_template_cancel_cb(gpointer action, gpointer data)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ _("_Close"), _("_Continue editing"), NULL,
ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
} else if (modified_list && alertpanel(_("Templates list not saved"),
_("The templates list has been modified. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ _("_Close"), _("_Continue editing"), NULL,
ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
}
@@ -901,7 +897,7 @@ static void prefs_template_delete_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete template"),
_("Do you really want to delete this template?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ _("_Cancel"), "edit-delete", NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -914,7 +910,7 @@ static void prefs_template_delete_all_cb(gpointer action, gpointer data)
{
if (alertpanel(_("Delete all templates"),
_("Do you really want to delete all the templates?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ _("_Cancel"), "edit-delete", NULL,
ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 2c8d5b1a9..aca830439 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2015 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 2003-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -505,7 +505,7 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
val = alertpanel(alert_title,
_("Are you sure you want to remove this theme?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST);
g_free(alert_title);
if (G_ALERTALTERNATE == val) {
@@ -561,7 +561,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
val = alertpanel(alert_title,
_("This folder doesn't seem to be a theme"
"folder.\nInstall anyway?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST);
if (G_ALERTALTERNATE != val) {
g_free(alert_title);
goto end_inst;
@@ -570,7 +570,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
val = alertpanel(alert_title,
_("Do you want to install theme for all users?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST);
g_free(alert_title);
switch (val) {
case G_ALERTALTERNATE:
@@ -593,7 +593,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
_("A theme with the same name is\n"
"already installed in this location.\n\n"
"Do you want to replace it?"),
- GTK_STOCK_CANCEL, _("Overwrite"), NULL, ALERTFOCUS_FIRST,
+ _("_Cancel"), _("Overwrite"), NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
if (val == G_ALERTALTERNATE) {
if (remove_dir_recursive(cinfo->dest) < 0) {
@@ -1096,7 +1096,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_START);
gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 5);
- btn_remove = gtk_button_new_with_label (_("Remove"));
+ btn_remove = gtkut_stock_button("list-remove");
gtk_widget_show (btn_remove);
gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
gtk_widget_set_can_default (btn_remove, TRUE);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 7f68a02fa..2be81484c 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2017 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 2002-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1007,9 +1007,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
btn_hbox = gtk_hbox_new(TRUE, 4);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_mnemonic (_("A_dd"));
- gtk_button_set_image(GTK_BUTTON(reg_btn),
- gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_BUTTON));
+ reg_btn = gtkut_stock_button("list-add");
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
G_CALLBACK(prefs_toolbar_register),
@@ -1021,9 +1019,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
G_CALLBACK(prefs_toolbar_substitute),
prefs_toolbar);
- del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
- gtk_button_set_image(GTK_BUTTON(del_btn),
- gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
+ del_btn = gtkut_stock_button("edit-delete");
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_toolbar_delete),
@@ -1065,11 +1061,11 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox_bottom), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtkut_stock_button("go-up");
gtk_widget_show(up_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 4);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtkut_stock_button("go-down");
gtk_widget_show(down_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(btn_vbox), 8);
diff --git a/src/printing.c b/src/printing.c
index ca3ed9101..f811dbce0 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -1,5 +1,5 @@
/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2012 Holger Berndt <hb at claws-mail.org>,
+ * Copyright (C) 2007-2019 Holger Berndt <hb at claws-mail.org>,
* Colin Leroy <colin at colino.net>, and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -465,7 +465,8 @@ static gboolean cb_preview(GtkPrintOperation *operation,
}
#define TOOLBAR_ITEM(item,text,tooltip,cb,cbdata) { \
- item = GTK_WIDGET(gtk_tool_button_new_from_stock(text)); \
+ item = GTK_WIDGET(gtk_tool_button_new (NULL, NULL)); \
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), text); \
gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
@@ -474,36 +475,36 @@ static gboolean cb_preview(GtkPrintOperation *operation,
tooltip); \
}
- TOOLBAR_ITEM(preview_data->first, GTK_STOCK_GOTO_FIRST,
+ TOOLBAR_ITEM(preview_data->first, "go-first",
_("First page"), cb_preview_go_first, preview_data);
- TOOLBAR_ITEM(preview_data->previous, GTK_STOCK_GO_BACK,
+ TOOLBAR_ITEM(preview_data->previous, "go-previous",
_("Previous page"), cb_preview_go_previous, preview_data);
page = gtk_label_new("");
preview_data->page_nr_label = page;
- TOOLBAR_ITEM(preview_data->next, GTK_STOCK_GO_FORWARD,
+ TOOLBAR_ITEM(preview_data->next, "go-next",
_("Next page"), cb_preview_go_next, preview_data);
- TOOLBAR_ITEM(preview_data->last, GTK_STOCK_GOTO_LAST,
+ TOOLBAR_ITEM(preview_data->last, "go-last",
_("Last page"), cb_preview_go_last, preview_data);
separator = gtk_separator_tool_item_new();
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(separator), -1);
- TOOLBAR_ITEM(preview_data->zoom_100, GTK_STOCK_ZOOM_100,
+ TOOLBAR_ITEM(preview_data->zoom_100, "zoom-original",
_("Zoom 100%"), cb_preview_zoom_100, preview_data);
- TOOLBAR_ITEM(preview_data->zoom_fit, GTK_STOCK_ZOOM_FIT,
+ TOOLBAR_ITEM(preview_data->zoom_fit, "zoom-fit-best",
_("Zoom fit"), cb_preview_zoom_fit, preview_data);
- TOOLBAR_ITEM(preview_data->zoom_in, GTK_STOCK_ZOOM_IN,
+ TOOLBAR_ITEM(preview_data->zoom_in, "zoom-in",
_("Zoom in"), cb_preview_zoom_in, preview_data);
- TOOLBAR_ITEM(preview_data->zoom_out, GTK_STOCK_ZOOM_OUT,
+ TOOLBAR_ITEM(preview_data->zoom_out, "zoom-out",
_("Zoom out"), cb_preview_zoom_out, preview_data);
separator = gtk_separator_tool_item_new();
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(separator), -1);
/* tooltip has to be NULL else it triggers an expose_event */
- TOOLBAR_ITEM(preview_data->close, GTK_STOCK_CLOSE, NULL,
+ TOOLBAR_ITEM(preview_data->close, "window-close", _("Close"),
cb_preview_btn_close, preview_data);
gtk_widget_show(statusbar);
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index 5baee73e9..d8838a718 100644
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -520,7 +520,7 @@ void quotefmt_add_info_button(GtkWindow *parent_window, GtkWidget *parent_box)
{
GtkWidget *btn_formatdesc;
- btn_formatdesc = gtk_button_new_from_stock(GTK_STOCK_INFO);
+ btn_formatdesc = gtkut_stock_button("dialog-information");
gtk_widget_show (btn_formatdesc);
gtk_box_pack_start (GTK_BOX (parent_box), btn_formatdesc, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(btn_formatdesc), "clicked",
@@ -537,7 +537,7 @@ void quotefmt_add_defaults_button(GtkWindow *parent_window,
btn_formatdesc = gtk_button_new_with_mnemonic (_("Defaults"));
gtk_button_set_image (GTK_BUTTON(btn_formatdesc),
- gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_BUTTON));
gtk_widget_show (btn_formatdesc);
gtk_box_pack_end (GTK_BOX (parent_box), btn_formatdesc, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(btn_formatdesc), "clicked",
diff --git a/src/send_message.c b/src/send_message.c
index 61f5e55eb..4d1e90d73 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -290,7 +290,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
- GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+ _("_Cancel"), _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) {
session_destroy(session);
return -1;
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 884a0225f..b23e639f0 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
+ * Copyright (C) 1999-2019 Colin Leroy and the Claws Mail team
*
* 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
@@ -208,16 +208,16 @@ void ssl_manager_create(void)
hbox1 = gtk_hbox_new(FALSE, 6);
vbox1 = gtk_vbox_new(FALSE, 0);
- delete_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ delete_btn = gtkut_stock_button("edit-delete");
g_signal_connect(G_OBJECT(delete_btn), "clicked",
G_CALLBACK(ssl_manager_delete_cb), NULL);
- view_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+ view_btn = gtkut_stock_button("document-properties");
g_signal_connect(G_OBJECT(view_btn), "clicked",
G_CALLBACK(ssl_manager_view_cb), NULL);
- close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close_btn = gtk_button_new_with_mnemonic("_Close");
g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(ssl_manager_close_cb), NULL);
@@ -444,7 +444,7 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
val = alertpanel_full(_("Delete certificate"),
_("Do you really want to delete this certificate?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST,
+ _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
diff --git a/src/summary_search.c b/src/summary_search.c
index efe208fec..f10e64c2b 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -317,7 +317,7 @@ static void summary_search_create(void)
g_signal_connect(G_OBJECT(bool_optmenu), "changed",
G_CALLBACK(optmenu_changed), NULL);
- clear_btn = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ clear_btn = gtkut_stock_button("edit-clear");
gtk_widget_show(clear_btn);
gtk_box_pack_end(GTK_BOX(bool_hbox), clear_btn, FALSE, FALSE, 0);
@@ -480,23 +480,23 @@ static void summary_search_create(void)
gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
gtk_widget_show(all_btn);
- prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
+ prev_btn = gtkut_stock_button("go-previous");
gtk_widget_set_can_default(prev_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
gtk_widget_show(prev_btn);
- next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+ next_btn = gtkut_stock_button("go-next");
gtk_widget_set_can_default(next_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
gtk_widget_show(next_btn);
- close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close_btn = gtk_button_new_with_mnemonic("_Close");
gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
gtk_widget_show(close_btn);
/* stop button hidden */
- stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
+ stop_btn = gtk_button_new_with_mnemonic("_Stop");
gtk_widget_set_can_default(stop_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
@@ -780,7 +780,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
if (all_searched) {
alertpanel_full(_("Search failed"),
_("Search string not found."),
- GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST,
+ _("_Close"), NULL, NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
break;
}
@@ -791,7 +791,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
str = _("End of list reached; continue from beginning?");
val = alertpanel(_("Search finished"), str,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+ _("_No"), _("_Yes"), NULL,
ALERTFOCUS_SECOND);
if (G_ALERTALTERNATE == val) {
if (backward) {
diff --git a/src/summaryview.c b/src/summaryview.c
index b7d9a527b..7087716cb 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -1327,7 +1327,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
val = alertpanel(_("Process mark"),
_("Some marks are left. Process them?"),
- GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL, ALERTFOCUS_FIRST);
+ _("_No"), _("_Yes"), _("_Cancel"), ALERTFOCUS_FIRST);
if (G_ALERTALTERNATE == val) {
summary_unlock(summaryview);
summary_execute(summaryview);
@@ -1930,7 +1930,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Search from the end?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTALTERNATE;
@@ -1978,7 +1978,7 @@ void summary_select_next_unread(SummaryView *summaryview)
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Go to next folder?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTALTERNATE;
@@ -2015,7 +2015,7 @@ void summary_select_prev_new(SummaryView *summaryview)
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Search from the end?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTALTERNATE;
@@ -2063,7 +2063,7 @@ void summary_select_next_new(SummaryView *summaryview)
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Go to next folder?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTALTERNATE;
@@ -2097,7 +2097,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the end?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
if (val != G_ALERTALTERNATE) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
@@ -2130,7 +2130,7 @@ void summary_select_next_marked(SummaryView *summaryview)
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Go to next folder?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTALTERNATE;
@@ -2164,7 +2164,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the end?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
if (val != G_ALERTALTERNATE) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
@@ -2193,7 +2193,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the beginning?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND);
if (val != G_ALERTALTERNATE) return;
if (summaryview->sort_type == SORT_ASCENDING)
node = summary_find_next_flagged_msg(summaryview, NULL,
@@ -4248,7 +4248,7 @@ static gboolean summary_mark_all_read_confirm(gboolean ask_if_needed)
if (ask_if_needed && prefs_common.ask_mark_all_read) {
AlertValue val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this folder as read?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST,
TRUE, NULL, ALERT_QUESTION);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4294,7 +4294,7 @@ static gboolean summary_mark_all_unread_confirm(gboolean ask_if_needed)
if (ask_if_needed && prefs_common.ask_mark_all_read) {
AlertValue val = alertpanel_full(_("Mark all as unread"),
_("Do you really want to mark all mails in this folder as unread?"),
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST,
TRUE, NULL, ALERT_QUESTION);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4534,7 +4534,7 @@ void summary_delete(SummaryView *summaryview)
num);
aval = alertpanel(ngettext("Delete message", "Delete messages", num),
buf,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND);
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_SECOND);
g_free(buf);
if (aval != G_ALERTALTERNATE) {
END_LONG_OPERATION(summaryview);
@@ -4996,7 +4996,7 @@ void summary_save_as(SummaryView *summaryview)
if (is_file_exist(dest)) {
aval = alertpanel(_("Append or Overwrite"),
_("Append or overwrite existing file?"),
- _("_Append"), _("_Overwrite"), GTK_STOCK_CANCEL,
+ _("_Append"), _("_Overwrite"), _("_Cancel"),
ALERTFOCUS_FIRST);
if (aval != 0 && aval != 1)
return;
@@ -5049,7 +5049,7 @@ void summary_print(SummaryView *summaryview)
"want to continue?"),
g_list_length(clist->selection));
if (g_list_length(clist->selection) > 9
- && alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_YES,
+ && alertpanel(_("Warning"), msg, _("_Cancel"), _("_Yes"),
NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) {
g_free(msg);
return;
@@ -5788,7 +5788,7 @@ static gboolean summary_filter_get_mode(void)
_("Filtering"),
_("There are some filtering rules that belong to an account.\n"
"Please choose what to do with these rules:"),
- GTK_STOCK_CANCEL, _("_Filter"), NULL, ALERTFOCUS_SECOND,
+ _("_Cancel"), _("_Filter"), NULL, ALERTFOCUS_SECOND,
TRUE, vbox);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) {
@@ -6055,7 +6055,7 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
else
msg = _("Do you really want to apply this color label to all selected messages?");
val = alertpanel_full(labelcolor == 0? _("Reset color label"): _("Set color label"), msg,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+ _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST,
TRUE, NULL, ALERT_QUESTION);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
diff --git a/src/textview.c b/src/textview.c
index 0b77404af..fdb0f7f0a 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -842,7 +842,7 @@ void textview_show_error(TextView *textview)
" Use "));
TEXTVIEW_INSERT_LINK(_("'Network Log'"), "sc://view_log", NULL);
TEXTVIEW_INSERT(_(" in the Tools menu for more information."));
- textview_show_icon(textview, GTK_STOCK_DIALOG_ERROR);
+ textview_show_icon(textview, "dialog-error");
}
void textview_show_info(TextView *textview, const gchar *info_str)
@@ -859,7 +859,7 @@ void textview_show_info(TextView *textview, const gchar *info_str)
gtk_text_buffer_get_start_iter(buffer, &iter);
TEXTVIEW_INSERT(info_str);
- textview_show_icon(textview, GTK_STOCK_DIALOG_INFO);
+ textview_show_icon(textview, "dialog-information");
textview_cursor_normal(textview);
}
@@ -959,7 +959,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
#endif
TEXTVIEW_INSERT("\n");
- textview_show_icon(textview, GTK_STOCK_DIALOG_INFO);
+ textview_show_icon(textview, "dialog-information");
}
static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
@@ -1985,7 +1985,7 @@ void textview_show_icon(TextView *textview, const gchar *stock_id)
if (textview->image)
gtk_widget_destroy(textview->image);
- textview->image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG);
+ textview->image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_DIALOG);
cm_return_if_fail(textview->image != NULL);
gtk_widget_show(textview->image);
@@ -2883,7 +2883,7 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
_("Real URL:"), uri->uri,
_("Open it anyway?"));
aval = alertpanel_full(_("Phishing attempt warning"), msg,
- GTK_STOCK_CANCEL, _("_Open URL"), NULL, ALERTFOCUS_FIRST,
+ _("_Cancel"), _("_Open URL"), NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
g_free(msg);
if (aval == G_ALERTALTERNATE)
diff --git a/src/toolbar.c b/src/toolbar.c
index 13fce67de..682b7b964 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -3031,7 +3031,7 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
- GTK_STOCK_NO, GTK_STOCK_YES,
+ _("_No"), _("_Yes"),
NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -3051,7 +3051,7 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
if (found && !prefs_common.work_offline) {
if (alertpanel(_("Send queued messages"),
_("Send all queued messages?"),
- GTK_STOCK_CANCEL, _("_Send"),
+ _("_Cancel"), _("_Send"),
NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
}
diff --git a/src/uri_opener.c b/src/uri_opener.c
index e68e3e518..bdd1b8783 100644
--- a/src/uri_opener.c
+++ b/src/uri_opener.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team
+ * Copyright (C) 1999-2019 Colin Leroy and the Claws Mail team
*
* 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
@@ -200,8 +200,8 @@ static void uri_opener_create(void)
vbox1 = gtk_vbox_new(FALSE, 6);
gtkut_stock_button_set_create(&hbox1,
- &open_btn, GTK_STOCK_OPEN,
- &close_btn, GTK_STOCK_CLOSE,
+ &open_btn, "document-open",
+ &close_btn, "window-close",
NULL, NULL);
g_signal_connect(G_OBJECT(open_btn), "clicked",
diff --git a/src/wizard.c b/src/wizard.c
index b09416b7a..e75f74492 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net>
+ * Copyright (C) 1999-2019 Colin Leroy <colin at colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -1787,10 +1787,10 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
wizard->window = gtk_dialog_new_with_buttons (_("Claws Mail Setup Wizard"),
NULL, 0,
- GTK_STOCK_GO_BACK, GO_BACK,
- GTK_STOCK_GO_FORWARD, GO_FORWARD,
- GTK_STOCK_SAVE, FINISHED,
- GTK_STOCK_CANCEL, CANCEL,
+ _("_Previous"), GO_BACK,
+ _("_Next"), GO_FORWARD,
+ _("_Save"), FINISHED,
+ _("_Cancel"), CANCEL,
NULL);
gtk_window_set_position(GTK_WINDOW(wizard->window), GTK_WIN_POS_CENTER);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list