xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 257
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Thu 2011-02-10 19:52:49 +0100
message:
  etc/xdg/xdg-xubuntu/menus/xfce-applications.menu: small cleanup; hide
  more duplicate entries.
modified:
  debian/changelog
  etc/xdg/xdg-xubuntu/menus/xfce-applications.menu


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-09 23:27:36 +0000
+++ debian/changelog	2011-02-10 18:52:49 +0000
@@ -3,6 +3,8 @@
   * etc/xdg/xdg-xubuntu/xfce4/xfconf/…/xfce4-keyboard-shortcuts.xml:
     resync default keyboard shortcuts with upstream; mostly add shortcuts
     for 'xfce4-display-settings --minimal'.
+  * etc/xdg/xdg-xubuntu/menus/xfce-applications.menu: small cleanup; hide
+    more duplicate entries.
 
  -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Thu, 10 Feb 2011 00:25:22 +0100
 

=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2011-01-25 20:37:04 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2011-02-10 18:52:49 +0000
@@ -8,12 +8,10 @@
     <DefaultDirectoryDirs/>
 
     <Include>
-        <Or>
-            <Filename>ubuntu-software-center.desktop</Filename>
-            <Filename>xfhelp4.desktop</Filename>
-            <Filename>xfce4-about.desktop</Filename>
-            <Filename>xfce4-session-logout.desktop</Filename>
-        </Or>
+        <Filename>ubuntu-software-center.desktop</Filename>
+        <Filename>xfhelp4.desktop</Filename>
+        <Filename>xfce4-about.desktop</Filename>
+        <Filename>xfce4-session-logout.desktop</Filename>
     </Include>
 
     <Layout>
@@ -32,29 +30,21 @@
         <Name>Settings</Name>
         <Directory>xfce-settings.directory</Directory>
         <Include>
-            <Category>Settings</Category>
+            <Filename>xfce-settings-manager.desktop</Filename>
+            <Filename>xfce4-settings-editor.desktop</Filename>
+            <And>
+                <Category>Settings</Category>
+                <Not><Category>X-XFCE</Category></Not>
+                <Not><Category>X-XfceSettingsDialog</Category></Not>
+                <Not><Category>System</Category></Not>
+            </And>
         </Include>
-        <Exclude>
-            <Or>
-                <Category>X-XfceSettingsDialog</Category>
-                <Category>System</Category>
-            </Or>
-        </Exclude>
-
 
         <Layout>
             <Filename>xfce-settings-manager.desktop</Filename>
             <Separator/>
             <Merge type="all"/>
         </Layout>
-
-        <Menu>
-            <Name>Screensavers</Name>
-            <Directory>xfce-screensavers.directory</Directory>
-            <Include>
-                <Category>Screensaver</Category>
-            </Include>
-        </Menu>
     </Menu>
 
     <Menu>
@@ -69,12 +59,9 @@
             </Or>
         </Include>
         <Exclude>
-            <Or>
-                <Filename>exo-file-manager.desktop</Filename>
-                <Filename>exo-terminal-emulator.desktop</Filename>
-                <Filename>xfce4-about.desktop</Filename>
-                <Filename>xfrun4.desktop</Filename>
-            </Or>
+            <Category>Settings</Category>
+            <Category>System</Category>
+            <Category>X-Xfce-Toplevel</Category>
         </Exclude>
     </Menu>
 
@@ -90,7 +77,10 @@
         <Name>Education</Name>
         <Directory>xfce-education.directory</Directory>
         <Include>
-            <Category>Education</Category>
+            <And>
+                <Category>Education</Category>
+                <Not><Category>Science</Category></Not>
+            </And>
         </Include>
     </Menu>
 
@@ -127,10 +117,7 @@
             <Category>Network</Category>
         </Include>
         <Exclude>
-            <Or>
-                <Filename>exo-mail-reader.desktop</Filename>
-                <Filename>exo-web-browser.desktop</Filename>
-            </Or>
+            <Category>X-Xfce-Toplevel</Category>
         </Exclude>
     </Menu>
 
@@ -146,7 +133,10 @@
         <Name>Science</Name>
         <Directory>xfce-science.directory</Directory>
         <Include>
-            <Category>Science</Category>
+            <And>
+                <Category>Education</Category>
+                <Category>Science</Category>
+            </And>
         </Include>
     </Menu>
 
@@ -160,10 +150,7 @@
             </Or>
         </Include>
         <Exclude>
-            <Or>
-                <Filename>xfce4-session-logout.desktop</Filename>
-                <Filename>ubuntu-software-center.desktop</Filename>
-            </Or>
+            <Filename>ubuntu-software-center.desktop</Filename>
         </Exclude>
     </Menu>
 
@@ -175,12 +162,10 @@
             <All/>
         </Include>
         <Exclude>
-            <Or>
-                <Category>X-XfceSettingsDialog</Category>
-                <Category>X-Xfce-Toplevel</Category>
-            </Or>
+            <Category>Settings</Category>
+            <Category>Screensaver</Category>
+            <Category>X-Xfce-Toplevel</Category>
         </Exclude>
-
     </Menu>
 
 </Menu>