commit 0156e3dd6e9d5310de1775126f2f18a7a7fef86f
parent 4a60441e3544c2c30a5407034bfcd7834386aaf4
Author: Paul <paul@claws-mail.org>
Date: Mon, 28 Apr 2025 14:48:02 +0100
use '-symbolic' varient of gtk stock images throughout
Diffstat:
12 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/alertpanel.c b/src/alertpanel.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 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
@@ -300,20 +300,20 @@ static void alertpanel_create(const gchar *title,
switch (alert_type) {
case ALERT_QUESTION:
image = gtk_image_new_from_icon_name
- ("dialog-question", GTK_ICON_SIZE_DIALOG);
+ ("dialog-question-symbolic", GTK_ICON_SIZE_DIALOG);
break;
case ALERT_WARNING:
image = gtk_image_new_from_icon_name
- ("dialog-warning", GTK_ICON_SIZE_DIALOG);
+ ("dialog-warning-symbolic", GTK_ICON_SIZE_DIALOG);
break;
case ALERT_ERROR:
image = gtk_image_new_from_icon_name
- ("dialog-error", GTK_ICON_SIZE_DIALOG);
+ ("dialog-error-symbolic", GTK_ICON_SIZE_DIALOG);
break;
case ALERT_NOTICE:
default:
image = gtk_image_new_from_icon_name
- ("dialog-information", GTK_ICON_SIZE_DIALOG);
+ ("dialog-information-symbolic", GTK_ICON_SIZE_DIALOG);
break;
}
gtk_widget_set_halign(image, GTK_ALIGN_CENTER);
diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2022 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2025 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
@@ -294,7 +294,7 @@ static void export_html_next( GtkWidget *widget ) {
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));
+ gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_BUTTON));
exp_html_finish_show();
exporthtml_save_settings( _exportCtl_ );
diff --git a/src/expldifdlg.c b/src/expldifdlg.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2022 the Claws Mail team and Match Grun
+ * Copyright (C) 2003-2025 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
@@ -322,7 +322,7 @@ static void export_ldif_next( GtkWidget *widget ) {
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));
+ gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_BUTTON));
exp_ldif_finish_show();
exportldif_save_settings( _exportCtl_ );
export_ldif_message();
diff --git a/src/importldif.c b/src/importldif.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
+ * Copyright (C) 2001-2025 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
@@ -437,7 +437,7 @@ static void imp_ldif_next( GtkWidget *widget ) {
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));
+ gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_BUTTON));
imp_ldif_finish_show();
}
}
diff --git a/src/inc.c b/src/inc.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 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
@@ -843,7 +843,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
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));
+ gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_BUTTON));
}
g_free(fin_msg);
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1917,7 +1917,7 @@ MainWindow *main_window_create()
gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
warning_btn = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(warning_btn),
- gtk_image_new_from_icon_name("dialog-warning", GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("dialog-warning-symbolic", GTK_ICON_SIZE_BUTTON));
CLAWS_SET_TIP(warning_btn,
_("Some error(s) happened. Click here to view log."));
diff --git a/src/password_gtk.c b/src/password_gtk.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2016-2021 the Claws Mail team and Andrej Kacian
+ * Copyright (C) 2016-2025 the Claws Mail team and Andrej Kacian
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -130,7 +130,7 @@ void primary_passphrase_change_dialog()
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- icon = gtk_image_new_from_icon_name("dialog-password",
+ icon = gtk_image_new_from_icon_name("dialog-password-symbolic",
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign(icon, GTK_ALIGN_CENTER);
gtk_widget_set_valign(icon, GTK_ALIGN_START);
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -1340,7 +1340,7 @@ static void basic_create_widget_func(PrefsPage * _page,
#endif
no_imap_warn_icon = gtk_image_new_from_icon_name
- ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
+ ("dialog-warning-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
buf = g_strconcat("<span weight=\"bold\">",
_("Warning: this version of Claws Mail\n"
"has been built without IMAP and News support."), "</span>", NULL);
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 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
@@ -518,7 +518,7 @@ static void prefs_filtering_create(void)
#ifndef GENERIC_UMPC
page_up_btn = gtk_button_new_with_mnemonic (_("Page u_p"));
gtk_button_set_image(GTK_BUTTON(page_up_btn),
- gtk_image_new_from_icon_name("go-up",GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("go-up-symbolic",GTK_ICON_SIZE_BUTTON));
gtk_widget_show (page_up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), page_up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (page_up_btn), "clicked",
@@ -546,7 +546,7 @@ static void prefs_filtering_create(void)
#ifndef GENERIC_UMPC
page_down_btn = gtk_button_new_with_mnemonic (_("Page dow_n"));
gtk_button_set_image(GTK_BUTTON(page_down_btn),
- gtk_image_new_from_icon_name("go-down",GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("go-down-symbolic",GTK_ICON_SIZE_BUTTON));
gtk_widget_show (page_down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), page_down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (page_down_btn), "clicked",
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
@@ -540,7 +540,7 @@ void quotefmt_add_defaults_button(GtkWindow *parent_window,
btn_formatdesc = gtk_button_new_with_mnemonic (_("Defaults"));
gtk_button_set_image (GTK_BUTTON(btn_formatdesc),
- gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_BUTTON));
+ gtk_image_new_from_icon_name("edit-undo-symbolic", GTK_ICON_SIZE_BUTTON));
gtk_widget_show (btn_formatdesc);
gtk_box_pack_end (GTK_BOX (parent_box), btn_formatdesc, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(btn_formatdesc), "clicked",
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Colin Leroy
+ * Copyright (C) 1999-2025 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
@@ -217,7 +217,7 @@ void ssl_manager_create(void)
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));
+ gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_BUTTON));
g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(ssl_manager_close_cb), NULL);
diff --git a/src/textview.c b/src/textview.c
@@ -2049,11 +2049,14 @@ void textview_show_icon(TextView *textview, const gchar *stock_id)
GtkAllocation allocation;
GtkTextView *text = GTK_TEXT_VIEW(textview->text);
gint x, wx, wy;
+ gchar *img_sym = NULL;
if (textview->image)
gtk_widget_destroy(textview->image);
- textview->image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_DIALOG);
+ img_sym = g_strconcat(stock_id, "-symbolic", NULL);
+ textview->image = gtk_image_new_from_icon_name(img_sym, GTK_ICON_SIZE_DIALOG);
+ g_free(img_sym);
cm_return_if_fail(textview->image != NULL);
gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_icon");
