[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-406-ge39325645
paul at claws-mail.org
paul at claws-mail.org
Mon Jan 24 17:02:25 CET 2022
The branch, gtk3 has been updated
via e393256458da8383d35168739b74215f2daa0d45 (commit)
from 817071429ee9fd06edd1f03463eac526c3e8c4ec (commit)
Summary of changes:
src/addrcustomattr.c | 4 ++--
src/addrduplicates.c | 2 +-
src/addressbook.c | 14 +++++++-------
src/edittags.c | 4 ++--
src/plugins/mailmbox/plugin_gtk.c | 2 +-
src/plugins/managesieve/sieve_manager.c | 2 +-
src/plugins/rssyl/rssyl_cb_menu.c | 2 +-
src/plugins/vcalendar/vcal_folder.c | 2 +-
src/prefs_actions.c | 4 ++--
src/prefs_customheader.c | 2 +-
src/prefs_filtering.c | 4 ++--
src/prefs_template.c | 4 ++--
12 files changed, 23 insertions(+), 23 deletions(-)
- Log -----------------------------------------------------------------
commit e393256458da8383d35168739b74215f2daa0d45
Author: paul <paul at claws-mail.org>
Date: Mon Jan 24 16:02:21 2022 +0000
add image to Delete buttons
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index 728708036..030c52875 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -159,7 +159,7 @@ static void custom_attr_window_list_view_clear_list(GtkWidget *list_view, gboole
{
if (!warn || alertpanel(_("Delete all attribute names"),
_("Do you really want to delete all attribute names?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(list_view)));
@@ -185,7 +185,7 @@ static void custom_attr_popup_delete (void *obj, void *data)
if (alertpanel(_("Delete attribute name"),
_("Do you really want to delete this attribute name?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
dirty = TRUE;
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 592724da3..e68c58e17 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -790,7 +790,7 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data)
aval = alertpanel(_("Delete address(es)"),
_("Really delete the address(es)?"),
- NULL, _("_Cancel"), NULL, _("D_elete"),
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"),
NULL, NULL, ALERTFOCUS_SECOND);
if(aval != G_ALERTALTERNATE)
return;
diff --git a/src/addressbook.c b/src/addressbook.c
index e83859504..b1c02859e 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1475,7 +1475,7 @@ 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."),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
@@ -1483,7 +1483,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
} else {
aval = alertpanel( _("Delete address(es)"),
_("Really delete the address(es)?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
@@ -2951,7 +2951,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
"results and addresses in '%s'?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_SECOND );
g_free(message);
if( aval == G_ALERTALTERNATE ) {
@@ -2964,8 +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,
- NULL, _("_Cancel"), NULL, _("Delete _folder only"),
- NULL, _("Delete folder and _addresses"), ALERTFOCUS_SECOND);
+ NULL, _("_Cancel"), "edit-delete", _("Delete _folder only"),
+ "edit-delete", _("Delete folder and _addresses"), ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ONLY;
@@ -2979,14 +2979,14 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
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, NULL, _("_Cancel"),
- NULL, _("D_elete"), NULL, NULL, ALERTFOCUS_SECOND);
+ "edit-delete", _("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, NULL, _("_Cancel"),
- NULL, _("D_elete"), NULL, NULL, ALERTFOCUS_SECOND);
+ "edit-delete", _("D_elete"), NULL, NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
}
diff --git a/src/edittags.c b/src/edittags.c
index 43dafc3df..8d2db260d 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -231,7 +231,7 @@ static void tags_popup_delete (GtkAction *action, gpointer data)
if (alertpanel(_("Delete tag"),
_("Do you really want to delete this tag?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -267,7 +267,7 @@ static void tags_popup_delete_all (GtkAction *action, gpointer data)
if (alertpanel(_("Delete all tags"),
_("Do you really want to delete all tags?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
index 74162f3df..462660f65 100644
--- a/src/plugins/mailmbox/plugin_gtk.c
+++ b/src/plugins/mailmbox/plugin_gtk.c
@@ -332,7 +332,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
(_("All folders and messages under '%s' will be deleted.\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- NULL, _("_Cancel"), NULL, _("_Delete"),
+ NULL, _("_Cancel"), "edit-delete", _("_Delete"),
NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_NOTICE);
g_free(message);
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 659b94914..8869d1d51 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -327,7 +327,7 @@ static void filter_delete(GtkWidget *widget, SieveManagerPage *page)
g_snprintf(buf, sizeof(buf),
_("Do you really want to delete the filter '%s'?"), filter_name);
if (alertpanel_full(_("Delete filter"), buf,
- NULL, _("_Cancel"), NULL, _("_Delete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("_Delete"), NULL, NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return;
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 45b5a916a..d14755285 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -191,7 +191,7 @@ void rssyl_remove_folder_cb(GtkAction *action,
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- NULL, _("_Cancel"), NULL, _("_Delete"),
+ NULL, _("_Cancel"), "edit-delete", _("_Delete"),
NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 213ac7697..073fbd46a 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -2029,7 +2029,7 @@ static void unsubscribe_cal_cb(GtkAction *action, gpointer data)
message = g_strdup_printf
(_("Do you really want to unsubscribe?"));
avalue = alertpanel_full(_("Delete subscription"), message,
- NULL, _("_Cancel"), NULL, _("_Delete"),
+ NULL, _("_Cancel"), "edit-delete", _("_Delete"),
NULL, NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
g_free(message);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 969f97905..0f0205db6 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -721,7 +721,7 @@ static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data)
if (alertpanel(_("Delete action"),
_("Do you really want to delete this action?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -743,7 +743,7 @@ static void prefs_actions_delete_all_cb(gpointer gtk_action, gpointer data)
if (alertpanel(_("Delete all actions"),
_("Do you really want to delete all the actions?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) != G_ALERTDEFAULT)
return;
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 960bf951f..02508073c 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -690,7 +690,7 @@ static void prefs_custom_header_delete_cb(void)
if (alertpanel(_("Delete header"),
_("Do you really want to delete this header?"),
- NULL, _("_Cancel"), NULL, _("_Delete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("_Delete"), NULL, NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index eb07715fc..f5a6c1bf8 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1193,7 +1193,7 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete rule"),
_("Do you really want to delete this rule?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
@@ -1213,7 +1213,7 @@ static void prefs_filtering_delete_all_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete all rules"),
_("Do you really want to delete all the rules?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
diff --git a/src/prefs_template.c b/src/prefs_template.c
index ac78ea67e..1b5abf592 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -896,7 +896,7 @@ static void prefs_template_delete_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete template"),
_("Do you really want to delete this template?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -909,7 +909,7 @@ static void prefs_template_delete_all_cb(gpointer action, gpointer data)
{
if (alertpanel(_("Delete all templates"),
_("Do you really want to delete all the templates?"),
- NULL, _("_Cancel"), NULL, _("D_elete"), NULL, NULL,
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list