← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to kdeui/kernel/kglobalsettings.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Kolberg
  • Date: 2012-03-03 00:25:28 UTC
  • mfrom: (1.14.15)
  • Revision ID: package-import@ubuntu.com-20120303002528-chhwyfluldkicy5k
Tags: 4:4.8.1-0ubuntu1
* New upstream release
  - Update symbol files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdeui/kernel/kglobalsettings.cpp
176
176
         */
177
177
        void applyCursorTheme();
178
178
 
179
 
        /**
180
 
         * drop cached values for settings that aren't in any of the previous groups
181
 
         */
182
 
        static void rereadOtherSettings();
 
179
        static void reloadStyleSettings();
183
180
 
184
181
        KGlobalSettings *q;
185
182
        bool activated;
789
786
 
790
787
    if (!_graphicEffectsInitialized) {
791
788
        _graphicEffectsInitialized = true;
792
 
        Private::rereadOtherSettings();
 
789
        Private::reloadStyleSettings();
793
790
    }
794
791
 
795
792
    return _graphicEffects;
873
870
 
874
871
    case SettingsChanged: {
875
872
        KGlobal::config()->reparseConfiguration();
876
 
        rereadOtherSettings();
877
873
        SettingsCategory category = static_cast<SettingsCategory>(arg);
878
 
        if (category == SETTINGS_MOUSE) {
879
 
            KGlobalSettingsData::self()->dropMouseSettingsCache();
880
 
        }
881
874
        if (category == SETTINGS_QT) {
882
875
            if (activated) {
883
876
                propagateQtSettings();
884
877
            }
885
878
        } else {
886
 
            if (category == SETTINGS_LOCALE) {
887
 
                KGlobal::locale()->reparseConfiguration();
 
879
            switch (category) {
 
880
                case SETTINGS_STYLE:
 
881
                    reloadStyleSettings();
 
882
                    break;
 
883
                case SETTINGS_MOUSE:
 
884
                    KGlobalSettingsData::self()->dropMouseSettingsCache();
 
885
                    break;
 
886
                case SETTINGS_LOCALE:
 
887
                    KGlobal::locale()->reparseConfiguration();
 
888
                    break;
 
889
                default:
 
890
                    break;
888
891
            }
889
892
            emit q->settingsChanged(category);
890
893
        }
1084
1087
}
1085
1088
 
1086
1089
 
1087
 
void KGlobalSettings::Private::rereadOtherSettings()
 
1090
void KGlobalSettings::Private::reloadStyleSettings()
1088
1091
{
1089
1092
    KConfigGroup g( KGlobal::config(), "KDE-Global GUI Settings" );
1090
1093