Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 14 insertions, 0 deletions

diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index 711853c37..a5bb667ef 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <ksimpleconfig.h>
 
 #include <qtimer.h>
+#include <qstring.h>
 #include <qcursor.h>
 #include <qpalette.h>
 
@@ -124,6 +125,8 @@ xIOErr( Display * )
 	exit( EX_RESERVER_DPY );
 }
 
+//KSimpleConfig *iccconfig;
+
 void
 kg_main( const char *argv0 )
 {
@@ -141,6 +144,17 @@ kg_main( const char *argv0 )
 	if (!_GUIStyle.isEmpty())
 		app.setStyle( _GUIStyle );
 
+	// Load up the systemwide ICC profile
+	QString iccConfigFile = QString(KDE_CONFDIR);
+	iccConfigFile += "/kicc/kiccconfigrc";
+	KSimpleConfig iccconfig(iccConfigFile, true);
+	if (iccconfig.readBoolEntry("EnableICC", false) == true) {
+		QString iccCommand = QString("/usr/bin/xcalib ");
+		iccCommand += iccconfig.readEntry("ICCFile");
+		iccCommand += QString(" &");
+		system(iccCommand.ascii());
+	}
+
 	_colorScheme = locate( "data", "kdisplay/color-schemes/" + _colorScheme + ".kcsrc" );
 	if (!_colorScheme.isEmpty()) {
 		KSimpleConfig config( _colorScheme, true );