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.

4 files changed, 30 insertions, 23 deletions

diff --git a/systemsettings/menu/Makefile.am b/systemsettings/menu/Makefile.am
index 4228bba..3fa1b51 100644
--- a/systemsettings/menu/Makefile.am
+++ b/systemsettings/menu/Makefile.am
@@ -1,9 +1,9 @@
 #temporary till KDE4 and it can be renamed
 xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop laptop.desktop medianotifications.desktop
 
-xdg_menu_DATA = system-settings.menu
+xdg_menu_DATA = tde-system-settings.menu
 
-xdg_mergedmenu_DATA = system-settings-merge.menu
+xdg_mergedmenu_DATA = tde-system-settings-merge.menu
 xdg_mergedmenudir = $(xdg_menudir)/applications-merged
 
 xdg_directory_DATA = \
@@ -30,7 +30,7 @@ tde-settings-splashscreen.directory \
 tde-settings-system.directory \
 tde-settings-useraccount.directory \
 tde-settings-windowbehavior.directory \
-system-settings.directory
+tde-system-settings.directory
 
 #install-data-local:
 #	tdebuildsycoca
diff --git a/systemsettings/menu/system-settings-merge.menu b/systemsettings/menu/tde-system-settings-merge.menu
index 70d4b07..1cf66a2 100644
--- a/systemsettings/menu/system-settings-merge.menu
+++ b/systemsettings/menu/tde-system-settings-merge.menu
@@ -5,7 +5,7 @@
         <!-- The following menus are hidden by default -->
 	<Menu>
 		<Name>System Settings</Name>
-		<Directory>system-settings.directory</Directory>
-                <MergeFile>../system-settings.menu</MergeFile>
+		<Directory>tde-system-settings.directory</Directory>
+		<MergeFile>../tde-system-settings.menu</MergeFile>
 	</Menu>
 </Menu>
diff --git a/systemsettings/menu/system-settings.directory b/systemsettings/menu/tde-system-settings.directory
index d622e4f..d622e4f 100644
--- a/systemsettings/menu/system-settings.directory
+++ b/systemsettings/menu/tde-system-settings.directory
diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/tde-system-settings.menu
index d2f3089..355d5fb 100644
--- a/systemsettings/menu/system-settings.menu
+++ b/systemsettings/menu/tde-system-settings.menu
@@ -1,4 +1,4 @@
- <!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">
 <!--
 This menu layout aims to conform to the structure described here:
@@ -70,7 +70,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-language.desktop</Filename>
 					<Filename>tde-spellchecking.desktop</Filename>
 					<Filename>tde-keyboard_layout.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 				<Include>
 					<Filename>tde-language.desktop</Filename>
@@ -87,7 +87,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Layout>
 					<Filename>tde-kcmaccess.desktop</Filename>
 					<Filename>tde-khotkeys.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 				<Include>
 					<Filename>tde-kcmaccess.desktop</Filename>
@@ -122,13 +122,11 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<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>
 
@@ -139,23 +137,30 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Layout>
 					<Filename>tde-colors.desktop</Filename>
 					<Filename>tde-fonts.desktop</Filename>
-					<Filename>kcmgtk-xdg.desktop</Filename>
 					<Filename>tde-kcmfontinst.desktop</Filename>
+					<Filename>kcmgtk.desktop</Filename>
 					<Filename>tde-icons.desktop</Filename>
+					<Filename>tde-ksplashthememgr.desktop</Filename>
 					<Filename>tde-style.desktop</Filename>
+					<Filename>tde-kthememanager.desktop</Filename>
 					<Filename>tde-twindecoration.desktop</Filename>
-                                        <Merge type="files" />
+					<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>kcmgtk.desktop</Filename>
 					<Filename>tde-icons.desktop</Filename>
+					<Filename>tde-ksplashthememgr.desktop</Filename>
 					<Filename>tde-style.desktop</Filename>
+					<Filename>tde-kthememanager.desktop</Filename>
 					<Filename>tde-twindecoration.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-appearance</Category>
 				</Include>
+				<Exclude>
+					<Filename>tde-tdmtheme.desktop</Filename>
+				</Exclude>
 			</Menu>
 
 			<!-- Desktop -->
@@ -168,7 +173,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-screensaver.desktop</Filename>
 					<Filename>tde-desktopbehavior.desktop</Filename>
 					<Filename>tde-desktop.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 
 				<Include>
@@ -188,7 +193,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Layout>
 					<Filename>tde-twinoptions.desktop</Filename>
 					<Filename>tde-twinrules.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 				<Include>
 					<Filename>tde-twinoptions.desktop</Filename>
@@ -206,7 +211,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-kcmnotify.desktop</Filename>
 					<Filename>tde-bell.desktop</Filename>
 					<Filename>tde-medianotifications.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 				<Include>
 					<Filename>tde-kcmnotify.desktop</Filename>
@@ -229,8 +234,8 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<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-laptop.desktop</Filename>-->
+				<!--	<Filename>tde-thinkpad.desktop</Filename>
 				<Filename>tde-kvaio.desktop</Filename>-->
 				<Filename>tde-userconfig.desktop</Filename>
 				<Merge type="files" />
@@ -240,8 +245,8 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<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-laptop.desktop</Filename>-->
+				<!--	<Filename>tde-thinkpad.desktop</Filename>
 				<Filename>tde-kvaio.desktop</Filename>-->
 				<Filename>tde-userconfig.desktop</Filename>
 				<Category>X-TDE-systemsettings-administration</Category>
@@ -256,7 +261,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-keys.desktop</Filename>
 					<Filename>tde-mouse.desktop</Filename>
 					<Filename>tde-joystick.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 				<Include>
 					<Filename>tde-keyboard.desktop</Filename>
@@ -294,7 +299,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-proxy.desktop</Filename>
 					<Filename>tde-netpref.desktop</Filename>
 					<Filename>tde-kcm_tdednssd.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 
 				<Include>
@@ -315,7 +320,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-kcmkrfb.desktop</Filename>
 					<Filename>tde-fileshare.desktop</Filename>
 					<Filename>tde-lanbrowser.desktop</Filename>
-                                        <Merge type="files" />
+					<Merge type="files" />
 				</Layout>
 
 				<Include>
@@ -348,6 +353,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Filename>tde-mountconfig.desktop</Filename>
 				<Filename>tde-serviceconfig.desktop</Filename>
 				<Filename>tde-tdm.desktop</Filename>
+				<Filename>tde-tdmtheme.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
 
@@ -355,6 +361,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Filename>tde-mountconfig.desktop</Filename>
 				<Filename>tde-serviceconfig.desktop</Filename>
 				<Filename>tde-tdm.desktop</Filename>
+				<Filename>tde-tdmtheme.desktop</Filename>
 				<Category>X-TDE-systemsettings-advancedadministration</Category>
 			</Include>
 		</Menu>