summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruebrain <truebrain@openttd.org>2008-10-16 11:33:17 +0000
committertruebrain <truebrain@openttd.org>2008-10-16 11:33:17 +0000
commita4712a3323eb11ee8c62a1dfaccad4dfefb4cb24 (patch)
treea454590328a740cb4a004c9c0f3cebb432960ebe
parent570c998c60f1fdf8ed58231beb59b9bf74c2d8a7 (diff)
downloadopenttd-a4712a3323eb11ee8c62a1dfaccad4dfefb4cb24.tar.xz
(svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
-rw-r--r--config.lib9
-rw-r--r--media/openttd.desktop.in5
2 files changed, 10 insertions, 4 deletions
diff --git a/config.lib b/config.lib
index 78d7301de..181de5a93 100644
--- a/config.lib
+++ b/config.lib
@@ -37,6 +37,7 @@ set_default() {
man_dir="1"
menu_dir="1"
menu_group="Game;"
+ menu_name="OpenTTD"
binary_name="openttd"
enable_debug="0"
enable_desync_debug="0"
@@ -101,6 +102,7 @@ set_default() {
shared_dir
install_dir
menu_group
+ menu_name
binary_name
enable_debug
enable_desync_debug
@@ -215,6 +217,9 @@ detect_params() {
--menu-dir=*) menu_dir="$optarg";;
--without-menu-entry) menu_dir="";;
+ --menu-name) prevp_p="menu_name";;
+ --menu-name=*) menu_name="$optarg";;
+
--binary-name) prevp_p="binary_name";;
--binary-name=*) binary_name="$optarg";;
@@ -2379,7 +2384,8 @@ make_sed() {
generate_menu_item() {
MENU_REPLACE="
s~!!TTD!!~$TTD~g;
- s~!!MENU_GROUP!!~$menu_group~g
+ s~!!MENU_GROUP!!~$menu_group~g;
+ s~!!MENU_NAME!!~$menu_name~g
"
echo "Generating menu item..."
mkdir -p media
@@ -2553,6 +2559,7 @@ showhelp() {
echo " (OSX ONLY)"
echo " --without-menu-entry Don't generate a menu item (Freedesktop based only)"
echo " --menu-group=group Category in which the menu item will be placed (Freedesktop based only)"
+ echo " --menu-name=name Name of the menu item when placed [OpenTTD]
echo " --with-direct-music enable direct music support (Win32 ONLY)"
echo " --with-sort=sort define a non-default location for sort"
echo " --with-midi=midi define which midi-player to use"
diff --git a/media/openttd.desktop.in b/media/openttd.desktop.in
index 4ad20ca4c..b3ed675fb 100644
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -4,9 +4,8 @@
Encoding=UTF-8
Type=Application
Version=1.1
-Name=OpenTTD
-GenericName=A clone of Transport Tycoon Deluxe
-Comment=A business simulation game
+Name=!!MENU_NAME!!
+Comment=A clone of Transport Tycoon Deluxe
Icon=openttd
Exec=!!TTD!!
Terminal=false