Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > media > main-src > by-pkgid > a6bc312ce50b5c8d0c51736e58ac32bc > files > 341

kdebase-3.4.2-55mdk.src.rpm

--- kdebase-3.4.0/kcontrol/kthememanager/kthemedlg.ui.h--	2005-05-06 12:07:54.678292147 +0200
+++ kdebase-3.4.0/kcontrol/kthememanager/kthemedlg.ui.h	2005-05-06 12:11:16.073076898 +0200
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 #include <krun.h>
-
+#include <kstandarddirs.h>
 void KThemeDlg::startKonqui( const QString & url )
 {
     (void) new KRun(url);
@@ -16,34 +16,53 @@ void KThemeDlg::startKonqui( const QStri
 
 void KThemeDlg::startBackground()
 {
-    KRun::runCommand("kcmshell kde-background");
+   if( KStandardDirs::default_menu_type_by_version()=="kde")
+    	KRun::runCommand("kcmshell kde-background");
+	else
+		KRun::runCommand("kcmshell background");
 }
 
 
 void KThemeDlg::startColors()
 {
-    KRun::runCommand("kcmshell kde-colors");
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+	   KRun::runCommand("kcmshell kde-colors");
+	else
+		KRun::runCommand("kcmshell colors");
+
 }
 
 
 void KThemeDlg::startStyle()
 {
-    KRun::runCommand("kcmshell kde-style");
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+	    KRun::runCommand("kcmshell kde-style");
+	else
+		KRun::runCommand("kcmshell style");
 }
 
 
 void KThemeDlg::startIcons()
 {
-    KRun::runCommand("kcmshell kde-icons");
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+	    KRun::runCommand("kcmshell kde-icons");
+	else
+		KRun::runCommand("kcmshell icons");
 }
 
 void KThemeDlg::startFonts()
 {
-   KRun::runCommand("kcmshell kde-fonts");
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+   		KRun::runCommand("kcmshell kde-fonts");
+	else
+		KRun::runCommand("kcmshell fonts");
 }
 
 
 void KThemeDlg::startSaver()
 {
-    KRun::runCommand("kcmshell kde-screensaver");
+	if( KStandardDirs::default_menu_type_by_version()=="kde")
+	    KRun::runCommand("kcmshell kde-screensaver");
+	else
+		KRun::runCommand("kcmshell screensaver");
 }