diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp --- a/kcms/lookandfeel/kcm.cpp +++ b/kcms/lookandfeel/kcm.cpp @@ -423,10 +423,22 @@ } } } + //TODO: option to enable/disable apply? they don't seem required by UI design + cg = KConfigGroup(conf, "ksplashrc"); + cg = KConfigGroup(&cg, "KSplash"); + QString splashScreen = (cg.readEntry("Theme", QString())); + // Retain compatibility with certain Look & Feels - L&Fs without a specified Splash Screen will have the splash screen set to their theme name instead + if (!splashScreen.isEmpty()) { + setSplashScreen(splashScreen); + } else { + setSplashScreen(m_selectedPlugin); + } + } else { + // The old behaviour was to set the Splash Screen regardless of whether there was a defaults file or not, therefore we'll use the old behaviour still if there's NO defaults file found + setSplashScreen(m_selectedPlugin); } //TODO: option to enable/disable apply? they don't seem required by UI design - setSplashScreen(m_selectedPlugin); setLockScreen(m_selectedPlugin); m_configGroup.sync();