Create image from icon name instead of stock id

diff --git a/src/logwindow.cc b/src/logwindow.cc
index 1a783a1..2cf2ebd 100644 (file)
--- a/src/logwindow.cc
+++ b/src/logwindow.cc
@@ -485,8 +485,8 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        logwin->search_entry_box = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(search_box), logwin->search_entry_box, FALSE, FALSE, 0);
        gtk_widget_show(logwin->search_entry_box);
-       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
-       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_PRIMARY, "edit-find");
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_widget_show(search_box);
        gtk_widget_set_tooltip_text(logwin->search_entry_box, _("Search for text in log window"));
        g_signal_connect(logwin->search_entry_box, "icon-press", G_CALLBACK(search_entry_icon_cb), logwin);
@@ -527,7 +527,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
 
        textbox = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(hbox), textbox, FALSE, FALSE, 0);
-       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(textbox), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(textbox), GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_widget_show(textbox);
        g_signal_connect(G_OBJECT(textbox), "activate",
                         G_CALLBACK(log_window_regexp_cb), logwin);

diff --git a/src/preferences.cc b/src/preferences.cc
index 820608e..5a09daa 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -2049,12 +2049,12 @@ static void config_tab_general(GtkWidget *notebook)
        gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
        gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet."));
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
-                                               GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry),
+                                               GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
                                                GTK_ENTRY_ICON_SECONDARY, _("Clear"));
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
-                                               GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_REVERT_TO_SAVED);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry),
+                                               GTK_ENTRY_ICON_PRIMARY, "document-revert");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
                                                GTK_ENTRY_ICON_PRIMARY, _("Default"));
        g_signal_connect(GTK_ENTRY(star_rating_entry), "icon-press",
@@ -2081,12 +2081,12 @@ static void config_tab_general(GtkWidget *notebook)
        gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
        gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet."));
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
-                                               GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry),
+                                               GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
                                                GTK_ENTRY_ICON_SECONDARY, _("Clear"));
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
-                                               GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_REVERT_TO_SAVED);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry),
+                                               GTK_ENTRY_ICON_PRIMARY, "document-revert");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
                                                GTK_ENTRY_ICON_PRIMARY, _("Default"));
        g_signal_connect(GTK_ENTRY(star_rating_entry), "icon-press",
@@ -2220,12 +2220,12 @@ static void config_tab_general(GtkWidget *notebook)
 
        gtk_widget_set_tooltip_text(help_search_engine_entry, _("The format varies between search engines, e.g the format may be:\nhttps://www.search_engine.com/search?q=site:geeqie.org/help\nhttps://www.search_engine.com/?q=site:geeqie.org/help"));
 
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(help_search_engine_entry),
-                                               GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(help_search_engine_entry),
+                                               GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(help_search_engine_entry),
                                                GTK_ENTRY_ICON_SECONDARY, _("Clear"));
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(help_search_engine_entry),
-                                               GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_REVERT_TO_SAVED);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(help_search_engine_entry),
+                                               GTK_ENTRY_ICON_PRIMARY, "document-revert");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(help_search_engine_entry),
                                                GTK_ENTRY_ICON_PRIMARY, _("Default"));
        g_signal_connect(GTK_ENTRY(help_search_engine_entry), "icon-press",

diff --git a/src/toolbar.cc b/src/toolbar.cc
index 6a37c69..312d551 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -330,7 +330,7 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label,
                }
        else
                {
-               toolbar_entry->image = gtk_image_new_from_stock(GTK_STOCK_JUMP_TO,
+               toolbar_entry->image = gtk_image_new_from_icon_name("go-jump",
                                                                                                                GTK_ICON_SIZE_BUTTON);
                }
        gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->image, FALSE, FALSE, 0);

diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc
index 38e594d..4146979 100644 (file)
--- a/src/ui-bookmark.cc
+++ b/src/ui-bookmark.cc
@@ -655,13 +655,13 @@ static void bookmark_populate(BookMarkData *bm)
                                        }
                                else
                                        {
-                                       b->image = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY,
+                                       b->image = gtk_image_new_from_icon_name("folder",
                                                                            GTK_ICON_SIZE_BUTTON);
                                        }
                                }
                        else
                                {
-                               b->image = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON);
+                               b->image = gtk_image_new_from_icon_name("folder", GTK_ICON_SIZE_BUTTON);
                                }
                        gtk_box_pack_start(GTK_BOX(box), b->image, FALSE, FALSE, 0);
                        gtk_widget_show(b->image);

diff --git a/src/ui-spinner.cc b/src/ui-spinner.cc
index 24431a7..d1a16d3 100644 (file)
--- a/src/ui-spinner.cc
+++ b/src/ui-spinner.cc
@@ -166,7 +166,7 @@ GtkWidget *spinner_new(const gchar *path, gint interval)
                }
        else
                {
-               sp->image = gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_DIALOG);
+               sp->image = gtk_image_new_from_icon_name("image-missing", GTK_ICON_SIZE_DIALOG);
                }
 
        g_object_set_data(G_OBJECT(sp->image), "spinner", sp);

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index c4be369..bd0d03b 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -918,8 +918,8 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
        gtk_table_attach_defaults(GTK_TABLE(table), mte->edit_widget, 1, 2, 0, 1);
        generic_dialog_attach_default(mte->gd, mte->edit_widget);
 
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(mte->edit_widget),
-                                     GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(mte->edit_widget),
+                                     GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_entry_set_icon_tooltip_text(GTK_ENTRY(mte->edit_widget),
                                        GTK_ENTRY_ICON_SECONDARY, "Clear");
        g_signal_connect(GTK_ENTRY(mte->edit_widget), "icon-press",
@@ -1177,7 +1177,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
        gtk_widget_show((GTK_WIDGET(vf->file_filter.combo)));
        gtk_widget_set_tooltip_text(GTK_WIDGET(vf->file_filter.combo), _("Use regular expressions"));
 
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear"));
        g_signal_connect(GTK_ENTRY(combo_entry), "icon-press", G_CALLBACK(file_filter_clear_cb), combo_entry);
 

diff --git a/src/window.cc b/src/window.cc
index fefdbdf..9b48d73 100644 (file)
--- a/src/window.cc
+++ b/src/window.cc
@@ -392,8 +392,8 @@ void help_search_window_show()
        generic_dialog_attach_default(gd, hsd->edit_widget);
        gtk_widget_show(hsd->edit_widget);
 
-       gtk_entry_set_icon_from_stock(GTK_ENTRY(hsd->edit_widget),
-                                               GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(hsd->edit_widget),
+                                               GTK_ENTRY_ICON_SECONDARY, "edit-clear");
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY(hsd->edit_widget),
                                                GTK_ENTRY_ICON_SECONDARY, _("Clear"));
        g_signal_connect(GTK_ENTRY(hsd->edit_widget), "icon-press",