adjust excluding GNOME settings from menus

GNOME settings tools were excluded from several menus because
- GNOME has its own menu for them
- They are not relevant for non-GNOME

However, GNOME doesn't seem to have a separate menu for them anymore,
but instead has a control center.

Also, they matched some applications that are useful in non-GNOME (like
GParted).

Therefore, exclude only entries that have
- X-GNOME-Settings-Panel (they are included in GNOME control center)
or
- GNOME and X-GNOME-*Settings (they seem to be individual application
  settings shortcuts, useful mostly in the previous distinct settings
  menu but not so much cluttering the general Tools menu)

This shouldn't hide any previously visible tools, but should fix e.g.
missing gconf-editor.

This also has the effect that GNOME;HardwareSettings; tools like GParted
now appear in KDE under SystemTools.

If unwanted applications appear, they should get OnlyShowIn/NotShowIn,
get moved elsewhere, or handled individually in some other way.

1 files changed, 15 insertions, 9 deletions

diff --git a/menu/applications.menu.in b/menu/applications.menu.in
index b929f54..6d7cbd7 100644
--- a/menu/applications.menu.in
+++ b/menu/applications.menu.in
@@ -365,9 +365,17 @@
               <Category>X-KDE-settings-sound</Category>
               <Category>X-KDE-settings-system</Category>
               <Category>X-KDE-information</Category>
+              <Category>X-GNOME-Settings-Panel</Category>
               <And>
+                <!-- exclude X-GNOME-*Settings only when GNOME is set, as non-GNOME applications may have them
+                     these are excluded on GNOME because they either are already in the GNOME settings program
+                     or are simply shortcuts to settings of individual GNOME applications -->
                 <Category>GNOME</Category>
-                <Category>Settings</Category>
+                <Or>
+                  <Category>X-GNOME-PersonalSettings</Category>
+                  <Category>X-GNOME-SystemSettings</Category>
+                  <Category>X-GNOME-NetworkSettings</Category>
+                </Or>
               </And>
             </Or>
             <Not>
@@ -389,9 +397,9 @@
       </Layout>
       <Include>
         <And>
-          <!-- never show those, they are in a separate menu for GNOME and not relevant for KDE -->
+          <!-- never show those, they are in a separate tool for GNOME and not relevant for KDE -->
           <Not>
-            <Category>GNOME</Category>
+            <Category>X-GNOME-Settings-Panel</Category>
           </Not>
           <Category>HardwareSettings</Category>
         </And>
@@ -454,11 +462,13 @@
       <Name>GNOME Preferences</Name>
       <Directory>mandriva-system-configuration-gnome.directory</Directory>
       <Include>
+        <Category>X-GNOME-Settings-Panel</Category>
         <And>
           <Category>GNOME</Category>
           <Or>
-            <Category>Settings</Category>
-            <Category>DesktopSettings</Category>
+            <Category>X-GNOME-PersonalSettings</Category>
+            <Category>X-GNOME-SystemSettings</Category>
+            <Category>X-GNOME-NetworkSettings</Category>
           </Or>
         </And>
         <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
@@ -492,10 +502,6 @@
             <Category>X-MandrivaLinux-More</Category>
           </Or>
           <Not>
-            <And>
-              <Category>GNOME</Category>
-              <Category>Settings</Category>
-            </And>
             <Category>Accessibility</Category>
             <Category>HardwareSettings</Category>
             <Category>PackageManager</Category>