Add an XDG menu directory (#1149)

Add XDG directory and menu files

to have a Waydroid menu directory with all Waydroid apps,
and avoid having them in a 'Lost & Found' menu directory

---------

Co-authored-by: Taha <62564400+inspectorgadget03@users.noreply.github.com>

diff --git a/Makefile b/Makefile
index cc625952510722998406185e5b52e38dd1cdc141..9e7af7696ce9795e99081afca55c7a0a98699090 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ USE_NFTABLES ?= 0
 WAYDROID_DIR := $(PREFIX)/lib/waydroid
 BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications
 WAYDROID_DIR := $(PREFIX)/lib/waydroid
 BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications

+APPS_DIRECTORY_DIR := $(PREFIX)/share/desktop-directories
+APPS_MENU_DIR := /etc/xdg/menus/applications-merged

 METAINFO_DIR := $(PREFIX)/share/metainfo
 ICONS_DIR := $(PREFIX)/share/icons
 SYSD_DIR := $(PREFIX)/lib/systemd/system
 METAINFO_DIR := $(PREFIX)/share/metainfo
 ICONS_DIR := $(PREFIX)/share/icons
 SYSD_DIR := $(PREFIX)/lib/systemd/system


@@ -17,6 +19,8 @@ APPARMOR_DIR := /etc/apparmor.d
 INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
 INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)

+INSTALL_APPS_DIRECTORY_DIR := $(DESTDIR)$(APPS_DIRECTORY_DIR)
+INSTALL_APPS_MENU_DIR := $(DESTDIR)$(APPS_MENU_DIR)

 INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
 INSTALL_ICONS_DIR := $(DESTDIR)$(ICONS_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)
 INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
 INSTALL_ICONS_DIR := $(DESTDIR)$(ICONS_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)


@@ -34,6 +38,8 @@ install:
        ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
        mv $(INSTALL_WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
        mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
        ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
        mv $(INSTALL_WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
        mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)

+       mv $(INSTALL_WAYDROID_DIR)/data/*.menu $(INSTALL_APPS_MENU_DIR)
+       mv $(INSTALL_WAYDROID_DIR)/data/*.directory $(INSTALL_APPS_DIRECTORY_DIR)

        mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
        cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
        cp dbus/id.waydro.Container.policy $(INSTALL_POLKIT_DIR)/actions/
        mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
        cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
        cp dbus/id.waydro.Container.policy $(INSTALL_POLKIT_DIR)/actions/

diff --git a/data/waydroid.directory b/data/waydroid.directory
new file mode 100644 (file)
index 0000000..3f3a2d6
--- /dev/null
+++ b/data/waydroid.directory
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Waydroid
+Icon=waydroid
+Type=Directory

diff --git a/data/waydroid.menu b/data/waydroid.menu
new file mode 100644 (file)
index 0000000..55f7f36
--- /dev/null
+++ b/data/waydroid.menu
@@ -0,0 +1,12 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+       <Name>Applications</Name>
+       <Menu>
+               <Name>Waydroid</Name>
+               <Directory>waydroid.directory</Directory>
+               <Include>
+                       <Category>X-WayDroid-App</Category>
+               </Include>
+       </Menu>
+</Menu>