revision 1017:f94af28e38b7
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 1017:f94af28e38b7 |
parent | 1016:6c63a6d20011 |
child | 1018:5942a162e5ef |
author | nkeynes |
date | Wed Jun 03 04:00:52 2009 +0000 (14 years ago) |
Replace dcemu.gif with the better-named lxdream.png
Update gtkui to actually use the icon
Add a GNOME desktop entry for menu goodness
Update gtkui to actually use the icon
Add a GNOME desktop entry for menu goodness
![]() | Makefile.am | view | annotate | diff | log | |
![]() | Makefile.in | view | annotate | diff | log | |
![]() | lxdream.desktop | view | annotate | diff | log | |
pixmaps/dcemu.gif | view | annotate | diff | log | ||
![]() | pixmaps/lxdream.png | view | annotate | diff | log | |
![]() | src/cocoaui/cocoaui.m | view | annotate | diff | log | |
![]() | src/gtkui/gtk_win.c | view | annotate | diff | log | |
![]() | src/gtkui/gtkcb.c | view | annotate | diff | log |
1.1 --- a/Makefile.am Wed Jun 03 03:59:22 2009 +00001.2 +++ b/Makefile.am Wed Jun 03 04:00:52 2009 +00001.3 @@ -8,7 +8,7 @@1.4 endif1.5 SUBDIRS = src po $(TEST_SUBDIR)1.7 -EXTRA_DIST = autogen.sh lxdream.pod bundlelibs.pl1.8 +EXTRA_DIST = autogen.sh lxdream.pod lxdream.desktop bundlelibs.pl1.10 dist_sysconf_DATA = lxdreamrc1.11 CLEANFILES = lxdream.11.12 @@ -27,11 +27,15 @@1.13 fi \1.14 done \1.15 fi1.16 + $(INSTALL_DATA) $(srcdir)/lxdream.desktop $(DESTDIR)$(datadir)/applications1.17 + $(INSTALL_DATA) $(srcdir)/pixmaps/lxdream.png $(DESTDIR)$(datadir)/pixmaps1.18 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)1.20 uninstall-local:1.21 @$(NORMAL_UNINSTALL)1.22 - rm -rf $(DESTDIR)$(datadir)/pixmaps1.23 + rm -rf $(DESTDIR)$(datadir)/pixmaps/$(PACKAGE)1.24 + rm -f $(DESTDIR)$(datadir)/pixmaps/lxdream.png1.25 + rm -f $(DESTDIR)$(datadir)/applications/lxdream.desktop1.27 clean-local:1.28 rm -rf $(BUNDLE)
2.1 --- a/Makefile.in Wed Jun 03 03:59:22 2009 +00002.2 +++ b/Makefile.in Wed Jun 03 04:00:52 2009 +00002.3 @@ -264,7 +264,7 @@2.4 BUNDLE = lxdream.app2.5 @BUILD_SYSTEST_TRUE@TEST_SUBDIR = test2.6 SUBDIRS = src po $(TEST_SUBDIR)2.7 -EXTRA_DIST = autogen.sh lxdream.pod bundlelibs.pl2.8 +EXTRA_DIST = autogen.sh lxdream.pod lxdream.desktop bundlelibs.pl2.9 dist_sysconf_DATA = lxdreamrc2.10 CLEANFILES = lxdream.12.11 man_MANS = lxdream.12.12 @@ -786,11 +786,15 @@2.13 fi \2.14 done \2.15 fi2.16 + $(INSTALL_DATA) $(srcdir)/lxdream.desktop $(DESTDIR)$(datadir)/applications2.17 + $(INSTALL_DATA) $(srcdir)/pixmaps/lxdream.png $(DESTDIR)$(datadir)/pixmaps2.18 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)2.20 uninstall-local:2.21 @$(NORMAL_UNINSTALL)2.22 - rm -rf $(DESTDIR)$(datadir)/pixmaps2.23 + rm -rf $(DESTDIR)$(datadir)/pixmaps/$(PACKAGE)2.24 + rm -f $(DESTDIR)$(datadir)/pixmaps/lxdream.png2.25 + rm -f $(DESTDIR)$(datadir)/applications/lxdream.desktop2.27 clean-local:2.28 rm -rf $(BUNDLE)
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +00003.2 +++ b/lxdream.desktop Wed Jun 03 04:00:52 2009 +00003.3 @@ -0,0 +1,12 @@3.4 +[Desktop Entry]3.5 +Version=1.03.6 +Encoding=UTF-83.7 +Name=lxdream3.8 +GenericName=Dreamcast Emulator3.9 +Type=Application3.10 +Categories=Game;Emulator3.11 +MimeType=application/x-lxdream-save-state;3.12 +FilePattern=gdi;GDI;dst;DST;3.13 +Exec=lxdream %f3.14 +TryExec=lxdream3.15 +Icon=lxdream
4.1 Binary file pixmaps/dcemu.gif has changed
5.1 Binary file pixmaps/lxdream.png has changed
6.1 --- a/src/cocoaui/cocoaui.m Wed Jun 03 03:59:22 2009 +00006.2 +++ b/src/cocoaui/cocoaui.m Wed Jun 03 04:00:52 2009 +00006.3 @@ -310,7 +310,7 @@6.5 LxdreamDelegate *delegate = [[LxdreamDelegate alloc] init];6.6 [NSApp setDelegate: delegate];6.7 - NSString *iconFile = [[NSBundle mainBundle] pathForResource:@"dcemu" ofType:@"gif"];6.8 + NSString *iconFile = [[NSBundle mainBundle] pathForResource:@"lxdream" ofType:@"png"];6.9 NSImage *iconImage = [[NSImage alloc] initWithContentsOfFile: iconFile];6.10 [iconImage setName: @"NSApplicationIcon"];6.11 [NSApp setApplicationIconImage: iconImage];
7.1 --- a/src/gtkui/gtk_win.c Wed Jun 03 03:59:22 2009 +00007.2 +++ b/src/gtkui/gtk_win.c Wed Jun 03 04:00:52 2009 +00007.3 @@ -289,6 +289,8 @@7.4 win->is_grabbed = FALSE;7.5 gtk_window_set_title( GTK_WINDOW(win->window), title );7.6 gtk_window_add_accel_group (GTK_WINDOW (win->window), accel_group);7.7 + gtk_window_set_icon_from_file( GTK_WINDOW(win->window),7.8 + PACKAGE_DATA_DIR "/pixmaps/lxdream.png", NULL );7.10 gtk_toolbar_set_style( GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS );
8.1 --- a/src/gtkui/gtkcb.c Wed Jun 03 03:59:22 2009 +00008.2 +++ b/src/gtkui/gtkcb.c Wed Jun 03 04:00:52 2009 +00008.3 @@ -181,6 +181,7 @@8.4 "name", APP_NAME,8.5 "version", lxdream_full_version,8.6 "copyright", lxdream_copyright,8.7 + "logo-icon-name", "lxdream",8.8 NULL);8.9 gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);8.10 gtk_dialog_run(GTK_DIALOG(dialog));
.