diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 03:46:01 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 03:46:01 +0000 |
| commit | 865f314dd5ed55508f45a32973b709b79a541e36 (patch) | |
| tree | dc1a3a884bb2fc10a89a3c46313897d22c5771eb /kded/applications.menu | |
| parent | ce4a32fe52ef09d8f5ff1dd22c001110902b60a2 (diff) | |
| download | tdelibs-865f314dd5ed55508f45a32973b709b79a541e36.tar.gz tdelibs-865f314dd5ed55508f45a32973b709b79a541e36.zip | |
kdelibs update to Trinity v3.5.11
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kded/applications.menu')
| -rw-r--r-- | kded/applications.menu | 84 |
1 files changed, 20 insertions, 64 deletions
diff --git a/kded/applications.menu b/kded/applications.menu index be08eb848..16cfb24d1 100644 --- a/kded/applications.menu +++ b/kded/applications.menu @@ -248,6 +248,7 @@ <And> <Category>Graphics</Category> <Not><Category>X-KDE-More</Category></Not> + <Not><Filename>ooo-draw.desktop</Filename></Not> </And> </Include> <Menu> @@ -325,6 +326,7 @@ <Category>Office</Category> <Not><Category>X-KDE-More</Category></Not> </And> + <Filename>ooo-draw.desktop</Filename> </Include> <Menu> <Name>More</Name> @@ -376,74 +378,20 @@ <Name>Utilities</Name> <Directory>kde-utilities.directory</Directory> <Include> - <And> + <And> + <Or> <Category>Utility</Category> - <Not><Category>Accessibility</Category></Not> - <Not><Category>X-KDE-Utilities-Desktop</Category></Not> - <Not><Category>X-KDE-Utilities-File</Category></Not> - <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> - <Not><Category>X-KDE-Utilities-PIM</Category></Not> + <Category>TextEditor</Category> + <Category>X-KDE-Utilities-File</Category> + <Category>X-KDE-Utilities-Desktop</Category> + <Category>X-KDE-Utilities-Peripherals</Category> + <Category>X-KDE-Utilities-PIM</Category> + <Category>Accessibility</Category> + </Or> <Not><Category>X-KDE-More</Category></Not> - </And> + </And> </Include> <Menu> - <Name>Accessibility</Name> - <Directory>kde-utilities-accessibility.directory</Directory> - <Include> - <And> - <Category>Utility</Category> - <Category>Accessibility</Category> - </And> - </Include> - </Menu> - <Menu> - <Name>Desktop</Name> - <Directory>kde-utilities-desktop.directory</Directory> - <Include> - <And> - <Category>Utility</Category> - <Category>X-KDE-Utilities-Desktop</Category> - </And> - </Include> - </Menu> - <Menu> - <Name>Editors</Name> - <Directory>kde-editors.directory</Directory> - <Include> - <Category>TextEditor</Category> - </Include> - </Menu> - <Menu> - <Name>File</Name> - <Directory>kde-utilities-file.directory</Directory> - <Include> - <And> - <Category>Utility</Category> - <Category>X-KDE-Utilities-File</Category> - </And> - </Include> - </Menu> - <Menu> - <Name>Peripherals</Name> - <Directory>kde-utilities-peripherals.directory</Directory> - <Include> - <And> - <Category>Utility</Category> - <Category>X-KDE-Utilities-Peripherals</Category> - </And> - </Include> - </Menu> - <Menu> - <Name>PIM</Name> - <Directory>kde-utilities-pim.directory</Directory> - <Include> - <And> - <Category>Utility</Category> - <Category>X-KDE-Utilities-PIM</Category> - </And> - </Include> - </Menu> - <Menu> <Name>XUtilities</Name> <Directory>kde-utilities-xutils.directory</Directory> </Menu> @@ -465,5 +413,13 @@ </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> |