Adding upstream version 0.1.1.
[debian/lxmenu-data.git] / layout / lxde-applications.menu
index 84b1986..013957b 100644 (file)
@@ -83,6 +83,7 @@
                <Include>
                        <And>
                                <Category>Graphics</Category>
+                               <Not><Category>Utility</Category></Not>
                        </And>
                </Include>
        </Menu> <!-- End Graphics -->
 
        <Menu>
                <Name>DesktopSettings</Name>
-               <Directory>lxde-menu-system.directory</Directory>
+               <Directory>lxde-settings.directory</Directory>
+               <OnlyUnallocated/>
                <Include>
+                       <Or>
+                               <Category>Settings</Category>
                                <Category>PackageManager</Category>
+                               <Category>System</Category>
+                       </Or>
                </Include>
-               <Menu>
-                       <Name>Preferences</Name>
-                       <Directory>lxde-settings.directory</Directory>
-                       <Include>
-                               <And>
-                                       <Category>Settings</Category>
-                                       <Not>
-                                               <Or>
-                                                       <Category>System</Category>
-                                                       <Filename>gnomecc.desktop</Filename>
-                                               </Or>
-                                       </Not>
-                               </And>
-                       </Include>
-               </Menu>
-
-               <!-- System Settings -->
-               <Menu>
-                       <Name>Administration</Name>
-                       <Directory>lxde-settings-system.directory</Directory>
-                       <Include>
-                               <And>
-                                       <Category>Settings</Category>
-                                       <Category>System</Category>
-                               </And>
-                       </Include>
-               </Menu>          <!-- End System Settings -->
-
                <Layout>
-                       <Menuname>Preferences</Menuname>
-                       <Menuname>Administration</Menuname>
                        <Merge type="menus"/>
                        <Merge type="files"/>
                </Layout>