diff --git a/data/icons/menu/dark/add.svg b/data/icons/menu/dark/add.svg new file mode 100644 index 00000000..bcf1c2c2 --- /dev/null +++ b/data/icons/menu/dark/add.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/dark/copy.svg b/data/icons/menu/dark/copy.svg new file mode 100644 index 00000000..936b5ebd --- /dev/null +++ b/data/icons/menu/dark/copy.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/dark/delete.svg b/data/icons/menu/dark/delete.svg new file mode 100644 index 00000000..df61c508 --- /dev/null +++ b/data/icons/menu/dark/delete.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/dark/refresh.svg b/data/icons/menu/dark/refresh.svg new file mode 100644 index 00000000..a325b64e --- /dev/null +++ b/data/icons/menu/dark/refresh.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/dark/remove.svg b/data/icons/menu/dark/remove.svg new file mode 100644 index 00000000..63494850 --- /dev/null +++ b/data/icons/menu/dark/remove.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/dark/spell-check.svg b/data/icons/menu/dark/spell-check.svg new file mode 100644 index 00000000..24ebc5be --- /dev/null +++ b/data/icons/menu/dark/spell-check.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/light/add.svg b/data/icons/menu/light/add.svg new file mode 100644 index 00000000..4f91008c --- /dev/null +++ b/data/icons/menu/light/add.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/light/copy.svg b/data/icons/menu/light/copy.svg new file mode 100644 index 00000000..7fb9ada5 --- /dev/null +++ b/data/icons/menu/light/copy.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/light/delete.svg b/data/icons/menu/light/delete.svg new file mode 100644 index 00000000..d90217ac --- /dev/null +++ b/data/icons/menu/light/delete.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/light/refresh.svg b/data/icons/menu/light/refresh.svg new file mode 100644 index 00000000..735b7a2d --- /dev/null +++ b/data/icons/menu/light/refresh.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/light/remove.svg b/data/icons/menu/light/remove.svg new file mode 100644 index 00000000..c5c69f7c --- /dev/null +++ b/data/icons/menu/light/remove.svg @@ -0,0 +1,3 @@ + diff --git a/data/icons/menu/light/spell-check.svg b/data/icons/menu/light/spell-check.svg new file mode 100644 index 00000000..af7af94a --- /dev/null +++ b/data/icons/menu/light/spell-check.svg @@ -0,0 +1,3 @@ + diff --git a/data/zoitechat.gresource.xml b/data/zoitechat.gresource.xml index 8ff44484..b42f4044 100644 --- a/data/zoitechat.gresource.xml +++ b/data/zoitechat.gresource.xml @@ -33,7 +33,13 @@ icons/menu/light/chanlist.svg icons/menu/light/preferences.svg icons/menu/light/clear.svg + icons/menu/light/copy.svg + icons/menu/light/delete.svg + icons/menu/light/add.svg + icons/menu/light/remove.svg + icons/menu/light/spell-check.svg icons/menu/light/save.svg + icons/menu/light/refresh.svg icons/menu/light/search.svg icons/menu/light/find.svg icons/menu/light/help.svg @@ -51,7 +57,13 @@ icons/menu/dark/chanlist.svg icons/menu/dark/preferences.svg icons/menu/dark/clear.svg + icons/menu/dark/copy.svg + icons/menu/dark/delete.svg + icons/menu/dark/add.svg + icons/menu/dark/remove.svg + icons/menu/dark/spell-check.svg icons/menu/dark/save.svg + icons/menu/dark/refresh.svg icons/menu/dark/search.svg icons/menu/dark/find.svg icons/menu/dark/help.svg diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index 22bec3b0..6a739dbc 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -47,9 +47,9 @@ #if HAVE_GTK3 #define ICON_CHANLIST_JOIN "zc-menu-join" -#define ICON_CHANLIST_COPY "edit-copy" +#define ICON_CHANLIST_COPY "zc-menu-copy" #define ICON_CHANLIST_FIND "zc-menu-find" -#define ICON_CHANLIST_REFRESH "view-refresh" +#define ICON_CHANLIST_REFRESH "zc-menu-refresh" #define ICON_CHANLIST_SAVE "zc-menu-save" #endif #if !HAVE_GTK3 @@ -132,7 +132,7 @@ chanlist_icon_button (const char *label, const char *icon_name, button = gtk_button_new_with_mnemonic (label); #if HAVE_GTK3 - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); #elif !HAVE_GTK3 image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); #endif @@ -160,7 +160,7 @@ chanlist_icon_menu_item (const char *label, const char *icon_name, icon_name_gtk3 = gtkutil_icon_name_from_stock (icon_name); if (!icon_name_gtk3) icon_name_gtk3 = icon_name; - image = icon_name_gtk3 ? gtk_image_new_from_icon_name (icon_name_gtk3, GTK_ICON_SIZE_MENU) : NULL; + image = icon_name_gtk3 ? gtkutil_image_new_from_stock (icon_name_gtk3, GTK_ICON_SIZE_MENU) : NULL; label_widget = gtk_label_new_with_mnemonic (label); if (image) gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0); diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c index 100f404a..91ad6814 100644 --- a/src/fe-gtk/plugingui.c +++ b/src/fe-gtk/plugingui.c @@ -66,8 +66,8 @@ plugingui_get_target_session (void) #if HAVE_GTK3 #define ICON_PLUGIN_LOAD "zc-menu-load-plugin" -#define ICON_PLUGIN_UNLOAD "edit-delete" -#define ICON_PLUGIN_RELOAD "view-refresh" +#define ICON_PLUGIN_UNLOAD "zc-menu-delete" +#define ICON_PLUGIN_RELOAD "zc-menu-refresh" #endif #if !HAVE_GTK3 #define ICON_PLUGIN_LOAD GTK_STOCK_REVERT_TO_SAVED @@ -85,7 +85,7 @@ plugingui_icon_button (GtkWidget *box, const char *label, GtkWidget *image; button = gtk_button_new_with_mnemonic (label); - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), image); gtk_button_set_use_underline (GTK_BUTTON (button), TRUE); gtk_container_add (GTK_CONTAINER (box), button); diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 74a1ff8e..1ba37786 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -60,9 +60,9 @@ #endif #if HAVE_GTK3 -#define ICON_ADD "list-add" -#define ICON_REMOVE "list-remove" -#define ICON_SPELL_CHECK "tools-check-spelling" +#define ICON_ADD "zc-menu-add" +#define ICON_REMOVE "zc-menu-remove" +#define ICON_SPELL_CHECK "zc-menu-spell-check" #endif #if !HAVE_GTK3 #define ICON_ADD GTK_STOCK_ADD @@ -737,7 +737,7 @@ sexy_spell_entry_icon_menu_item (const char *label, const char *stock_name) item = gtk_menu_item_new (); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); if (icon_name) - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU); label_widget = gtk_label_new_with_mnemonic (label); if (image) gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0); diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index f9471756..f71f7f60 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -35,7 +35,7 @@ #if HAVE_GTK3 #define ICON_URLGRAB_CLEAR "zc-menu-clear" -#define ICON_URLGRAB_COPY "edit-copy" +#define ICON_URLGRAB_COPY "zc-menu-copy" #define ICON_URLGRAB_SAVE_AS "zc-menu-save" #endif #if !HAVE_GTK3