aboutsummaryrefslogtreecommitdiffstats
path: root/menu
diff options
context:
space:
mode:
Diffstat (limited to 'menu')
-rw-r--r--menu/applications.menu.in57
-rw-r--r--menu/desktop-directories/mageia-games-action.directory.in5
-rw-r--r--menu/desktop-directories/mageia-games-emulators.directory.in5
-rw-r--r--menu/desktop-directories/mageia-games-roleplaying.directory.in5
-rw-r--r--menu/desktop-directories/mageia-games-shooters.directory.in5
-rw-r--r--menu/desktop-directories/mageia-games-simulation.directory.in5
6 files changed, 74 insertions, 8 deletions
diff --git a/menu/applications.menu.in b/menu/applications.menu.in
index b80d57f..173817f 100644
--- a/menu/applications.menu.in
+++ b/menu/applications.menu.in
@@ -454,7 +454,12 @@
<Name>Emulators</Name>
<Directory>mandriva-emulators.directory</Directory>
<Include>
- <Category>Emulator</Category>
+ <And>
+ <Category>Emulator</Category>
+ <Not>
+ <Category>Game</Category>
+ </Not>
+ </And>
</Include>
</Menu>
<!-- always present, just to ensure GNOME preferences don't appear in any menu -->
@@ -615,11 +620,16 @@
<Menu>
<Name>Games</Name>
<Layout>
+ <Menuname>Action</Menuname>
<Menuname>Adventure</Menuname>
<Menuname>Arcade</Menuname>
<Menuname>Boards</Menuname>
<Menuname>Cards</Menuname>
+ <Menuname>Emulators</Menuname>
<Menuname>Puzzles</Menuname>
+ <Menuname>Role-Playing</Menuname>
+ <Menuname>Shooters</Menuname>
+ <Menuname>Simulation</Menuname>
<Menuname>Sports</Menuname>
<Menuname>Strategy</Menuname>
<Menuname>Toys</Menuname>
@@ -635,6 +645,13 @@
</Or>
</Include>
<Menu>
+ <Name>Action</Name>
+ <Directory>mageia-games-action.directory</Directory>
+ <Include>
+ <Category>ActionGame</Category>
+ </Include>
+ </Menu>
+ <Menu>
<Name>Adventure</Name>
<Directory>mandriva-games-adventure.directory</Directory>
<Include>
@@ -675,6 +692,16 @@
</Include>
</Menu>
<Menu>
+ <Name>Emulators</Name>
+ <Directory>mageia-games-emulators.directory</Directory>
+ <Include>
+ <And>
+ <Category>Game</Category>
+ <Category>Emulator</Category>
+ </And>
+ </Include>
+ </Menu>
+ <Menu>
<Name>Puzzles</Name>
<Directory>mandriva-games-puzzles.directory</Directory>
<Include>
@@ -686,6 +713,27 @@
</Include>
</Menu>
<Menu>
+ <Name>Role-Playing</Name>
+ <Directory>mageia-games-roleplaying.directory</Directory>
+ <Include>
+ <Category>RolePlaying</Category>
+ </Include>
+ </Menu>
+ <Menu>
+ <Name>Shooters</Name>
+ <Directory>mageia-games-shooters.directory</Directory>
+ <Include>
+ <Category>Shooter</Category>
+ </Include>
+ </Menu>
+ <Menu>
+ <Name>Simulation</Name>
+ <Directory>mageia-games-simulation.directory</Directory>
+ <Include>
+ <Category>Simulation</Category>
+ </Include>
+ </Menu>
+ <Menu>
<Name>Sports</Name>
<Directory>mandriva-games-sports.directory</Directory>
<Include>
@@ -712,13 +760,6 @@
<Or>
<Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
<Category>KidsGame</Category>
- <Category>RolePlaying</Category>
- <Category>Simulation</Category>
- <Category>ActionGame</Category>
- <And>
- <Category>Game</Category>
- <Category>Emulator</Category>
- </And>
</Or>
</Include>
</Menu>
diff --git a/menu/desktop-directories/mageia-games-action.directory.in b/menu/desktop-directories/mageia-games-action.directory.in
new file mode 100644
index 0000000..46f05ad
--- /dev/null
+++ b/menu/desktop-directories/mageia-games-action.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Action
+Icon=other_amusement
diff --git a/menu/desktop-directories/mageia-games-emulators.directory.in b/menu/desktop-directories/mageia-games-emulators.directory.in
new file mode 100644
index 0000000..9b0385b
--- /dev/null
+++ b/menu/desktop-directories/mageia-games-emulators.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Emulators
+Icon=other_amusement
diff --git a/menu/desktop-directories/mageia-games-roleplaying.directory.in b/menu/desktop-directories/mageia-games-roleplaying.directory.in
new file mode 100644
index 0000000..4b34a02
--- /dev/null
+++ b/menu/desktop-directories/mageia-games-roleplaying.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Role-Playing
+Icon=other_amusement
diff --git a/menu/desktop-directories/mageia-games-shooters.directory.in b/menu/desktop-directories/mageia-games-shooters.directory.in
new file mode 100644
index 0000000..af1335b
--- /dev/null
+++ b/menu/desktop-directories/mageia-games-shooters.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Shooters
+Icon=other_amusement
diff --git a/menu/desktop-directories/mageia-games-simulation.directory.in b/menu/desktop-directories/mageia-games-simulation.directory.in
new file mode 100644
index 0000000..e8d3074
--- /dev/null
+++ b/menu/desktop-directories/mageia-games-simulation.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Simulation
+Icon=other_amusement