[kde-doc-english] [kde-runtime/frameworks] /: kcmshell4 -> kcmshell5
Hrvoje Senjan
hrvoje.senjan at gmail.com
Sat Mar 22 21:12:36 UTC 2014
Git commit 669088a245ff5721bf922783a9466a695a7c79f9 by Hrvoje Senjan.
Committed on 22/03/2014 at 21:11.
Pushed by hrvojes into branch 'frameworks'.
kcmshell4 -> kcmshell5
M +1 -1 attica/kcm/kcm_attica.desktop
M +1 -1 doc/kcontrol/filetypes/index.docbook
M +1 -1 doc/kioslave/cgi/index.docbook
M +1 -1 kcontrol/componentchooser/componentchooser.desktop
M +1 -1 kcontrol/dnssd/kcm_kdnssd.desktop
M +1 -1 kcontrol/emoticons/emoticons.desktop
M +1 -1 kcontrol/kded/kcmkded.desktop
M +1 -1 kcontrol/knotify/kcmnotify.desktop
M +1 -1 kcontrol/locale/language.desktop
M +1 -1 kcontrol/spellchecking/spellchecking.desktop
M +1 -1 keditfiletype/filetypes.desktop
M +1 -1 kglobalaccel/component.cpp
M +1 -1 khelpcenter/htmlsearch/htmlsearch.desktop
M +1 -1 khelpcenter/kcmhelpcenter.desktop
M +1 -1 kioslave/cgi/kcmcgi/kcmcgi.desktop
M +1 -1 kioslave/trash/kcmtrash.desktop
M +1 -1 phonon/kcm/kcm_phonon.desktop
M +1 -1 phonon/kded-module/phononserver.cpp
M +1 -1 platforms/win/config/platform.desktop
M +1 -1 solid-device-automounter/kcm/device_automounter_kcm.desktop
http://commits.kde.org/kde-runtime/669088a245ff5721bf922783a9466a695a7c79f9
diff --git a/attica/kcm/kcm_attica.desktop b/attica/kcm/kcm_attica.desktop
index c9790da..878fb4b 100644
--- a/attica/kcm/kcm_attica.desktop
+++ b/attica/kcm/kcm_attica.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcm_attica
+Exec=kcmshell5 kcm_attica
Type=Service
Icon=get-hot-new-stuff
diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook
index 3f9c03d..3c49c2a 100644
--- a/doc/kcontrol/filetypes/index.docbook
+++ b/doc/kcontrol/filetypes/index.docbook
@@ -70,7 +70,7 @@ without opening and analyzing the format of each and every file.</para>
<para>You can start this module
by opening &systemsettings; and selecting <guilabel>File Associations</guilabel> in the
<guilabel>Common Appearance and Behavior</guilabel> category. Alternatively, you can start it by
-typing <command>kcmshell4 filetypes</command> from the terminal or &krunner;.</para>
+typing <command>kcmshell5 filetypes</command> from the terminal or &krunner;.</para>
<para>The file associations are organized into several categories, and
at a minimum you will have:</para>
diff --git a/doc/kioslave/cgi/index.docbook b/doc/kioslave/cgi/index.docbook
index 8c79726..52e0e3b 100644
--- a/doc/kioslave/cgi/index.docbook
+++ b/doc/kioslave/cgi/index.docbook
@@ -29,7 +29,7 @@ list of folders.</para>
</userinput>. The value defaults to <filename class="directory">$<envar>HOME</envar>/.kde4/cgi-bin/</filename>.</para>
<para>Use the &systemsettings; module <guilabel>CGI Script</guilabel>
-(launched with <userinput><command>kcmshell4</command> <option>kcmcgi</option>
+(launched with <userinput><command>kcmshell5</command> <option>kcmcgi</option>
</userinput>) to add or remove additional user defined paths that are searched for
<acronym>CGI</acronym> scripts.</para>
diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
index b670068..b3727bd 100644
--- a/kcontrol/componentchooser/componentchooser.desktop
+++ b/kcontrol/componentchooser/componentchooser.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 componentchooser
+Exec=kcmshell5 componentchooser
Icon=preferences-desktop-default-applications
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/kcontrol/dnssd/kcm_kdnssd.desktop b/kcontrol/dnssd/kcm_kdnssd.desktop
index b61cfff..38c000d 100644
--- a/kcontrol/dnssd/kcm_kdnssd.desktop
+++ b/kcontrol/dnssd/kcm_kdnssd.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcm_kdnssd
+Exec=kcmshell5 kcm_kdnssd
Icon=preferences-system-network-discovery
Name=Service Discovery
Name[af]=Dienste ontdekker
diff --git a/kcontrol/emoticons/emoticons.desktop b/kcontrol/emoticons/emoticons.desktop
index 1ca4677..8945804 100644
--- a/kcontrol/emoticons/emoticons.desktop
+++ b/kcontrol/emoticons/emoticons.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 emoticons
+Exec=kcmshell5 emoticons
Icon=face-smile
Type=Service
X-DocPath=kcontrol/emoticons/index.html
diff --git a/kcontrol/kded/kcmkded.desktop b/kcontrol/kded/kcmkded.desktop
index fa30e6f..8e674b3 100644
--- a/kcontrol/kded/kcmkded.desktop
+++ b/kcontrol/kded/kcmkded.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcmkded
+Exec=kcmshell5 kcmkded
Icon=preferences-system-session-services
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/kcontrol/knotify/kcmnotify.desktop b/kcontrol/knotify/kcmnotify.desktop
index 413e3ff..1d0ffab 100644
--- a/kcontrol/knotify/kcmnotify.desktop
+++ b/kcontrol/knotify/kcmnotify.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcmnotify
+Exec=kcmshell5 kcmnotify
Icon=preferences-desktop-notification
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/kcontrol/locale/language.desktop b/kcontrol/locale/language.desktop
index b00aa0a..d8112b8 100644
--- a/kcontrol/locale/language.desktop
+++ b/kcontrol/locale/language.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 language
+Exec=kcmshell5 language
Icon=preferences-desktop-locale
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/kcontrol/spellchecking/spellchecking.desktop b/kcontrol/spellchecking/spellchecking.desktop
index 1683856..d9c969b 100644
--- a/kcontrol/spellchecking/spellchecking.desktop
+++ b/kcontrol/spellchecking/spellchecking.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 spellchecking
+Exec=kcmshell5 spellchecking
Icon=tools-check-spelling
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/keditfiletype/filetypes.desktop b/keditfiletype/filetypes.desktop
index 34bff90..c5b96fc 100644
--- a/keditfiletype/filetypes.desktop
+++ b/keditfiletype/filetypes.desktop
@@ -2,7 +2,7 @@
Icon=preferences-desktop-filetype-association
Type=Service
X-KDE-ServiceTypes=KCModule
-Exec=kcmshell4 filetypes
+Exec=kcmshell5 filetypes
X-DocPath=kcontrol/filetypes/index.html
X-KDE-Library=kcm_filetypes
diff --git a/kglobalaccel/component.cpp b/kglobalaccel/component.cpp
index 3c539d0..c0d263e 100644
--- a/kglobalaccel/component.cpp
+++ b/kglobalaccel/component.cpp
@@ -424,7 +424,7 @@ QStringList Component::shortcutNames( const QString &contextName) const
bool Component::showKCM()
{
- return KRun::runCommand("kcmshell4 keys", NULL);
+ return KRun::runCommand("kcmshell5 keys", NULL);
}
diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop
index 2016512..1d73608 100644
--- a/khelpcenter/htmlsearch/htmlsearch.desktop
+++ b/khelpcenter/htmlsearch/htmlsearch.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 htmlsearch
+Exec=kcmshell5 htmlsearch
Icon=help_index
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/khelpcenter/kcmhelpcenter.desktop b/khelpcenter/kcmhelpcenter.desktop
index 0e947f6..66a4a0e 100644
--- a/khelpcenter/kcmhelpcenter.desktop
+++ b/khelpcenter/kcmhelpcenter.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=kcmshell4 kcmhelpcenter
+Exec=kcmshell5 kcmhelpcenter
Icon=help
X-KDE-SubstituteUID=true
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.desktop b/kioslave/cgi/kcmcgi/kcmcgi.desktop
index f89db0e..452b66b 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/kioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -2,7 +2,7 @@
Icon=run
Type=Service
X-KDE-ServiceTypes=KCModule
-Exec=kcmshell4 kcmcgi
+Exec=kcmshell5 kcmcgi
X-DocPath=kcontrol/kcmcgi/index.html
X-KDE-Library=kcm_cgi
X-KDE-ParentApp=kcontrol
diff --git a/kioslave/trash/kcmtrash.desktop b/kioslave/trash/kcmtrash.desktop
index 39151bd..c3ff0c5 100644
--- a/kioslave/trash/kcmtrash.desktop
+++ b/kioslave/trash/kcmtrash.desktop
@@ -163,7 +163,7 @@ Comment[zh_TW]=此服務允許設定資源回收筒的檢視。
Icon=user-trash
Type=Service
X-KDE-ServiceTypes=KCModule
-Exec=kcmshell4 kcmtrash
+Exec=kcmshell5 kcmtrash
X-KDE-Library=kcm_trash
X-KDE-PluginKeyword=trash
diff --git a/phonon/kcm/kcm_phonon.desktop b/phonon/kcm/kcm_phonon.desktop
index 5253acb..82a7048 100644
--- a/phonon/kcm/kcm_phonon.desktop
+++ b/phonon/kcm/kcm_phonon.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcm_phonon
+Exec=kcmshell5 kcm_phonon
Icon=preferences-desktop-sound
Type=Service
X-KDE-ServiceTypes=KCModule
diff --git a/phonon/kded-module/phononserver.cpp b/phonon/kded-module/phononserver.cpp
index ca17444..3c0f6cf 100644
--- a/phonon/kded-module/phononserver.cpp
+++ b/phonon/kded-module/phononserver.cpp
@@ -1128,7 +1128,7 @@ void PhononServer::askToRemoveDevices(const QStringList &devList, int type, cons
{
if (button == KDialog::User1) {
kDebug(601) << "start kcm_phonon";
- QProcess::startDetached(QLatin1String("kcmshell4"), QStringList(QLatin1String("kcm_phonon")));
+ QProcess::startDetached(QLatin1String("kcmshell5"), QStringList(QLatin1String("kcm_phonon")));
reject();
} else {
KDialog::slotButtonClicked(button);
diff --git a/platforms/win/config/platform.desktop b/platforms/win/config/platform.desktop
index c851944..1f25635 100644
--- a/platforms/win/config/platform.desktop
+++ b/platforms/win/config/platform.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 platform
+Exec=kcmshell5 platform
Icon=kde-windows
Type=Service
X-DocPath=kcontrol/platform/index.html
diff --git a/solid-device-automounter/kcm/device_automounter_kcm.desktop b/solid-device-automounter/kcm/device_automounter_kcm.desktop
index ea48a42..ba0b64f 100644
--- a/solid-device-automounter/kcm/device_automounter_kcm.desktop
+++ b/solid-device-automounter/kcm/device_automounter_kcm.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 device_automounter_kcm
+Exec=kcmshell5 device_automounter_kcm
Icon=drive-removable-media
Type=Service
X-KDE-ServiceTypes=KCModule
More information about the kde-doc-english
mailing list