diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-26 10:53:10 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-26 10:53:10 -0500 |
| commit | 787bd7949eba1871f34d251e0aefeeb9ad6b4830 (patch) | |
| tree | 36e5396d796428f1b2237956582b633921d37fae /kded/applications.menu | |
| parent | 79153d2ecefd731ba7d067114a9a4d6144d0ec5c (diff) | |
| download | tdelibs-787bd7949eba1871f34d251e0aefeeb9ad6b4830.tar.gz tdelibs-787bd7949eba1871f34d251e0aefeeb9ad6b4830.zip | |
Update TDE menu to reduce clutter and eliminate conflicts with KDE4.
This partially resolves bug report 977.
Diffstat (limited to 'kded/applications.menu')
| -rw-r--r-- | kded/applications.menu | 623 |
1 files changed, 529 insertions, 94 deletions
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/> |