Update TDE menu to reduce clutter and eliminate conflicts with KDE4.

This partially resolves bug report 977.

4 files changed, 1100 insertions, 97 deletions

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 0b9a3d72a..903126ca8 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES kdedmodule.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 ##### other data ################################
 
 install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-install( FILES applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
+install( FILES applications.menu applications.menu-no-kde DESTINATION ${XDG_MENU_INSTALL_DIR} )
 install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 
diff --git a/kded/Makefile.am b/kded/Makefile.am
index a536a0ab3..ba49c2c8f 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -39,7 +39,7 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
 
 kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdontchangethehostname_LDADD = $(LIB_TDECORE) 
+kdontchangethehostname_LDADD = $(LIB_TDECORE)
 kdontchangethehostname_SOURCES = khostname.cpp
 
 kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
@@ -62,7 +62,7 @@ noinst_HEADERS = kbuildsycoca.h kbuildservicetypefactory.h \
 servicetype_DATA = kdedmodule.desktop
 servicetypedir = $(kde_servicetypesdir)
 
-xdg_menu_DATA = applications.menu
+xdg_menu_DATA = applications.menu applications.menu-no-kde
 
 update_DATA = kded.upd
 updatedir = $(kde_datadir)/kconf_update
diff --git a/kded/applications.menu b/kded/applications.menu
index 4590254c8..884de9cb9 100644
--- a/kded/applications.menu
+++ b/kded/applications.menu
@@ -44,8 +44,9 @@
       <Directory>tde-development-tdevelop.directory</Directory>
       <Include>
         <And>
-        <Category>Development</Category>
-        <Category>X-TDE-TDevelopIDE</Category>
+          <Category>Development</Category>
+          <Category>X-TDE-TDevelopIDE</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -54,8 +55,9 @@
       <Directory>tde-development-translation.directory</Directory>
       <Include>
         <And>
-        <Category>Development</Category>
-        <Category>Translation</Category>
+          <Category>Development</Category>
+          <Category>Translation</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -64,19 +66,58 @@
       <Directory>tde-development-webdevelopment.directory</Directory>
       <Include>
         <And>
-        <Category>Development</Category>
-        <Category>WebDevelopment</Category>
+          <Category>Development</Category>
+          <Category>WebDevelopment</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
-      <Include>
-        <And>
+    <Include>
+      <And>
         <Category>Development</Category>
         <Not><Category>X-TDE-TDevelopIDE</Category></Not>
         <Not><Category>Translation</Category></Not>
         <Not><Category>WebDevelopment</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-development.directory</Directory>
+      <Include>
+        <And>
+          <Category>Development</Category>
+          <Category>KDE</Category>
+          <Not><Category>Translation</Category></Not>
+          <Not><Category>WebDevelopment</Category></Not>
+          <Not><Category>TDE</Category></Not>
         </And>
       </Include>
+      <Menu>
+        <Name>Translation</Name>
+        <Directory>kde-development-translation.directory</Directory>
+        <Include>
+          <And>
+            <Category>Development</Category>
+            <Category>Translation</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Web Development</Name>
+        <Directory>kde-development-webdevelopment.directory</Directory>
+        <Include>
+          <And>
+            <Category>Development</Category>
+            <Category>WebDevelopment</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+    </Menu>
   </Menu>
   <Menu>
     <Name>Science</Name>
@@ -94,6 +135,7 @@
           <Category>Science</Category>
         </Or>
         <Not><Category>Education</Category></Not>
+        <Not><Category>KDE</Category></Not>
       </And>
     </Include>
   </Menu>
@@ -105,11 +147,12 @@
       <Directory>tde-edu-languages.directory</Directory>
       <Include>
         <And>
-        <Category>Education</Category>
-        <Or>
-        <Category>Languages</Category>
-        <Category>X-TDE-Edu-Language</Category>
-        </Or>
+          <Category>Education</Category>
+          <Or>
+            <Category>Languages</Category>
+            <Category>X-TDE-Edu-Language</Category>
+          </Or>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -118,8 +161,9 @@
       <Directory>tde-edu-mathematics.directory</Directory>
       <Include>
         <And>
-        <Category>Education</Category>
-        <Category>Math</Category>
+          <Category>Education</Category>
+          <Category>Math</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -128,15 +172,16 @@
       <Directory>tde-edu-miscellaneous.directory</Directory>
       <Include>
         <And>
-        <Category>Education</Category>
-        <Not>
-        <Category>Languages</Category>
-        <Category>X-TDE-Edu-Language</Category>
-        <Category>Math</Category>
-        <Category>Science</Category>
-        <Category>Teaching</Category>
-        <Category>X-TDE-Edu-Teaching</Category>
-        </Not>
+          <Category>Education</Category>
+          <Not>
+            <Category>Languages</Category>
+            <Category>X-TDE-Edu-Language</Category>
+            <Category>Math</Category>
+            <Category>Science</Category>
+            <Category>Teaching</Category>
+            <Category>X-TDE-Edu-Teaching</Category>
+            <Category>KDE</Category>
+          </Not>
         </And>
       </Include>
     </Menu>
@@ -145,8 +190,9 @@
       <Directory>tde-edu-science.directory</Directory>
       <Include>
         <And>
-        <Category>Education</Category>
-        <Category>Science</Category>
+          <Category>Education</Category>
+          <Category>Science</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -155,13 +201,101 @@
       <Directory>tde-edu-tools.directory</Directory>
       <Include>
         <And>
-        <Category>Education</Category>
-        <Or>
-        <Category>Teaching</Category>
-        <Category>X-TDE-Edu-Teaching</Category>
-        </Or>
+          <Category>Education</Category>
+          <Or>
+            <Category>Teaching</Category>
+            <Category>X-TDE-Edu-Teaching</Category>
+          </Or>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-edutainment.directory</Directory>
+      <Include>
+        <And>
+          <Category>Education</Category>
+          <Category>KDE</Category>
+          <Not>
+            <Category>Education</Category>
+            <Category>Languages</Category>
+            <Category>X-TDE-Edu-Language</Category>
+            <Category>X-KDE-Edu-Language</Category>
+            <Category>Math</Category>
+            <Category>Science</Category>
+            <Category>Teaching</Category>
+            <Category>X-TDE-Edu-Teaching</Category>
+            <Category>X-KDE-Edu-Teaching</Category>
+            <Category>TDE</Category>
+          </Not>
         </And>
       </Include>
+      <Menu>
+        <Name>Languages</Name>
+        <Directory>kde-edu-languages.directory</Directory>
+        <Include>
+          <And>
+            <Category>Languages</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Mathematics</Name>
+        <Directory>kde-edu-mathematics.directory</Directory>
+        <Include>
+          <And>
+            <Category>Math</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Miscellaneous</Name>
+        <Directory>kde-edu-miscellaneous.directory</Directory>
+        <Include>
+          <And>
+            <Category>Education</Category>
+            <Category>KDE</Category>
+            <Not>
+              <Category>Languages</Category>
+              <Category>X-TDE-Edu-Language</Category>
+              <Category>X-KDE-Edu-Language</Category>
+              <Category>Math</Category>
+              <Category>Science</Category>
+              <Category>Teaching</Category>
+              <Category>X-TDE-Edu-Teaching</Category>
+              <Category>X-KDE-Edu-Teaching</Category>
+              <Category>TDE</Category>
+            </Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Science</Name>
+        <Directory>kde-edu-science.directory</Directory>
+        <Include>
+          <And>
+            <Category>Science</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Tools</Name>
+        <Directory>kde-edu-tools.directory</Directory>
+        <Include>
+          <And>
+            <Category>Teaching</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
     </Menu>
   </Menu>
   <Menu>
@@ -172,8 +306,9 @@
       <Directory>tde-games-arcade.directory</Directory>
       <Include>
         <And>
-        <Category>Game</Category>
-        <Category>ArcadeGame</Category>
+          <Category>Game</Category>
+          <Category>ArcadeGame</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -182,8 +317,9 @@
       <Directory>tde-games-board.directory</Directory>
       <Include>
         <And>
-        <Category>Game</Category>
-        <Category>BoardGame</Category>
+          <Category>Game</Category>
+          <Category>BoardGame</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -192,8 +328,9 @@
       <Directory>tde-games-card.directory</Directory>
       <Include>
         <And>
-        <Category>Game</Category>
-        <Category>CardGame</Category>
+          <Category>Game</Category>
+          <Category>CardGame</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -202,11 +339,12 @@
       <Directory>tde-games-kids.directory</Directory>
       <Include>
         <And>
-        <Category>Game</Category>
-        <Or>
-        <Category>X-TDE-KidsGame</Category>
-        <Category>KidsGame</Category>
-        </Or>
+          <Category>Game</Category>
+          <Or>
+            <Category>X-TDE-KidsGame</Category>
+            <Category>KidsGame</Category>
+          </Or>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -215,42 +353,137 @@
       <Directory>tde-games-strategy.directory</Directory>
       <Include>
         <And>
-        <Category>Game</Category>
-        <Category>StrategyGame</Category>
+          <Category>Game</Category>
+          <Category>StrategyGame</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
     <Include>
       <And>
-      <Category>Game</Category>
-      <Not>
-      <Category>ArcadeGame</Category>
-      <Category>BoardGame</Category>
-      <Category>CardGame</Category>
-      <Category>X-TDE-KidsGame</Category>
-      <Category>KidsGame</Category>
-      <Category>StrategyGame</Category>
-      </Not>
+        <Category>Game</Category>
+        <Not>
+          <Category>ArcadeGame</Category>
+          <Category>BoardGame</Category>
+          <Category>CardGame</Category>
+          <Category>X-TDE-KidsGame</Category>
+          <Category>KidsGame</Category>
+          <Category>StrategyGame</Category>
+          <Category>KDE</Category>
+        </Not>
       </And>
     </Include>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-games.directory</Directory>
+      <Menu>
+        <Name>Arcade</Name>
+        <Directory>kde-games-arcade.directory</Directory>
+        <Include>
+          <And>
+            <Category>Game</Category>
+            <Category>ArcadeGame</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Board</Name>
+        <Directory>kde-games-board.directory</Directory>
+        <Include>
+          <And>
+            <Category>Game</Category>
+            <Category>BoardGame</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Card</Name>
+        <Directory>kde-games-card.directory</Directory>
+        <Include>
+          <And>
+            <Category>Game</Category>
+            <Category>CardGame</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Kidsgames</Name>
+        <Directory>kde-games-kids.directory</Directory>
+        <Include>
+          <And>
+            <Category>Game</Category>
+            <Category>KidsGame</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>TacticStrategy</Name>
+        <Directory>kde-games-strategy.directory</Directory>
+        <Include>
+          <And>
+            <Category>Game</Category>
+            <Category>StrategyGame</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Include>
+        <And>
+          <Category>Game</Category>
+          <Category>KDE</Category>
+          <Not>
+            <Category>ArcadeGame</Category>
+            <Category>BoardGame</Category>
+            <Category>CardGame</Category>
+            <Category>X-TDE-KidsGame</Category>
+            <Category>KidsGame</Category>
+            <Category>StrategyGame</Category>
+            <Category>TDE</Category>
+          </Not>
+        </And>
+      </Include>
+    </Menu>
   </Menu>
   <Menu>
     <Name>Graphics</Name>
     <Directory>tde-graphics.directory</Directory>
     <Include>
       <And>
-      <Category>Graphics</Category>
-      <Not><Category>X-TDE-More</Category></Not>
-      <Not><Filename>ooo-draw.desktop</Filename></Not>
+        <Category>Graphics</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+        <Not><Filename>ooo-draw.desktop</Filename></Not>
       </And>
     </Include>
     <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-graphics.directory</Directory>
+      <Include>
+        <And>
+          <Category>Graphics</Category>
+          <Category>KDE</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
       <Name>More</Name>
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
-        <Category>Graphics</Category>
-        <Category>X-TDE-More</Category>
+          <Category>Graphics</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -260,8 +493,10 @@
     <Directory>tde-internet.directory</Directory>
     <Include>
       <And>
-      <Category>Network</Category>
-      <Not><Category>X-TDE-More</Category></Not>
+        <Category>Network</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -273,8 +508,20 @@
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
-        <Category>Network</Category>
-        <Category>X-TDE-More</Category>
+          <Category>Network</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-internet.directory</Directory>
+      <Include>
+        <And>
+          <Category>Network</Category>
+          <Category>KDE</Category>
         </And>
       </Include>
     </Menu>
@@ -284,8 +531,10 @@
     <Directory>tde-multimedia.directory</Directory>
     <Include>
       <And>
-      <Category>AudioVideo</Category>
-      <Not><Category>X-TDE-More</Category></Not>
+        <Category>AudioVideo</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -293,8 +542,20 @@
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
-        <Category>AudioVideo</Category>
-        <Category>X-TDE-More</Category>
+          <Category>AudioVideo</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-multimedia.directory</Directory>
+      <Include>
+        <And>
+          <Category>AudioVideo</Category>
+          <Category>KDE</Category>
         </And>
       </Include>
     </Menu>
@@ -310,18 +571,42 @@
     </Layout>
     <Include>
       <And>
-      <Category>Office</Category>
+        <Category>Office</Category>
+        <Not><Category>X-TDE-Office-PIM</Category></Not>
         <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
       </And>
     <Filename>ooo-draw.desktop</Filename>
     </Include>
     <Menu>
+      <Name>PIM</Name>
+      <Directory>tde-office-pim.directory</Directory>
+      <Include>
+        <And>
+        <Category>X-TDE-Office-PIM</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
       <Name>More</Name>
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
           <Category>Office</Category>
           <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-office.directory</Directory>
+      <Include>
+        <And>
+          <Category>Office</Category>
+          <Category>KDE</Category>
         </And>
       </Include>
     </Menu>
@@ -330,16 +615,32 @@
     <Name>Settingsmenu</Name>
     <Directory>tde-settingsmenu.directory</Directory>
     <Include>
-      <Category>Settings</Category>
+      <And>
+        <Category>Settings</Category>
+        <Not><Category>KDE</Category></Not>
+        <Not><Category>X-KDE-settings-sound</Category></Not>
+      </And>
     </Include>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-settingsmenu.directory</Directory>
+      <Include>
+        <And>
+          <Category>Settings</Category>
+          <Category>KDE</Category>
+        </And>
+      </Include>
+    </Menu>
   </Menu>
   <Menu>
     <Name>System</Name>
     <Directory>tde-system.directory</Directory>
     <Include>
       <And>
-      <Category>System</Category>
-      <Not><Category>X-TDE-More</Category></Not>
+        <Category>System</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -347,8 +648,11 @@
       <Directory>tde-system-su.directory</Directory>
       <Include>
         <And>
-        <Category>X-TDE-System-su</Category>
-        <Not><Category>X-TDE-More</Category></Not>
+          <Category>X-TDE-System-su</Category>
+          <Not><Category>X-TDE-More</Category></Not>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>X-KDE-System-su</Category></Not>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -357,8 +661,20 @@
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
-        <Category>System</Category>
-        <Category>X-TDE-More</Category>
+          <Category>System</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-system.directory</Directory>
+      <Include>
+        <And>
+          <Category>System</Category>
+          <Category>KDE</Category>
         </And>
       </Include>
     </Menu>
@@ -376,12 +692,17 @@
     <Directory>tde-utilities.directory</Directory>
     <Include>
       <And>
-      <Category>Utility</Category>
-      <Not><Category>Accessibility</Category></Not>
-      <Not><Category>X-TDE-Utilities-Desktop</Category></Not>
-      <Not><Category>X-TDE-Utilities-Peripherals</Category></Not>
-      <Not><Category>X-TDE-Utilities-PIM</Category></Not>
-      <Not><Category>X-TDE-More</Category></Not>
+        <Category>Utility</Category>
+        <Not>
+          <Category>Accessibility</Category>
+          <Category>X-TDE-Utilities-Desktop</Category>
+          <Category>X-TDE-Utilities-File</Category>
+          <Category>X-TDE-Utilities-Peripherals</Category>
+          <Category>X-TDE-Utilities-PIM</Category>
+          <Category>TextEditor</Category>
+          <Category>X-TDE-More</Category>
+          <Category>KDE</Category>
+        </Not>
       </And>
     </Include>
     <Menu>
@@ -389,8 +710,9 @@
       <Directory>tde-utilities-accessibility.directory</Directory>
       <Include>
         <And>
-        <Category>Utility</Category>
-        <Category>Accessibility</Category>
+          <Category>Utility</Category>
+          <Category>Accessibility</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -399,8 +721,9 @@
       <Directory>tde-utilities-desktop.directory</Directory>
       <Include>
         <And>
-        <Category>Utility</Category>
-        <Category>X-TDE-Utilities-Desktop</Category>
+          <Category>Utility</Category>
+          <Category>X-TDE-Utilities-Desktop</Category>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -408,7 +731,30 @@
       <Name>Editors</Name>
       <Directory>tde-editors.directory</Directory>
       <Include>
-        <Category>TextEditor</Category>
+        <And>
+          <Category>TextEditor</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>File</Name>
+      <Directory>tde-utilities-file.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-TDE-Utilities-File</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Peripherals</Name>
+      <Directory>tde-utilities-peripherals.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-TDE-Utilities-Peripherals</Category>
+        </And>
       </Include>
     </Menu>
     <Menu>
@@ -416,8 +762,10 @@
       <Directory>tde-utilities-pim.directory</Directory>
       <Include>
         <And>
-        <Category>Utility</Category>
-        <Category>X-TDE-Utilities-PIM</Category>
+          <Category>Utility</Category>
+          <Category>X-TDE-Utilities-PIM</Category>
+          <Not><Category>KDE</Category></Not>
+          <Not><Category>X-KDE-Utilities-PIM</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -425,7 +773,10 @@
       <Name>Toys</Name>
       <Directory>tde-toys.directory</Directory>
       <Include>
-        <Category>Amusement</Category>
+        <And>
+          <Category>Amusement</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
       </Include>
     </Menu>
     <Menu>
@@ -437,8 +788,10 @@
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
-        <Category>Utility</Category>
-        <Category>X-TDE-More</Category>
+          <Category>Utility</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -447,16 +800,98 @@
       <Directory>tde-more.directory</Directory>
       <Include>
         <And>
-        <Category>Utility</Category>
-        <Category>X-TDE-More</Category>
+          <Category>Utility</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>KDE</Name>
+      <Directory>kde-utilities.directory</Directory>
+      <Include>
+        <And>
+          <Category>Utility</Category>
+          <Category>KDE</Category>
+          <Not>
+            <Category>Accessibility</Category>
+            <Category>X-TDE-Utilities-Desktop</Category>
+            <Category>X-KDE-Utilities-Desktop</Category>
+            <Category>X-TDE-Utilities-Peripherals</Category>
+            <Category>X-TDE-Utilities-PIM</Category>
+            <Category>X-KDE-Utilities-PIM</Category>
+            <Category>X-TDE-More</Category>
+            <Category>X-KDE-More</Category>
+            <Category>TextEditor</Category>
+            <Category>TDE</Category>
+          </Not>
         </And>
       </Include>
+      <Menu>
+        <Name>Accessibility</Name>
+        <Directory>kde-utilities-accessibility.directory</Directory>
+        <Include>
+          <And>
+            <Category>Utility</Category>
+            <Category>Accessibility</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Desktop</Name>
+        <Directory>kde-utilities-desktop.directory</Directory>
+        <Include>
+          <And>
+            <Category>Utility</Category>
+            <Category>X-KDE-Utilities-Desktop</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Editors</Name>
+        <Directory>kde-editors.directory</Directory>
+        <Include>
+          <And>
+            <Category>TextEditor</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>PIM</Name>
+        <Directory>kde-utilities-pim.directory</Directory>
+        <Include>
+          <And>
+            <Category>Utility</Category>
+            <Category>X-KDE-Utilities-PIM</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Toys</Name>
+        <Directory>kde-toys.directory</Directory>
+        <Include>
+          <And>
+            <Category>Amusement</Category>
+            <Category>KDE</Category>
+            <Not><Category>TDE</Category></Not>
+          </And>
+        </Include>
+      </Menu>
     </Menu>
   </Menu>
   <Include>
     <And>
-    <Category>TDE</Category>
-    <Category>Core</Category>
+      <Category>TDE</Category>
+      <Category>Core</Category>
     </And>
   </Include>
   <DefaultMergeDirs/>
diff --git a/kded/applications.menu-no-kde b/kded/applications.menu-no-kde
new file mode 100644
index 000000000..3fd0e2d5d
--- /dev/null
+++ b/kded/applications.menu-no-kde
@@ -0,0 +1,568 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+  <Name>Applications</Name>
+  <Directory>tde-main.directory</Directory>
+  <!-- Search the default locations -->
+  <KDELegacyDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <DefaultLayout>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+    <Separator/>
+    <Menuname>More</Menuname>
+  </DefaultLayout>
+  <Layout>
+    <Merge type="menus"/>
+    <Menuname>Applications</Menuname>
+    <Merge type="files"/>
+  </Layout>
+
+  <Menu>
+    <Name>Applications</Name>
+    <Directory>tde-unknown.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Not>
+        <!-- Don't list non-TDE core applications -->
+        <And>
+          <Category>Core</Category>
+          <Not><Category>TDE</Category></Not>
+        </And>
+        <!-- Don't list SUSE's YaST in here -->
+        <Category>X-SuSE-YaST</Category>
+        <!-- This is a special menu setup. Don't list KDE3 apps here. -->
+        <Category>KDE</Category>
+      </Not>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Development</Name>
+    <Directory>tde-development.directory</Directory>
+    <Menu>
+      <Name>X-TDE-TDevelopIDE</Name>
+      <Directory>tde-development-tdevelop.directory</Directory>
+      <Include>
+        <And>
+          <Category>Development</Category>
+          <Category>X-TDE-TDevelopIDE</Category>
+          <Not><Category>KDE</Category></Not>
+          <Not><Category>X-KDE-KDevelopIDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Translation</Name>
+      <Directory>tde-development-translation.directory</Directory>
+      <Include>
+        <And>
+          <Category>Development</Category>
+          <Category>Translation</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Web Development</Name>
+      <Directory>tde-development-webdevelopment.directory</Directory>
+      <Include>
+        <And>
+          <Category>Development</Category>
+          <Category>WebDevelopment</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Include>
+      <And>
+        <Category>Development</Category>
+        <Not><Category>X-TDE-TDevelopIDE</Category></Not>
+        <Not><Category>Translation</Category></Not>
+        <Not><Category>WebDevelopment</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Science</Name>
+    <Directory>tde-science.directory</Directory>
+    <Include>
+      <And><!-- Include /any/ Science app which is not an Education app -->
+        <Or>
+          <Category>Astronomy</Category>
+          <Category>Biology</Category>
+          <Category>Chemistry</Category>
+          <Category>Geology</Category>
+          <Category>MedicalSoftware</Category>
+          <Category>Physics</Category>
+          <Category>Math</Category>
+          <Category>Science</Category>
+        </Or>
+        <Not><Category>Education</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Edutainment</Name>
+    <Directory>tde-edutainment.directory</Directory>
+    <Menu>
+      <Name>Languages</Name>
+      <Directory>tde-edu-languages.directory</Directory>
+      <Include>
+        <And>
+          <Category>Education</Category>
+          <Or>
+            <Category>Languages</Category>
+            <Category>X-TDE-Edu-Language</Category>
+          </Or>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Mathematics</Name>
+      <Directory>tde-edu-mathematics.directory</Directory>
+      <Include>
+        <And>
+          <Category>Education</Category>
+          <Category>Math</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Miscellaneous</Name>
+      <Directory>tde-edu-miscellaneous.directory</Directory>
+      <Include>
+        <And>
+          <Category>Education</Category>
+          <Not>
+            <Category>Languages</Category>
+            <Category>X-TDE-Edu-Language</Category>
+            <Category>Math</Category>
+            <Category>Science</Category>
+            <Category>Teaching</Category>
+            <Category>X-TDE-Edu-Teaching</Category>
+            <Category>KDE</Category>
+          </Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Science</Name>
+      <Directory>tde-edu-science.directory</Directory>
+      <Include>
+        <And>
+          <Category>Education</Category>
+          <Category>Science</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Tools</Name>
+      <Directory>tde-edu-tools.directory</Directory>
+      <Include>
+        <And>
+          <Category>Education</Category>
+          <Or>
+            <Category>Teaching</Category>
+            <Category>X-TDE-Edu-Teaching</Category>
+          </Or>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Games</Name>
+    <Directory>tde-games.directory</Directory>
+    <Menu>
+      <Name>Arcade</Name>
+      <Directory>tde-games-arcade.directory</Directory>
+      <Include>
+        <And>
+          <Category>Game</Category>
+          <Category>ArcadeGame</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Board</Name>
+      <Directory>tde-games-board.directory</Directory>
+      <Include>
+        <And>
+          <Category>Game</Category>
+          <Category>BoardGame</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Card</Name>
+      <Directory>tde-games-card.directory</Directory>
+      <Include>
+        <And>
+          <Category>Game</Category>
+          <Category>CardGame</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Kidsgames</Name>
+      <Directory>tde-games-kids.directory</Directory>
+      <Include>
+        <And>
+          <Category>Game</Category>
+          <Or>
+            <Category>X-TDE-KidsGame</Category>
+            <Category>KidsGame</Category>
+          </Or>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>TacticStrategy</Name>
+      <Directory>tde-games-strategy.directory</Directory>
+      <Include>
+        <And>
+          <Category>Game</Category>
+          <Category>StrategyGame</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Include>
+      <And>
+        <Category>Game</Category>
+        <Not>
+          <Category>ArcadeGame</Category>
+          <Category>BoardGame</Category>
+          <Category>CardGame</Category>
+          <Category>X-TDE-KidsGame</Category>
+          <Category>KidsGame</Category>
+          <Category>StrategyGame</Category>
+          <Category>KDE</Category>
+        </Not>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>tde-graphics.directory</Directory>
+    <Include>
+      <And>
+        <Category>Graphics</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+        <Not><Filename>ooo-draw.desktop</Filename></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>Graphics</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>tde-internet.directory</Directory>
+    <Include>
+      <And>
+        <Category>Network</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Terminal</Name>
+      <Directory>tde-internet-terminal.directory</Directory>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>Network</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>tde-multimedia.directory</Directory>
+    <Include>
+      <And>
+        <Category>AudioVideo</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>AudioVideo</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Directory>tde-office.directory</Directory>
+    <Layout>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+      <Separator/>
+      <Menuname>More</Menuname>
+    </Layout>
+    <Include>
+      <And>
+        <Category>Office</Category>
+        <Not><Category>X-TDE-Office-PIM</Category></Not>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    <Filename>ooo-draw.desktop</Filename>
+    </Include>
+    <Menu>
+      <Name>PIM</Name>
+      <Directory>tde-office-pim.directory</Directory>
+      <Include>
+        <And>
+        <Category>X-TDE-Office-PIM</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>Office</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Settingsmenu</Name>
+    <Directory>tde-settingsmenu.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not><Category>KDE</Category></Not>
+        <Not><Category>X-KDE-settings-sound</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Directory>tde-system.directory</Directory>
+    <Include>
+      <And>
+        <Category>System</Category>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>SuperUser</Name>
+      <Directory>tde-system-su.directory</Directory>
+      <Include>
+        <And>
+          <Category>X-TDE-System-su</Category>
+          <Not><Category>X-TDE-More</Category></Not>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>X-KDE-System-su</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>System</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>ScreenSavers</Name>
+      <Directory>tde-system-screensavers.directory</Directory>
+    </Menu>
+    <Menu>
+      <Name>Terminal</Name>
+      <Directory>tde-system-terminal.directory</Directory>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Utilities</Name>
+    <Directory>tde-utilities.directory</Directory>
+    <Include>
+      <And>
+        <Category>Utility</Category>
+        <Not><Category>Accessibility</Category></Not>
+        <Not><Category>X-TDE-Utilities-Desktop</Category></Not>
+        <Not><Category>X-TDE-Utilities-File</Category></Not>
+        <Not><Category>X-TDE-Utilities-Peripherals</Category></Not>
+        <Not><Category>X-TDE-Utilities-PIM</Category></Not>
+        <Not><Category>X-TDE-More</Category></Not>
+        <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
+        <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
+        <Not><Category>X-KDE-Utilities-PIM</Category></Not>
+        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>KDE</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Accessibility</Name>
+      <Directory>tde-utilities-accessibility.directory</Directory>
+      <Include>
+        <And>
+          <Category>Utility</Category>
+          <Category>Accessibility</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Desktop</Name>
+      <Directory>tde-utilities-desktop.directory</Directory>
+      <Include>
+        <And>
+          <Category>Utility</Category>
+          <Category>X-TDE-Utilities-Desktop</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Editors</Name>
+      <Directory>tde-editors.directory</Directory>
+      <Include>
+        <And>
+          <Category>TextEditor</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>File</Name>
+      <Directory>tde-utilities-file.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-TDE-Utilities-File</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Peripherals</Name>
+      <Directory>tde-utilities-peripherals.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-TDE-Utilities-Peripherals</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>PIM</Name>
+      <Directory>tde-utilities-pim.directory</Directory>
+      <Include>
+        <And>
+          <Category>Utility</Category>
+          <Category>X-TDE-Utilities-PIM</Category>
+          <Not><Category>KDE</Category></Not>
+          <Not><Category>X-KDE-Utilities-PIM</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Toys</Name>
+      <Directory>tde-toys.directory</Directory>
+      <Include>
+        <And>
+          <Category>Amusement</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>XUtilities</Name>
+      <Directory>tde-utilities-xutils.directory</Directory>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>Utility</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>tde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>Utility</Category>
+          <Category>X-TDE-More</Category>
+          <Not><Category>X-KDE-More</Category></Not>
+          <Not><Category>KDE</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Include>
+    <And>
+      <Category>TDE</Category>
+      <Category>Core</Category>
+    </And>
+  </Include>
+  <DefaultMergeDirs/>
+
+  <Menu>
+    <Name>Debian</Name>
+    <Directory>debian.directory</Directory>
+    <MergeFile>debian-menu.menu</MergeFile>
+  </Menu>
+
+  <MergeDir>applications-merged</MergeDir>
+  <MergeFile>applications-kmenuedit.menu</MergeFile>
+</Menu>