From 46dbe96efd039d49a4a43603f823340520eccfaa Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Thu, 12 Jun 2014 18:03:39 -0700 Subject: Add desktop entries for all the games, make the Setup launch generic The same icon is used for all four games, even though it's designed to resemble Doom's logo and looks a bit silly with all of them lined up. Also the Setup Desktop Entry now only launches chocolate-setup, which then prompts for the game to configure. This avoids cluttering up a DE's Preferences menu, control panel, or however it will be displayed. --- configure.ac | 7 ++++++- src/Makefile.am | 15 ++++++++++++++- src/doom-screensaver.desktop.in | 6 ++---- src/doom.desktop.in | 2 +- src/heretic.desktop.in | 7 +++++++ src/hexen.desktop.in | 7 +++++++ src/setup/setup.desktop.in | 6 +++--- src/strife.desktop.in | 7 +++++++ 8 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 src/heretic.desktop.in create mode 100644 src/hexen.desktop.in create mode 100644 src/strife.desktop.in diff --git a/configure.ac b/configure.ac index a9c3d8cb..fcefdc60 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_INIT(Chocolate Doom, 2.0.0, fraggle@gmail.com, chocolate-doom) -PACKAGE_SHORTDESC="Conservative Doom source port" +PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom} +PACKAGE_SHORTDESC="Conservative source port" PACKAGE_COPYRIGHT="Copyright (C) 1993-2013" PACKAGE_LICENSE="GNU General Public License, version 2" PACKAGE_MAINTAINER="Simon Howard" @@ -135,6 +136,7 @@ AC_SUBST(SDLNET_LIBS) AC_SUBST(ac_aux_dir) +AC_SUBST(PACKAGE_SHORTNAME) AC_SUBST(PACKAGE_SHORTDESC) AC_SUBST(PACKAGE_COPYRIGHT) AC_SUBST(PACKAGE_LICENSE) @@ -160,13 +162,16 @@ src/Makefile src/doom.desktop src/doom-screensaver.desktop src/doom/Makefile +src/heretic.desktop src/heretic/Makefile +src/hexen.desktop src/hexen/Makefile src/resource.rc src/setup-res.rc src/setup/Makefile src/setup/setup.desktop src/setup/setup-manifest.xml +src/strife.desktop src/strife/Makefile textscreen/Makefile textscreen/examples/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 5c9d15f4..16496d88 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -218,11 +218,24 @@ EXTRA_DIST = \ manifest.xml appdir = $(prefix)/share/applications -app_DATA = @PROGRAM_PREFIX@doom.desktop +app_DATA = \ + @PROGRAM_PREFIX@doom.desktop \ + @PROGRAM_PREFIX@heretic.desktop \ + @PROGRAM_PREFIX@hexen.desktop \ + @PROGRAM_PREFIX@strife.desktop @PROGRAM_PREFIX@doom.desktop : doom.desktop cp doom.desktop $@ +@PROGRAM_PREFIX@heretic.desktop : heretic.desktop + cp heretic.desktop $@ + +@PROGRAM_PREFIX@hexen.desktop : hexen.desktop + cp hexen.desktop $@ + +@PROGRAM_PREFIX@strife.desktop : strife.desktop + cp strife.desktop $@ + screensaverdir = $(prefix)/share/applications/screensavers screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop diff --git a/src/doom-screensaver.desktop.in b/src/doom-screensaver.desktop.in index 315f964c..deb7274a 100644 --- a/src/doom-screensaver.desktop.in +++ b/src/doom-screensaver.desktop.in @@ -1,12 +1,10 @@ - [Desktop Entry] -Name=@PACKAGE_NAME@ +Name=@PACKAGE_SHORTNAME@ Doom Comment=@PACKAGE_SHORTDESC@ TryExec=@PROGRAM_PREFIX@doom Exec=@PROGRAM_PREFIX@doom StartupNotify=false Terminal=false Type=Application -OnlyShowIn=GNOME; +OnlyShowIn=GNOME;MATE; Categories=Screensaver; - diff --git a/src/doom.desktop.in b/src/doom.desktop.in index 44b76e62..e554a244 100644 --- a/src/doom.desktop.in +++ b/src/doom.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -Name=@PACKAGE_NAME@ +Name=@PACKAGE_SHORTNAME@ Doom Exec=@PROGRAM_PREFIX@doom Icon=@PROGRAM_PREFIX@doom Type=Application diff --git a/src/heretic.desktop.in b/src/heretic.desktop.in new file mode 100644 index 00000000..54ef6a83 --- /dev/null +++ b/src/heretic.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=@PACKAGE_SHORTNAME@ Heretic +Exec=@PROGRAM_PREFIX@heretic +Icon=@PROGRAM_PREFIX@doom +Type=Application +Comment=@PACKAGE_SHORTDESC@ +Categories=Game;ActionGame; diff --git a/src/hexen.desktop.in b/src/hexen.desktop.in new file mode 100644 index 00000000..14603840 --- /dev/null +++ b/src/hexen.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=@PACKAGE_SHORTNAME@ Hexen +Exec=@PROGRAM_PREFIX@hexen +Icon=@PROGRAM_PREFIX@doom +Type=Application +Comment=@PACKAGE_SHORTDESC@ +Categories=Game;ActionGame; diff --git a/src/setup/setup.desktop.in b/src/setup/setup.desktop.in index 4b1cf69c..91decb41 100644 --- a/src/setup/setup.desktop.in +++ b/src/setup/setup.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -Name=@PACKAGE_NAME@ Setup -Exec=@PROGRAM_PREFIX@doom-setup +Name=@PACKAGE_SHORTNAME@ Setup +Exec=@PROGRAM_PREFIX@setup Icon=@PROGRAM_PREFIX@setup Type=Application -Comment=Setup tool for @PACKAGE_NAME@ +Comment=Setup tool for @PACKAGE_SHORTNAME@ Categories=Settings diff --git a/src/strife.desktop.in b/src/strife.desktop.in new file mode 100644 index 00000000..eb44c61d --- /dev/null +++ b/src/strife.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=@PACKAGE_SHORTNAME@ Strife +Exec=@PROGRAM_PREFIX@strife +Icon=@PROGRAM_PREFIX@doom +Type=Application +Comment=@PACKAGE_SHORTDESC@ +Categories=Game;ActionGame; -- cgit v1.2.3