← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/kdebase-workspace/gutsy

« back to all changes in this revision

Viewing changes to kcontrol/background/bgsettings.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2007-10-11 14:04:48 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071011140448-v0eb7lxbb24zagca
Tags: 3.94.0-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kcontrol/background/bgsettings.cpp
24
24
 
25
25
#include <kapplication.h>
26
26
#include <kdebug.h>
27
 
#include <kglobalsettings.h>
 
27
#include <KColorScheme>
28
28
#include <kdesktopfile.h>
 
29
#include <kconfiggroup.h>
29
30
#include <kstandarddirs.h>
30
31
#include <krandomsequence.h>
31
32
 
538
539
        else
539
540
            configname.sprintf("kdesktop-screen-%drc", screen_number);
540
541
 
541
 
        m_pConfig = KSharedConfig::openConfig(configname, KConfig::NoGlobals);
 
542
        m_pConfig = KSharedConfig::openConfig(configname, KConfig::CascadeConfig);
542
543
    } else {
543
544
        m_pConfig = config;
544
545
    }
1257
1258
    for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
1258
1259
        m_bDrawBackgroundPerScreen[i] = common.readEntry( QString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );
1259
1260
 
1260
 
    m_TextColor = KGlobalSettings::textColor();
 
1261
    // OK to use explicit QPalette::Active here, desktop icons can ignore state
 
1262
    // ### But, aren't desktop icons gone in KDE4?
 
1263
    m_TextColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
1261
1264
    const KConfigGroup fmSettings = m_pConfig->group("FMSettings");
1262
1265
    m_TextColor = fmSettings.readEntry("NormalTextColor", m_TextColor);
1263
1266
    m_TextBackgroundColor = fmSettings.readEntry("ItemTextBackground");