From bfa056c87600cce90617ce3cc9f6f42286ebc574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96yvind=20S=C3=A6ther?= <oyvinds@everdot.org>
Date: Sat, 8 Feb 2020 06:32:39 +0100
Subject: [PATCH] Add sub-menus for games, web browsers, text editors,
 multimeida mixers, calculators

---
 data/xfce/Makefile.am            |  17 ++-
 data/xfce/xfce-applications.menu | 200 +++++++++++++++++++++++++++++--
 2 files changed, 206 insertions(+), 11 deletions(-)

diff --git a/data/xfce/Makefile.am b/data/xfce/Makefile.am
index 3f63e4d..6f84064 100644
--- a/data/xfce/Makefile.am
+++ b/data/xfce/Makefile.am
@@ -36,7 +36,22 @@ directory_in_files =							\
 	xfce-personal.directory.in					\
 	xfce-screensavers.directory.in					\
 	xfce-settings.directory.in					\
-	xfce-system.directory.in
+	xfce-system.directory.in					\
+	xfce-calculators.directory.in					\
+	xfce-texteditors.directory.in					\
+	xfce-games-action.directory.in					\
+	xfce-games-arcade.directory.in					\
+	xfce-games-kids.directory.in					\
+	xfce-games-strategy.directory.in				\
+	xfce-games-card.directory.in					\
+	xfce-games-adventure.directory.in				\
+	xfce-games-board.directory.in					\
+	xfce-games-emulators.directory.in				\
+	xfce-games-logic.directory.in					\
+	xfce-multimedia-editors.directory.in				\
+	xfce-internet-webrowser.directory.in				\
+	xfce-multimedia-mixers.directory.in				\
+	xfce-games-logic.directory.in
 
 directory_DATA = $(directory_in_files:.directory.in=.directory)
 @INTLTOOL_DIRECTORY_RULE@
diff --git a/data/xfce/xfce-applications.menu b/data/xfce/xfce-applications.menu
index dc3056b..2233312 100644
--- a/data/xfce/xfce-applications.menu
+++ b/data/xfce/xfce-applications.menu
@@ -53,6 +53,26 @@
     <Menu>
         <Name>Accessories</Name>
         <Directory>xfce-accessories.directory</Directory>
+                <Menu>
+                        <Name>Calculator</Name>
+                        <Directory>xfce-calculator.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Utility</Category>
+                                        <Category>Calculator</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                        <Name>Text Editors</Name>
+                        <Directory>xfce-texteditors.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Utility</Category>
+                                        <Category>TextEditor</Category>
+                                </And>
+                        </Include>
+                </Menu>
         <Include>
             <Or>
                 <Category>Accessibility</Category>
@@ -63,6 +83,8 @@
         </Include>
         <Exclude>
             <Or>
+                <Category>Calculator</Category>
+                <Category>TextEditor</Category>
                 <Filename>exo-file-manager.desktop</Filename>
                 <Filename>exo-terminal-emulator.desktop</Filename>
                 <Filename>xfce4-about.desktop</Filename>
@@ -87,12 +109,122 @@
         </Include>
     </Menu>
 
-    <Menu>
+  <Menu>
         <Name>Games</Name>
         <Directory>xfce-games.directory</Directory>
-        <Include>
-            <Category>Game</Category>
-        </Include>
+                <Menu>
+                        <Name>Action</Name>
+                        <Directory>xfce-games-action.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>ActionGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                        <Name>Adventure</Name>
+                        <Directory>xfce-games-adventure.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>AdventureGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                        <Name>Arcade</Name>
+                        <Directory>xfce-games-arcade.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>ArcadeGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                        <Name>Board</Name>
+                        <Directory>xfce-games-board.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>BoardGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                      	<Name>Card</Name>
+                        <Directory>xfce-games-card.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>CardGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                        <Name>Kidsgames</Name>
+                        <Directory>xfce-games-kids.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>KidsGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                      	<Name>TacticStrategy</Name>
+                        <Directory>xfce-games-strategy.directory</Directory>
+                        <Include>
+                                <And>
+                                     	<Category>Game</Category>
+                                        <Category>StrategyGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                        <Name>Logic</Name>
+                        <Directory>xfce-games-logic.directory</Directory>
+                        <Include>
+                                <And>
+                                     	<Category>Game</Category>
+                                        <Category>LogicGame</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                      	<Name>Emulators</Name>
+                        <Directory>xfce-games-emulators.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Game</Category>
+                                        <Category>Emulator</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Include>
+                        <And>
+                                <Category>Game</Category>
+                                <Not>
+                                     	<Category>ActionGame</Category>
+                                        <Category>ArcadeGame</Category>
+                                        <Category>AdventureGame</Category>
+                                        <Category>BoardGame</Category>
+                                        <Category>CardGame</Category>
+                                        <Category>KidsGame</Category>
+                                        <Category>StrategyGame</Category>
+                                        <Category>LogicGame</Category>
+                                        <Category>Emulator</Category>
+                                </Not>
+                        </And>
+                </Include>
+                <Menu>
+                      	<Name>Toys</Name>
+                        <Directory>xfce-toys.directory</Directory>
+                        <Include>
+                                <Category>Amusement</Category>
+                        </Include>
+                </Menu>
     </Menu>
 
     <Menu>
@@ -104,21 +236,69 @@
     </Menu>
 
     <Menu>
-        <Name>Multimedia</Name>
+	<Name>Multimedia</Name>
         <Directory>xfce-multimedia.directory</Directory>
+                <Menu>
+                        <Name>Mixers</Name>
+                        <Directory>xfce-multimedia-mixers.directory</Directory>
+                        <Include>
+                                <And>
+                                     	<Category>AudioVideo</Category>
+                                        <Category>Mixer</Category>
+                                </And>
+                        </Include>
+                </Menu>
+                <Menu>
+                      	<Name>Editors</Name>
+                        <Directory>xfce-multimedia-editors.directory</Directory>
+                        <Include>
+                                <And>
+                                     	<Category>AudioVideo</Category>
+                                        <Category>AudioVideoEditing</Category>
+                                </And>
+                        </Include>
+                </Menu>
         <Include>
-            <Category>Audio</Category>
-            <Category>Video</Category>
-            <Category>AudioVideo</Category>
+                        <Category>Video</Category>
+                <And>
+                     	<Category>Audio</Category>
+                        <Not>
+                             	<Category>Mixer</Category>
+                                <Category>AudioVideoEditing</Category>
+
+                        </Not>
+                </And>
+                <And>
+                        <Category>AudioVideo</Category>
+                        <Not>
+                             	<Category>Mixer</Category>
+                                <Category>AudioVideoEditing</Category>
+                        </Not>
+                </And>
         </Include>
     </Menu>
 
     <Menu>
         <Name>Network</Name>
         <Directory>xfce-network.directory</Directory>
+                <Menu>
+                        <Name>Web Browser</Name>
+                        <Directory>xfce-internet-webrowser.directory</Directory>
+                        <Include>
+                                <And>
+                                        <Category>Network</Category>
+                                        <Category>WebBrowser</Category>
+                                </And>
+                        </Include>
+                </Menu>
         <Include>
-            <Category>Network</Category>
-        </Include>
+                        <And>
+                                <Category>Network</Category>
+                                <Not>
+                                        <Category>WebBrowser</Category>
+                                </Not>
+                        </And>
+	</Include>
         <Exclude>
             <Or>
                 <Filename>exo-mail-reader.desktop</Filename>
-- 
2.24.1