From 5b4bb7679edd86066e0de3d505ffc617a832963b Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Mon, 20 Jan 2014 18:38:05 -0600 Subject: 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. --- systemsettings/menu/Makefile.am | 6 +- systemsettings/menu/system-settings-merge.menu | 11 - systemsettings/menu/system-settings.directory | 34 -- systemsettings/menu/system-settings.menu | 385 -------------------- systemsettings/menu/tde-system-settings-merge.menu | 11 + systemsettings/menu/tde-system-settings.directory | 34 ++ systemsettings/menu/tde-system-settings.menu | 392 +++++++++++++++++++++ 7 files changed, 440 insertions(+), 433 deletions(-) delete mode 100644 systemsettings/menu/system-settings-merge.menu delete mode 100644 systemsettings/menu/system-settings.directory delete mode 100644 systemsettings/menu/system-settings.menu create mode 100644 systemsettings/menu/tde-system-settings-merge.menu create mode 100644 systemsettings/menu/tde-system-settings.directory create mode 100644 systemsettings/menu/tde-system-settings.menu 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/system-settings-merge.menu deleted file mode 100644 index 70d4b07..0000000 --- a/systemsettings/menu/system-settings-merge.menu +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - System Settings - system-settings.directory - ../system-settings.menu - - diff --git a/systemsettings/menu/system-settings.directory b/systemsettings/menu/system-settings.directory deleted file mode 100644 index d622e4f..0000000 --- a/systemsettings/menu/system-settings.directory +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=System Settings -Name[ar]=تعيينات النظام -Name[bg]=Системни настройки -Name[br]=Dibarzhoù ar Reizhiad -Name[cs]=Nastavení systému -Name[cy]=Gosodiadau Cysawd -Name[da]=Systemopsætning -Name[de]=Systemeinstellungen -Name[el]=Ρυθμίσεις συστήματος -Name[es]=Preferencias del sistema -Name[et]=Süsteemi seadistused -Name[fr]=Paramètres du Système -Name[ga]=Socruithe an Chórais -Name[gl]=Configurazón do Sistema -Name[it]=Impostazioni di sistema -Name[ja]=システム設定 -Name[ka]=სისტემის პარამეტრები -Name[lt]=Sistemos nustatymai -Name[nl]=Systeeminstellingen -Name[pl]=Ustawienia systemowe -Name[pt]=Configuração do Sistema -Name[pt_BR]=Configurações do Sistema -Name[sk]=Systémové nastavenia -Name[sr]=Системске поставке -Name[sr@Latn]=Sistemske postavke -Name[sv]=Systeminställningar -Name[tr]=Sistem Ayarları -Name[xx]=xxSystem Settingsxx -Name[zh_CN]=系统设置 -NoDisplay=true -Icon=package_settings -X-TDE-BaseGroup=systemsettings 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 @@ - - - - System Settings - - - General - - Advanced - - - - - General - tde-settings-general.directory - - - Personal - - Look and Feel - - Computer Administration - - Network and Connectivity - - - - - Personal - tde-settings-personal.directory - - - User Account - Regional - Accessibility - Default Applications - - - - - - - User Account - tde-settings-useraccount.directory - - tde-kcm_useraccount.desktop - tde-desktoppath.desktop - - - - tde-kcm_useraccount.desktop - tde-desktoppath.desktop - X-TDE-systemsettings-personal-useraccount - - - - - - Regional - tde-settings-regional.directory - - tde-language.desktop - tde-spellchecking.desktop - tde-keyboard_layout.desktop - - - - tde-language.desktop - tde-spellchecking.desktop - tde-keyboard_layout.desktop - X-TDE-systemsettings-personal-regional - - - - - - Accessibility - tde-settings-accessibility_ss.directory - - tde-kcmaccess.desktop - tde-khotkeys.desktop - - - - tde-kcmaccess.desktop - tde-khotkeys.desktop - X-TDE-systemsettings-personal-accessibility - - - - - - Default Applications - tde-settings-defaultapplications.directory - - tde-defaultapplication.desktop - tde-filetypes.desktop - - - - tde-defaultapplication.desktop - tde-filetypes.desktop - X-TDE-systemsettings-personal - - - - - - - - - Look and Feel - tde-settings-looknfeel2.directory - - Appearance - Desktop - tde-ksplashthememgr.desktop - Window Behavior - Notifications - - - - tde-ksplashthememgr.desktop - X-TDE-systemsettings-lookandfeel - - - - - Appearance - tde-settings-appearance.directory - - tde-colors.desktop - tde-fonts.desktop - kcmgtk-xdg.desktop - tde-kcmfontinst.desktop - tde-icons.desktop - tde-style.desktop - tde-twindecoration.desktop - - - - tde-colors.desktop - tde-fonts.desktop - kcmgtk-xdg.desktop - tde-kcmfontinst.desktop - tde-icons.desktop - tde-style.desktop - tde-twindecoration.desktop - X-TDE-systemsettings-lookandfeel-appearance - - - - - - Desktop - tde-settings-desktop.directory - - - tde-background.desktop - tde-screensaver.desktop - tde-desktopbehavior.desktop - tde-desktop.desktop - - - - - tde-background.desktop - tde-screensaver.desktop - tde-desktopbehavior.desktop - tde-desktop.desktop - X-TDE-systemsettings-lookandfeel-desktop - - - - - - Window Behavior - tde-settings-windowbehavior.directory - - - tde-twinoptions.desktop - tde-twinrules.desktop - - - - tde-twinoptions.desktop - tde-twinrules.desktop - X-TDE-systemsettings-lookandfeel-windowbehavior - - - - - - Notifications - tde-settings-notifications.directory - - - tde-kcmnotify.desktop - tde-bell.desktop - tde-medianotifications.desktop - - - - tde-kcmnotify.desktop - tde-bell.desktop - tde-medianotifications.desktop - X-TDE-systemsettings-lookandfeel-notifications - - - - - - - - Computer Administration - tde-settings-computeradministration.directory - - - tde-clock.desktop - Keyboard and Mouse - tde-displayconfig.desktop - tde-arts.desktop - tde-printers.desktop - - - tde-userconfig.desktop - - - - tde-clock.desktop - tde-displayconfig.desktop - tde-arts.desktop - tde-printers.desktop - - - tde-userconfig.desktop - X-TDE-systemsettings-administration - - - - - Keyboard and Mouse - tde-settings-keyboardmouse.directory - - tde-keyboard.desktop - tde-keys.desktop - tde-mouse.desktop - tde-joystick.desktop - - - - tde-keyboard.desktop - tde-keys.desktop - tde-mouse.desktop - tde-joystick.desktop - X-TDE-systemsettings-administration-keyboardmouse - - - - - - - - Network and Connectivity - tde-settings-networkconnectivity.directory - - - Network Settings - Sharing - - - - - X-TDE-systemsettings-network - - - - - Network Settings - tde-settings-networksettings.directory - - - tde-kcm_knetworkconfmodule_ss.desktop - tde-proxy.desktop - tde-netpref.desktop - tde-kcm_tdednssd.desktop - - - - - tde-kcm_knetworkconfmodule_ss.desktop - tde-proxy.desktop - tde-netpref.desktop - tde-kcm_tdednssd.desktop - X-TDE-systemsettings-network-networksettings - - - - - - Sharing - tde-settings-sharing.directory - - - tde-kcmkrfb.desktop - tde-fileshare.desktop - tde-lanbrowser.desktop - - - - - tde-kcmkrfb.desktop - tde-fileshare.desktop - tde-lanbrowser.desktop - X-TDE-systemsettings-network-sharing - - - - - - - - Advanced - - tde-settings-advanced.directory - - System - - Advanced User Settings - - - - - System - tde-settings-system.directory - - - tde-mountconfig.desktop - tde-serviceconfig.desktop - tde-tdm.desktop - - - - - tde-mountconfig.desktop - tde-serviceconfig.desktop - tde-tdm.desktop - X-TDE-systemsettings-advancedadministration - - - - - - Advanced User Settings - tde-settings-advancedusersettings.directory - - - tde-audioencoding.desktop - tde-tderesources.desktop - tde-kcmkded.desktop - tde-kcmsmserver.desktop - - - - - tde-audioencoding.desktop - tde-tderesources.desktop - tde-kcmkded.desktop - tde-kcmsmserver.desktop - X-TDE-systemsettings-advancedusersettings - - - - - diff --git a/systemsettings/menu/tde-system-settings-merge.menu b/systemsettings/menu/tde-system-settings-merge.menu new file mode 100644 index 0000000..1cf66a2 --- /dev/null +++ b/systemsettings/menu/tde-system-settings-merge.menu @@ -0,0 +1,11 @@ + + + + + + System Settings + tde-system-settings.directory + ../tde-system-settings.menu + + diff --git a/systemsettings/menu/tde-system-settings.directory b/systemsettings/menu/tde-system-settings.directory new file mode 100644 index 0000000..d622e4f --- /dev/null +++ b/systemsettings/menu/tde-system-settings.directory @@ -0,0 +1,34 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=System Settings +Name[ar]=تعيينات النظام +Name[bg]=Системни настройки +Name[br]=Dibarzhoù ar Reizhiad +Name[cs]=Nastavení systému +Name[cy]=Gosodiadau Cysawd +Name[da]=Systemopsætning +Name[de]=Systemeinstellungen +Name[el]=Ρυθμίσεις συστήματος +Name[es]=Preferencias del sistema +Name[et]=Süsteemi seadistused +Name[fr]=Paramètres du Système +Name[ga]=Socruithe an Chórais +Name[gl]=Configurazón do Sistema +Name[it]=Impostazioni di sistema +Name[ja]=システム設定 +Name[ka]=სისტემის პარამეტრები +Name[lt]=Sistemos nustatymai +Name[nl]=Systeeminstellingen +Name[pl]=Ustawienia systemowe +Name[pt]=Configuração do Sistema +Name[pt_BR]=Configurações do Sistema +Name[sk]=Systémové nastavenia +Name[sr]=Системске поставке +Name[sr@Latn]=Sistemske postavke +Name[sv]=Systeminställningar +Name[tr]=Sistem Ayarları +Name[xx]=xxSystem Settingsxx +Name[zh_CN]=系统设置 +NoDisplay=true +Icon=package_settings +X-TDE-BaseGroup=systemsettings diff --git a/systemsettings/menu/tde-system-settings.menu b/systemsettings/menu/tde-system-settings.menu new file mode 100644 index 0000000..355d5fb --- /dev/null +++ b/systemsettings/menu/tde-system-settings.menu @@ -0,0 +1,392 @@ + + + + System Settings + + + General + + Advanced + + + + + General + tde-settings-general.directory + + + Personal + + Look and Feel + + Computer Administration + + Network and Connectivity + + + + + Personal + tde-settings-personal.directory + + + User Account + Regional + Accessibility + Default Applications + + + + + + + User Account + tde-settings-useraccount.directory + + tde-kcm_useraccount.desktop + tde-desktoppath.desktop + + + + tde-kcm_useraccount.desktop + tde-desktoppath.desktop + X-TDE-systemsettings-personal-useraccount + + + + + + Regional + tde-settings-regional.directory + + tde-language.desktop + tde-spellchecking.desktop + tde-keyboard_layout.desktop + + + + tde-language.desktop + tde-spellchecking.desktop + tde-keyboard_layout.desktop + X-TDE-systemsettings-personal-regional + + + + + + Accessibility + tde-settings-accessibility_ss.directory + + tde-kcmaccess.desktop + tde-khotkeys.desktop + + + + tde-kcmaccess.desktop + tde-khotkeys.desktop + X-TDE-systemsettings-personal-accessibility + + + + + + Default Applications + tde-settings-defaultapplications.directory + + tde-defaultapplication.desktop + tde-filetypes.desktop + + + + tde-defaultapplication.desktop + tde-filetypes.desktop + X-TDE-systemsettings-personal + + + + + + + + + Look and Feel + tde-settings-looknfeel2.directory + + Appearance + Desktop + Window Behavior + Notifications + + + + X-TDE-systemsettings-lookandfeel + + + + + Appearance + tde-settings-appearance.directory + + tde-colors.desktop + tde-fonts.desktop + tde-kcmfontinst.desktop + kcmgtk.desktop + tde-icons.desktop + tde-ksplashthememgr.desktop + tde-style.desktop + tde-kthememanager.desktop + tde-twindecoration.desktop + + + + tde-colors.desktop + tde-fonts.desktop + tde-kcmfontinst.desktop + kcmgtk.desktop + tde-icons.desktop + tde-ksplashthememgr.desktop + tde-style.desktop + tde-kthememanager.desktop + tde-twindecoration.desktop + X-TDE-systemsettings-lookandfeel-appearance + + + tde-tdmtheme.desktop + + + + + + Desktop + tde-settings-desktop.directory + + + tde-background.desktop + tde-screensaver.desktop + tde-desktopbehavior.desktop + tde-desktop.desktop + + + + + tde-background.desktop + tde-screensaver.desktop + tde-desktopbehavior.desktop + tde-desktop.desktop + X-TDE-systemsettings-lookandfeel-desktop + + + + + + Window Behavior + tde-settings-windowbehavior.directory + + + tde-twinoptions.desktop + tde-twinrules.desktop + + + + tde-twinoptions.desktop + tde-twinrules.desktop + X-TDE-systemsettings-lookandfeel-windowbehavior + + + + + + Notifications + tde-settings-notifications.directory + + + tde-kcmnotify.desktop + tde-bell.desktop + tde-medianotifications.desktop + + + + tde-kcmnotify.desktop + tde-bell.desktop + tde-medianotifications.desktop + X-TDE-systemsettings-lookandfeel-notifications + + + + + + + + Computer Administration + tde-settings-computeradministration.directory + + + tde-clock.desktop + Keyboard and Mouse + tde-displayconfig.desktop + tde-arts.desktop + tde-printers.desktop + + + tde-userconfig.desktop + + + + tde-clock.desktop + tde-displayconfig.desktop + tde-arts.desktop + tde-printers.desktop + + + tde-userconfig.desktop + X-TDE-systemsettings-administration + + + + + Keyboard and Mouse + tde-settings-keyboardmouse.directory + + tde-keyboard.desktop + tde-keys.desktop + tde-mouse.desktop + tde-joystick.desktop + + + + tde-keyboard.desktop + tde-keys.desktop + tde-mouse.desktop + tde-joystick.desktop + X-TDE-systemsettings-administration-keyboardmouse + + + + + + + + Network and Connectivity + tde-settings-networkconnectivity.directory + + + Network Settings + Sharing + + + + + X-TDE-systemsettings-network + + + + + Network Settings + tde-settings-networksettings.directory + + + tde-kcm_knetworkconfmodule_ss.desktop + tde-proxy.desktop + tde-netpref.desktop + tde-kcm_tdednssd.desktop + + + + + tde-kcm_knetworkconfmodule_ss.desktop + tde-proxy.desktop + tde-netpref.desktop + tde-kcm_tdednssd.desktop + X-TDE-systemsettings-network-networksettings + + + + + + Sharing + tde-settings-sharing.directory + + + tde-kcmkrfb.desktop + tde-fileshare.desktop + tde-lanbrowser.desktop + + + + + tde-kcmkrfb.desktop + tde-fileshare.desktop + tde-lanbrowser.desktop + X-TDE-systemsettings-network-sharing + + + + + + + + Advanced + + tde-settings-advanced.directory + + System + + Advanced User Settings + + + + + System + tde-settings-system.directory + + + tde-mountconfig.desktop + tde-serviceconfig.desktop + tde-tdm.desktop + tde-tdmtheme.desktop + + + + + tde-mountconfig.desktop + tde-serviceconfig.desktop + tde-tdm.desktop + tde-tdmtheme.desktop + X-TDE-systemsettings-advancedadministration + + + + + + Advanced User Settings + tde-settings-advancedusersettings.directory + + + tde-audioencoding.desktop + tde-tderesources.desktop + tde-kcmkded.desktop + tde-kcmsmserver.desktop + + + + + tde-audioencoding.desktop + tde-tderesources.desktop + tde-kcmkded.desktop + tde-kcmsmserver.desktop + X-TDE-systemsettings-advancedusersettings + + + + + -- cgit v1.2.1