xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 380
fixes bug: https://launchpad.net/bugs/1040902
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Wed 2012-08-29 01:41:08 +0200
message:
  * etc/xdg/xdg-xubuntu/menus/*.menu:
    - updated to show more Settings' apps in xfce4-settings-manager,
    per other-q-xubuntu-settings-manager-launchers. lp: #1040902
    - fix typo, xfrun4.desktop is actually named xfce4-run.desktop.
added:
  etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu
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	2012-08-23 19:02:08 +0000
+++ debian/changelog	2012-08-28 23:41:08 +0000
@@ -1,3 +1,12 @@
+xubuntu-default-settings (12.10.4) UNRELEASED; urgency=low
+
+  * etc/xdg/xdg-xubuntu/menus/*.menu:
+    - updated to show more Settings' apps in xfce4-settings-manager,
+    per other-q-xubuntu-settings-manager-launchers. lp: #1040902
+    - fix typo, xfrun4.desktop is actually named xfce4-run.desktop.
+
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Wed, 29 Aug 2012 01:35:06 +0200
+
 xubuntu-default-settings (12.10.3) quantal; urgency=low
 
   * Replace datetime by clock now that it features a calendar as well.

=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2012-08-23 18:53:47 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2012-08-28 23:41:08 +0000
@@ -11,6 +11,7 @@
     <Include>
         <Filename>exo-web-browser.desktop</Filename>
         <Filename>exo-mail-reader.desktop</Filename>
+        <Filename>xfce-settings-manager.desktop</Filename>
         <Filename>ubuntu-software-center.desktop</Filename>
         <Filename>xfhelp4.desktop</Filename>
         <Filename>xfce4-about.desktop</Filename>
@@ -21,7 +22,7 @@
         <Filename>exo-web-browser.desktop</Filename>
         <Filename>exo-mail-reader.desktop</Filename>
         <Separator/>
-        <Menuname>Settings</Menuname>
+        <Filename>xfce-settings-manager.desktop</Filename>
         <Separator/>
         <Merge type="all"/>
         <Separator/>
@@ -33,27 +34,6 @@
     </Layout>
 
     <Menu>
-        <Name>Settings</Name>
-        <Directory>xfce-settings.directory</Directory>
-        <Include>
-            <Filename>xfce-settings-manager.desktop</Filename>
-            <Filename>xfce4-settings-editor.desktop</Filename>
-            <And>
-                <Category>Settings</Category>
-                <Not><Category>XFCE</Category></Not>
-                <Not><Category>X-XFCE-SettingsDialog</Category></Not>
-                <Not><Category>System</Category></Not>
-            </And>
-        </Include>
-
-        <Layout>
-            <Filename>xfce-settings-manager.desktop</Filename>
-            <Separator/>
-            <Merge type="all"/>
-        </Layout>
-    </Menu>
-
-    <Menu>
         <Name>Accessories</Name>
         <Directory>xfce-accessories.directory</Directory>
         <Include>
@@ -73,7 +53,7 @@
         </Exclude>
 
         <Layout>
-            <Filename>xfrun4.desktop</Filename>
+            <Filename>xfce4-run.desktop</Filename>
             <Filename>xfce4-appfinder.desktop</Filename>
             <Separator/>
             <Merge type="all"/>
@@ -155,6 +135,7 @@
         </Include>
         <Exclude>
             <Or>
+                <Category>Settings</Category>
                 <Filename>xfce4-session-logout.desktop</Filename>
                 <Filename>ubuntu-software-center.desktop</Filename>
             </Or>

=== added file 'etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu	1970-01-01 00:00:00 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu	2012-08-28 23:41:08 +0000
@@ -0,0 +1,124 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd";>
+
+<Menu>
+  <Name>Settings</Name>
+
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <DefaultMergeDirs/>
+
+   <Layout>
+     <Menuname>Personal</Menuname>
+     <Menuname>Hardware</Menuname>
+     <Menuname>System</Menuname>
+     <Menuname>Other</Menuname>
+     <Merge type="all" />
+   </Layout>
+
+  <Include>
+    <And>
+      <Category>Settings</Category>
+      <Not>
+        <Or>
+          <Category>X-XFCE-PersonalSettings</Category>
+          <Category>X-XFCE-HardwareSettings</Category>
+          <Category>X-XFCE-SystemSettings</Category>
+        </Or>
+      </Not>
+    </And>
+  </Include>
+
+  <Exclude>
+    <Filename>xfce-settings-manager.desktop</Filename>
+  </Exclude>
+
+  <Menu>
+    <Name>Personal</Name>
+    <Directory>xfce-personal.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-PersonalSettings</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>DesktopSettings</Category>
+      </And>
+      <Filename>xscreensaver-properties.desktop</Filename>
+    </Include>
+    <Exclude>
+      <Category>X-XFCE-HardwareSettings</Category>
+      <Category>X-XFCE-SystemSettings</Category>
+      <Filename>xfce4-settings-editor.desktop</Filename>
+      <Filename>xfce-settings-manager.desktop</Filename>
+    </Exclude>
+  </Menu>
+
+  <Menu>
+    <Name>Hardware</Name>
+    <Directory>xfce-hardware.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-HardwareSettings</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>HardwareSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+      <Filename>nm-connection-editor.desktop</Filename>
+      <Filename>system-config-printer.desktop</Filename>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System</Name>
+    <Directory>xfce-system.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-SystemSettings</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>System</Category>
+        <Not><Category>PackageManager</Category></Not>
+      </And>
+      <Filename>software-properties-gtk.desktop</Filename>
+    </Include>
+    <Exclude>
+      <Filename>system-config-printer.desktop</Filename>
+    </Exclude>
+  </Menu>
+
+  <Menu>
+    <Name>Other</Name>
+    <Directory>xfce-other.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not>
+          <Or>
+            <Category>X-XFCE-PersonalSettings</Category>
+            <Category>X-XFCE-SystemSettings</Category>
+            <Category>X-XFCE-HardwareSettings</Category>
+            <Category>DesktopSettings</Category>
+            <Category>HardwareSettings</Category>
+            <Category>System</Category>
+            <Filename>nm-connection-editor.desktop</Filename>
+            <Filename>software-properties-gtk.desktop</Filename>
+            <Filename>xscreensaver-properties.desktop</Filename>
+            <Filename>xfce-settings-manager.desktop</Filename>
+          </Or>
+        </Not>
+      </And>
+      <Filename>xfce4-settings-editor.desktop</Filename>
+    </Include>
+  </Menu>
+
+</Menu>