Further organize TDE Menu.

pull/16/head
Darrell Anderson 13 years ago
parent 4d67557b4b
commit 955686e61b

@ -1 +1 @@
Subproject commit eb886af35eccf31b370f56bd3d901e9804859e06 Subproject commit 1e5f9378a47b7a809f3027ae8f39ef5062825756

@ -1,429 +1,472 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu> <Menu>
<Name>Applications</Name> <Name>Applications</Name>
<Directory>kde-main.directory</Directory> <Directory>kde-main.directory</Directory>
<!-- Search the default locations --> <!-- Search the default locations -->
<KDELegacyDirs/> <KDELegacyDirs/>
<DefaultAppDirs/> <DefaultAppDirs/>
<DefaultDirectoryDirs/> <DefaultDirectoryDirs/>
<DefaultLayout> <DefaultLayout>
<Merge type="menus"/> <Merge type="menus"/>
<Merge type="files"/> <Merge type="files"/>
<Separator/> <Separator/>
<Menuname>More</Menuname> <Menuname>More</Menuname>
</DefaultLayout> </DefaultLayout>
<Layout> <Layout>
<Merge type="menus"/> <Merge type="menus"/>
<Menuname>Applications</Menuname> <Menuname>Applications</Menuname>
<Merge type="files"/> <Merge type="files"/>
</Layout> </Layout>
<Menu> <Menu>
<Name>Applications</Name> <Name>Applications</Name>
<Directory>kde-unknown.directory</Directory> <Directory>kde-unknown.directory</Directory>
<OnlyUnallocated/> <OnlyUnallocated/>
<Include> <Include>
<Not> <Not>
<!-- Don't list non-KDE core applications --> <!-- Don't list non-KDE core applications -->
<And> <And>
<Category>Core</Category> <Category>Core</Category>
<Not><Category>KDE</Category></Not> <Not><Category>KDE</Category></Not>
</And> </And>
<!-- Don't list SUSE's YaST in here --> <!-- Don't list SUSE's YaST in here -->
<Category>X-SuSE-YaST</Category> <Category>X-SuSE-YaST</Category>
</Not> </Not>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Development</Name> <Name>Development</Name>
<Directory>kde-development.directory</Directory> <Directory>kde-development.directory</Directory>
<Menu> <Menu>
<Name>X-KDE-KDevelopIDE</Name> <Name>X-KDE-KDevelopIDE</Name>
<Directory>kde-development-tdevelop.directory</Directory> <Directory>kde-development-tdevelop.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Development</Category> <Category>Development</Category>
<Category>X-KDE-KDevelopIDE</Category> <Category>X-KDE-KDevelopIDE</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Translation</Name> <Name>Translation</Name>
<Directory>kde-development-translation.directory</Directory> <Directory>kde-development-translation.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Development</Category> <Category>Development</Category>
<Category>Translation</Category> <Category>Translation</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Web Development</Name> <Name>Web Development</Name>
<Directory>kde-development-webdevelopment.directory</Directory> <Directory>kde-development-webdevelopment.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Development</Category> <Category>Development</Category>
<Category>WebDevelopment</Category> <Category>WebDevelopment</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Include> <Include>
<And> <And>
<Category>Development</Category> <Category>Development</Category>
<Not><Category>X-KDE-KDevelopIDE</Category></Not> <Not><Category>X-KDE-KDevelopIDE</Category></Not>
<Not><Category>Translation</Category></Not> <Not><Category>Translation</Category></Not>
<Not><Category>WebDevelopment</Category></Not> <Not><Category>WebDevelopment</Category></Not>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Science</Name> <Name>Science</Name>
<Directory>kde-science.directory</Directory> <Directory>kde-science.directory</Directory>
<Include> <Include>
<And><!-- Include /any/ Science app which is not an Education app --> <And><!-- Include /any/ Science app which is not an Education app -->
<Or> <Or>
<Category>Astronomy</Category> <Category>Astronomy</Category>
<Category>Biology</Category> <Category>Biology</Category>
<Category>Chemistry</Category> <Category>Chemistry</Category>
<Category>Geology</Category> <Category>Geology</Category>
<Category>MedicalSoftware</Category> <Category>MedicalSoftware</Category>
<Category>Physics</Category> <Category>Physics</Category>
<Category>Math</Category> <Category>Math</Category>
<Category>Science</Category> <Category>Science</Category>
</Or> </Or>
<Not><Category>Education</Category></Not> <Not><Category>Education</Category></Not>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Edutainment</Name> <Name>Edutainment</Name>
<Directory>kde-edutainment.directory</Directory> <Directory>kde-edutainment.directory</Directory>
<Menu> <Menu>
<Name>Languages</Name> <Name>Languages</Name>
<Directory>kde-edu-languages.directory</Directory> <Directory>kde-edu-languages.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Education</Category> <Category>Education</Category>
<Or> <Or>
<Category>Languages</Category> <Category>Languages</Category>
<Category>X-KDE-Edu-Language</Category> <Category>X-KDE-Edu-Language</Category>
</Or> </Or>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Mathematics</Name> <Name>Mathematics</Name>
<Directory>kde-edu-mathematics.directory</Directory> <Directory>kde-edu-mathematics.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Education</Category> <Category>Education</Category>
<Category>Math</Category> <Category>Math</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Miscellaneous</Name> <Name>Miscellaneous</Name>
<Directory>kde-edu-miscellaneous.directory</Directory> <Directory>kde-edu-miscellaneous.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Education</Category> <Category>Education</Category>
<Not> <Not>
<Category>Languages</Category> <Category>Languages</Category>
<Category>X-KDE-Edu-Language</Category> <Category>X-KDE-Edu-Language</Category>
<Category>Math</Category> <Category>Math</Category>
<Category>Science</Category> <Category>Science</Category>
<Category>Teaching</Category> <Category>Teaching</Category>
<Category>X-KDE-Edu-Teaching</Category> <Category>X-KDE-Edu-Teaching</Category>
</Not> </Not>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Science</Name> <Name>Science</Name>
<Directory>kde-edu-science.directory</Directory> <Directory>kde-edu-science.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Education</Category> <Category>Education</Category>
<Category>Science</Category> <Category>Science</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Tools</Name> <Name>Tools</Name>
<Directory>kde-edu-tools.directory</Directory> <Directory>kde-edu-tools.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Education</Category> <Category>Education</Category>
<Or> <Or>
<Category>Teaching</Category> <Category>Teaching</Category>
<Category>X-KDE-Edu-Teaching</Category> <Category>X-KDE-Edu-Teaching</Category>
</Or> </Or>
</And> </And>
</Include> </Include>
</Menu> </Menu>
</Menu> </Menu>
<Menu> <Menu>
<Name>Games</Name> <Name>Games</Name>
<Directory>kde-games.directory</Directory> <Directory>kde-games.directory</Directory>
<Menu> <Menu>
<Name>Arcade</Name> <Name>Arcade</Name>
<Directory>kde-games-arcade.directory</Directory> <Directory>kde-games-arcade.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Game</Category> <Category>Game</Category>
<Category>ArcadeGame</Category> <Category>ArcadeGame</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Board</Name> <Name>Board</Name>
<Directory>kde-games-board.directory</Directory> <Directory>kde-games-board.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Game</Category> <Category>Game</Category>
<Category>BoardGame</Category> <Category>BoardGame</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Card</Name> <Name>Card</Name>
<Directory>kde-games-card.directory</Directory> <Directory>kde-games-card.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Game</Category> <Category>Game</Category>
<Category>CardGame</Category> <Category>CardGame</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Kidsgames</Name> <Name>Kidsgames</Name>
<Directory>kde-games-kids.directory</Directory> <Directory>kde-games-kids.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Game</Category> <Category>Game</Category>
<Or> <Or>
<Category>X-KDE-KidsGame</Category> <Category>X-KDE-KidsGame</Category>
<Category>KidsGame</Category> <Category>KidsGame</Category>
</Or> </Or>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>TacticStrategy</Name> <Name>TacticStrategy</Name>
<Directory>kde-games-strategy.directory</Directory> <Directory>kde-games-strategy.directory</Directory>
<Include> <Include>
<And> <And>
<Category>Game</Category> <Category>Game</Category>
<Category>StrategyGame</Category> <Category>StrategyGame</Category>
</And> </And>
</Include> </Include>
</Menu> </Menu>
<Include> <Include>
<And> <And>
<Category>Game</Category> <Category>Game</Category>
<Not> <Not>
<Category>ArcadeGame</Category> <Category>ArcadeGame</Category>
<Category>BoardGame</Category> <Category>BoardGame</Category>
<Category>CardGame</Category> <Category>CardGame</Category>
<Category>X-KDE-KidsGame</Category> <Category>X-KDE-KidsGame</Category>
<Category>KidsGame</Category> <Category>KidsGame</Category>
<Category>StrategyGame</Category> <Category>StrategyGame</Category>
</Not> </Not>
</And> </And>
</Include> </Include>
<Menu> </Menu>
<Name>Toys</Name> <Menu>
<Directory>kde-toys.directory</Directory> <Name>Graphics</Name>
<Include> <Directory>kde-graphics.directory</Directory>
<Category>Amusement</Category> <Include>
</Include> <And>
</Menu> <Category>Graphics</Category>
</Menu> <Not><Category>X-KDE-More</Category></Not>
<Menu> <Not><Filename>ooo-draw.desktop</Filename></Not>
<Name>Graphics</Name> </And>
<Directory>kde-graphics.directory</Directory> </Include>
<Include> <Menu>
<And> <Name>More</Name>
<Category>Graphics</Category> <Directory>kde-more.directory</Directory>
<Not><Category>X-KDE-More</Category></Not> <Include>
<Not><Filename>ooo-draw.desktop</Filename></Not> <And>
</And> <Category>Graphics</Category>
</Include> <Category>X-KDE-More</Category>
<Menu> </And>
<Name>More</Name> </Include>
<Directory>kde-more.directory</Directory> </Menu>
<Include> </Menu>
<And> <Menu>
<Category>Graphics</Category> <Name>Internet</Name>
<Category>X-KDE-More</Category> <Directory>kde-internet.directory</Directory>
</And> <Include>
</Include> <And>
</Menu> <Category>Network</Category>
</Menu> <Not><Category>X-KDE-More</Category></Not>
<Menu> </And>
<Name>Internet</Name> </Include>
<Directory>kde-internet.directory</Directory> <Menu>
<Include> <Name>Terminal</Name>
<And> <Directory>kde-internet-terminal.directory</Directory>
<Category>Network</Category> </Menu>
<Not><Category>X-KDE-More</Category></Not> <Menu>
</And> <Name>More</Name>
</Include> <Directory>kde-more.directory</Directory>
<Menu> <Include>
<Name>Terminal</Name> <And>
<Directory>kde-internet-terminal.directory</Directory> <Category>Network</Category>
</Menu> <Category>X-KDE-More</Category>
<Menu> </And>
<Name>More</Name> </Include>
<Directory>kde-more.directory</Directory> </Menu>
<Include> </Menu>
<And> <Menu>
<Category>Network</Category> <Name>Multimedia</Name>
<Category>X-KDE-More</Category> <Directory>kde-multimedia.directory</Directory>
</And> <Include>
</Include> <And>
</Menu> <Category>AudioVideo</Category>
</Menu> <Not><Category>X-KDE-More</Category></Not>
<Menu> </And>
<Name>Multimedia</Name> </Include>
<Directory>kde-multimedia.directory</Directory> <Menu>
<Include> <Name>More</Name>
<And> <Directory>kde-more.directory</Directory>
<Category>AudioVideo</Category> <Include>
<Not><Category>X-KDE-More</Category></Not> <And>
</And> <Category>AudioVideo</Category>
</Include> <Category>X-KDE-More</Category>
<Menu> </And>
<Name>More</Name> </Include>
<Directory>kde-more.directory</Directory> </Menu>
<Include> </Menu>
<And> <Menu>
<Category>AudioVideo</Category> <Name>Office</Name>
<Category>X-KDE-More</Category> <Directory>kde-office.directory</Directory>
</And> <Layout>
</Include> <Merge type="menus"/>
</Menu> <Merge type="files"/>
</Menu> <Separator/>
<Menu> <Menuname>More</Menuname>
<Name>Office</Name> </Layout>
<Directory>kde-office.directory</Directory> <Include>
<Layout> <And>
<Merge type="menus"/> <Category>Office</Category>
<Merge type="files"/> <Not><Category>X-KDE-More</Category></Not>
<Separator/> </And>
<Menuname>More</Menuname> <Filename>ooo-draw.desktop</Filename>
</Layout> </Include>
<Include> <Menu>
<And> <Name>More</Name>
<Category>Office</Category> <Directory>kde-more.directory</Directory>
<Not><Category>X-KDE-More</Category></Not> <Include>
</And> <And>
<Filename>ooo-draw.desktop</Filename> <Category>Office</Category>
</Include> <Category>X-KDE-More</Category>
<Menu> </And>
<Name>More</Name> </Include>
<Directory>kde-more.directory</Directory> </Menu>
<Include> </Menu>
<And> <Menu>
<Category>Office</Category> <Name>Settingsmenu</Name>
<Category>X-KDE-More</Category> <Directory>kde-settingsmenu.directory</Directory>
</And> <Include>
</Include> <Category>Settings</Category>
</Menu> </Include>
</Menu> </Menu>
<Menu> <Menu>
<Name>Settingsmenu</Name> <Name>System</Name>
<Directory>kde-settingsmenu.directory</Directory> <Directory>kde-system.directory</Directory>
<Include> <Include>
<Category>Settings</Category> <And>
</Include> <Category>System</Category>
</Menu> <Not><Category>X-KDE-More</Category></Not>
<Menu> </And>
<Name>System</Name> </Include>
<Directory>kde-system.directory</Directory> <Menu>
<Include> <Name>SuperUser</Name>
<And> <Directory>kde-system-su.directory</Directory>
<Category>System</Category> <Include>
<Not><Category>X-KDE-More</Category></Not> <And>
</And> <Category>X-KDE-System-su</Category>
</Include> <Not><Category>X-KDE-More</Category></Not>
<Menu> </And>
<Name>SuperUser</Name> </Include>
<Directory>kde-system-su.directory</Directory> </Menu>
<Include> <Menu>
<And> <Name>More</Name>
<Category>X-KDE-System-su</Category> <Directory>kde-more.directory</Directory>
<Not><Category>X-KDE-More</Category></Not> <Include>
</And> <And>
</Include> <Category>System</Category>
</Menu> <Category>X-KDE-More</Category>
<Menu> </And>
<Name>More</Name> </Include>
<Directory>kde-more.directory</Directory> </Menu>
<Include> <Menu>
<And> <Name>ScreenSavers</Name>
<Category>System</Category> <Directory>kde-system-screensavers.directory</Directory>
<Category>X-KDE-More</Category> </Menu>
</And> <Menu>
</Include> <Name>Terminal</Name>
</Menu> <Directory>kde-system-terminal.directory</Directory>
<Menu> </Menu>
<Name>ScreenSavers</Name> </Menu>
<Directory>kde-system-screensavers.directory</Directory> <Menu>
</Menu> <Name>Utilities</Name>
<Menu> <Directory>kde-utilities.directory</Directory>
<Name>Terminal</Name> <Include>
<Directory>kde-system-terminal.directory</Directory> <And>
</Menu> <Category>Utility</Category>
</Menu> <Not><Category>Accessibility</Category></Not>
<Menu> <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
<Name>Utilities</Name> <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
<Directory>kde-utilities.directory</Directory> <Not><Category>X-KDE-Utilities-PIM</Category></Not>
<Include> <Not><Category>X-KDE-More</Category></Not>
<And> </And>
<Or> </Include>
<Category>Utility</Category> <Menu>
<Category>TextEditor</Category> <Name>Accessibility</Name>
<Category>X-KDE-Utilities-File</Category> <Directory>kde-utilities-accessibility.directory</Directory>
<Category>X-KDE-Utilities-Desktop</Category> <Include>
<Category>X-KDE-Utilities-Peripherals</Category> <And>
<Category>X-KDE-Utilities-PIM</Category> <Category>Utility</Category>
<Category>Accessibility</Category> <Category>Accessibility</Category>
</Or> </And>
<Not><Category>X-KDE-More</Category></Not> </Include>
</And> </Menu>
</Include> <Menu>
<Menu> <Name>Desktop</Name>
<Name>XUtilities</Name> <Directory>kde-utilities-desktop.directory</Directory>
<Directory>kde-utilities-xutils.directory</Directory> <Include>
</Menu> <And>
<Menu> <Category>Utility</Category>
<Name>More</Name> <Category>X-KDE-Utilities-Desktop</Category>
<Directory>kde-more.directory</Directory> </And>
<Include> </Include>
<And> </Menu>
<Category>Utility</Category> <Menu>
<Category>X-KDE-More</Category> <Name>Editors</Name>
</And> <Directory>kde-editors.directory</Directory>
</Include> <Include>
</Menu> <Category>TextEditor</Category>
</Menu> </Include>
<Include> </Menu>
<And> <Menu>
<Category>KDE</Category> <Name>PIM</Name>
<Category>Core</Category> <Directory>kde-utilities-pim.directory</Directory>
</And> <Include>
</Include> <And>
<DefaultMergeDirs/> <Category>Utility</Category>
<Category>X-KDE-Utilities-PIM</Category>
</And>
</Include>
</Menu>
<Menu>
<Name>Toys</Name>
<Directory>kde-toys.directory</Directory>
<Include>
<Category>Amusement</Category>
</Include>
</Menu>
<Menu>
<Name>XUtilities</Name>
<Directory>kde-utilities-xutils.directory</Directory>
</Menu>
<Menu>
<Name>More</Name>
<Directory>kde-more.directory</Directory>
<Include>
<And>
<Category>Utility</Category>
<Category>X-KDE-More</Category>
</And>
</Include>
</Menu>
<Menu>
<Name>More</Name>
<Directory>kde-more.directory</Directory>
<Include>
<And>
<Category>Utility</Category>
<Category>X-KDE-More</Category>
</And>
</Include>
</Menu>
</Menu>
<Include>
<And>
<Category>KDE</Category>
<Category>Core</Category>
</And>
</Include>
<DefaultMergeDirs/>
<Menu> <Menu>
<Name>Debian</Name> <Name>Debian</Name>
<Directory>debian.directory</Directory> <Directory>debian.directory</Directory>
<MergeFile>debian-menu.menu</MergeFile> <MergeFile>debian-menu.menu</MergeFile>
</Menu> </Menu>
<MergeDir>applications-merged</MergeDir> <MergeDir>applications-merged</MergeDir>
<MergeFile>applications-kmenuedit.menu</MergeFile> <MergeFile>applications-kmenuedit.menu</MergeFile>
</Menu> </Menu>

Loading…
Cancel
Save