From 10e41144596fc9ced40fc349d9ecd099b1c2ea19 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 11 Dec 2009 20:21:27 +0000 Subject: 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 --- kdm/kfrontend/kgapp.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'kdm/kfrontend/kgapp.cpp') 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 #include +#include #include #include @@ -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 ); -- cgit v1.2.1