fix a bunch of buttons in dark corners. add some images to others
authorpaul <paul@claws-mail.org>
Mon, 24 Jan 2022 15:41:29 +0000 (15:41 +0000)
committerpaul <paul@claws-mail.org>
Mon, 24 Jan 2022 15:41:29 +0000 (15:41 +0000)
93 files changed:
src/account.c
src/addrcustomattr.c
src/addrduplicates.c
src/addressadd.c
src/addressbook.c
src/addressbook_foldersel.c
src/addrgather.c
src/addrindex.c
src/addrmerge.c
src/alertpanel.c
src/alertpanel.h
src/browseldap.c
src/compose.c
src/editaddress.c
src/editbook.c
src/editgroup.c
src/editjpilot.c
src/editldap.c
src/editldap_basedn.c
src/edittags.c
src/editvcard.c
src/exphtmldlg.c
src/expldifdlg.c
src/export.c
src/file_checker.c
src/foldersel.c
src/folderview.c
src/gtk/about.c
src/gtk/description_window.c
src/gtk/foldersort.c
src/gtk/gtkutils.c
src/gtk/gtkutils.h
src/gtk/icon_legend.c
src/gtk/pluginwindow.c
src/gtk/prefswindow.c
src/gtk/sslcertwindow.c
src/imap.c
src/imap_gtk.c
src/import.c
src/importldif.c
src/importmutt.c
src/importpine.c
src/inc.c
src/main.c
src/mainwindow.c
src/mbox.c
src/message_search.c
src/messageview.c
src/mh_gtk.c
src/mimeview.c
src/news.c
src/news_gtk.c
src/plugins/archive/archiver_gtk.c
src/plugins/att_remover/att_remover.c
src/plugins/attachwarner/attachwarner.c
src/plugins/libravatar/libravatar_prefs.c
src/plugins/mailmbox/plugin_gtk.c
src/plugins/managesieve/sieve_editor.c
src/plugins/managesieve/sieve_manager.c
src/plugins/notification/notification_foldercheck.c
src/plugins/notification/notification_trayicon.c
src/plugins/pdf_viewer/poppler_viewer.c
src/plugins/perl/perl_plugin.c
src/plugins/pgpcore/passphrase.c
src/plugins/pgpcore/pgp_viewer.c
src/plugins/pgpcore/select-keys.c
src/plugins/pgpcore/sgpgme.c
src/plugins/rssyl/rssyl_cb_menu.c
src/plugins/vcalendar/vcal_folder.c
src/plugins/vcalendar/vcal_meeting_gtk.c
src/plugins/vcalendar/vcalendar.c
src/prefs_actions.c
src/prefs_customheader.c
src/prefs_display_header.c
src/prefs_filtering.c
src/prefs_filtering_action.c
src/prefs_folder_column.c
src/prefs_folder_item.c
src/prefs_matcher.c
src/prefs_migration.c
src/prefs_other.c
src/prefs_summaries.c
src/prefs_summary_column.c
src/prefs_summary_open.c
src/prefs_template.c
src/prefs_themes.c
src/send_message.c
src/ssl_manager.c
src/summary_search.c
src/summaryview.c
src/textview.c
src/toolbar.c
src/uri_opener.c

index f25c9ce894458975ab40e11392b9c16d834dd8e9..7b6c0e69065a3b8bfbeb02d646d02a7d93777d90 100644 (file)
@@ -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;
index 40d5ceb63b64a6760521e4d3bd5a21a255bf8357..728708036ccfec8ea1666a46afc2518c447d266b 100644 (file)
@@ -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);
index 6e7e8e3f2154a611b10da453f7bcb6d275e13579..592724da36b6b6aab749496516e9715ee35fe442 100644 (file)
@@ -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;
        }
 
index d01581ca6298041627239caf19d0ceeb8ea5ea6e..1d842807e57d8439558b25afac65322a99afbfe1 100644 (file)
@@ -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;
                                }
                        }
index d96109c8b7839c8cdb3bb3fe555675187aefaec8..e83859504a5d8bf3014dcf4482af97317d045e40 100644 (file)
@@ -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" );
 }
index 775bdf4aa2b9e76e1e3a920ff20517184ebcfad0..4b060ec4c44965d0c73a5e623261227b0f836d15 100644 (file)
@@ -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 );
index e0513a2dbb95025c813455caa5f51f0bbcb14917..22f01a32748ece5aa756069a2ba52b83bc64f6c0 100644 (file)
@@ -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 */
index fe2a83401dec2b50ce98a0ea9c36adfda561d7ec..735a6a61de27496c651246725d01e9e6c969d144 100644 (file)
@@ -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;
index f1b197620f035619ac0a55054e2da4b97143a6d1..71a699e36d9556f36dc08ed16390b69bc3f01424 100644 (file)
@@ -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;
        }
 
index 5972d984497647ec5281b098ddd3f3a9e7d66084..38b5a05ea6fad2c9bbfd62a37532f620287929ea 100644 (file)
@@ -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);
 
index 708766d2e40087df692a24c5696affa9dba6ab95..4d42936e974041ebeda73e77603907392f6e026c 100644 (file)
@@ -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);
index 6e6e62b6cc5c69237fe4c14e60701de65b08061c..933d82ee879ddf27c84f1b529851a6305eb9ad2d 100644 (file)
@@ -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 );
 
index 943aead1200b0c6dd02754604d2594cc3eb22d90..cbacc8ff0ad7fca0858bf950859bfdd15d023613 100644 (file)
@@ -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;
                }
index 60638f116469f89761a77cfca55c5bf59fdcc5ae..25f96ffea5deed0cac4571928473267d361e8ef2 100644 (file)
@@ -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);
index 9ffb64b6996aa4ca3da2918905a496210fbb8d8b..a3aa69a0ab99b70f78a52b1707f7d717cd0a6d77 100644 (file)
@@ -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);
index 93533e88203d0cf701feaa39ad5b4f3f6ccc929e..09fbf1f8239401c8a269500be433c489a029b647 100644 (file)
@@ -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);
 
index 0580dbba492b777607ec1f6add1f1150c2bce0cf..b0da08bfd87522d543b946b6cee7ad1a81121e45 100644 (file)
@@ -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);
index f36194cd7ed85ce9c1f0247dfd8684150e6956f7..baf82bcf15b32ba252bf03e24b5628b68b14bc66 100644 (file)
@@ -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);
 
index 0cdaa23fe9d9c5233d180b62040339f90d77b3c3..b34c1a69deb48e0174c522d6d58a442aedcd6670 100644 (file)
@@ -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);
index 404d5ba4d03638780ecc043beebddae58db89f02..43dafc3dfac797eff82e6526675089206bd3b485 100644 (file)
@@ -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);
index 7daabfad467af20d02e9b829e6ca7c4b934652be..6e294942847216ac15c1dc160bd0766b132c790f 100644 (file)
@@ -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);
index 7760683242a409c134e7bf1d95a623b7c88070fa..9feae90361d9107e31d08a635385884d0675237d 100644 (file)
@@ -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);
index 51953719848ec40fd3f31f64fba38d47db19243d..4b5609da31c69de0cf8f5964d752fa579637036a 100644 (file)
@@ -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);
index 56193fc1600164d6c5448dfea16cf612e1e60103..8e316e170c7cdda3d1ea53fa5d0aab67740b00b5 100644 (file)
@@ -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);
 
index c5003298ba81cda474845cf0a3a363e1b0318de4..7efd210835b86aa56d10048c887c93a0ac3716e7 100644 (file)
@@ -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;
index 4f42989252a5c6f689f0de312467098032aae55c..ab740e34fbe51269c794b829c06ca496edde6f52 100644 (file)
@@ -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);
index 53a301de0ee7f2bf001823a49145aba9dda1a966..a532e133c322baadb2d04b1edbdc508bd9026187 100644 (file)
@@ -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)
index 639403dc9d0cea5ccaf1146cbb8c4fcf86392667..32a9ec48618c6a49a86109d2e70e1964ca4d7971 100644 (file)
@@ -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++;
 
index e412d88deb3648ec3a39520b3eda7d4ecef9bfb3..8561f768d0f0ef3445cb1159c353ce558bfb6c27 100644 (file)
@@ -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);
index b60b9102898385e36b0113741de2221f8fbde91c..755193f1a3c709999147d4c06d98837ffa4a3f87 100644 (file)
@@ -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);
index 85f532d8ecfe17e3d00fb205695de7112d2d99e2..8078a6959c625f0a8d135baf9b9eee3475762392 100644 (file)
@@ -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);
index 08c8630ec23b27c6e0143efc190daac1385bd84c..bfc60a7037c8241394f3faf5a053bf3b2c422c93 100644 (file)
@@ -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,
index 3bf24fbd17ee16acf7e86d4d6b891c25d4034c57..e267caba3f2347f20b5dc6da23857c4a0c916276 100644 (file)
@@ -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
index e36781b8260a7642b500b71a0570a68b9b05bc7c..d128eb5cb4118857e6260850b5c602d52da1dc4c 100644 (file)
@@ -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);
index 899cee8db9309c3b2755013dc4760911d2139e01..ec814de9cb2af24d16ab16d5c61f81b1053a9dea 100644 (file)
@@ -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);
index 6f8ba2f01db24447950894e3057e422c6c9f1c90..76e4a02e56e6349f20ee16abe2c339cc35783d58 100644 (file)
@@ -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);
 }
index fecb4b30880b385a0241f6c7f632d010ec320958..3827986e63decedccb6f626ab8eb508c868178f4 100644 (file)
@@ -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
index e631f93975f97ca384932ef2439c3164b53ec1e1..b4e49163426ce9ee773c591de36b69308501146d 100644 (file)
@@ -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;
        
index 00f7b161590c5d36c6e9aa222715b27f278a3ef9..0a15565277f25944ed1240a60652f2173bb90394 100644 (file)
@@ -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;
index db9608e3aadc508b9f47fb4d7ade91c17549279f..f436e489ef89ddcc6cbc98cdfe2f22d4dee370bf 100644 (file)
@@ -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);
index d82cd58b94fa7c146f8cefd4cd812026041ec64c..e8b02a339f9b02110ddaf8de4461878f6dfaf346 100644 (file)
@@ -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);
index 8c50045bfb8cbf7dde692198388f892f70899961..9d5dd1c4372a3923b8b60e9a4ece609d5134d57f 100644 (file)
@@ -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);
index c8049b2c6025dc0d5fc88ffcffcb18bfc995d28b..e50876f1242dd8a854b91f24c4fb728f3ac60605 100644 (file)
--- 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);
index bfda67926e242581c587804fc2dbd31cd5a291d8..f8904314603971456e46f1aa009d2bbc5a78fb58 100644 (file)
@@ -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;
index a9e425665e252623d7cb44b57c1561dd309e7ef7..94d9f75ad64e41e9aa32080427c64123531340c2 100644 (file)
@@ -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)
index 0f26168754e339b98e039fdca8e7c8fab8fe74b0..b9a0dcc7a3c9e22a66b08c72d45256d2f4910e42 100644 (file)
@@ -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;
index 3065dc5132631800f6eb187bfd0097d47b037b59..4541f44e8fd9ed60cb78f96579e18c0912fb2cc2 100644 (file)
@@ -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);
index 8f15eece79d4a03664c44411ce69c1c3db80e0d1..fa8fa385bdfe15b0cc5127c73950dec7485b14e9 100644 (file)
@@ -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;
index a76fe01a6724736068f7936cf441e26836198307..3f370fcae86ad1de7e7fa4145060771392cd0a44 100644 (file)
@@ -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);
index ff5a0f936b5f16f96aec686e35acf6be331f3c73..b87a3158dd5f215df3caf428329a1c914ec90c82 100644 (file)
@@ -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);
index b9e4971e1601d3c4f4d1d2abc4a20470a84834ce..3a7adb14b9bf8df64d8ca89975da14106f672040 100644 (file)
@@ -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;
index 6f8dff3f45059141af7a7490811d7a778afa5a04..7f0dc7c8a92c1caa00d921f86dd3258e04b3576c 100644 (file)
@@ -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);
index 01ded8a341175effc308f2e17dc56f1bc0f0e0c2..0eacd26876c466262c6bdf0a311f023d9f8222be 100644 (file)
@@ -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);
index ffa6a0752a274dc8222419cc5f8af7b1545ac22c..ae0e127839803cce9dbf6769d0860bac7909f317 100644 (file)
@@ -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);
index fbd69cbef39745823b8e35db9db145b3d04c0948..49048319b9a9da934b311cb6f840e60afdb774b7 100644 (file)
@@ -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)
index 4ee40687b756ff6f3ee7ea216b26850d8744c3c3..0f68fa9a047eac314c145d87883539010ce41856 100644 (file)
@@ -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;
 
index ab7c86409dd28c3e1507ddfb657b67672e9ba148..74162f3df4eb275597aa8e3ded49f73d48a77036 100644 (file)
@@ -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;
index 8149dffd3e4d2ef5b0292c754ce3cd1b205682e7..a15d032164a2584d2d5434a1479917d3b3c1f021 100644 (file)
@@ -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;
index 166187eb967c1dc40014c6ef120ba1842b6353f3..659b949142d6341e30c300e23c4fc8224ffb02f5 100644 (file)
@@ -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);
index 58992d12980fc4fdc64b1fcc9b4175f53047e21b..8d6770709ae123dd0c7b03c8a012b1a004a235f6 100644 (file)
@@ -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);
 
index 51dfe18194de00d45151c6c72d3f37648b5a535e..d5a4e637d3efa67339e93861da6e2ecd67256bbf 100644 (file)
@@ -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);
index 37126fbd1b1c75a491b59f1ebc6a77b4e9d19483..5615c68744808df7eb05bf85e2ed3348aeba01bb 100644 (file)
@@ -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);
 }
index 992b7edc9d817ebcc604d958505d0d43a87eb10b..57571fe4f93cbecda0671e254d84a989c54ce7b2 100644 (file)
@@ -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) {
index 223b245ebe8c5be51d4eaa477b57268c413387f3..44d541daa000a8fa3c7d99a69e813f8c36d936ba 100644 (file)
@@ -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);
index 055d14242c7839596af66b5f06db79eac14564b1..bb5212105262b63fa9cfa829902c39a670b7c518 100644 (file)
@@ -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) {
index 936c84416a5562932e1c9e6485e73ac4fbb117d3..62c77de2a2a841f2b646444f15275392dc385a00 100644 (file)
@@ -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)
index 09e55ec13be162030a1ae30c9dd66bc8c209bff6..5166a1866dc2ba015bdd55f8af2048ed378fc3f7 100644 (file)
@@ -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();
index 6c08fc377fc14f43c7277a05c986ed95692a50f7..45b5a916ae385ba0da099a826ba27e69bb4f0920 100644 (file)
@@ -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);
index cebfa392a28bd35dcdc13d707a6d4f02aa87fec3..213ac76975bc8ae9e7c0a81bce94dfe2eb4a100a 100644 (file)
@@ -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;
index 9cf7ebe4d391437ea4e1608fec762acdc66c6c1d..33485798dd9012089ffa77b7096ac2ec31e21d27 100644 (file)
@@ -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;
index 0dbd6d028e6dd3b356c088f73e8cce3c69ca84c1..b2e66f4595b5198211d09989f361ae3f4c8a80f0 100644 (file)
@@ -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();
index 138374b7795b52fe5c67e75a70e68838df37ed14..969f97905b0c60099d251c7b8db9df8054746fe3 100644 (file)
@@ -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);
index 5d36c96cbdeb6eecd79265199be16ab92ce82334..960bf951f0b31db8ea71b43f896bd215c847c5ea 100644 (file)
@@ -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,
index 207112b60337e9e22e31efb3a5f11c0246cd901a..37710e3ebb89ea8f4fd796a22b23c6d16b373cf2 100644 (file)
@@ -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);
index 885f94441ab346540f1ce3da8f402ccb3e4a175d..eb07715fc08c89670264765636e8a827c1d1975c 100644 (file)
@@ -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);
index 36afa63b388ce66820fa485508970b5725b86903..1954410c1c70a735524206c1b3e3ec83b6bfd47c 100644 (file)
@@ -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);
 
index c9fdc8a8bb404bf6bc6cd33fa14a44533442f38c..48725041a138ec6deeee0595fad436dc0aa56b0f 100644 (file)
@@ -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);
index c3e720041a5a2f557db137c3f75edf604b01df25..503511277aa77fcfc6affee2256a9d86d71fdc7e 100644 (file)
@@ -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;
        
index de7785cfc344c38a16bc166f9e0726f1532ba027..09662d8c6de3c54175546a1a44ed5789e45613e6 100644 (file)
@@ -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);                                             
index 6dc67bea0dc2a97a09127424e558071928e58db5..8077387bcded5ed01cbb13743d3b3c3ee4d62b13 100644 (file)
@@ -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);
 
index d4dfa8546fcf912a7b79a032f5960ebef9bf9421..f78a0a370667b19f6324866074d09c33f130559e 100644 (file)
@@ -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);
 
index 4c84db1d069ad4dde38d5442794f139e1da8378b..c316000bc5f8617b918ae365ba0af8abc01a932e 100644 (file)
@@ -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);
index 173f6206c8a9b3b9872fccd65ec2332785b1030e..695c9151d25579221bd592368176628818012551 100644 (file)
@@ -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);
index 473ce52605f998162e5283fd279a36f510740e60..e2c477dd38176288a221fdd2004113166f11bf6d 100644 (file)
@@ -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);
index 51a3f067ba42b2ef7de2d8b46188f798562dad98..ac78ea67e18eb36bf750f765a0e65e74b5617696 100644 (file)
@@ -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();
index 39474fb2ddae6e783c0772b3582749955ed2d31e..f115cf2f8520c02c796b8f10ea96934c821f31ab 100644 (file)
@@ -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."),
index 99941e6183ad87cdb82fd0c3835d4c0a34144b20..5376d7e863010ca79f543e309b0be49b1e0a855b 100644 (file)
@@ -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;
                        }
index 669405a94a16e3ce6b14a6f79df196b77c2ea351..fe802de8fe6453a85fefa452d05d9b6c5c70bea1 100644 (file)
@@ -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)
index 0377429502f9bf5fd924a682ff6bbb2a7c74ea92..4b383e524018ac53ce3ef71fbeabc2d674366518 100644 (file)
@@ -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) {
index e92cbc62b80071503df30a55087887ff75872e4d..6eaf2cbc101e915916c645647ed5487587ea9d86 100644 (file)
@@ -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)
index e3ec4c130f7994ddc01de82b693cb275b6143939..c952c477539d7cec2f7ce7194416dc2d9253c904 100644 (file)
@@ -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;
index cd5a294035737670a8722c680b728bcf1efdfa5f..b05ea8d73d0702c02ace5ab89b0014ef004f5c96 100644 (file)
@@ -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;
                }
        }
index 838c20ce9ccf00ed40db1cea7be04733ad7a5832..babb511a0561e8f7f5881c6a4a2151f0f34ab125 100644 (file)
@@ -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);