|
Dan Vrátil |
33ee7eb |
diff -ur kservice-5.15.0/kbuildsycoca/applications.menu kservice-5.15.0-xdg-menu/kbuildsycoca/applications.menu
|
|
Dan Vrátil |
33ee7eb |
--- kservice-5.15.0/src/applications.menu 2015-07-05 11:13:00.000000000 +0200
|
|
Dan Vrátil |
33ee7eb |
+++ kservice-5.15.0-xdg-menu/src/applications.menu 2015-08-16 00:29:20.823019434 +0200
|
|
Kevin Kofler |
6f662a1 |
@@ -31,29 +31,31 @@
|
|
Kevin Kofler |
6f662a1 |
<Category>Core</Category>
|
|
Kevin Kofler |
6f662a1 |
<Not><Category>KDE</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
</And>
|
|
Kevin Kofler |
6f662a1 |
+ <Category>X-Red-Hat-Base</Category>
|
|
Kevin Kofler |
6f662a1 |
|
|
Kevin Kofler |
6f662a1 |
<Category>X-SuSE-YaST</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-hardware</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-accessibility</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-components</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-desktop</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-looknfeel</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-network</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-webbrowsing</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-peripherals</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-hardware</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-power</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-security</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-sound</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-settings-system</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Category>X-KDE-information</Category>
|
|
Kevin Kofler |
6f662a1 |
- <Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
|
|
Kevin Kofler |
6f662a1 |
- <Filename>kde-medianotifications.desktop</Filename>
|
|
Kevin Kofler |
6f662a1 |
- <Filename>kde-audioencoding.desktop</Filename>
|
|
Kevin Kofler |
6f662a1 |
</Not>
|
|
Kevin Kofler |
6f662a1 |
</Include>
|
|
Kevin Kofler |
6f662a1 |
</Menu>
|
|
Kevin Kofler |
6f662a1 |
<Menu>
|
|
Kevin Kofler |
6f662a1 |
+ <Name>System Settings</Name>
|
|
Kevin Kofler |
6f662a1 |
+ <Directory>SystemConfig.directory</Directory>
|
|
Kevin Kofler |
6f662a1 |
+ <Include>
|
|
Kevin Kofler |
6f662a1 |
+ <And>
|
|
Kevin Kofler |
6f662a1 |
+ <Category>System</Category>
|
|
Kevin Kofler |
6f662a1 |
+ <Category>Settings</Category>
|
|
Kevin Kofler |
6f662a1 |
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
+ </And>
|
|
Kevin Kofler |
6f662a1 |
+ </Include>
|
|
Kevin Kofler |
6f662a1 |
+ <Menu>
|
|
Kevin Kofler |
6f662a1 |
+ <Name>Server</Name>
|
|
Kevin Kofler |
6f662a1 |
+ <Directory>ServerConfig.directory</Directory>
|
|
Kevin Kofler |
6f662a1 |
+ <Include>
|
|
Kevin Kofler |
6f662a1 |
+ <Category>X-Red-Hat-ServerConfig</Category>
|
|
Kevin Kofler |
6f662a1 |
+ </Include>
|
|
Kevin Kofler |
6f662a1 |
+ </Menu>
|
|
Kevin Kofler |
6f662a1 |
+ </Menu>
|
|
Kevin Kofler |
6f662a1 |
+ <Menu>
|
|
Kevin Kofler |
6f662a1 |
<Name>Development</Name>
|
|
Kevin Kofler |
6f662a1 |
<Directory>kf5-development.directory</Directory>
|
|
Kevin Kofler |
6f662a1 |
<Menu>
|
|
Kevin Kofler |
6f662a1 |
@@ -369,7 +371,11 @@
|
|
Kevin Kofler |
6f662a1 |
<Name>Settingsmenu</Name>
|
|
Kevin Kofler |
6f662a1 |
<Directory>kf5-settingsmenu.directory</Directory>
|
|
Kevin Kofler |
6f662a1 |
<Include>
|
|
Kevin Kofler |
6f662a1 |
- <Category>Settings</Category>
|
|
Kevin Kofler |
6f662a1 |
+ <And>
|
|
Kevin Kofler |
6f662a1 |
+ <Category>Settings</Category>
|
|
Kevin Kofler |
6f662a1 |
+ <Not><Category>System</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
+ </And>
|
|
Kevin Kofler |
6f662a1 |
</Include>
|
|
Kevin Kofler |
6f662a1 |
</Menu>
|
|
Kevin Kofler |
6f662a1 |
<Menu>
|
|
Kevin Kofler |
6f662a1 |
@@ -378,7 +384,9 @@
|
|
Kevin Kofler |
6f662a1 |
<Include>
|
|
Kevin Kofler |
6f662a1 |
<And>
|
|
Kevin Kofler |
6f662a1 |
<Category>System</Category>
|
|
Kevin Kofler |
6f662a1 |
+ <Not><Category>Settings</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
<Not><Category>X-KDE-More</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
Kevin Kofler |
6f662a1 |
</And>
|
|
Kevin Kofler |
6f662a1 |
</Include>
|
|
Kevin Kofler |
6f662a1 |
<Menu>
|