commit 817071429ee9fd06edd1f03463eac526c3e8c4ec parent fdbb06fa7463e60e35bbfe9bee9216ab2ccf4cce Author: paul <paul@claws-mail.org> Date: Mon, 24 Jan 2022 15:41:29 +0000 fix a bunch of buttons in dark corners. add some images to others Diffstat:
93 files changed, 625 insertions(+), 532 deletions(-)
diff --git a/src/account.c b/src/account.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -838,8 +838,8 @@ 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, _("_Close"), - NULL, NULL, NULL, NULL); + &close_btn, "window-close", _("_Close"), + NULL, NULL, NULL, NULL, NULL, NULL); gtk_widget_show(confirm_area); gtk_box_pack_end (GTK_BOX (hbox), confirm_area, FALSE, FALSE, 0); @@ -1138,7 +1138,8 @@ static void account_delete(GtkWidget *widget, gpointer data) ac_prefs->account_name ? ac_prefs->account_name : _("(Untitled)")); if (alertpanel_full(_("Delete account"), buf, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), "edit-delete", _("_Delete"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) return; account_list_dirty = TRUE; diff --git 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-2021 The Claws Mail Team + * Copyright (C) 2007-2022 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 @@ -158,8 +158,9 @@ static void custom_attr_window_create_list_view_columns(GtkWidget *list_view) static void custom_attr_window_list_view_clear_list(GtkWidget *list_view, gboolean warn) { if (!warn || alertpanel(_("Delete all attribute names"), - _("Do you really want to delete all attribute names?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) { + _("Do you really want to delete all attribute names?"), + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, 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 +185,8 @@ static void custom_attr_popup_delete (void *obj, void *data) if (alertpanel(_("Delete attribute name"), _("Do you really want to delete this attribute name?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) { + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST) == G_ALERTALTERNATE) { gtk_list_store_remove(GTK_LIST_STORE(model), &sel); dirty = TRUE; } @@ -194,7 +196,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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) { + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) { GList *tmp = custom_attr_default_list(); custom_attr_window_load_list(tmp); if (tmp) { @@ -493,9 +495,9 @@ static void custom_attr_window_create(void) del_btn = gtkut_stock_button("edit-delete", _("D_elete")); gtk_box_pack_start(GTK_BOX(hbox1), del_btn, FALSE, FALSE, 0); - gtkut_stock_button_set_create(&hbox2, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbox2, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_widget_show(new_attr_label); gtk_widget_show(new_attr_entry); diff --git 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-2021 Holger Berndt <hb@claws-mail.org> + * Copyright (C) 2007-2022 Holger Berndt <hb@claws-mail.org> * and the Claws Mail team * * This program is free software; you can redistribute it and/or modify @@ -144,7 +144,7 @@ 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."), - _("_Cancel"), "edit-find", NULL, + NULL, _("_Cancel"), "edit-find", _("_Find"), NULL, NULL, ALERTFOCUS_SECOND, FALSE, vbox, ALERT_NOTICE); if(val == G_ALERTALTERNATE) { want_search = TRUE; @@ -790,8 +790,8 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data) aval = alertpanel(_("Delete address(es)"), _("Really delete the address(es)?"), - _("_Cancel"), _("D_elete"), NULL, - ALERTFOCUS_SECOND); + NULL, _("_Cancel"), NULL, _("D_elete"), + NULL, NULL, ALERTFOCUS_SECOND); if(aval != G_ALERTALTERNATE) return; @@ -838,9 +838,10 @@ gboolean addrduplicates_delete_item_person(ItemPerson *item, AddressDataSource * /* Test for read only */ iface = ds->interface; if( iface && iface->readOnly ) { - alertpanel( _("Delete address"), - _("This address data is read-only and cannot be deleted."), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST ); + alertpanel(_("Delete address"), + _("This address data is read-only and cannot be deleted."), + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST ); return FALSE; } diff --git 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-2019 Match Grun and the Claws Mail team + * Copyright (C) 2001-2022 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,9 +297,9 @@ static void addressadd_create( void ) { G_CALLBACK(addressadd_tree_row_activated), NULL); /* Button panel */ - gtkut_stock_button_set_create(&hbbox, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), HSPACING_NARROW ); gtk_widget_grab_default(ok_btn); @@ -597,7 +597,8 @@ gboolean addressadd_selection(const gchar *name, const gchar *address, if (server->retVal != LDAPRC_SUCCESS) { alertpanel( _("Add address(es)"), _("Can't add the specified address"), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST ); + "window-close". _("_Close"), NULL, NULL, + NULL, NULL, ALERTFOCUS_FIRST ); return server->retVal; } } diff --git a/src/addressbook.c b/src/addressbook.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -1187,7 +1187,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_with_mnemonic("_Close"); + close_btn = gtkut_stock_button("window-close", "_Close"); gtk_widget_set_can_default(close_btn, TRUE); gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0); @@ -1429,7 +1429,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data) if( iface->readOnly ) { alertpanel( _("Delete address(es)"), _("This address data is read-only and cannot be deleted."), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, ALERTFOCUS_FIRST); return; } @@ -1475,14 +1475,16 @@ 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."), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND ); + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_SECOND ); if( aval != G_ALERTALTERNATE ) { goto thaw_ret; } } else { aval = alertpanel( _("Delete address(es)"), _("Really delete the address(es)?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND ); + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_SECOND ); if( aval != G_ALERTALTERNATE ) { goto thaw_ret; } @@ -2949,7 +2951,8 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data) "results and addresses in '%s'?" ), obj->name ); aval = alertpanel( _("Delete"), message, - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND ); + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_SECOND ); g_free(message); if( aval == G_ALERTALTERNATE ) { delType = ADDRTREE_DEL_FOLDER_ADDR; @@ -2961,7 +2964,8 @@ 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, - _("_Cancel"), _("Delete _folder only"), _("Delete folder and _addresses"), ALERTFOCUS_SECOND); + NULL, _("_Cancel"), NULL, _("Delete _folder only"), + NULL, _("Delete folder and _addresses"), ALERTFOCUS_SECOND); g_free(message); if( aval == G_ALERTALTERNATE ) { delType = ADDRTREE_DEL_FOLDER_ONLY; @@ -2974,15 +2978,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, _("_Cancel"), - _("D_elete"), NULL, ALERTFOCUS_SECOND); + aval = alertpanel(_("Delete"), message, NULL, _("_Cancel"), + NULL, _("D_elete"), NULL, 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, _("_Cancel"), - _("D_elete"), NULL, ALERTFOCUS_SECOND); + aval = alertpanel(_("Delete"), message, NULL, _("_Cancel"), + NULL, _("D_elete"), NULL, NULL, ALERTFOCUS_SECOND); g_free(message); if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA; } @@ -3250,7 +3254,8 @@ static void addressbook_new_address_cb( GtkAction *action, gpointer data ) { if (server->retVal != LDAPRC_SUCCESS) { alertpanel( _("Add address(es)"), addressbook_err2string(_lutErrorsLDAP_, server->retVal), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST ); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST ); server->retVal = LDAPRC_SUCCESS; return; } @@ -3301,7 +3306,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), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST ); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, ALERTFOCUS_FIRST ); return; } } @@ -4167,17 +4172,16 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) { } } } - if( errFlag ) { + if (errFlag) { debug_print( "Error\n%s\n", msg ); alertpanel_full(_("Addressbook conversion error"), msg, - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_ERROR); - } - else if( msg ) { + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_ERROR); + } else if (msg) { debug_print( "Warning\n%s\n", msg ); alertpanel_full(_("Addressbook conversion error"), msg, - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_WARNING); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); } return retVal; @@ -4292,8 +4296,8 @@ void addressbook_read_file( void ) { addrindex_print_index( addrIndex, stdout ); alertpanel_full(_("Addressbook Error"), _("Could not read address index"), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_ERROR); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_ERROR); } debug_print( "done.\n" ); } diff --git 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-2019 the Claws Mail team and Match Grun + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2022 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,9 +209,9 @@ static void addressbook_foldersel_create( void ) gtk_container_add( GTK_CONTAINER(tree_win), view ); /* Button panel */ - gtkut_stock_button_set_create( &hbbox, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL ); + gtkut_stock_button_set_create( &hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL ); gtk_box_pack_end( GTK_BOX(vbox), hbbox, FALSE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 ); gtk_widget_grab_default( ok_btn ); diff --git 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-2020 the Claws Mail team and Match Grun + * Copyright (C) 2002-2022 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 @@ -551,9 +551,9 @@ 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, _("_Cancel"), - &btnOk, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &btnCancel, NULL, _("_Cancel"), + &btnOk, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); /* Signal handlers */ diff --git 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-2019 the Claws Mail team and Match Grun + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2022 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,8 @@ gint addrindex_save_data( AddressIndex *addrIndex ) { if( abf->retVal != LDAPRC_SUCCESS ) { alertpanel( _("Address(es) update"), _("Update failed. Changes not written to Directory."), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST ); + "window-close", _("_Close"), NULL, NULL, + NULL, NULL, ALERTFOCUS_FIRST ); } else { abf->retVal = MGU_SUCCESS; diff --git a/src/addrmerge.c b/src/addrmerge.c @@ -395,9 +395,10 @@ void addrmerge_merge( /* Test for read only */ if( ds->interface->readOnly ) { - alertpanel( _("Merge addresses"), - _("This address data is read-only and cannot be deleted."), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST ); + alertpanel(_("Merge addresses"), + _("This address data is read-only and cannot be deleted."), + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST ); return; } diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -47,8 +47,11 @@ static GtkWidget *window; static void alertpanel_show (void); static void alertpanel_create (const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, AlertFocus focus, gboolean can_disable, @@ -68,23 +71,29 @@ static gboolean alertpanel_close (GtkWidget *widget, AlertValue alertpanel_with_widget(const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, AlertFocus focus, gboolean can_disable, GtkWidget *widget) { - return alertpanel_full(title, message, button1_label, - button2_label, button3_label, focus, - can_disable, widget, ALERT_QUESTION); + return alertpanel_full(title, message, NULL, button1_label, + NULL, button2_label, NULL, button3_label, + focus, can_disable, widget, ALERT_QUESTION); } AlertValue alertpanel_full(const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, - AlertFocus focus, + AlertFocus focus, gboolean can_disable, GtkWidget *widget, AlertType alert_type) @@ -95,8 +104,9 @@ AlertValue alertpanel_full(const gchar *title, const gchar *message, alertpanel_is_open = TRUE; hooks_invoke(ALERTPANEL_OPENED_HOOKLIST, &alertpanel_is_open); } - alertpanel_create(title, message, button1_label, button2_label, - button3_label, focus, can_disable, widget, alert_type); + alertpanel_create(title, message, stock_icon1, button1_label, stock_icon2, + button2_label, stock_icon3, button3_label, focus, + can_disable, widget, alert_type); alertpanel_show(); debug_print("return value = %d\n", value); @@ -105,13 +115,16 @@ AlertValue alertpanel_full(const gchar *title, const gchar *message, AlertValue alertpanel(const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, - AlertFocus focus) + AlertFocus focus) { - return alertpanel_full(title, message, button1_label, button2_label, - button3_label, focus, FALSE, NULL, ALERT_QUESTION); + return alertpanel_full(title, message, stock_icon1, button1_label, stock_icon2, button2_label, + stock_icon3, button3_label, focus, FALSE, NULL, ALERT_QUESTION); } static void alertpanel_message(const gchar *title, const gchar *message, gint type) @@ -123,7 +136,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, _("_Close"), NULL, NULL, + alertpanel_create(title, message, NULL, _("_Close"), NULL, NULL, NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, type); alertpanel_show(); } @@ -187,9 +200,9 @@ void alertpanel_error_log(const gchar *format, ...) if (mainwin && mainwin->logwin) { mainwindow_clear_error(mainwin); - val = alertpanel_full(_("Error"), buf, _("_Close"), - _("_View log"), NULL, ALERTFOCUS_FIRST, FALSE, NULL, - ALERT_ERROR); + val = alertpanel_full(_("Error"), buf, NULL, _("_Close"), NULL, + _("_View log"), NULL, NULL, ALERTFOCUS_FIRST, + FALSE, NULL, ALERT_ERROR); if (val == G_ALERTALTERNATE) log_window_show(mainwin->logwin); } else @@ -227,8 +240,11 @@ static void alertpanel_show(void) static void alertpanel_create(const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, AlertFocus focus, gboolean can_disable, @@ -371,9 +387,9 @@ static void alertpanel_create(const gchar *title, label3 = button3_label; gtkut_stock_button_set_create(&confirm_area, - &button1, button1_label, - button2_label ? &button2 : NULL, label2, - button3_label ? &button3 : NULL, label3); + &button1, stock_icon1, button1_label, + button2_label ? &button2 : NULL, stock_icon2, label2, + button3_label ? &button3 : NULL, stock_icon3, label3); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0); diff --git a/src/alertpanel.h b/src/alertpanel.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-2022 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 @@ -52,8 +52,11 @@ typedef enum #define ALERTPANEL_OPENED_HOOKLIST "alertpanel_opened_hooklist" AlertValue alertpanel_full(const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, AlertFocus focus, gboolean can_disable, @@ -62,19 +65,25 @@ AlertValue alertpanel_full(const gchar *title, const gchar *message, AlertValue alertpanel (const gchar *title, const gchar *message, + const gchar *stock_icon1, const gchar *button1_label, + const gchar *stock_icon2, const gchar *button2_label, + const gchar *stock_icon3, const gchar *button3_label, AlertFocus focus); -AlertValue alertpanel_with_widget (const gchar *title, - const gchar *message, - const gchar *button1_label, - const gchar *button2_label, - const gchar *button3_label, - AlertFocus focus, - gboolean can_disable, - GtkWidget *widget); +AlertValue alertpanel_with_widget(const gchar *title, + const gchar *message, + const gchar *stock_icon1, + const gchar *button1_label, + const gchar *stock_icon2, + const gchar *button2_label, + const gchar *stock_icon3, + const gchar *button3_label, + AlertFocus focus, + gboolean can_disable, + GtkWidget *widget); void alertpanel_notice (const gchar *format, ...) G_GNUC_PRINTF(1, 2); diff --git 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-2019 Match Grun and the Claws Mail team + * Copyright (C) 2003-2022 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 @@ -298,8 +298,8 @@ static void browse_create( void ) { gtk_container_add( GTK_CONTAINER(tree_win), view ); /* Button panel */ - gtkut_stock_button_set_create(&hbbox, &close_btn, _("_Close"), - NULL, NULL, NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &close_btn, "window-close", _("_Close"), + NULL, NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -3698,8 +3698,8 @@ 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, _("_Cancel"), - _("_Insert"), NULL, ALERTFOCUS_SECOND, TRUE, + aval = alertpanel_full(_("Are you sure?"), msg, NULL, _("_Cancel"), + NULL, _("_Insert"), NULL, NULL, ALERTFOCUS_SECOND, TRUE, NULL, ALERT_QUESTION); g_free(msg); @@ -3826,8 +3826,8 @@ 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, - _("_Cancel"), _("_Attach anyway"), NULL, - ALERTFOCUS_SECOND, FALSE, NULL, ALERT_WARNING); + NULL, _("_Cancel"), NULL, _("_Attach anyway"), + NULL, NULL, ALERTFOCUS_SECOND, FALSE, NULL, ALERT_WARNING); g_free(msg); if (aval != G_ALERTALTERNATE) { @@ -5137,7 +5137,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose) prefs_common_translated_header_name("Cc")); aval = alertpanel(_("Send"), text, - _("_Cancel"), _("_Send"), NULL, ALERTFOCUS_SECOND); + NULL, _("_Cancel"), NULL, _("_Send"), NULL, NULL, ALERTFOCUS_SECOND); g_free(text); if (aval != G_ALERTALTERNATE) return FALSE; @@ -5174,7 +5174,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose) prefs_common_translated_header_name("Bcc")); aval = alertpanel(_("Send"), text, - _("_Cancel"), _("_Send"), NULL, ALERTFOCUS_SECOND); + NULL, _("_Cancel"), NULL, _("_Send"), NULL, NULL, ALERTFOCUS_SECOND); g_free(text); if (aval != G_ALERTALTERNATE) return FALSE; @@ -5211,8 +5211,8 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin _("Queue it anyway?")); aval = alertpanel_full(compose->sending?_("Send"):_("Send later"), message, - _("_Cancel"), compose->sending?_("_Send"):_("_Queue"), NULL, - ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); + NULL, _("_Cancel"), NULL, compose->sending?_("_Send"):_("_Queue"), + NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); g_free(message); if (aval & G_ALERTDISABLE) { aval &= ~G_ALERTDISABLE; @@ -5254,8 +5254,8 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin _("Queue it anyway?")); aval = alertpanel_full(compose->sending?_("Send"):_("Send later"), message, - _("_Cancel"), compose->sending?_("_Send"):_("_Queue"), NULL, - ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); + NULL, _("_Cancel"), NULL, compose->sending?_("_Send"):_("_Queue"), + NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); g_free(message); if (aval & G_ALERTDISABLE) { aval &= ~G_ALERTDISABLE; @@ -5818,9 +5818,9 @@ 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, _("_Cancel"), - _("_Send"), NULL, ALERTFOCUS_SECOND, FALSE, - NULL, ALERT_ERROR); + aval = alertpanel_full(_("Error"), msg, NULL, _("_Cancel"), + NULL, _("_Send"), NULL, NULL, ALERTFOCUS_SECOND, FALSE, + NULL, ALERT_ERROR); g_free(msg); if (aval != G_ALERTALTERNATE) { @@ -5877,8 +5877,8 @@ 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, _("_Cancel"), _("_OK"), NULL, - ALERTFOCUS_FIRST); + aval = alertpanel(_("Warning"), msg, NULL, _("_Cancel"), NULL, _("_OK"), + NULL, NULL, ALERTFOCUS_FIRST); g_free(msg); if (aval != G_ALERTALTERNATE) { g_free(buf); @@ -6113,8 +6113,8 @@ static gboolean compose_warn_encryption(Compose *compose) return TRUE; val = alertpanel_full(_("Encryption warning"), warning, - _("_Cancel"), _("C_ontinue"), NULL, ALERTFOCUS_SECOND, - TRUE, NULL, ALERT_WARNING); + NULL, _("_Cancel"), NULL, _("C_ontinue"), NULL, NULL, + ALERTFOCUS_SECOND, TRUE, NULL, ALERT_WARNING); if (val & G_ALERTDISABLE) { val &= ~G_ALERTDISABLE; if (val == G_ALERTALTERNATE) @@ -6427,8 +6427,9 @@ static int compose_add_attachments(Compose *compose, MimeInfo *parent) if (!is_file_exist(ainfo->file)) { gchar *msg = g_strdup_printf(_("Attachment %s doesn't exist anymore. Ignore?"), ainfo->file); AlertValue val = alertpanel_full(_("Warning"), msg, - _("Cancel sending"), _("Ignore attachment"), NULL, - ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); + NULL, _("Cancel sending"), + NULL, _("Ignore attachment"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(msg); if (val == G_ALERTDEFAULT) { return -1; @@ -9550,9 +9551,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_widget_grab_default(ok_btn); @@ -9821,8 +9822,8 @@ static gboolean compose_ext_editor_kill(Compose *compose) (_("The external editor is still working.\n" "Force terminating the process?\n" "process id: %" G_PID_FORMAT), pid); - val = alertpanel_full(_("Notice"), msg, _("_No"), _("_Yes"), - NULL, ALERTFOCUS_FIRST, FALSE, NULL, + val = alertpanel_full(_("Notice"), msg, NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(msg); @@ -10433,10 +10434,10 @@ warn_err: AlertValue val; gtkut_window_popup(compose->window); val = alertpanel_full(_("Could not save draft"), - _("Could not save draft.\n" - "Do you want to cancel exit or discard this email?"), - _("_Cancel exit"), _("_Discard email"), NULL, ALERTFOCUS_FIRST, - FALSE, NULL, ALERT_QUESTION); + _("Could not save draft.\n" + "Do you want to cancel exit or discard this email?"), + NULL, _("_Cancel exit"), NULL, _("_Discard email"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_QUESTION); if (val == G_ALERTALTERNATE) { lock = FALSE; g_mutex_unlock(&compose->mutex); /* must be done before closing */ @@ -10733,12 +10734,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"), _("_Cancel"), + NULL, _("_Discard"), NULL, _("_Save to Drafts"), NULL, _("_Cancel"), ALERTFOCUS_FIRST); } else { val = alertpanel(_("Save changes"), _("This message has been modified. Save the latest changes?"), - _("_Don't save"), _("_Save to Drafts"), _("_Cancel"), + NULL, _("_Don't save"), NULL, _("_Save to Drafts"), NULL, _("_Cancel"), ALERTFOCUS_SECOND); } g_mutex_unlock(&compose->mutex); @@ -10812,7 +10813,8 @@ 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"), _("_Cancel"), ALERTFOCUS_FIRST); + NULL, _("_Replace"), NULL, _("_Insert"), NULL, _("_Cancel"), + ALERTFOCUS_FIRST); g_free(msg); if (val == G_ALERTDEFAULT) @@ -11709,9 +11711,8 @@ static void compose_insert_drag_received_cb (GtkWidget *widget, num_files), num_files); val = alertpanel_full(_("Insert or attach?"), msg, - _("_Cancel"), _("_Insert"), _("_Attach"), - ALERTFOCUS_SECOND, - TRUE, NULL, ALERT_QUESTION); + NULL, _("_Cancel"), NULL, _("_Insert"), NULL, _("_Attach"), + ALERTFOCUS_SECOND, TRUE, NULL, ALERT_QUESTION); g_free(msg); break; case COMPOSE_DND_INSERT: @@ -12227,8 +12228,8 @@ 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, _("_Cancel"), _("_Yes"), NULL, - ALERTFOCUS_SECOND) != G_ALERTALTERNATE) { + && alertpanel(_("Warning"), msg, NULL, _("_Cancel"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) { g_free(msg); return; } diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -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 - _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_SECOND ); + NULL, _("_Cancel"), NULL, _("_OK"), NULL, 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); else gtkut_stock_with_text_button_set_create(&hbbox, - &cancel_btn, _("_Cancel"), _("Discard"), - &ok_btn, _("_OK"), _("Apply"), + &cancel_btn, NULL, _("Discard"), + &ok_btn, NULL, _("Apply"), NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0); gtk_widget_grab_default(ok_btn); diff --git 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-2019 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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 @@ -193,9 +193,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 ); gtk_widget_grab_default(ok_btn); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -404,9 +404,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2019 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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,9 +302,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 ); gtk_widget_grab_default(ok_btn); diff --git 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-2021 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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,9 +359,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2019 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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 @@ -235,9 +235,9 @@ 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, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 ); gtk_widget_grab_default(ok_btn); diff --git 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-2021 Colin Leroy and The Claws Mail Team + * Copyright (C) 2007-2022 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 @@ -231,8 +231,8 @@ static void tags_popup_delete (GtkAction *action, gpointer data) if (alertpanel(_("Delete tag"), _("Do you really want to delete this tag?"), - _("_Cancel"), _("D_elete"), NULL, - ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; TAGS_WINDOW_LOCK(); @@ -267,8 +267,8 @@ static void tags_popup_delete_all (GtkAction *action, gpointer data) if (alertpanel(_("Delete all tags"), _("Do you really want to delete all tags?"), - _("_Cancel"), _("D_elete"), NULL, - ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; TAGS_WINDOW_LOCK(); @@ -588,7 +588,7 @@ static void tags_window_create(void) CLAWS_SET_TIP(del_btn, _("Delete the selected tag")); - close_btn = gtk_button_new_with_mnemonic("_Close"); + close_btn = gtkut_stock_button("window-close", _("_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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2019 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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 @@ -200,9 +200,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 ); gtk_widget_grab_default(ok_btn); diff --git 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-2019 Match Grun and the Claws Mail team + * Copyright (C) 2002-2022 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 @@ -177,8 +177,9 @@ static gboolean exp_html_move_file( void ) { "The HTML output directory '%s'\n" \ "does not exist. Do you want to create it?" ), _exportCtl_->dirOutput ); - aval = alertpanel( _("Create directory" ), - msg, _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST ); + aval = alertpanel(_("Create directory" ), + msg, NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_FIRST ); g_free( msg ); if( aval != G_ALERTALTERNATE ) return FALSE; @@ -189,7 +190,8 @@ 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, - "window-close", NULL, NULL, ALERTFOCUS_FIRST, FALSE, + "window-close", _("_Close"), NULL, NULL, + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_ERROR); g_free( msg ); return FALSE; @@ -291,6 +293,9 @@ static void export_html_next( GtkWidget *widget ) { GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FINISH ); gtk_button_set_label(GTK_BUTTON(exphtml_dlg.btnCancel), _("_Close")); + gtk_button_set_image(GTK_BUTTON(exphtml_dlg.btnCancel), + gtk_image_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON)); + exp_html_finish_show(); exporthtml_save_settings( _exportCtl_ ); export_html_message(); @@ -598,9 +603,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, "go-previous", - &btnNext, "go-next", - &btnCancel, _("_Cancel")); + gtkut_stock_button_set_create(&hbbox, &btnPrev, "go-previous", _("_Previous"), + &btnNext, "go-next", _("_Next"), + &btnCancel, NULL, _("_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); diff --git 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-2019 the Claws Mail team and Match Grun + * Copyright (C) 2003-2022 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, _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST ); + msg, NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST ); g_free( msg ); if( aval != G_ALERTALTERNATE ) return FALSE; @@ -199,8 +199,8 @@ 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, - _("Close"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_ERROR); + NULL, _("Close"), NULL, NULL, 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?" ), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST ); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST ); if( aval != G_ALERTALTERNATE ) { gtk_widget_grab_focus( expldif_dlg.entrySuffix ); errFlag = TRUE; @@ -321,6 +321,8 @@ static void export_ldif_next( GtkWidget *widget ) { GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_FINISH ); gtk_button_set_label(GTK_BUTTON(expldif_dlg.btnCancel), _("_Close")); + gtk_button_set_image(GTK_BUTTON(expldif_dlg.btnCancel), + gtk_image_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON)); exp_ldif_finish_show(); exportldif_save_settings( _exportCtl_ ); export_ldif_message(); @@ -666,9 +668,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, "go-previous", - &btnNext, "go-next", - &btnCancel, _("_Cancel")); + gtkut_stock_button_set_create(&hbbox, &btnPrev, "go-previous", _("_Previous"), + &btnNext, "go-next", _("_Next"), + &btnCancel, NULL, _("_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); diff --git 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-2019 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -171,9 +171,9 @@ static void export_create(void) G_CALLBACK(export_filesel_cb), NULL); gtkut_stock_button_set_create(&confirm_area, - &cancel_button, _("_Cancel"), - &ok_button, _("_OK"), - NULL, NULL); + &cancel_button, NULL, _("_Cancel"), + &ok_button, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0); gtk_widget_grab_default(ok_button); diff --git a/src/file_checker.c b/src/file_checker.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2013-2021 the Claws Mail team + * Copyright (C) 2013-2022 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 @@ -80,8 +80,8 @@ static gboolean verify_folderlist_xml() msg = g_strdup_printf (_("The file %s is missing! " "Do you want to use the backup file from %s?"), FOLDER_LIST,buf); - aval = alertpanel(_("Warning"), msg, _("_No"), _("_Yes"), NULL, - ALERTFOCUS_FIRST); + aval = alertpanel(_("Warning"), msg, NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_FIRST); g_free(msg); if (aval != G_ALERTALTERNATE) return FALSE; @@ -104,8 +104,8 @@ static gboolean verify_folderlist_xml() msg = g_strdup_printf (_("The file %s is empty or corrupted! " "Do you want to use the backup file from %s?"), FOLDER_LIST,buf); - aval = alertpanel(_("Warning"), msg, _("_No"), _("_Yes"), NULL, - ALERTFOCUS_FIRST); + aval = alertpanel(_("Warning"), msg, NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_FIRST); g_free(msg); if (aval != G_ALERTALTERNATE) return FALSE; diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -345,9 +345,9 @@ static void foldersel_create(const gchar *title) gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0); gtkut_stock_button_set_create(&confirm_area, - &new_button, _("_New"), - &cancel_button, _("_Cancel"), - &ok_button, _("_OK")); + &new_button, NULL, _("_New"), + &cancel_button, NULL, _("_Cancel"), + &ok_button, NULL, _("_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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -881,8 +881,8 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data, } if (prefs_common.ask_mark_all_read) { val = alertpanel_full(title, message, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, - TRUE, NULL, ALERT_QUESTION); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) return; @@ -1109,8 +1109,8 @@ 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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, - FALSE, NULL, ALERT_WARNING) + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) { return; } @@ -2494,7 +2494,7 @@ 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?"), - _("_Cancel"), _("_Empty trash"), NULL, + NULL, _("_Cancel"), NULL, _("_Empty trash"), NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) return; } @@ -2540,8 +2540,8 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data) if (prefs_common.work_offline) if (alertpanel(_("Offline warning"), _("You're working offline. Override?"), - _("_No"), _("_Yes"), - NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; /* ask for confirmation before sending queued messages only @@ -2552,8 +2552,8 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data) if (!prefs_common.work_offline) { if (alertpanel(_("Send queued messages"), _("Send all queued messages?"), - _("_Cancel"), _("_Send"), - NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("_Send"), + NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; } } @@ -2648,8 +2648,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, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, - TRUE, NULL, ALERT_QUESTION); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); g_free(buf); if ((status & ~G_ALERTDISABLE) != G_ALERTALTERNATE) diff --git a/src/gtk/about.c b/src/gtk/about.c @@ -914,8 +914,8 @@ 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, _("_Close"), - NULL, NULL, NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &close_button, "window-close", _("_Close"), + NULL, NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -142,8 +142,8 @@ static void description_create(DescriptionWindow * dwindow) g_free(max_width); width += 100; - gtkut_stock_button_set_create(&hbbox, &close_btn, _("_Close"), - NULL, NULL, NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &close_btn, "window-close", _("_Close"), + NULL, NULL, NULL, NULL, NULL, NULL); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW); gtk_container_add(GTK_CONTAINER(dwindow->window), vbox); diff --git 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-2021 the Claws Mail Team + * Copyright (C) 2004-2022 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 @@ -241,9 +241,9 @@ void foldersort_open() gtk_widget_show(vbox); gtk_container_add(GTK_CONTAINER(window), vbox); - gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_widget_show(confirm_area); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0); gtk_widget_grab_focus(ok_btn); diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c @@ -114,23 +114,23 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn) void gtkut_stock_button_set_create_with_help(GtkWidget **bbox, GtkWidget **help_button, - GtkWidget **button1, const gchar *label1, - GtkWidget **button2, const gchar *label2, - GtkWidget **button3, const gchar *label3) + GtkWidget **button1, const gchar *stock_icon1, const gchar *label1, + GtkWidget **button2, const gchar *stock_icon2, const gchar *label2, + GtkWidget **button3, const gchar *stock_icon3, const gchar *label3) { cm_return_if_fail(bbox != NULL); cm_return_if_fail(button1 != NULL); - gtkut_stock_button_set_create(bbox, button1, label1, - button2, label2, button3, label3); + gtkut_stock_button_set_create(bbox, button1, stock_icon1, label1, + button2, stock_icon2, label2, button3, stock_icon3, label3); gtkut_stock_button_add_help(*bbox, help_button); } void gtkut_stock_button_set_create(GtkWidget **bbox, - GtkWidget **button1, const gchar *label1, - GtkWidget **button2, const gchar *label2, - GtkWidget **button3, const gchar *label3) + GtkWidget **button1, const gchar *stock_icon1, const gchar *label1, + GtkWidget **button2, const gchar *stock_icon2, const gchar *label2, + GtkWidget **button3, const gchar *stock_icon3, const gchar *label3) { cm_return_if_fail(bbox != NULL); cm_return_if_fail(button1 != NULL); @@ -140,12 +140,16 @@ void gtkut_stock_button_set_create(GtkWidget **bbox, gtk_box_set_spacing(GTK_BOX(*bbox), 5); *button1 = gtk_button_new_with_mnemonic(label1); + gtk_button_set_image(GTK_BUTTON(*button1), + gtk_image_new_from_icon_name(stock_icon1, GTK_ICON_SIZE_BUTTON)); 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_with_mnemonic(label2); + gtk_button_set_image(GTK_BUTTON(*button2), + gtk_image_new_from_icon_name(stock_icon2, GTK_ICON_SIZE_BUTTON)); gtk_widget_set_can_default(*button2, TRUE); gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0); gtk_widget_show(*button2); @@ -153,6 +157,8 @@ void gtkut_stock_button_set_create(GtkWidget **bbox, if (button3) { *button3 = gtk_button_new_with_mnemonic(label3); + gtk_button_set_image(GTK_BUTTON(*button3), + gtk_image_new_from_icon_name(stock_icon3, GTK_ICON_SIZE_BUTTON)); gtk_widget_set_can_default(*button3, TRUE); gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0); gtk_widget_show(*button3); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -90,16 +90,19 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn); void gtkut_stock_button_set_create_with_help(GtkWidget **bbox, GtkWidget **help_button, - GtkWidget **button1, const gchar *label1, - GtkWidget **button2, const gchar *label2, - GtkWidget **button3, const gchar *label3); + GtkWidget **button1, const gchar *stock_icon1, const gchar *label1, + GtkWidget **button2, const gchar *stock_icon2, const gchar *label2, + GtkWidget **button3, const gchar *stock_icon3, const gchar *label3); void gtkut_stock_button_set_create (GtkWidget **bbox, GtkWidget **button1, + const gchar *stock_icon1, const gchar *label1, GtkWidget **button2, + const gchar *stock_icon2, const gchar *label2, GtkWidget **button3, + const gchar *stock_icon3, const gchar *label3); void gtkut_stock_with_text_button_set_create(GtkWidget **bbox, diff --git 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-2019 Paul Mangan and the Claws Mail team + * Copyright (C) 2005-2022 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 @@ -181,8 +181,8 @@ static void legend_create(void) gtk_container_add(GTK_CONTAINER(scrolledwindow), GTK_WIDGET(table)); - gtkut_stock_button_set_create(&confirm_area, &close_button, _("_Close"), - NULL, NULL, NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &close_button, "window-close", _("_Close"), + NULL, NULL, NULL, NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 4); gtk_widget_grab_default(close_button); g_signal_connect_closure diff --git 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-2019 the Claws Mail Team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -335,9 +335,9 @@ void pluginwindow_create() gtk_widget_grab_focus(GTK_WIDGET(plugin_list_view)); gtkut_stock_button_set_create(&hbuttonbox1, - &load_btn, _("_Load..."), - &unload_btn, _("_Unload"), - NULL, NULL); + &load_btn, NULL, _("_Load..."), + &unload_btn, NULL, _("_Unload"), + NULL, NULL, NULL); gtk_widget_show(hbuttonbox1); gtk_box_pack_start(GTK_BOX(vbox3), hbuttonbox1, FALSE, FALSE, 0); @@ -388,8 +388,8 @@ 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, _("_Close"), - NULL, NULL, NULL, NULL); + &close_btn, "window-close", _("_Close"), + NULL, NULL, NULL, NULL, NULL, NULL); gtk_box_set_spacing(GTK_BOX(hbuttonbox2), 6); gtk_widget_show(hbuttonbox2); diff --git 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-2021 the Claws Mail Team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,14 +500,14 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, #ifndef GENERIC_UMPC gtkut_stock_button_set_create(&prefswindow->confirm_area, - &prefswindow->apply_btn, _("_Apply"), - &prefswindow->cancel_btn, _("_Cancel"), - &prefswindow->ok_btn, _("_OK")); + &prefswindow->apply_btn, NULL, _("_Apply"), + &prefswindow->cancel_btn, NULL, _("_Cancel"), + &prefswindow->ok_btn, NULL, _("_OK")); #else gtkut_stock_button_set_create(&prefswindow->confirm_area, - &prefswindow->apply_btn, _("_Apply"), - &prefswindow->ok_btn, _("_Close"), - NULL, NULL); + &prefswindow->apply_btn, NULL, _("_Apply"), + &prefswindow->ok_btn, "window-close", _("_Close"), + NULL, NULL, NULL); #endif gtk_widget_show_all(prefswindow->confirm_area); gtk_widget_show(prefswindow->vbox); diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy + * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy * * 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 @@ -371,7 +371,7 @@ void sslcertwindow_show_cert(SSLCertificate *cert) gchar *buf; buf = g_strdup_printf(_("TLS certificate for %s"), cert->host); - alertpanel_full(buf, NULL, _("_Close"), NULL, NULL, + alertpanel_full(buf, NULL, "window-close", _("_Close"), NULL, NULL, NULL, NULL, ALERTFOCUS_FIRST, FALSE, cert_widget, ALERT_NOTICE); g_free(buf); } @@ -437,8 +437,8 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert) title = _("TLS certificate is unknown"); val = alertpanel_full(title, NULL, - _("_Cancel connection"), _("_Accept and save"), NULL, - ALERTFOCUS_FIRST, FALSE, vbox, ALERT_QUESTION); + NULL, _("_Cancel connection"), NULL, _("_Accept and save"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, vbox, ALERT_QUESTION); return (val == G_ALERTALTERNATE); } @@ -487,8 +487,8 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert) title = _("TLS certificate is expired"); val = alertpanel_full(title, NULL, - _("_Cancel connection"), _("_Accept"), NULL, - ALERTFOCUS_FIRST, FALSE, vbox, ALERT_QUESTION); + NULL, _("_Cancel connection"), NULL, _("_Accept"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, vbox, ALERT_QUESTION); return (val == G_ALERTALTERNATE); } @@ -549,8 +549,8 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert else title = _("TLS certificate changed"); val = alertpanel_full(title, NULL, - _("_Cancel connection"), _("_Accept and save"), NULL, - ALERTFOCUS_FIRST, FALSE, vbox2, ALERT_WARNING); + NULL, _("_Cancel connection"), NULL, _("_Accept and save"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, vbox2, ALERT_WARNING); return (val == G_ALERTALTERNATE); } diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -1180,8 +1180,8 @@ static IMAPSession *imap_session_new(Folder * folder, "Do you want to continue connecting to this " "server? The communication would not be " "secure."), - _("_Cancel"), _("Con_tinue connecting"), NULL, - ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("Con_tinue connecting"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) return NULL; } port = account->set_imapport ? account->imapport diff --git 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-2019 the Claws Mail Team and Hiroyuki Yamamoto + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2022 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,8 @@ 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, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), "edit-delete", _("_Delete"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); if (avalue != G_ALERTALTERNATE) return; @@ -512,7 +513,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action) G_CALLBACK(chk_update_val), &recurse); avalue = alertpanel_full(_("Subscriptions"), message, - _("_Cancel"), _("_Search"), NULL, ALERTFOCUS_SECOND, + NULL, _("_Cancel"), "edit-find", _("_Search"), + NULL, NULL, ALERTFOCUS_SECOND, FALSE, rec_chk, ALERT_QUESTION); g_free(message); if (avalue != G_ALERTALTERNATE) return; @@ -571,8 +573,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action) G_CALLBACK(chk_update_val), &recurse); avalue = alertpanel_full(_("Subscriptions"), message, - _("_Cancel"), action?_("_Subscribe"):_("_Unsubscribe"), NULL, - ALERTFOCUS_SECOND, FALSE, rec_chk, ALERT_QUESTION); + NULL, _("_Cancel"), NULL, action?_("_Subscribe"):_("_Unsubscribe"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -170,9 +170,9 @@ static void import_create(void) G_CALLBACK(import_destsel_cb), NULL); gtkut_stock_button_set_create(&confirm_area, - &cancel_button, _("_Cancel"), - &ok_button, _("_OK"), - NULL, NULL); + &cancel_button, NULL, _("_Cancel"), + &ok_button, NULL, _("_OK"), + NULL, 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) { if (alertpanel(_("Import mbox file"), _("Destination folder is not set.\nImport mbox file to the Inbox folder?"), - _("_OK"), _("_Cancel"), NULL, ALERTFOCUS_FIRST) + NULL, _("_OK"), NULL, _("_Cancel"), NULL, NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) { gtk_widget_grab_focus(dest_entry); return; diff --git 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-2019 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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 @@ -436,6 +436,8 @@ static void imp_ldif_next( GtkWidget *widget ) { GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FINISH ); gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel), _("_Close")); + gtk_button_set_image(GTK_BUTTON(impldif_dlg.btnCancel), + gtk_image_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON)); imp_ldif_finish_show(); } } @@ -918,9 +920,9 @@ static void imp_ldif_dialog_create() { /* Button panel */ gtkut_stock_button_set_create(&hbbox, - &btnPrev, "go-previous", - &btnNext, "go-next", - &btnCancel, _("_Cancel")); + &btnPrev, "go-previous", _("_Previous"), + &btnNext, "go-next", _("_Next"), + &btnCancel, NULL, _("_Cancel")); btnProceed = gtk_button_new_with_mnemonic(_("Proceed")); gtk_widget_set_can_default(btnProceed, TRUE); diff --git 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-2019 the Claws Mail team and Match Grun + * Copyright (C) 2001-2022 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 @@ -247,9 +247,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 5); gtk_widget_grab_default(ok_btn); diff --git 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-2019 the Claws Mail team and Match Grun + * Copyright (C) 2002-2022 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,9 +246,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width( GTK_CONTAINER(hbbox), 5); gtk_widget_grab_default(ok_btn); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -24,7 +24,7 @@ #include "defs.h" #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n.h>NULL, #include <gtk/gtk.h> #include <stdio.h> #include <unistd.h> @@ -839,6 +839,8 @@ static gint inc_start(IncProgressDialog *inc_dialog) fin_msg); gtk_button_set_label(GTK_BUTTON(inc_dialog->dialog->cancel_btn), _("_Close")); + gtk_button_set_image(GTK_BUTTON(inc_dialog->dialog->cancel_btn), + gtk_image_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON)); } g_free(fin_msg); @@ -885,8 +887,8 @@ static IncState inc_pop3_session_do(IncSession *session) "Do you want to continue connecting to this " "server? The communication would not be " "secure."), - _("_Cancel"), _("Con_tinue connecting"), NULL, - ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("Con_tinue connecting"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) return INC_CANCEL; } #endif @@ -1668,8 +1670,8 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg) answer = alertpanel(_("Offline warning"), tmp, - _("_No"), _("_Yes"), - !force_ask? _("On_ly once"):NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, !force_ask? _("On_ly once"):NULL, ALERTFOCUS_SECOND); g_free(tmp); if (answer == G_ALERTALTERNATE) { inc_offline_overridden_yes = time(NULL); diff --git 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-2020 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -409,8 +409,8 @@ 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, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND, FALSE, - keep_backup_chk, ALERT_QUESTION) != G_ALERTALTERNATE) { + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_SECOND, + FALSE, keep_backup_chk, ALERT_QUESTION) != G_ALERTALTERNATE) { return FALSE; } @@ -2283,7 +2283,8 @@ 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?"), - _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_FIRST) + NULL, _("_Cancel"), NULL, _("_OK"), NULL, NULL, + ALERTFOCUS_FIRST) != G_ALERTALTERNATE) { main_window_popup(mainwin); sc_exiting = FALSE; diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + Copyright (C) 1999-2022 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 @@ -2876,12 +2876,12 @@ gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean if (for_quit) val = alertpanel(_("Empty trash"), _("Delete all messages in trash folders?"), - _("_No"), _("_Yes"), _("Don't quit"), + NULL, _("_No"), NULL, _("_Yes"), NULL, _("Don't quit"), ALERTFOCUS_SECOND); else val = alertpanel(_("Empty trash"), _("Delete all messages in trash folders?"), - _("_No"), _("_Yes"), NULL, + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_SECOND); if (val == G_ALERTALTERNATE) { debug_print("will empty trash\n"); @@ -4013,7 +4013,8 @@ static void app_exit_cb(GtkAction *action, gpointer data) if (prefs_common.confirm_on_exit) { if (alertpanel(_("Exit"), _("Exit Claws Mail?"), - _("_Cancel"), _("_Quit"), NULL, ALERTFOCUS_FIRST) + NULL, _("_Cancel"), NULL, _("_Quit"), + NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; manage_window_focus_in(mainwin->window, NULL, NULL); @@ -4215,7 +4216,8 @@ 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?"), - _("_Cancel"), _("_Synchronise"), NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("_Synchronise"), NULL, NULL, + ALERTFOCUS_SECOND) != G_ALERTALTERNATE) return; if (offline_ask_sync) diff --git 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-2020 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -546,7 +546,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?"), - _("_Cancel"), _("Overwrite"), NULL, + NULL, _("_Cancel"), NULL, _("Overwrite"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) { return -2; diff --git a/src/message_search.c b/src/message_search.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -235,7 +235,7 @@ static void message_search_create(void) gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0); gtk_widget_show(next_btn); - close_btn = gtk_button_new_with_mnemonic("_Close"); + close_btn = gtkut_stock_button("window-close", _("_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); @@ -317,8 +317,8 @@ static void message_search_execute(gboolean backward) if (all_searched) { alertpanel_full(_("Search failed"), _("Search string not found."), - _("_Close"), NULL, NULL, FALSE, - ALERTFOCUS_FIRST, NULL, ALERT_WARNING); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + FALSE, ALERTFOCUS_FIRST, NULL, ALERT_WARNING); break; } @@ -332,7 +332,8 @@ static void message_search_execute(gboolean backward) "continue from beginning?"); val = alertpanel(_("Search finished"), str, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_SECOND); if (G_ALERTALTERNATE == val) { manage_window_focus_in(search_window.window, NULL, NULL); diff --git a/src/messageview.c b/src/messageview.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -859,8 +859,9 @@ static gint disposition_notification_send(MsgInfo *msginfo) "It is advised to not send the return receipt."), to, buf); val = alertpanel_full(_("Warning"), message, - _("_Don't Send"), _("_Send"), NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_WARNING); + NULL, _("_Don't Send"), NULL, _("_Send"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, + NULL, ALERT_WARNING); g_free(message); if (val != G_ALERTALTERNATE) { g_free(buf); @@ -2076,9 +2077,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list, gboolean has_accou prefs_common_translated_header_name("Cc")); val = alertpanel_with_widget( _("Return Receipt Notification"), - text, - _("_Cancel"), _("_Send Notification"), NULL, - ALERTFOCUS_FIRST, FALSE, optmenu); + text, NULL, _("_Cancel"), NULL, _("_Send Notification"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, optmenu); g_free(tr); g_free(text); } else @@ -2088,8 +2088,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list, gboolean has_accou "address that this message was sent to.\n" "Please choose which account you want to " "use for sending the receipt notification:"), - _("_Cancel"), _("_Send Notification"), NULL, - ALERTFOCUS_FIRST, FALSE, optmenu); + NULL, _("_Cancel"), NULL, _("_Send Notification"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, optmenu); if (val != G_ALERTALTERNATE) return NULL; diff --git a/src/mh_gtk.c b/src/mh_gtk.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail Team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,8 @@ 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, - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), "edit-delete", _("D_elete"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); if (avalue != G_ALERTALTERNATE) return; @@ -372,7 +373,8 @@ 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, - _("_Cancel"), "list-remove", NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), "list-remove", _("_Remove"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -1815,8 +1815,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, _("_Cancel"), - _("_OK"), NULL, ALERTFOCUS_FIRST); + aval = alertpanel(_("Overwrite"), res, NULL, _("_Cancel"), + NULL, _("_OK"), NULL, NULL, ALERTFOCUS_FIRST); g_free(res); if (G_ALERTALTERNATE != aval) return FALSE; } @@ -1840,7 +1840,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, _("_Cancel"), _("Skip"), _("Skip all"), + message, NULL, _("_Cancel"), NULL, _("Skip"), NULL, _("Skip all"), ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); return av; @@ -2265,9 +2265,9 @@ 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?"), _("_Cancel"), - _("Run binary"), - NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); + "Do you want to run this file?"), NULL, _("_Cancel"), + NULL, _("Run binary"), NULL, NULL, ALERTFOCUS_FIRST, + FALSE, NULL, ALERT_WARNING); if (val == G_ALERTALTERNATE) { debug_print("executing binary\n"); ShellExecute(NULL, L"open", (LPCWSTR)fn16, NULL, NULL, SW_SHOW); diff --git a/src/news.c b/src/news.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,8 +406,8 @@ static Session *news_session_new_for_folder(Folder *folder) "Do you want to continue connecting to this " "server? The communication would not be " "secure."), - _("_Cancel"), _("Con_tinue connecting"), NULL, - ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("Con_tinue connecting"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) return NULL; } port = ac->set_nntpport ? ac->nntpport : NNTP_PORT; diff --git 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-2019 the Claws Mail team and Hiroyuki Yamamoto + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2022 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,7 +249,7 @@ 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, - _("_Cancel"), _("_Unsubscribe"), NULL, + NULL, _("_Cancel"), NULL, _("_Unsubscribe"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); g_free(name); diff --git 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-2019 Michael Rasmussen and the Claws Mail Team + * Copyright (C) 1999-2022 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 @@ -572,8 +572,8 @@ static gboolean archiver_save_files(struct ArchivePage* page) { AlertValue aval; aval = alertpanel_full(_("Creating archive"), msg, - _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_WARNING); + NULL, _("_Cancel"), NULL, _("_OK"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(msg); if (aval != G_ALERTALTERNATE) return FALSE; @@ -619,8 +619,8 @@ static gboolean archiver_save_files(struct ArchivePage* page) { "\nContinue anyway?"), orig_file, g_slist_length(list)); aval = alertpanel_full(_("Creating archive"), msg, - _("_Cancel"), _("_OK"), NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_WARNING); + NULL, _("_Cancel"), NULL, _("_OK"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(msg); if (aval != G_ALERTALTERNATE) { archive_free_file_list(page->md5, page->rename); diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c @@ -1,7 +1,7 @@ /* * att_remover -- for Claws Mail * - * Copyright (C) 2005=2019 Colin Leroy <colin@colino.net> + * Copyright (C) 2005-2022 Colin Leroy <colin@colino.net> * and the Claws Mail Team * * Sylpheed is a GTK+ based, lightweight, and fast e-mail client @@ -384,9 +384,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create(&hbbox, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbbox), HSPACING_NARROW); gtk_widget_grab_default(ok_btn); @@ -426,8 +426,8 @@ 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."), - _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND, - FALSE, NULL, ALERT_QUESTION) != G_ALERTALTERNATE) + NULL, _("_Cancel"), "edit-delete", _("_Delete"), NULL, NULL, + ALERTFOCUS_SECOND, FALSE, NULL, ALERT_QUESTION) != G_ALERTALTERNATE) return; main_window_cursor_wait(summaryview->mainwin); diff --git 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-2021 Ricardo Mones and the Claws Mail Team + * Copyright (C) 2006-2022 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 @@ -215,10 +215,9 @@ 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, - _("_Cancel"), - compose->sending ? _("_Send") : _("Queue"), - NULL, - ALERTFOCUS_SECOND); + NULL, _("_Cancel"), + NULL, compose->sending ? _("_Send") : _("Queue"), + NULL, NULL, ALERTFOCUS_SECOND); g_free(message); g_free(bold_text); if (aval != G_ALERTALTERNATE) diff --git 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-2021 Ricardo Mones and the Claws Mail Team + * Copyright (C) 2014-2022 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 @@ -172,8 +172,8 @@ 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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_WARNING); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); if (val != G_ALERTALTERNATE) return; diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c @@ -1,6 +1,6 @@ /* - * mailmbox Plugin -- mbox support for Sylpheed - * Copyright (C) 2003-2019 the Claws Mail team, + * mailmbox Plugin -- mbox support for Claws Mail + * Copyright (C) 2003-2022 the Claws Mail team, * Christoph Hohmann, * Hoa v. Dinh, * Alfons Hoogervorst @@ -299,7 +299,8 @@ 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, - _("_Cancel"), _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), "list-remove", _("_Remove"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); g_free(name); @@ -331,7 +332,8 @@ 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, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), NULL, _("_Delete"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2004-2019 the Claws Mail team + * Copyright (C) 2004-2022 the Claws Mail team * Copyright (C) 2014-2015 Charles Lehner * * This program is free software; you can redistribute it and/or modify @@ -333,7 +333,8 @@ 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, _("_Cancel"), ALERTFOCUS_FIRST) == G_ALERTDEFAULT) + NULL, _("_Revert"), NULL, NULL, NULL, _("_Cancel"), + ALERTFOCUS_FIRST) == G_ALERTDEFAULT) sieve_editor_revert(page); } @@ -431,7 +432,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"), _("_Cancel"), + NULL, _("_Discard"), "document-save", _("_Save"), NULL, _("_Cancel"), ALERTFOCUS_SECOND)) { case G_ALERTDEFAULT: return TRUE; diff --git 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-2021 the Claws Mail team + * Copyright (C) 2004-2022 the Claws Mail team * Copyright (C) 2014-2015 Charles Lehner * * This program is free software; you can redistribute it and/or modify @@ -9,7 +9,7 @@ * (at your option) any later version. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY; withouNULL, t even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * @@ -327,8 +327,8 @@ 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, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_WARNING) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("_Delete"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) return; cmd_data = g_new(CommandDataName, 1); @@ -783,8 +783,8 @@ static SieveManagerPage *sieve_manager_page_new() /* bottom area stuff */ gtkut_stock_button_set_create(&hbox, - &btn, _("_Close"), - NULL, NULL, NULL, NULL); + &btn, "window-close", _("_Close"), + NULL, NULL, NULL, NULL, NULL, NULL); /* close */ gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); diff --git 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-2019 Holger Berndt and the Claws Mail Team + * Copyright (C) 2005-2022 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 @@ -585,9 +585,9 @@ 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, _("_Cancel"), - &ok_button, _("_OK"), - NULL, NULL); + &cancel_button, NULL, _("_Cancel"), + &ok_button, NULL, _("_OK"), + NULL, 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_trayicon.c b/src/plugins/notification/notification_trayicon.c @@ -1,5 +1,5 @@ /* Notification plugin for Claws Mail - * Copyright (C) 2005-2019 Holger Berndt and the Claws Mail Team. + * Copyright (C) 2005-2022 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 @@ -547,8 +547,8 @@ 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?"), - _("_Cancel"), _("_OK"), - NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) { + NULL, _("_Cancel"), NULL, _("_OK"), + NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) { return; } manage_window_focus_in(mainwin->window, NULL, NULL); diff --git 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-2021 the Claws Mail Team and Salvatore De Paolis + * Copyright (C) 1999-2022 the Claws Mail Team and Salvatore De Paolis * * 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 @@ -1230,8 +1230,8 @@ 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, _("_Close"), NULL, NULL, - ALERTFOCUS_FIRST, FALSE, + alertpanel_full(_("PDF properties"), NULL, "window-close", _("_Close"), NULL, NULL, + NULL, NULL, ALERTFOCUS_FIRST, FALSE, GTK_WIDGET(pdf_viewer_fill_info_table(viewer)), ALERT_NOTICE); } diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c @@ -1,9 +1,9 @@ /* Perl plugin -- Perl Support for Claws Mail * - * Copyright (C) 2004-2007 Holger Berndt + * Copyright (C) 2004-2022 Holger Berndt and the Claws Mail Team * - * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients - * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team + * Claws Mail are GTK+ based, lightweight, and fast e-mail clients + * Copyright (C) 1999-2022 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 @@ -1612,8 +1612,8 @@ static int perl_load_file(void) message = g_strdup_printf("Error processing Perl script file: " "(line numbers may not be valid)\n%s", SvPV(ERRSV,n_a)); - val = alertpanel("Perl Plugin error",message,"Retry","Abort","Edit", - ALERTFOCUS_FIRST); + val = alertpanel("Perl Plugin error",message,NULL,"Retry",NULL, + "Abort",NULL,"Edit", ALERTFOCUS_FIRST); g_free(message); if(val == G_ALERTOTHER) { diff --git 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-2019 Werner Koch (dd9jn) and the Claws Mail team + * Copyright (C) 2001-2022 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 @@ -119,9 +119,9 @@ 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, _("_Cancel"), - &ok_button, _("_OK"), - NULL, NULL); + &cancel_button, NULL, _("_Cancel"), + &ok_button, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0); gtk_widget_grab_default(ok_button); diff --git 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-2021 the Claws Mail team + * Copyright (C) 1999-2022 the Claws Mail team * This file Copyright (C) 2006 Colin Leroy <colin@colino.net> * * This program is free software; you can redistribute it and/or modify @@ -179,8 +179,8 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo) val = alertpanel(_("Key import"), _("This key is not in your keyring. Do you want " "Claws Mail to try to import it?"), - _("_No"), _("from keyserver"), _("from Web Key Directory"), - ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("from keyserver"), + NULL, _("from Web Key Directory"), ALERTFOCUS_SECOND); GTK_EVENTS_FLUSH(); } if (val == G_ALERTDEFAULT) { diff --git 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-2019 Werner Koch (dd9jn) and the Claws Mail team + * Copyright (C) 2001-2022 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,9 +495,9 @@ create_dialog (struct select_keys_s *sk) * Do_n't encrypt are different than the one in the stock Cancel * button */ gtkut_stock_button_set_create (&bbox, - &select_btn, _("_Select"), - &other_btn, _("_Other"), - &dont_encrypt_btn, _("Do_n't encrypt")); + &select_btn, NULL, _("_Select"), + &other_btn, NULL, _("_Other"), + &dont_encrypt_btn, NULL, _("Do_n't encrypt")); cancel_btn = gtk_button_new_with_mnemonic("_Cancel"); gtk_widget_set_can_default(cancel_btn, TRUE); @@ -709,7 +709,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, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST); + NULL, _("_No"), NULL, _("_Yes"), NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2019 the Claws Mail team + * Copyright (C) 1999-2022 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 @@ -1001,8 +1001,8 @@ void sgpgme_init() _("GnuPG is not installed properly, or needs " "to be upgraded.\n" "OpenPGP support disabled."), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL, - ALERT_WARNING); + "window-close", _("_Close"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST, TRUE, NULL, ALERT_WARNING); if (val & G_ALERTDISABLE) prefs_gpg_get_config()->gpg_warning = FALSE; } @@ -1085,7 +1085,8 @@ 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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_SECOND); if (val == G_ALERTDEFAULT) { return; } @@ -1207,7 +1208,7 @@ again: "to a keyserver?"), key->fpr ? key->fpr:"null"); AlertValue val = alertpanel(_("Key generated"), buf, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), NULL, 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 @@ -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-2021 Andrej Kacian <andrej@kacian.sk> and the + * This file (C) 2005-2022 Andrej Kacian <andrej@kacian.sk> and the * Claws Mail team * * - callback handler functions for folderview rssyl context menu items @@ -191,7 +191,8 @@ 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, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), NULL, _("_Delete"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); if (avalue != G_ALERTALTERNATE) return; @@ -357,7 +358,8 @@ 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, - _("_Cancel"), _("_Remove"), NULL, ALERTFOCUS_FIRST, FALSE, + NULL, _("_Cancel"), "list-remove", _("_Remove"), + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(message); g_free(n); diff --git 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-2021 Colin Leroy <colin@colino.net> and + * Copyright (C) 1999-2022 Colin Leroy <colin@colino.net> and * the Claws Mail team * * This program is free software; you can redistribute it and/or modify @@ -2029,7 +2029,8 @@ 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, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, + NULL, _("_Cancel"), NULL, _("_Delete"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 Colin Leroy <colin@colino.net> and + * Copyright (C) 1999-2022 Colin Leroy <colin@colino.net> and * the Claws Mail team * * This program is free software; you can redistribute it and/or modify @@ -928,8 +928,9 @@ 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, - _("_Cancel"), _("Send anyway"), NULL, ALERTFOCUS_FIRST, - FALSE, NULL, ALERT_QUESTION); + NULL, _("_Cancel"), NULL, _("Send anyway"), + NULL, NULL, ALERTFOCUS_FIRST, + FALSE, NULL, ALERT_QUESTION); g_free(msg); } msg = get_avail_msg(unavailable_persons, TRUE, TRUE, offset_before, offset_after); @@ -1789,8 +1790,8 @@ gboolean vcal_meeting_alert_check(gpointer data) postpone_min > 1 ? 2:1), postpone_min); aval = alertpanel_full(title, message, - label, _("_OK"), NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_NOTICE); + NULL, label, NULL, _("_OK"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_NOTICE); g_free(label); g_free(title); @@ -1913,8 +1914,8 @@ gboolean vcal_meeting_export_calendar(const gchar *path, if (!automatic) { alertpanel_full(_("Empty calendar"), _("There is nothing to export."), - _("_OK"), NULL, NULL, ALERTFOCUS_FIRST, FALSE, - NULL, ALERT_NOTICE); + NULL, _("_OK"), NULL, NULL, NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_NOTICE); g_free(tmpfile); g_free(internal_file); return FALSE; diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c @@ -119,8 +119,8 @@ static void create_meeting_from_message_cb_ui(GtkAction *action, gpointer data) "want to continue?"), total); if (total > 9 - && alertpanel(_("Warning"), msg, _("_Cancel"), _("_Yes"), NULL, - ALERTFOCUS_SECOND) + && alertpanel(_("Warning"), msg, NULL, _("_Cancel"), + NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) { g_free(msg); return; @@ -958,9 +958,9 @@ void vcalendar_cancel_meeting(FolderItem *item, const gchar *uid) &send_notify); val = alertpanel_full(_("Cancel meeting"), - _("Are you sure you want to cancel this meeting?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, FALSE, - send_notify_chkbtn, ALERT_WARNING); + _("Are you sure you want to cancel this meeting?"), + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, send_notify_chkbtn, ALERT_WARNING); if (val != G_ALERTALTERNATE) return; @@ -1054,9 +1054,9 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data) if (!account) { AlertValue val = alertpanel_full(_("No account found"), - _("You have no account matching any attendee.\n" - "Do you want to reply anyway?"), - _("_Cancel"), _("Reply anyway"), NULL, + _("You have no account matching any attendee.\n" + "Do you want to reply anyway?"), + NULL, _("_Cancel"), NULL, _("Reply anyway"), NULL, NULL, ALERTFOCUS_SECOND, FALSE, NULL, ALERT_QUESTION); if (val == G_ALERTALTERNATE) { account = account_get_default(); diff --git 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-2021 the Claws Mail Team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -195,7 +195,7 @@ static void prefs_actions_create(MainWindow *mainwin) GtkWidget *info_btn; GtkWidget *btn_vbox; - GtkWidget *spc_vbox; + GtkWidget *spc_vbox; GtkWidget *top_btn; GtkWidget *up_btn; GtkWidget *down_btn; @@ -216,9 +216,9 @@ 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, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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); @@ -721,7 +721,8 @@ static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data) if (alertpanel(_("Delete action"), _("Do you really want to delete this action?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; /* XXX: Here's the reason why we need to store the original @@ -742,7 +743,8 @@ 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?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) != G_ALERTDEFAULT) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST) != G_ALERTDEFAULT) return; list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view))); @@ -909,14 +911,14 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data) GtkListStore *store; if (modified && alertpanel(_("Entry not saved"), - _("The entry was not saved. Close anyway?"), - _("_Close"), _("_Continue editing"), NULL, - ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + _("ThNULL, e entry was not saved. Close anyway?"), + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } else if (modified_list && alertpanel(_("Actions list not saved"), _("The actions list has been modified. Close anyway?"), - _("_Close"), _("_Continue editing"), NULL, - ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } modified = FALSE; @@ -941,8 +943,8 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data) if (modified && alertpanel(_("Entry not saved"), _("The entry was not saved. Close anyway?"), - _("_Close"), _("_Continue editing"), - NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } modified = FALSE; @@ -1310,7 +1312,8 @@ static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data) alertpanel(_("Entry was modified"), _("Opening the filter action dialog will clear current modifications " "of the command-line."), - _("_Cancel"), _("_Continue editing"), NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + NULL, _("_Cancel"), NULL, _("_Continue editing"), NULL, NULL, + ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } tokens = g_strsplit_set(action_str, "{}", 5); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,8 +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, _("_Cancel"), - &ok_btn, _("_OK"), NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), NULL, 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); @@ -690,7 +690,8 @@ static void prefs_custom_header_delete_cb(void) if (alertpanel(_("Delete header"), _("Do you really want to delete this header?"), - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("_Delete"), NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,8 +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, _("_Cancel"), - &ok_btn, _("_OK"), NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), NULL, 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); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,9 +348,9 @@ 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,_("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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); @@ -1193,7 +1193,8 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data) if (alertpanel(_("Delete rule"), _("Do you really want to delete this rule?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_SECOND) == G_ALERTDEFAULT) return; model = gtk_tree_view_get_model(list_view); @@ -1212,7 +1213,8 @@ 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?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_SECOND) == G_ALERTDEFAULT) return; list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view))); @@ -1464,8 +1466,8 @@ 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?"), - _("_Close"), _("_Continue editing"), NULL, - ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { if (prop != NULL) filteringprop_free(prop); return TRUE; @@ -1488,7 +1490,8 @@ 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?"), - _("_Close"), _("_Continue editing"), NULL, ALERTFOCUS_SECOND); + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND); if (G_ALERTDEFAULT != val) { g_free(filtering_str); g_free(str); /* fixed two leaks: huzzah! */ @@ -1510,7 +1513,8 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list) strlen(action)) { val = alertpanel(_("Entry not saved"), _("The entry was not saved. Close anyway?"), - _("_Close"), _("_Continue editing"), NULL, ALERTFOCUS_SECOND); + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2003-2021 the Claws Mail team + * Copyright (C) 2003-2022 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,9 +389,9 @@ static void prefs_filtering_action_create(void) gtk_container_add(GTK_CONTAINER(window), vbox); gtkut_stock_button_set_create(&confirm_area, - &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0); gtk_widget_grab_default(ok_btn); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -338,9 +338,9 @@ static void prefs_folder_column_create(void) NULL); gtkut_stock_button_set_create(&confirm_area, - &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -1824,8 +1824,8 @@ 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?"), - _("_Cancel"), _("Discard"), NULL, ALERTFOCUS_SECOND, - FALSE, NULL, ALERT_WARNING) + NULL, _("_Cancel"), NULL, _("Discard"), NULL, NULL, + ALERTFOCUS_SECOND, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) return; diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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_box_new(GTK_ORIENTATION_VERTICAL, 6); gtk_container_add(GTK_CONTAINER(window), vbox); - gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0); gtk_widget_grab_default(ok_btn); @@ -2164,9 +2164,9 @@ 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?"), - _("_Close"), - _("_Continue editing"), - NULL, + NULL, _("_Close"), + NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND); if (G_ALERTDEFAULT != val) { g_free(matcher_str); diff --git 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-2021 the Claws Mail team + * Copyright (C) 2016-2022 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,8 @@ gboolean _version_check(gint ver) markup, "</span></a>"); g_free(markup); av = alertpanel_full(_("Configuration warning"), msg, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND, + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND, FALSE, NULL, ALERT_ERROR); g_free(msg); diff --git a/src/prefs_other.c b/src/prefs_other.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2019 Colin Leroy and The Claws Mail Team + * Copyright (C) 2005-2022 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 @@ -145,9 +145,9 @@ static void prefs_keybind_select(void) hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0); - gtkut_stock_button_set_create (&confirm_area, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + gtkut_stock_button_set_create (&confirm_area, &cancel_btn,NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2021 Colin Leroy and The Claws Mail Team + * Copyright (C) 2005-2022 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 @@ -281,8 +281,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data) gtk_widget_set_hexpand(label3, TRUE); gtk_widget_set_halign(label3, GTK_ALIGN_FILL); - gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), NULL, NULL, NULL); gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0); gtk_widget_show(confirm_area); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -352,9 +352,9 @@ static void prefs_summary_column_create(void) NULL); gtkut_stock_button_set_create(&confirm_area, - &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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); diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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,8 +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, _("_Cancel"), - &ok_btn, _("_OK"), NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), NULL, 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); diff --git 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-2021 The Claws Mail team + * Copyright (C) 2001-2022 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 @@ -396,9 +396,9 @@ static void prefs_template_window_create(void) /* help | cancel | ok */ gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn, - &cancel_btn, _("_Cancel"), - &ok_btn, _("_OK"), - NULL, NULL); + &cancel_btn, NULL, _("_Cancel"), + &ok_btn, NULL, _("_OK"), + NULL, 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); @@ -564,8 +564,8 @@ static void prefs_template_ok_cb(gpointer action, gpointer data) if (modified && alertpanel(_("Entry not saved"), _("The entry was not saved. Close anyway?"), - _("_Close"), _("_Continue editing"), NULL, - ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } @@ -589,13 +589,13 @@ static void prefs_template_cancel_cb(gpointer action, gpointer data) if (modified && alertpanel(_("Entry not saved"), _("The entry was not saved. Close anyway?"), - _("_Close"), _("_Continue editing"), NULL, - ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } else if (modified_list && alertpanel(_("Templates list not saved"), _("The templates list has been modified. Close anyway?"), - _("_Close"), _("_Continue editing"), NULL, - ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { + "window-close", _("_Close"), NULL, _("_Continue editing"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) { return; } @@ -896,8 +896,8 @@ static void prefs_template_delete_cb(gpointer action, gpointer data) if (alertpanel(_("Delete template"), _("Do you really want to delete this template?"), - _("_Cancel"), _("D_elete"), NULL, - ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; gtk_list_store_remove(GTK_LIST_STORE(model), &iter); @@ -909,8 +909,8 @@ 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?"), - _("_Cancel"), _("D_elete"), NULL, - ALERTFOCUS_SECOND) == G_ALERTDEFAULT) + NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL, + ALERTFOCUS_SECOND) == G_ALERTDEFAULT) return; prefs_template_clear_list(); diff --git 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-2021 the Claws Mail team + * Copyright (C) 2003-2022 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 @@ -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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST); + NULL, _("_No"), NULL, _("_Yes"), NULL, 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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST); + NULL, _("_No"), NULL, _("_Yes"), NULL, 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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST); + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST); g_free(alert_title); switch (val) { case G_ALERTALTERNATE: @@ -593,8 +593,8 @@ 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?"), - _("_Cancel"), _("Overwrite"), NULL, ALERTFOCUS_FIRST, - FALSE, NULL, ALERT_WARNING); + NULL, _("_Cancel"), NULL, _("Overwrite"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); if (val == G_ALERTALTERNATE) { if (remove_dir_recursive(cinfo->dest) < 0) { alertpanel_error(_("Couldn't delete the old theme in %s."), diff --git a/src/send_message.c b/src/send_message.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -291,8 +291,8 @@ 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."), - _("_Cancel"), _("Con_tinue connecting"), NULL, - ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) { + NULL, _("_Cancel"), NULL, _("Con_tinue connecting"), + NULL, 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 @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy + * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy * * 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 @@ -218,6 +218,8 @@ void ssl_manager_create(void) G_CALLBACK(ssl_manager_view_cb), NULL); close_btn = gtk_button_new_with_mnemonic("_Close"); + gtk_button_set_image(GTK_BUTTON(close_btn), + gtk_image_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON)); g_signal_connect(G_OBJECT(close_btn), "clicked", G_CALLBACK(ssl_manager_close_cb), NULL); @@ -448,8 +450,8 @@ static void ssl_manager_delete_cb(GtkWidget *widget, val = alertpanel_full(_("Delete certificate"), _("Do you really want to delete this certificate?"), - _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST, - FALSE, NULL, ALERT_WARNING); + NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); if (val != G_ALERTALTERNATE) diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -492,7 +492,7 @@ static void summary_search_create(void) gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0); gtk_widget_show(next_btn); - close_btn = gtk_button_new_with_mnemonic("_Close"); + close_btn = gtkut_stock_button("window-close", "_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); @@ -782,7 +782,8 @@ static void summary_search_execute(gboolean backward, gboolean search_all) if (all_searched) { alertpanel_full(_("Search failed"), _("Search string not found."), - _("_Close"), NULL, NULL, ALERTFOCUS_FIRST, + "window-close", _("_Close"), NULL, NULL, + NULL, NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); break; } @@ -793,7 +794,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all) str = _("End of list reached; continue from beginning?"); val = alertpanel(_("Search finished"), str, - _("_No"), _("_Yes"), NULL, + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_SECOND); if (G_ALERTALTERNATE == val) { if (backward) { diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -1328,7 +1328,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item, gboolean avoid val = alertpanel(_("Process mark"), _("Some marks are left. Process them?"), - _("_No"), _("_Yes"), _("_Cancel"), ALERTFOCUS_FIRST); + NULL, _("_No"), NULL, _("_Yes"), NULL, _("_Cancel"), + ALERTFOCUS_FIRST); if (G_ALERTALTERNATE == val) { summary_unlock(summaryview); summary_execute(summaryview); @@ -1934,7 +1935,8 @@ void summary_select_prev_unread(SummaryView *summaryview) val = alertpanel(_("No more unread messages"), _("No unread message found. " "Search from the end?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); break; case NEXTUNREADMSGDIALOG_ASSUME_YES: val = G_ALERTALTERNATE; @@ -1982,7 +1984,8 @@ void summary_select_next_unread(SummaryView *summaryview) val = alertpanel(_("No more unread messages"), _("No unread message found. " "Go to next folder?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); break; case NEXTUNREADMSGDIALOG_ASSUME_YES: val = G_ALERTALTERNATE; @@ -2019,7 +2022,8 @@ void summary_select_prev_new(SummaryView *summaryview) val = alertpanel(_("No more new messages"), _("No new message found. " "Search from the end?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); break; case NEXTUNREADMSGDIALOG_ASSUME_YES: val = G_ALERTALTERNATE; @@ -2067,7 +2071,8 @@ void summary_select_next_new(SummaryView *summaryview) val = alertpanel(_("No more new messages"), _("No new message found. " "Go to next folder?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); break; case NEXTUNREADMSGDIALOG_ASSUME_YES: val = G_ALERTALTERNATE; @@ -2101,7 +2106,8 @@ void summary_select_prev_marked(SummaryView *summaryview) val = alertpanel(_("No more marked messages"), _("No marked message found. " "Search from the end?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); if (val != G_ALERTALTERNATE) return; node = summary_find_prev_flagged_msg(summaryview, NULL, MSG_MARKED, TRUE); @@ -2134,7 +2140,8 @@ void summary_select_next_marked(SummaryView *summaryview) val = alertpanel(_("No more marked messages"), _("No marked message found. " "Go to next folder?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); break; case NEXTUNREADMSGDIALOG_ASSUME_YES: val = G_ALERTALTERNATE; @@ -2168,7 +2175,8 @@ void summary_select_prev_labeled(SummaryView *summaryview) val = alertpanel(_("No more labeled messages"), _("No labeled message found. " "Search from the end?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); if (val != G_ALERTALTERNATE) return; node = summary_find_prev_flagged_msg(summaryview, NULL, MSG_CLABEL_FLAG_MASK, TRUE); @@ -2197,7 +2205,8 @@ void summary_select_next_labeled(SummaryView *summaryview) val = alertpanel(_("No more labeled messages"), _("No labeled message found. " "Search from the beginning?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_SECOND); + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND); if (val != G_ALERTALTERNATE) return; if (summaryview->sort_type == SORT_ASCENDING) node = summary_find_next_flagged_msg(summaryview, NULL, @@ -4262,7 +4271,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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) @@ -4308,7 +4317,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?"), - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) @@ -4548,7 +4557,7 @@ void summary_delete(SummaryView *summaryview) num); aval = alertpanel(ngettext("Delete message", "Delete messages", num), buf, - _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_SECOND); + NULL, _("_Cancel"), NULL, _("_Delete"), NULL, NULL, ALERTFOCUS_SECOND); g_free(buf); if (aval != G_ALERTALTERNATE) { END_LONG_OPERATION(summaryview); @@ -5016,8 +5025,8 @@ void summary_save_as(SummaryView *summaryview) if (is_file_exist(dest)) { aval = alertpanel(_("Append or Overwrite"), _("Append or overwrite existing file?"), - _("_Append"), _("_Overwrite"), _("_Cancel"), - ALERTFOCUS_FIRST); + NULL, _("_Append"), NULL, _("_Overwrite"), + NULL, _("_Cancel"), ALERTFOCUS_FIRST); if (aval != 0 && aval != 1) return; } @@ -5073,8 +5082,8 @@ void summary_print(SummaryView *summaryview) "want to continue?"), g_list_length(clist->selection)); if (g_list_length(clist->selection) > 9 - && alertpanel(_("Warning"), msg, _("_Cancel"), _("_Yes"), - NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) { + && alertpanel(_("Warning"), msg, NULL, _("_Cancel"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) { g_free(msg); return; } @@ -5812,8 +5821,8 @@ 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:"), - _("_Cancel"), _("_Filter"), NULL, ALERTFOCUS_SECOND, - TRUE, vbox); + NULL, _("_Cancel"), NULL, _("_Filter"), NULL, NULL, + ALERTFOCUS_SECOND, TRUE, vbox); if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) { return FALSE; @@ -6079,7 +6088,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, - _("_No"), _("_Yes"), NULL, ALERTFOCUS_FIRST, + NULL, _("_No"), NULL, _("_Yes"), NULL, NULL, ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION); if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) diff --git 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-2021 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 1999-2022 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 @@ -3110,8 +3110,8 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri, gbo _("Real URL:"), uri->uri, open_or_cp); aval = alertpanel_full(_("Phishing attempt warning"), msg, - _("_Cancel"), open_or_cp_btn, NULL, ALERTFOCUS_FIRST, - FALSE, NULL, ALERT_WARNING); + NULL, _("_Cancel"), NULL, open_or_cp_btn, NULL, NULL, + ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING); g_free(msg); if (aval == G_ALERTALTERNATE) retval = TRUE; diff --git 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-2019 the Claws Mail team and Hiroyuki Yamamoto + * Copyright (C) 2001-2022 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 @@ -3085,8 +3085,8 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget) if (prefs_common.work_offline) if (alertpanel(_("Offline warning"), _("You're working offline. Override?"), - _("_No"), _("_Yes"), - NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_No"), NULL, _("_Yes"), + NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; /* ask for confirmation before sending queued messages only @@ -3105,8 +3105,8 @@ 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?"), - _("_Cancel"), _("_Send"), - NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) + NULL, _("_Cancel"), NULL, _("_Send"), + NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE) return; } } diff --git 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-2021 the Claws Mail team and Colin Leroy + * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy * * 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 @@ -222,9 +222,9 @@ static void uri_opener_create(void) vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); gtkut_stock_button_set_create(&hbox1, - &open_btn, _("Open in browser"), - &close_btn, _("Close"), - NULL, NULL); + &open_btn, NULL, _("Open in browser"), + &close_btn, NULL, _("Close"), + NULL, NULL, NULL); g_signal_connect(G_OBJECT(open_btn), "clicked", G_CALLBACK(uri_opener_open_cb), NULL);