diff --git a/data/icons/menu/dark/about.png b/data/icons/menu/dark/about.png new file mode 100644 index 00000000..08b64db1 Binary files /dev/null and b/data/icons/menu/dark/about.png differ diff --git a/data/icons/menu/dark/add.png b/data/icons/menu/dark/add.png new file mode 100644 index 00000000..1525d461 Binary files /dev/null and b/data/icons/menu/dark/add.png differ diff --git a/data/icons/menu/dark/chanlist.png b/data/icons/menu/dark/chanlist.png new file mode 100644 index 00000000..9aac1a20 Binary files /dev/null and b/data/icons/menu/dark/chanlist.png differ diff --git a/data/icons/menu/dark/clear.png b/data/icons/menu/dark/clear.png new file mode 100644 index 00000000..d3a1c607 Binary files /dev/null and b/data/icons/menu/dark/clear.png differ diff --git a/data/icons/menu/dark/close.png b/data/icons/menu/dark/close.png new file mode 100644 index 00000000..6e9bb61a Binary files /dev/null and b/data/icons/menu/dark/close.png differ diff --git a/data/icons/menu/dark/connect.png b/data/icons/menu/dark/connect.png new file mode 100644 index 00000000..d80b55aa Binary files /dev/null and b/data/icons/menu/dark/connect.png differ diff --git a/data/icons/menu/dark/copy.png b/data/icons/menu/dark/copy.png new file mode 100644 index 00000000..f0dab355 Binary files /dev/null and b/data/icons/menu/dark/copy.png differ diff --git a/data/icons/menu/dark/delete.png b/data/icons/menu/dark/delete.png new file mode 100644 index 00000000..511142cc Binary files /dev/null and b/data/icons/menu/dark/delete.png differ diff --git a/data/icons/menu/dark/detach.png b/data/icons/menu/dark/detach.png new file mode 100644 index 00000000..edbf3997 Binary files /dev/null and b/data/icons/menu/dark/detach.png differ diff --git a/data/icons/menu/dark/disconnect.png b/data/icons/menu/dark/disconnect.png new file mode 100644 index 00000000..f77be0ca Binary files /dev/null and b/data/icons/menu/dark/disconnect.png differ diff --git a/data/icons/menu/dark/find.png b/data/icons/menu/dark/find.png new file mode 100644 index 00000000..43ab9876 Binary files /dev/null and b/data/icons/menu/dark/find.png differ diff --git a/data/icons/menu/dark/help.png b/data/icons/menu/dark/help.png new file mode 100644 index 00000000..6bb506b4 Binary files /dev/null and b/data/icons/menu/dark/help.png differ diff --git a/data/icons/menu/dark/join.png b/data/icons/menu/dark/join.png new file mode 100644 index 00000000..60907671 Binary files /dev/null and b/data/icons/menu/dark/join.png differ diff --git a/data/icons/menu/dark/load-plugin.png b/data/icons/menu/dark/load-plugin.png new file mode 100644 index 00000000..cdfec9d5 Binary files /dev/null and b/data/icons/menu/dark/load-plugin.png differ diff --git a/data/icons/menu/dark/network-list.png b/data/icons/menu/dark/network-list.png new file mode 100644 index 00000000..9aac1a20 Binary files /dev/null and b/data/icons/menu/dark/network-list.png differ diff --git a/data/icons/menu/dark/new.png b/data/icons/menu/dark/new.png new file mode 100644 index 00000000..24e226c9 Binary files /dev/null and b/data/icons/menu/dark/new.png differ diff --git a/data/icons/menu/dark/next.png b/data/icons/menu/dark/next.png new file mode 100644 index 00000000..0ac0df17 Binary files /dev/null and b/data/icons/menu/dark/next.png differ diff --git a/data/icons/menu/dark/preferences.png b/data/icons/menu/dark/preferences.png new file mode 100644 index 00000000..c33104d3 Binary files /dev/null and b/data/icons/menu/dark/preferences.png differ diff --git a/data/icons/menu/dark/previous.png b/data/icons/menu/dark/previous.png new file mode 100644 index 00000000..fbbe0dbf Binary files /dev/null and b/data/icons/menu/dark/previous.png differ diff --git a/data/icons/menu/dark/quit.png b/data/icons/menu/dark/quit.png new file mode 100644 index 00000000..47c2793e Binary files /dev/null and b/data/icons/menu/dark/quit.png differ diff --git a/data/icons/menu/dark/refresh.png b/data/icons/menu/dark/refresh.png new file mode 100644 index 00000000..c32d4259 Binary files /dev/null and b/data/icons/menu/dark/refresh.png differ diff --git a/data/icons/menu/dark/remove.png b/data/icons/menu/dark/remove.png new file mode 100644 index 00000000..83e0e007 Binary files /dev/null and b/data/icons/menu/dark/remove.png differ diff --git a/data/icons/menu/dark/save-as.png b/data/icons/menu/dark/save-as.png new file mode 100644 index 00000000..21a63153 Binary files /dev/null and b/data/icons/menu/dark/save-as.png differ diff --git a/data/icons/menu/dark/save.png b/data/icons/menu/dark/save.png new file mode 100644 index 00000000..841b26c6 Binary files /dev/null and b/data/icons/menu/dark/save.png differ diff --git a/data/icons/menu/dark/search.png b/data/icons/menu/dark/search.png new file mode 100644 index 00000000..0310a705 Binary files /dev/null and b/data/icons/menu/dark/search.png differ diff --git a/data/icons/menu/dark/spell-check.png b/data/icons/menu/dark/spell-check.png new file mode 100644 index 00000000..ec54916a Binary files /dev/null and b/data/icons/menu/dark/spell-check.png differ diff --git a/data/icons/menu/light/about.png b/data/icons/menu/light/about.png new file mode 100644 index 00000000..e1b58432 Binary files /dev/null and b/data/icons/menu/light/about.png differ diff --git a/data/icons/menu/light/add.png b/data/icons/menu/light/add.png new file mode 100644 index 00000000..c160c13f Binary files /dev/null and b/data/icons/menu/light/add.png differ diff --git a/data/icons/menu/light/chanlist.png b/data/icons/menu/light/chanlist.png new file mode 100644 index 00000000..dd358626 Binary files /dev/null and b/data/icons/menu/light/chanlist.png differ diff --git a/data/icons/menu/light/clear.png b/data/icons/menu/light/clear.png new file mode 100644 index 00000000..49a4ccfd Binary files /dev/null and b/data/icons/menu/light/clear.png differ diff --git a/data/icons/menu/light/close.png b/data/icons/menu/light/close.png new file mode 100644 index 00000000..6f0e8e9c Binary files /dev/null and b/data/icons/menu/light/close.png differ diff --git a/data/icons/menu/light/connect.png b/data/icons/menu/light/connect.png new file mode 100644 index 00000000..4f73f890 Binary files /dev/null and b/data/icons/menu/light/connect.png differ diff --git a/data/icons/menu/light/copy.png b/data/icons/menu/light/copy.png new file mode 100644 index 00000000..369e8732 Binary files /dev/null and b/data/icons/menu/light/copy.png differ diff --git a/data/icons/menu/light/delete.png b/data/icons/menu/light/delete.png new file mode 100644 index 00000000..a7aff1e8 Binary files /dev/null and b/data/icons/menu/light/delete.png differ diff --git a/data/icons/menu/light/detach.png b/data/icons/menu/light/detach.png new file mode 100644 index 00000000..3f4a2e38 Binary files /dev/null and b/data/icons/menu/light/detach.png differ diff --git a/data/icons/menu/light/disconnect.png b/data/icons/menu/light/disconnect.png new file mode 100644 index 00000000..275fb050 Binary files /dev/null and b/data/icons/menu/light/disconnect.png differ diff --git a/data/icons/menu/light/find.png b/data/icons/menu/light/find.png new file mode 100644 index 00000000..88cc5143 Binary files /dev/null and b/data/icons/menu/light/find.png differ diff --git a/data/icons/menu/light/help.png b/data/icons/menu/light/help.png new file mode 100644 index 00000000..55032857 Binary files /dev/null and b/data/icons/menu/light/help.png differ diff --git a/data/icons/menu/light/join.png b/data/icons/menu/light/join.png new file mode 100644 index 00000000..29a7d38f Binary files /dev/null and b/data/icons/menu/light/join.png differ diff --git a/data/icons/menu/light/load-plugin.png b/data/icons/menu/light/load-plugin.png new file mode 100644 index 00000000..923c33ae Binary files /dev/null and b/data/icons/menu/light/load-plugin.png differ diff --git a/data/icons/menu/light/network-list.png b/data/icons/menu/light/network-list.png new file mode 100644 index 00000000..dd358626 Binary files /dev/null and b/data/icons/menu/light/network-list.png differ diff --git a/data/icons/menu/light/new.png b/data/icons/menu/light/new.png new file mode 100644 index 00000000..01625797 Binary files /dev/null and b/data/icons/menu/light/new.png differ diff --git a/data/icons/menu/light/next.png b/data/icons/menu/light/next.png new file mode 100644 index 00000000..47f6a11d Binary files /dev/null and b/data/icons/menu/light/next.png differ diff --git a/data/icons/menu/light/preferences.png b/data/icons/menu/light/preferences.png new file mode 100644 index 00000000..5f600e55 Binary files /dev/null and b/data/icons/menu/light/preferences.png differ diff --git a/data/icons/menu/light/previous.png b/data/icons/menu/light/previous.png new file mode 100644 index 00000000..cb6b8c58 Binary files /dev/null and b/data/icons/menu/light/previous.png differ diff --git a/data/icons/menu/light/quit.png b/data/icons/menu/light/quit.png new file mode 100644 index 00000000..165393d0 Binary files /dev/null and b/data/icons/menu/light/quit.png differ diff --git a/data/icons/menu/light/refresh.png b/data/icons/menu/light/refresh.png new file mode 100644 index 00000000..929edc37 Binary files /dev/null and b/data/icons/menu/light/refresh.png differ diff --git a/data/icons/menu/light/remove.png b/data/icons/menu/light/remove.png new file mode 100644 index 00000000..a61b4cff Binary files /dev/null and b/data/icons/menu/light/remove.png differ diff --git a/data/icons/menu/light/save-as.png b/data/icons/menu/light/save-as.png new file mode 100644 index 00000000..69fe5ffa Binary files /dev/null and b/data/icons/menu/light/save-as.png differ diff --git a/data/icons/menu/light/save.png b/data/icons/menu/light/save.png new file mode 100644 index 00000000..70d5d9da Binary files /dev/null and b/data/icons/menu/light/save.png differ diff --git a/data/icons/menu/light/search.png b/data/icons/menu/light/search.png new file mode 100644 index 00000000..cb55e883 Binary files /dev/null and b/data/icons/menu/light/search.png differ diff --git a/data/icons/menu/light/spell-check.png b/data/icons/menu/light/spell-check.png new file mode 100644 index 00000000..67fc779c Binary files /dev/null and b/data/icons/menu/light/spell-check.png differ diff --git a/data/zoitechat.gresource.xml b/data/zoitechat.gresource.xml index 0be80d77..b85d7163 100644 --- a/data/zoitechat.gresource.xml +++ b/data/zoitechat.gresource.xml @@ -21,58 +21,58 @@ icons/tree_server.png icons/tree_util.png - icons/menu/light/new.svg - icons/menu/light/network-list.svg - icons/menu/light/load-plugin.svg - icons/menu/light/detach.svg - icons/menu/light/close.svg - icons/menu/light/quit.svg - icons/menu/light/disconnect.svg - icons/menu/light/connect.svg - icons/menu/light/join.svg - 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/save-as.svg - icons/menu/light/refresh.svg - icons/menu/light/search.svg - icons/menu/light/find.svg - icons/menu/light/previous.svg - icons/menu/light/next.svg - icons/menu/light/help.svg - icons/menu/light/about.svg + icons/menu/light/new.png + icons/menu/light/network-list.png + icons/menu/light/load-plugin.png + icons/menu/light/detach.png + icons/menu/light/close.png + icons/menu/light/quit.png + icons/menu/light/disconnect.png + icons/menu/light/connect.png + icons/menu/light/join.png + icons/menu/light/chanlist.png + icons/menu/light/preferences.png + icons/menu/light/clear.png + icons/menu/light/copy.png + icons/menu/light/delete.png + icons/menu/light/add.png + icons/menu/light/remove.png + icons/menu/light/spell-check.png + icons/menu/light/save.png + icons/menu/light/save-as.png + icons/menu/light/refresh.png + icons/menu/light/search.png + icons/menu/light/find.png + icons/menu/light/previous.png + icons/menu/light/next.png + icons/menu/light/help.png + icons/menu/light/about.png - icons/menu/dark/new.svg - icons/menu/dark/network-list.svg - icons/menu/dark/load-plugin.svg - icons/menu/dark/detach.svg - icons/menu/dark/close.svg - icons/menu/dark/quit.svg - icons/menu/dark/disconnect.svg - icons/menu/dark/connect.svg - icons/menu/dark/join.svg - 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/save-as.svg - icons/menu/dark/refresh.svg - icons/menu/dark/search.svg - icons/menu/dark/find.svg - icons/menu/dark/previous.svg - icons/menu/dark/next.svg - icons/menu/dark/help.svg - icons/menu/dark/about.svg + icons/menu/dark/new.png + icons/menu/dark/network-list.png + icons/menu/dark/load-plugin.png + icons/menu/dark/detach.png + icons/menu/dark/close.png + icons/menu/dark/quit.png + icons/menu/dark/disconnect.png + icons/menu/dark/connect.png + icons/menu/dark/join.png + icons/menu/dark/chanlist.png + icons/menu/dark/preferences.png + icons/menu/dark/clear.png + icons/menu/dark/copy.png + icons/menu/dark/delete.png + icons/menu/dark/add.png + icons/menu/dark/remove.png + icons/menu/dark/spell-check.png + icons/menu/dark/save.png + icons/menu/dark/save-as.png + icons/menu/dark/refresh.png + icons/menu/dark/search.png + icons/menu/dark/find.png + icons/menu/dark/previous.png + icons/menu/dark/next.png + icons/menu/dark/help.png + icons/menu/dark/about.png diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 8c772908..fd3c3617 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -220,8 +220,14 @@ gtkutil_menu_icon_pixbuf_new (const char *icon_name) if (!icon_name || !g_str_has_prefix (icon_name, "zc-menu-")) return NULL; - resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-")); - pixbuf = gdk_pixbuf_new_from_resource_at_scale (resource_path, -1, -1, TRUE, NULL); + resource_path = g_strdup_printf ("/icons/menu/light/%s.png", icon_name + strlen ("zc-menu-")); + pixbuf = gdk_pixbuf_new_from_resource (resource_path, NULL); + if (!pixbuf) + { + g_free (resource_path); + resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-")); + pixbuf = gdk_pixbuf_new_from_resource (resource_path, NULL); + } g_free (resource_path); return pixbuf; @@ -326,14 +332,25 @@ gtkutil_menu_icon_image_new (const char *icon_name, GtkIconSize size) return NULL; variant = gtkutil_menu_icon_theme_variant (); - resource_path = g_strdup_printf ("/icons/menu/%s/%s.svg", variant, icon_name + strlen ("zc-menu-")); + resource_path = g_strdup_printf ("/icons/menu/%s/%s.png", variant, icon_name + strlen ("zc-menu-")); if (!g_resources_get_info (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL)) { g_free (resource_path); - resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-")); + resource_path = g_strdup_printf ("/icons/menu/light/%s.png", icon_name + strlen ("zc-menu-")); } - pixbuf = gdk_pixbuf_new_from_resource_at_scale (resource_path, -1, -1, TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_resource (resource_path, NULL); + if (!pixbuf) + { + g_free (resource_path); + resource_path = g_strdup_printf ("/icons/menu/%s/%s.svg", variant, icon_name + strlen ("zc-menu-")); + if (!g_resources_get_info (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL)) + { + g_free (resource_path); + resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-")); + } + pixbuf = gdk_pixbuf_new_from_resource (resource_path, NULL); + } if (pixbuf) { image = gtk_image_new_from_pixbuf (pixbuf); diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 81cda565..32364b53 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -74,8 +74,14 @@ menu_icon_exists_in_resource (const char *icon_name) if (!icon_name || !g_str_has_prefix (icon_name, "zc-menu-")) return FALSE; - resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-")); + resource_path = g_strdup_printf ("/icons/menu/light/%s.png", icon_name + strlen ("zc-menu-")); found = g_resources_get_info (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL); + if (!found) + { + g_free (resource_path); + resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-")); + found = g_resources_get_info (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL); + } g_free (resource_path); return found;