Placed the Theme Manager in the correct menu location. Moved TDM Theme Manager

from Appearance to System Administration. Organized the Appearance icons to
sort correctly. Added "tde-" prefix to the menu names.

1 files changed, 0 insertions, 385 deletions

diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu
deleted file mode 100644
index d2f3089..0000000
--- a/systemsettings/menu/system-settings.menu
+++ /dev/null
@@ -1,385 +0,0 @@
- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<!--
-This menu layout aims to conform to the structure described here:
-
-https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
-
--->
-<Menu>
-	<Name>System Settings</Name>
-
-	<DefaultLayout>
-		<Menuname>General</Menuname>
-		<Separator/>
-		<Menuname>Advanced</Menuname>
-	</DefaultLayout>
-
-	<!-- General page -->
-	<Menu>
-		<Name>General</Name>
-		<Directory>tde-settings-general.directory</Directory>
-
-		<Layout>
-			<Menuname>Personal</Menuname>
-			<Separator/>
-			<Menuname>Look and Feel</Menuname>
-			<Separator/>
-			<Menuname>Computer Administration</Menuname>
-			<Separator/>
-			<Menuname>Network and Connectivity</Menuname>
-		</Layout>
-
-		<!-- Personal -->
-		<Menu>
-			<Name>Personal</Name>
-			<Directory>tde-settings-personal.directory</Directory>
-
-			<Layout>
-				<Menuname>User Account</Menuname>
-				<Menuname>Regional</Menuname>
-				<Menuname>Accessibility</Menuname>
-				<Menuname>Default Applications</Menuname>
-			<!--<Menuname>Appearance</Menuname>
-			<Menuname>Panel</Menuname>
-			<Menuname>Desktop</Menuname>-->
-				<Merge type="menus" />
-			</Layout>
-
-			<!-- User Account -->
-			<Menu>
-				<Name>User Account</Name>
-				<Directory>tde-settings-useraccount.directory</Directory>
-				<Layout>
-					<Filename>tde-kcm_useraccount.desktop</Filename>
-					<Filename>tde-desktoppath.desktop</Filename>
-					<Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-kcm_useraccount.desktop</Filename>
-					<Filename>tde-desktoppath.desktop</Filename>
-					<Category>X-TDE-systemsettings-personal-useraccount</Category>
-				</Include>
-			</Menu>
-
-			<!-- Regional -->
-			<Menu>
-				<Name>Regional</Name>
-				<Directory>tde-settings-regional.directory</Directory>
-				<Layout>
-					<Filename>tde-language.desktop</Filename>
-					<Filename>tde-spellchecking.desktop</Filename>
-					<Filename>tde-keyboard_layout.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-language.desktop</Filename>
-					<Filename>tde-spellchecking.desktop</Filename>
-					<Filename>tde-keyboard_layout.desktop</Filename>
-					<Category>X-TDE-systemsettings-personal-regional</Category>
-				</Include>
-			</Menu>
-
-			<!-- Accessibility -->
-			<Menu>
-				<Name>Accessibility</Name>
-				<Directory>tde-settings-accessibility_ss.directory</Directory>
-				<Layout>
-					<Filename>tde-kcmaccess.desktop</Filename>
-					<Filename>tde-khotkeys.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-kcmaccess.desktop</Filename>
-					<Filename>tde-khotkeys.desktop</Filename>
-					<Category>X-TDE-systemsettings-personal-accessibility</Category>
-				</Include>
-			</Menu>
-
-			<!-- Default Applications -->
-			<Menu>
-				<Name>Default Applications</Name>
-				<Directory>tde-settings-defaultapplications.directory</Directory>
-				<Layout>
-					<Filename>tde-defaultapplication.desktop</Filename>
-					<Filename>tde-filetypes.desktop</Filename>
-					<Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-defaultapplication.desktop</Filename>
-					<Filename>tde-filetypes.desktop</Filename>
-					<Category>X-TDE-systemsettings-personal</Category>
-				</Include>
-			</Menu>
-
-		</Menu>
-
-
-		<!-- Look and Feel -->
-		<Menu>
-			<Name>Look and Feel</Name>
-			<Directory>tde-settings-looknfeel2.directory</Directory>
-			<Layout>
-				<Menuname>Appearance</Menuname>
-				<Menuname>Desktop</Menuname>
-				<Filename>tde-ksplashthememgr.desktop</Filename>
-				<Menuname>Window Behavior</Menuname>
-				<Menuname>Notifications</Menuname>
-				<Merge type="files" />
-			</Layout>
-			<Include>
-				<Filename>tde-ksplashthememgr.desktop</Filename>
-				<Category>X-TDE-systemsettings-lookandfeel</Category>
-			</Include>
-
-			<!-- Appearance -->
-			<Menu>
-				<Name>Appearance</Name>
-				<Directory>tde-settings-appearance.directory</Directory>
-				<Layout>
-					<Filename>tde-colors.desktop</Filename>
-					<Filename>tde-fonts.desktop</Filename>
-					<Filename>kcmgtk-xdg.desktop</Filename>
-					<Filename>tde-kcmfontinst.desktop</Filename>
-					<Filename>tde-icons.desktop</Filename>
-					<Filename>tde-style.desktop</Filename>
-					<Filename>tde-twindecoration.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-colors.desktop</Filename>
-					<Filename>tde-fonts.desktop</Filename>
-					<Filename>kcmgtk-xdg.desktop</Filename>
-					<Filename>tde-kcmfontinst.desktop</Filename>
-					<Filename>tde-icons.desktop</Filename>
-					<Filename>tde-style.desktop</Filename>
-					<Filename>tde-twindecoration.desktop</Filename>
-					<Category>X-TDE-systemsettings-lookandfeel-appearance</Category>
-				</Include>
-			</Menu>
-
-			<!-- Desktop -->
-			<Menu>
-				<Name>Desktop</Name>
-				<Directory>tde-settings-desktop.directory</Directory>
-
-				<Layout>
-					<Filename>tde-background.desktop</Filename>
-					<Filename>tde-screensaver.desktop</Filename>
-					<Filename>tde-desktopbehavior.desktop</Filename>
-					<Filename>tde-desktop.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-
-				<Include>
-					<Filename>tde-background.desktop</Filename>
-					<Filename>tde-screensaver.desktop</Filename>
-					<Filename>tde-desktopbehavior.desktop</Filename>
-					<Filename>tde-desktop.desktop</Filename>
-					<Category>X-TDE-systemsettings-lookandfeel-desktop</Category>
-				</Include>
-			</Menu>
-
-			<!-- Window Behavior -->
-			<Menu>
-				<Name>Window Behavior</Name>
-				<Directory>tde-settings-windowbehavior.directory</Directory>
-
-				<Layout>
-					<Filename>tde-twinoptions.desktop</Filename>
-					<Filename>tde-twinrules.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-twinoptions.desktop</Filename>
-					<Filename>tde-twinrules.desktop</Filename>
-					<Category>X-TDE-systemsettings-lookandfeel-windowbehavior</Category>
-				</Include>
-			</Menu>
-
-			<!-- Notifications -->
-			<Menu>
-				<Name>Notifications</Name>
-				<Directory>tde-settings-notifications.directory</Directory>
-
-				<Layout>
-					<Filename>tde-kcmnotify.desktop</Filename>
-					<Filename>tde-bell.desktop</Filename>
-					<Filename>tde-medianotifications.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-kcmnotify.desktop</Filename>
-					<Filename>tde-bell.desktop</Filename>
-					<Filename>tde-medianotifications.desktop</Filename>
-					<Category>X-TDE-systemsettings-lookandfeel-notifications</Category>
-				</Include>
-			</Menu>
-
-		</Menu>
-
-		<!-- Computer Administration -->
-		<Menu>
-			<Name>Computer Administration</Name>
-			<Directory>tde-settings-computeradministration.directory</Directory>
-
-			<Layout>
-				<Filename>tde-clock.desktop</Filename>
-				<Menuname>Keyboard and Mouse</Menuname>
-				<Filename>tde-displayconfig.desktop</Filename>
-				<Filename>tde-arts.desktop</Filename>
-				<Filename>tde-printers.desktop</Filename>
-<!--				<Filename>tde-laptop.desktop</Filename>-->
-	<!--			<Filename>tde-thinkpad.desktop</Filename>
-				<Filename>tde-kvaio.desktop</Filename>-->
-				<Filename>tde-userconfig.desktop</Filename>
-				<Merge type="files" />
-			</Layout>
-			<Include>
-				<Filename>tde-clock.desktop</Filename>
-				<Filename>tde-displayconfig.desktop</Filename>
-				<Filename>tde-arts.desktop</Filename>
-				<Filename>tde-printers.desktop</Filename>
-<!--				<Filename>tde-laptop.desktop</Filename>-->
-	<!--			<Filename>tde-thinkpad.desktop</Filename>
-				<Filename>tde-kvaio.desktop</Filename>-->
-				<Filename>tde-userconfig.desktop</Filename>
-				<Category>X-TDE-systemsettings-administration</Category>
-			</Include>
-
-			<!-- Keyboard and Mouse -->
-			<Menu>
-				<Name>Keyboard and Mouse</Name>
-				<Directory>tde-settings-keyboardmouse.directory</Directory>
-				<Layout>
-					<Filename>tde-keyboard.desktop</Filename>
-					<Filename>tde-keys.desktop</Filename>
-					<Filename>tde-mouse.desktop</Filename>
-					<Filename>tde-joystick.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-				<Include>
-					<Filename>tde-keyboard.desktop</Filename>
-					<Filename>tde-keys.desktop</Filename>
-					<Filename>tde-mouse.desktop</Filename>
-					<Filename>tde-joystick.desktop</Filename>
-					<Category>X-TDE-systemsettings-administration-keyboardmouse</Category>
-				</Include>
-			</Menu>
-
-		</Menu>
-
-		<!-- Network and Connectivity -->
-		<Menu>
-			<Name>Network and Connectivity</Name>
-			<Directory>tde-settings-networkconnectivity.directory</Directory>
-
-			<Layout>
-				<Menuname>Network Settings</Menuname>
-				<Menuname>Sharing</Menuname>
-				<Merge type="files" />
-			</Layout>
-
-			<Include>
-				<Category>X-TDE-systemsettings-network</Category>
-			</Include>
-
-			<!-- Network Settings -->
-			<Menu>
-				<Name>Network Settings</Name>
-				<Directory>tde-settings-networksettings.directory</Directory>
-
-				<Layout>
-					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
-					<Filename>tde-proxy.desktop</Filename>
-					<Filename>tde-netpref.desktop</Filename>
-					<Filename>tde-kcm_tdednssd.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-
-				<Include>
-					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
-					<Filename>tde-proxy.desktop</Filename>
-					<Filename>tde-netpref.desktop</Filename>
-					<Filename>tde-kcm_tdednssd.desktop</Filename>
-					<Category>X-TDE-systemsettings-network-networksettings</Category>
-				</Include>
-			</Menu>
-
-			<!-- Sharing -->
-			<Menu>
-				<Name>Sharing</Name>
-				<Directory>tde-settings-sharing.directory</Directory>
-
-				<Layout>
-					<Filename>tde-kcmkrfb.desktop</Filename>
-					<Filename>tde-fileshare.desktop</Filename>
-					<Filename>tde-lanbrowser.desktop</Filename>
-                                        <Merge type="files" />
-				</Layout>
-
-				<Include>
-					<Filename>tde-kcmkrfb.desktop</Filename>
-					<Filename>tde-fileshare.desktop</Filename>
-					<Filename>tde-lanbrowser.desktop</Filename>
-					<Category>X-TDE-systemsettings-network-sharing</Category>
-				</Include>
-			</Menu>
-		</Menu>
-	</Menu>
-
-	<!-- Advanced -->
-	<Menu>
-		<Name>Advanced</Name>
-
-		<Directory>tde-settings-advanced.directory</Directory>
-		<Layout>
-			<Menuname>System</Menuname>
-			<Separator/>
-			<Menuname>Advanced User Settings</Menuname>
-		</Layout>
-
-		<!-- System Administration -->
-		<Menu>
-			<Name>System</Name>
-			<Directory>tde-settings-system.directory</Directory>
-
-			<Layout>
-				<Filename>tde-mountconfig.desktop</Filename>
-				<Filename>tde-serviceconfig.desktop</Filename>
-				<Filename>tde-tdm.desktop</Filename>
-				<Merge type="files" />
-			</Layout>
-
-			<Include>
-				<Filename>tde-mountconfig.desktop</Filename>
-				<Filename>tde-serviceconfig.desktop</Filename>
-				<Filename>tde-tdm.desktop</Filename>
-				<Category>X-TDE-systemsettings-advancedadministration</Category>
-			</Include>
-		</Menu>
-
-		<!-- Advanced User Settings -->
-		<Menu>
-			<Name>Advanced User Settings</Name>
-			<Directory>tde-settings-advancedusersettings.directory</Directory>
-
-			<Layout>
-				<Filename>tde-audioencoding.desktop</Filename>
-				<Filename>tde-tderesources.desktop</Filename>
-				<Filename>tde-kcmkded.desktop</Filename>
-				<Filename>tde-kcmsmserver.desktop</Filename>
-				<Merge type="files" />
-			</Layout>
-
-			<Include>
-				<Filename>tde-audioencoding.desktop</Filename>
-				<Filename>tde-tderesources.desktop</Filename>
-				<Filename>tde-kcmkded.desktop</Filename>
-				<Filename>tde-kcmsmserver.desktop</Filename>
-				<Category>X-TDE-systemsettings-advancedusersettings</Category>
-			</Include>
-		</Menu>
-	</Menu>
-</Menu>
-