Create a nested 'kgames' menu for the desktop

This places all of the kgames applications inside a 'KGames' menu which lives in the main Games menu. This adds a configuration option as to whether to install the .menu file in the current user's home directory -- there isn't a location in /usr/local which is defined for this file, only /etc or $HOME. This is enabled by default so that a 'ninja install' works and doesn't require admin privs. Switch back to the /etc location by doing $ meson -Duser-menu=false Signed-off-by: Keith Packard <[email protected]>
keith-packard · Jan 10, 2022 · 7f000b8 · 7f000b8
1 parent 255d210
commit 7f000b8
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 14 deletions.
diff --git a/kaces/kaces.desktop.in b/kaces/kaces.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kcanfield/kcanfield.desktop.in b/kcanfield/kcanfield.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kcribbage/kcribbage.desktop.in b/kcribbage/kcribbage.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kdominos/kdominos.desktop.in b/kdominos/kdominos.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kdominos.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kgames.directory.in b/kgames.directory.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+
+Icon=@ICONDIR@/kgames.svg
+
+Name=Kgames
diff --git a/kgames.menu.in b/kgames.menu.in
@@ -0,0 +1,18 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.1.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Menu>
+    <Name>Games</Name>
+    <Exclude>
+      <Category>Kgames</Category>
+    </Exclude>
+    <Menu>
+      <Name>KGames</Name>
+      <Directory>kgames.directory</Directory>
+      <Include>
+	<Category>Kgames</Category>
+      </Include>
+    </Menu>
+  </Menu>
+</Menu>
diff --git a/kklondike/kklondike.desktop.in b/kklondike/kklondike.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kmcarlo/kmcarlo.desktop.in b/kmcarlo/kmcarlo.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kmontana/kmontana.desktop.in b/kmontana/kmontana.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kslyfox/kslyfox.desktop.in b/kslyfox/kslyfox.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kspider/kspider.desktop.in b/kspider/kspider.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/ktabby/ktabby.desktop.in b/ktabby/ktabby.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/kthieves/kthieves.desktop.in b/kthieves/kthieves.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/ktowers/ktowers.desktop.in b/ktowers/ktowers.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/kgames.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/meson.build b/meson.build
@@ -52,6 +52,20 @@ svg_icon_dir = datadir / 'icons/hicolor/scalable/apps'
 
 desktop_dir = datadir / 'applications'
 
+menudir = get_option('menudir')
+if menudir == ''
+  if get_option('user-menu')
+    fs = import('fs')
+    xdg_config_dir = fs.expanduser('~/.config')
+    message('user-menu config_dir is ' + xdg_config_dir)
+  else
+    xdg_config_dir= sysconfdir / 'xdg'
+  endif
+  menudir = xdg_config_dir / 'menus/applications-merged'
+endif
+
+message('menudir is ' + menudir)
+
 conf_data = configuration_data()
 conf_data.set('KGAMES_VERSION', meson.project_version(),
 	      description: 'KGames version in unquoted string form.')
@@ -60,6 +74,7 @@ conf_data.set('KGAMES_VERSION_STRING',
 	      description: 'KGames version in quoted string form.')
 conf_data.set('BINDIR', prefix / bindir)
 conf_data.set('ICONDIR', prefix / svg_icon_dir)
+conf_data.set('MENUDIR', menudir)
 
 inc_dirs = ['.']
 
@@ -69,6 +84,18 @@ configure_file(output : 'kgames.h',
 	       configuration: conf_data,
 	       install: false)
 
+configure_file(input: 'kgames.directory.in',
+	       output: '@BASENAME@',
+	       configuration: conf_data,
+	       install_dir : datadir / 'desktop-directories'
+	       )
+
+configure_file(input: 'kgames.menu.in',
+	       output: '@BASENAME@',
+	       configuration: conf_data,
+	       install_dir : menudir
+	       )
+
 subdir('Xkw')
 subdir('kaces')
 subdir('kcanfield')

diff --git a/meson_options.txt b/meson_options.txt
@@ -0,0 +1,4 @@
+option('user-menu', type: 'boolean', value: true,
+       description: 'Install menu file only for current user')
+option('menudir', type: 'string',
+       description: 'Install directory for menu file')
diff --git a/xmille/xmille.desktop.in b/xmille/xmille.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/xmille.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;CardGame
+Categories=Game;CardGame;Kgames
diff --git a/xreversi/xreversi.desktop.in b/xreversi/xreversi.desktop.in
@@ -8,4 +8,4 @@ Icon=@ICONDIR@/xreversi.svg
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Game;BoardGame
+Categories=Game;BoardGame;Kgames