diff --git a/desmume/src/frontend/posix/gtk/DeSmuME.svg b/desmume/src/frontend/posix/gtk/DeSmuME.svg new file mode 100644 index 000000000..d9d9d30f3 --- /dev/null +++ b/desmume/src/frontend/posix/gtk/DeSmuME.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/desmume/src/frontend/posix/gtk/DeSmuME.xpm b/desmume/src/frontend/posix/gtk/DeSmuME.xpm deleted file mode 100644 index d1ce27621..000000000 --- a/desmume/src/frontend/posix/gtk/DeSmuME.xpm +++ /dev/null @@ -1,50 +0,0 @@ -/* XPM */ -static const char * DeSmuME_xpm[] = { -"32 32 15 1", -" c None", -". c #000000", -"+ c #F6F6FB", -"@ c #ECECF6", -"# c #E2E2F1", -"$ c #D8D8EC", -"% c #CFCFE7", -"& c #C5C5E2", -"* c #BBBBDE", -"= c #B1B1D9", -"- c #A8A8D4", -"; c #9E9ECF", -"> c #9494CA", -", c #8A8AC5", -"' c #8080C0", -" .................... ", -" .................... ", -".....++..+++++..+++++.. ", -".....++..++.....++..... ", -"..@@@@@..@@@@@..@@@@@.. ", -"..@@.@@..@@........@@.. ", -"..##.##..##.##..##.##.. ", -"..##.##..##.##..##.##.. ", -"..$$.$$..$$.$$..$$.$$.. ", -"..$$.$$..$$.$$..$$.$$.. ", -"..%%.%%..%%.%%..%%.%%.. ", -"..%%.%%..%%.%%..%%.%%.. ", -"..&&&&&..&&&&&..&&&&&.. ", -"....................... ", -".......********.**.**.. ", -" ..==.==.==.==.==.. ", -" ..==.==.==.==.==.. ", -" ..--.--.--.--.--.. ", -" ..--.--.--.--.--.. ", -" ..;;.;;.;;.;;;;;.. ", -" ..................... ", -" ..................... ", -" ..>>>>>>>>.>>>>>.. ", -" ..>>.>>.>>.>>..... ", -" ..,,.,,.,,.,,,,,.. ", -" ..,,.,,.,,.,,..... ", -" ..''.''.''.''.''.. ", -" ..''.''.''.''.''.. ", -" ..''.''.''.''.''.. ", -" ..''.''.''.'''''.. ", -" .................. ", -" .................. "}; diff --git a/desmume/src/frontend/posix/gtk/Makefile.am b/desmume/src/frontend/posix/gtk/Makefile.am index 76a206c15..75ecb9bea 100644 --- a/desmume/src/frontend/posix/gtk/Makefile.am +++ b/desmume/src/frontend/posix/gtk/Makefile.am @@ -6,8 +6,8 @@ AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(ALSA_CFLAGS) $(LI Applicationsdir = $(datadir)/applications Applications_DATA = desmume.desktop pixmapdir = $(datadir)/pixmaps -pixmap_DATA = DeSmuME.xpm -EXTRA_DIST = DeSmuME.xpm desmume.desktop +pixmap_DATA = DeSmuME.svg +EXTRA_DIST = DeSmuME.svg desmume.desktop bin_PROGRAMS = desmume desmume_SOURCES = \ avout.h \ diff --git a/desmume/src/frontend/posix/gtk/main.cpp b/desmume/src/frontend/posix/gtk/main.cpp index b2f00349f..2468a4be0 100644 --- a/desmume/src/frontend/posix/gtk/main.cpp +++ b/desmume/src/frontend/posix/gtk/main.cpp @@ -88,8 +88,6 @@ #include "config.h" -#include "DeSmuME.xpm" - #undef GPOINTER_TO_INT #define GPOINTER_TO_INT(p) ((gint) (glong) (p)) @@ -1515,8 +1513,6 @@ static inline void UpdateStatusBar (const char *message) static void About(GSimpleAction *action, GVariant *parameter, gpointer user_data) { - GdkPixbuf * pixbuf = gdk_pixbuf_new_from_xpm_data(DeSmuME_xpm); - static const gchar *authors[] = { "yopyop (original author)", "DeSmuME team", @@ -1527,12 +1523,10 @@ static void About(GSimpleAction *action, GVariant *parameter, gpointer user_data "program-name", "DeSmuME", "version", EMU_DESMUME_VERSION_STRING() + 1, // skip space "website", "http://desmume.org", - "logo", pixbuf, + "logo-icon-name", "DeSmuME", "comments", "Nintendo DS emulator based on work by Yopyop", "authors", authors, NULL); - - g_object_unref(pixbuf); } static void ToggleMenuVisible(GSimpleAction *action, GVariant *parameter, gpointer user_data) @@ -3918,7 +3912,7 @@ common_gtk_main(GApplication *app, gpointer user_data) pWindow = gtk_application_window_new(GTK_APPLICATION(app)); gtk_window_set_title(GTK_WINDOW(pWindow), "DeSmuME"); gtk_window_set_resizable(GTK_WINDOW (pWindow), TRUE); - gtk_window_set_icon(GTK_WINDOW (pWindow), gdk_pixbuf_new_from_xpm_data(DeSmuME_xpm)); + gtk_window_set_icon_name(GTK_WINDOW (pWindow), "DeSmuME"); g_signal_connect(G_OBJECT(pWindow), "destroy", G_CALLBACK(DoQuit), NULL); g_signal_connect(G_OBJECT(pWindow), "key_press_event", G_CALLBACK(Key_Press), NULL); diff --git a/desmume/src/frontend/posix/gtk/meson.build b/desmume/src/frontend/posix/gtk/meson.build index 914c495cd..1433736b8 100644 --- a/desmume/src/frontend/posix/gtk/meson.build +++ b/desmume/src/frontend/posix/gtk/meson.build @@ -35,4 +35,4 @@ executable('desmume', ) install_data('desmume.desktop', install_dir: get_option('datadir') / 'applications') -install_data('DeSmuME.xpm', install_dir: get_option('datadir') / 'pixmaps') +install_data('DeSmuME.svg', install_dir: get_option('datadir') / 'pixmaps')