Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > by-pkgid > ee5019e51831f214d532979b59ea2d61 > files > 43

kdelibs-3.4.2-31.4.20060mdk.src.rpm

--- ./kdecore/kglobalsettings.cpp--	2005-09-05 16:48:15.000000000 +0200
+++ ./kdecore/kglobalsettings.cpp	2005-09-05 17:05:10.000000000 +0200
@@ -26,7 +26,7 @@
 #include <kconfig.h>
 #include <ksimpleconfig.h>
 #include <kapplication.h>
-
+#include <kstandarddirs.h>
 #include <kipc.h>
 
 #ifdef Q_WS_WIN
@@ -167,7 +167,11 @@ QColor KGlobalSettings::inactiveTitleCol
     return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION));
 #else
     if (!_inactiveBackground)
-        _inactiveBackground = new QColor(157, 170, 186);
+	{
+		if(KStandardDirs::isDiscovery())
+			_inactiveBackground = new QColor(143,159,180);
+		else
+        	_inactiveBackground = new QColor(157, 170, 186); }
     KConfigGroup g( KGlobal::config(), "WM" );
     return g.readColorEntry( "inactiveBackground", _inactiveBackground );
 #endif
@@ -192,7 +196,12 @@ QColor KGlobalSettings::activeTitleColor
 #else
     initColors();
     if (!_activeBackground)
-      _activeBackground = new QColor(65,142,220);
+	{
+		if( KStandardDirs::isDiscovery())
+			_activeBackground = new QColor(62,145,235);
+		else
+      		_activeBackground = new QColor(237,237,237);
+	}
     KConfigGroup g( KGlobal::config(), "WM" );
     return g.readColorEntry( "activeBackground", _activeBackground);
 #endif
@@ -524,7 +533,7 @@ void KGlobalSettings::initColors()
 {
     if (!_kde34Blue) {
       if (QPixmap::defaultDepth() > 8)
-        _kde34Blue = new QColor(103,141,178);
+        _kde34Blue = new QColor(33,68,156);
       else
         _kde34Blue = new QColor(0, 0, 192);
     }
--- ./kdecore/kapplication.cpp--	2005-09-05 16:44:00.000000000 +0200
+++ ./kdecore/kapplication.cpp	2005-09-05 17:05:54.000000000 +0200
@@ -1970,12 +1970,12 @@ QPalette KApplication::createApplication
 
 QPalette KApplication::createApplicationPalette( KConfig *config, int contrast_ )
 {
-    QColor kde34Background( 239, 239, 239 );
+    QColor kde34Background( "#E6E7E6" );
     QColor kde34Blue( 103,141,178 );
 
     QColor kde34Button;
     if ( QPixmap::defaultDepth() > 8 )
-      kde34Button.setRgb( 221, 223, 228 );
+      kde34Button.setRgb( 230,231,230 );
     else
       kde34Button.setRgb( 220, 220, 220 );
 
--- ./kdecore/kstandarddirs.cpp--	2005-09-05 16:59:40.000000000 +0200
+++ ./kdecore/kstandarddirs.cpp	2005-09-05 17:01:04.000000000 +0200
@@ -1819,4 +1819,8 @@ QString KStandardDirs::mandrake_merge_di
 	return QDir::homeDirPath() + "/.kde/DESKTOP_ENTRY/";
 }
 
+bool KStandardDirs::isDiscovery()
+{
+		return (KStandardDirs::mandrake_distro_version() == KStandardDirs::DISCOVERY);
+}
 
--- ./kdecore/kstandarddirs.h--	2005-09-05 17:01:13.000000000 +0200
+++ ./kdecore/kstandarddirs.h	2005-09-05 17:01:40.000000000 +0200
@@ -604,7 +604,7 @@ public:
 	
 	enum distroVersionType { DOWNLOAD = 0, POWERPACK, DISCOVERY, POWERPACKPLUS };
 	static distroVersionType mandrake_distro_version();
-	
+	static bool isDiscovery();
 	//------------------------------
 
 	/**