From 6d0479655241f3fab448e1e5d0b554e1f6a58e85 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 15 Jun 2012 23:12:00 -0500 Subject: [PATCH] Additional XDG compliance fixes. --- cmake | 2 +- systemsettings/HACKING | 2 +- systemsettings/kcmodulemenu.h | 2 +- systemsettings/menu/Makefile.am | 46 +-- systemsettings/menu/system-settings.menu | 302 +++++++++--------- ...> tde-settings-accessibility_ss.directory} | 0 ...ectory => tde-settings-advanced.directory} | 0 ...e-settings-advancedusersettings.directory} | 0 ...tory => tde-settings-appearance.directory} | 0 ...settings-computeradministration.directory} | 0 ...de-settings-defaultapplications.directory} | 0 ...rectory => tde-settings-general.directory} | 0 ...y => tde-settings-keyboardmouse.directory} | 0 ...rectory => tde-settings-laptops.directory} | 0 ...tory => tde-settings-looknfeel2.directory} | 0 ...tde-settings-networkconnections.directory} | 0 ...de-settings-networkconnectivity.directory} | 0 ...=> tde-settings-networksettings.directory} | 0 ...y => tde-settings-notifications.directory} | 0 ...directory => tde-settings-panel.directory} | 0 ...ectory => tde-settings-personal.directory} | 0 ...directory => tde-settings-power.directory} | 0 ...ectory => tde-settings-regional.directory} | 0 ...rectory => tde-settings-sharing.directory} | 0 ...ry => tde-settings-splashscreen.directory} | 0 ...irectory => tde-settings-system.directory} | 0 ...ory => tde-settings-useraccount.directory} | 0 ... => tde-settings-windowbehavior.directory} | 0 28 files changed, 177 insertions(+), 177 deletions(-) rename systemsettings/menu/{kde-settings-accessibility_ss.directory => tde-settings-accessibility_ss.directory} (100%) rename systemsettings/menu/{kde-settings-advanced.directory => tde-settings-advanced.directory} (100%) rename systemsettings/menu/{kde-settings-advancedusersettings.directory => tde-settings-advancedusersettings.directory} (100%) rename systemsettings/menu/{kde-settings-appearance.directory => tde-settings-appearance.directory} (100%) rename systemsettings/menu/{kde-settings-computeradministration.directory => tde-settings-computeradministration.directory} (100%) rename systemsettings/menu/{kde-settings-defaultapplications.directory => tde-settings-defaultapplications.directory} (100%) rename systemsettings/menu/{kde-settings-general.directory => tde-settings-general.directory} (100%) rename systemsettings/menu/{kde-settings-keyboardmouse.directory => tde-settings-keyboardmouse.directory} (100%) rename systemsettings/menu/{kde-settings-laptops.directory => tde-settings-laptops.directory} (100%) rename systemsettings/menu/{kde-settings-looknfeel2.directory => tde-settings-looknfeel2.directory} (100%) rename systemsettings/menu/{kde-settings-networkconnections.directory => tde-settings-networkconnections.directory} (100%) rename systemsettings/menu/{kde-settings-networkconnectivity.directory => tde-settings-networkconnectivity.directory} (100%) rename systemsettings/menu/{kde-settings-networksettings.directory => tde-settings-networksettings.directory} (100%) rename systemsettings/menu/{kde-settings-notifications.directory => tde-settings-notifications.directory} (100%) rename systemsettings/menu/{kde-settings-panel.directory => tde-settings-panel.directory} (100%) rename systemsettings/menu/{kde-settings-personal.directory => tde-settings-personal.directory} (100%) rename systemsettings/menu/{kde-settings-power.directory => tde-settings-power.directory} (100%) rename systemsettings/menu/{kde-settings-regional.directory => tde-settings-regional.directory} (100%) rename systemsettings/menu/{kde-settings-sharing.directory => tde-settings-sharing.directory} (100%) rename systemsettings/menu/{kde-settings-splashscreen.directory => tde-settings-splashscreen.directory} (100%) rename systemsettings/menu/{kde-settings-system.directory => tde-settings-system.directory} (100%) rename systemsettings/menu/{kde-settings-useraccount.directory => tde-settings-useraccount.directory} (100%) rename systemsettings/menu/{kde-settings-windowbehavior.directory => tde-settings-windowbehavior.directory} (100%) diff --git a/cmake b/cmake index 477d071..07921f2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 477d071b5db5544ace5449f0c2eea6d5c01d693b +Subproject commit 07921f23f88ede05bf40f01d870e18dee8868902 diff --git a/systemsettings/HACKING b/systemsettings/HACKING index 06ebba6..45d9449 100644 --- a/systemsettings/HACKING +++ b/systemsettings/HACKING @@ -17,7 +17,7 @@ kcmultiwidget - A basterdized kcmultidialog from tdelibs/kutil that provides inf To install a new menu you have to install three files. -(if you have debian, if you have another system use locate to determine where kde-system.* is installed and install in the same place. +(if you have debian, if you have another system use locate to determine where tde-system.* is installed and install in the same place. -/etc/xdg/menus/system-settings.menu -/etc/xdg/menus/applications-merged/system-settings-merge.menu diff --git a/systemsettings/kcmodulemenu.h b/systemsettings/kcmodulemenu.h index 7fbf706..d6b61c0 100644 --- a/systemsettings/kcmodulemenu.h +++ b/systemsettings/kcmodulemenu.h @@ -52,7 +52,7 @@ class KCModuleMenuPrivate; * \endcode * * example.directory should be installed in share/desktop-directories/ where files - * such as kde-system.directory reside. It is important that it have X-TDE-BaseGroup + * such as tde-system.directory reside. It is important that it have X-TDE-BaseGroup * as this value is the class constructor argument. * * \code diff --git a/systemsettings/menu/Makefile.am b/systemsettings/menu/Makefile.am index 926a135..30ffdf8 100644 --- a/systemsettings/menu/Makefile.am +++ b/systemsettings/menu/Makefile.am @@ -7,29 +7,29 @@ xdg_mergedmenu_DATA = system-settings-merge.menu xdg_mergedmenudir = $(xdg_menudir)/applications-merged xdg_directory_DATA = \ -kde-settings-accessibility_ss.directory \ -kde-settings-advanced.directory \ -kde-settings-advancedusersettings.directory \ -kde-settings-appearance.directory \ -kde-settings-computeradministration.directory \ -kde-settings-defaultapplications.directory \ -kde-settings-general.directory \ -kde-settings-keyboardmouse.directory \ -kde-settings-laptops.directory \ -kde-settings-looknfeel2.directory \ -kde-settings-networkconnections.directory \ -kde-settings-networkconnectivity.directory \ -kde-settings-networksettings.directory \ -kde-settings-notifications.directory \ -kde-settings-panel.directory \ -kde-settings-personal.directory \ -kde-settings-power.directory \ -kde-settings-regional.directory \ -kde-settings-sharing.directory \ -kde-settings-splashscreen.directory \ -kde-settings-system.directory \ -kde-settings-useraccount.directory \ -kde-settings-windowbehavior.directory \ +tde-settings-accessibility_ss.directory \ +tde-settings-advanced.directory \ +tde-settings-advancedusersettings.directory \ +tde-settings-appearance.directory \ +tde-settings-computeradministration.directory \ +tde-settings-defaultapplications.directory \ +tde-settings-general.directory \ +tde-settings-keyboardmouse.directory \ +tde-settings-laptops.directory \ +tde-settings-looknfeel2.directory \ +tde-settings-networkconnections.directory \ +tde-settings-networkconnectivity.directory \ +tde-settings-networksettings.directory \ +tde-settings-notifications.directory \ +tde-settings-panel.directory \ +tde-settings-personal.directory \ +tde-settings-power.directory \ +tde-settings-regional.directory \ +tde-settings-sharing.directory \ +tde-settings-splashscreen.directory \ +tde-settings-system.directory \ +tde-settings-useraccount.directory \ +tde-settings-windowbehavior.directory \ system-settings.directory #install-data-local: diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu index a9b5a3b..26879df 100644 --- a/systemsettings/menu/system-settings.menu +++ b/systemsettings/menu/system-settings.menu @@ -18,7 +18,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability General - kde-settings-general.directory + tde-settings-general.directory Personal @@ -33,8 +33,8 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability Personal - kde-settings-personal.directory - + tde-settings-personal.directory + User Account Regional @@ -49,15 +49,15 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability User Account - kde-settings-useraccount.directory + tde-settings-useraccount.directory - kde-kcm_useraccount.desktop - kde-desktoppath.desktop + tde-kcm_useraccount.desktop + tde-desktoppath.desktop - kde-kcm_useraccount.desktop - kde-desktoppath.desktop + tde-kcm_useraccount.desktop + tde-desktoppath.desktop X-TDE-systemsettings-personal-useraccount @@ -65,17 +65,17 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability Regional - kde-settings-regional.directory + tde-settings-regional.directory - kde-language.desktop - kde-spellchecking.desktop - kde-keyboard_layout.desktop + tde-language.desktop + tde-spellchecking.desktop + tde-keyboard_layout.desktop - kde-language.desktop - kde-spellchecking.desktop - kde-keyboard_layout.desktop + tde-language.desktop + tde-spellchecking.desktop + tde-keyboard_layout.desktop X-TDE-systemsettings-personal-regional @@ -83,15 +83,15 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability Accessibility - kde-settings-accessibility_ss.directory + tde-settings-accessibility_ss.directory - kde-kcmaccess.desktop - kde-khotkeys.desktop + tde-kcmaccess.desktop + tde-khotkeys.desktop - kde-kcmaccess.desktop - kde-khotkeys.desktop + tde-kcmaccess.desktop + tde-khotkeys.desktop X-TDE-systemsettings-personal-accessibility @@ -99,100 +99,100 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability Default Applications - kde-settings-defaultapplications.directory + tde-settings-defaultapplications.directory - kde-defaultapplication.desktop - kde-filetypes.desktop + tde-defaultapplication.desktop + tde-filetypes.desktop - kde-defaultapplication.desktop - kde-filetypes.desktop + tde-defaultapplication.desktop + tde-filetypes.desktop X-TDE-systemsettings-personal - + Look and Feel - kde-settings-looknfeel2.directory + tde-settings-looknfeel2.directory Appearance Desktop - kde-ksplashthememgr.desktop + tde-ksplashthememgr.desktop Window Behavior Notifications - kde-ksplashthememgr.desktop + tde-ksplashthememgr.desktop X-TDE-systemsettings-lookandfeel - + Appearance - kde-settings-appearance.directory + tde-settings-appearance.directory - kde-colors.desktop - kde-fonts.desktop + tde-colors.desktop + tde-fonts.desktop kcmgtk-xdg.desktop - kde-kcmfontinst.desktop - kde-icons.desktop - kde-style.desktop - kde-twindecoration.desktop + tde-kcmfontinst.desktop + tde-icons.desktop + tde-style.desktop + tde-twindecoration.desktop - kde-colors.desktop - kde-fonts.desktop + tde-colors.desktop + tde-fonts.desktop kcmgtk-xdg.desktop - kde-kcmfontinst.desktop - kde-icons.desktop - kde-style.desktop - kde-twindecoration.desktop + tde-kcmfontinst.desktop + tde-icons.desktop + tde-style.desktop + tde-twindecoration.desktop X-TDE-systemsettings-lookandfeel-appearance - + Desktop - kde-settings-desktop.directory - + tde-settings-desktop.directory + - kde-background.desktop - kde-screensaver.desktop - kde-desktopbehavior.desktop - kde-desktop.desktop + tde-background.desktop + tde-screensaver.desktop + tde-desktopbehavior.desktop + tde-desktop.desktop - + - kde-background.desktop - kde-screensaver.desktop - kde-desktopbehavior.desktop - kde-desktop.desktop + tde-background.desktop + tde-screensaver.desktop + tde-desktopbehavior.desktop + tde-desktop.desktop X-TDE-systemsettings-lookandfeel-desktop - + Window Behavior - kde-settings-windowbehavior.directory - + tde-settings-windowbehavior.directory + - kde-twinoptions.desktop - kde-twinrules.desktop + tde-twinoptions.desktop + tde-twinrules.desktop - kde-twinoptions.desktop - kde-twinrules.desktop + tde-twinoptions.desktop + tde-twinrules.desktop X-TDE-systemsettings-lookandfeel-windowbehavior @@ -200,80 +200,80 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability Notifications - kde-settings-notifications.directory - + tde-settings-notifications.directory + - kde-kcmnotify.desktop - kde-bell.desktop - kde-medianotifications.desktop + tde-kcmnotify.desktop + tde-bell.desktop + tde-medianotifications.desktop - kde-kcmnotify.desktop - kde-bell.desktop - kde-medianotifications.desktop + tde-kcmnotify.desktop + tde-bell.desktop + tde-medianotifications.desktop X-TDE-systemsettings-lookandfeel-notifications - + - + Computer Administration - kde-settings-computeradministration.directory - + tde-settings-computeradministration.directory + - kde-clock.desktop + tde-clock.desktop Keyboard and Mouse - kde-displayconfig.desktop - kde-arts.desktop - kde-printers.desktop - - - kde-userconfig.desktop + tde-displayconfig.desktop + tde-arts.desktop + tde-printers.desktop + + + tde-userconfig.desktop - kde-clock.desktop - kde-displayconfig.desktop - kde-arts.desktop - kde-printers.desktop - - - kde-userconfig.desktop + tde-clock.desktop + tde-displayconfig.desktop + tde-arts.desktop + tde-printers.desktop + + + tde-userconfig.desktop X-TDE-systemsettings-administration - + Keyboard and Mouse - kde-settings-keyboardmouse.directory + tde-settings-keyboardmouse.directory - kde-keyboard.desktop - kde-keys.desktop - kde-mouse.desktop - kde-joystick.desktop + tde-keyboard.desktop + tde-keys.desktop + tde-mouse.desktop + tde-joystick.desktop - kde-keyboard.desktop - kde-keys.desktop - kde-mouse.desktop - kde-joystick.desktop + tde-keyboard.desktop + tde-keys.desktop + tde-mouse.desktop + tde-joystick.desktop X-TDE-systemsettings-administration-keyboardmouse - + - + Network and Connectivity - kde-settings-networkconnectivity.directory - + tde-settings-networkconnectivity.directory + Network Settings Sharing @@ -283,45 +283,45 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability X-TDE-systemsettings-network - + Network Settings - kde-settings-networksettings.directory - + tde-settings-networksettings.directory + - kde-kcm_knetworkconfmodule_ss.desktop - kde-proxy.desktop - kde-netpref.desktop - kde-kcm_kdnssd.desktop + tde-kcm_knetworkconfmodule_ss.desktop + tde-proxy.desktop + tde-netpref.desktop + tde-kcm_kdnssd.desktop - - + + - kde-kcm_knetworkconfmodule_ss.desktop - kde-proxy.desktop - kde-netpref.desktop - kde-kcm_kdnssd.desktop + tde-kcm_knetworkconfmodule_ss.desktop + tde-proxy.desktop + tde-netpref.desktop + tde-kcm_kdnssd.desktop X-TDE-systemsettings-network-networksettings - + Sharing - kde-settings-sharing.directory - + tde-settings-sharing.directory + - kde-kcmkrfb.desktop - kde-fileshare.desktop - kde-lanbrowser.desktop + tde-kcmkrfb.desktop + tde-fileshare.desktop + tde-lanbrowser.desktop - + - kde-kcmkrfb.desktop - kde-fileshare.desktop - kde-lanbrowser.desktop + tde-kcmkrfb.desktop + tde-fileshare.desktop + tde-lanbrowser.desktop X-TDE-systemsettings-network-sharing @@ -329,10 +329,10 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability - + Advanced - kde-settings-advanced.directory + tde-settings-advanced.directory System @@ -342,44 +342,44 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability System - kde-settings-system.directory - + tde-settings-system.directory + - kde-mountconfig.desktop - kde-serviceconfig.desktop - kde-tdm.desktop + tde-mountconfig.desktop + tde-serviceconfig.desktop + tde-tdm.desktop - + - kde-mountconfig.desktop - kde-serviceconfig.desktop - kde-tdm.desktop + tde-mountconfig.desktop + tde-serviceconfig.desktop + tde-tdm.desktop X-TDE-systemsettings-advancedadministration - + Advanced User Settings - kde-settings-advancedusersettings.directory - + tde-settings-advancedusersettings.directory + - kde-audioencoding.desktop - kde-kresources.desktop - kde-kcmkded.desktop - kde-kcmsmserver.desktop + tde-audioencoding.desktop + tde-kresources.desktop + tde-kcmkded.desktop + tde-kcmsmserver.desktop - + - kde-audioencoding.desktop - kde-kresources.desktop - kde-kcmkded.desktop - kde-kcmsmserver.desktop + tde-audioencoding.desktop + tde-kresources.desktop + tde-kcmkded.desktop + tde-kcmsmserver.desktop X-TDE-systemsettings-advancedusersettings - + diff --git a/systemsettings/menu/kde-settings-accessibility_ss.directory b/systemsettings/menu/tde-settings-accessibility_ss.directory similarity index 100% rename from systemsettings/menu/kde-settings-accessibility_ss.directory rename to systemsettings/menu/tde-settings-accessibility_ss.directory diff --git a/systemsettings/menu/kde-settings-advanced.directory b/systemsettings/menu/tde-settings-advanced.directory similarity index 100% rename from systemsettings/menu/kde-settings-advanced.directory rename to systemsettings/menu/tde-settings-advanced.directory diff --git a/systemsettings/menu/kde-settings-advancedusersettings.directory b/systemsettings/menu/tde-settings-advancedusersettings.directory similarity index 100% rename from systemsettings/menu/kde-settings-advancedusersettings.directory rename to systemsettings/menu/tde-settings-advancedusersettings.directory diff --git a/systemsettings/menu/kde-settings-appearance.directory b/systemsettings/menu/tde-settings-appearance.directory similarity index 100% rename from systemsettings/menu/kde-settings-appearance.directory rename to systemsettings/menu/tde-settings-appearance.directory diff --git a/systemsettings/menu/kde-settings-computeradministration.directory b/systemsettings/menu/tde-settings-computeradministration.directory similarity index 100% rename from systemsettings/menu/kde-settings-computeradministration.directory rename to systemsettings/menu/tde-settings-computeradministration.directory diff --git a/systemsettings/menu/kde-settings-defaultapplications.directory b/systemsettings/menu/tde-settings-defaultapplications.directory similarity index 100% rename from systemsettings/menu/kde-settings-defaultapplications.directory rename to systemsettings/menu/tde-settings-defaultapplications.directory diff --git a/systemsettings/menu/kde-settings-general.directory b/systemsettings/menu/tde-settings-general.directory similarity index 100% rename from systemsettings/menu/kde-settings-general.directory rename to systemsettings/menu/tde-settings-general.directory diff --git a/systemsettings/menu/kde-settings-keyboardmouse.directory b/systemsettings/menu/tde-settings-keyboardmouse.directory similarity index 100% rename from systemsettings/menu/kde-settings-keyboardmouse.directory rename to systemsettings/menu/tde-settings-keyboardmouse.directory diff --git a/systemsettings/menu/kde-settings-laptops.directory b/systemsettings/menu/tde-settings-laptops.directory similarity index 100% rename from systemsettings/menu/kde-settings-laptops.directory rename to systemsettings/menu/tde-settings-laptops.directory diff --git a/systemsettings/menu/kde-settings-looknfeel2.directory b/systemsettings/menu/tde-settings-looknfeel2.directory similarity index 100% rename from systemsettings/menu/kde-settings-looknfeel2.directory rename to systemsettings/menu/tde-settings-looknfeel2.directory diff --git a/systemsettings/menu/kde-settings-networkconnections.directory b/systemsettings/menu/tde-settings-networkconnections.directory similarity index 100% rename from systemsettings/menu/kde-settings-networkconnections.directory rename to systemsettings/menu/tde-settings-networkconnections.directory diff --git a/systemsettings/menu/kde-settings-networkconnectivity.directory b/systemsettings/menu/tde-settings-networkconnectivity.directory similarity index 100% rename from systemsettings/menu/kde-settings-networkconnectivity.directory rename to systemsettings/menu/tde-settings-networkconnectivity.directory diff --git a/systemsettings/menu/kde-settings-networksettings.directory b/systemsettings/menu/tde-settings-networksettings.directory similarity index 100% rename from systemsettings/menu/kde-settings-networksettings.directory rename to systemsettings/menu/tde-settings-networksettings.directory diff --git a/systemsettings/menu/kde-settings-notifications.directory b/systemsettings/menu/tde-settings-notifications.directory similarity index 100% rename from systemsettings/menu/kde-settings-notifications.directory rename to systemsettings/menu/tde-settings-notifications.directory diff --git a/systemsettings/menu/kde-settings-panel.directory b/systemsettings/menu/tde-settings-panel.directory similarity index 100% rename from systemsettings/menu/kde-settings-panel.directory rename to systemsettings/menu/tde-settings-panel.directory diff --git a/systemsettings/menu/kde-settings-personal.directory b/systemsettings/menu/tde-settings-personal.directory similarity index 100% rename from systemsettings/menu/kde-settings-personal.directory rename to systemsettings/menu/tde-settings-personal.directory diff --git a/systemsettings/menu/kde-settings-power.directory b/systemsettings/menu/tde-settings-power.directory similarity index 100% rename from systemsettings/menu/kde-settings-power.directory rename to systemsettings/menu/tde-settings-power.directory diff --git a/systemsettings/menu/kde-settings-regional.directory b/systemsettings/menu/tde-settings-regional.directory similarity index 100% rename from systemsettings/menu/kde-settings-regional.directory rename to systemsettings/menu/tde-settings-regional.directory diff --git a/systemsettings/menu/kde-settings-sharing.directory b/systemsettings/menu/tde-settings-sharing.directory similarity index 100% rename from systemsettings/menu/kde-settings-sharing.directory rename to systemsettings/menu/tde-settings-sharing.directory diff --git a/systemsettings/menu/kde-settings-splashscreen.directory b/systemsettings/menu/tde-settings-splashscreen.directory similarity index 100% rename from systemsettings/menu/kde-settings-splashscreen.directory rename to systemsettings/menu/tde-settings-splashscreen.directory diff --git a/systemsettings/menu/kde-settings-system.directory b/systemsettings/menu/tde-settings-system.directory similarity index 100% rename from systemsettings/menu/kde-settings-system.directory rename to systemsettings/menu/tde-settings-system.directory diff --git a/systemsettings/menu/kde-settings-useraccount.directory b/systemsettings/menu/tde-settings-useraccount.directory similarity index 100% rename from systemsettings/menu/kde-settings-useraccount.directory rename to systemsettings/menu/tde-settings-useraccount.directory diff --git a/systemsettings/menu/kde-settings-windowbehavior.directory b/systemsettings/menu/tde-settings-windowbehavior.directory similarity index 100% rename from systemsettings/menu/kde-settings-windowbehavior.directory rename to systemsettings/menu/tde-settings-windowbehavior.directory