Commit b8d0537b authored by Fabian Vogt's avatar Fabian Vogt

Merge branch 'Plasma/5.12'

parents 825443ef ebdfab7e
......@@ -100,6 +100,7 @@ Name[zh_CN]=登录屏幕 (SDDM)
Name[zh_TW]=登入畫面(SDDM)
Comment=Configure Login Manager
Comment[ar]=اضبط مدير الولوج
Comment[ca]=Configura el gestor d'accés
Comment[ca@valencia]=Configura el gestor d'accés
Comment[cs]=Nastavit správce přihlášení...
......
......@@ -166,7 +166,9 @@ void ThemeConfig::prepareConfigurationUi(const QString &configPath)
QFile configFile(configPath);
if (configFile.exists()) {
KSharedConfigPtr themeConfig = KSharedConfig::openConfig(configFile.fileName() + ".user", KConfig::SimpleConfig);
KSharedConfigPtr themeConfig = KSharedConfig::openConfig(configFile.fileName() + ".user", KConfig::CascadeConfig);
themeConfig->addConfigSources({configFile.fileName()});
configUi->customizeBox->setVisible(true);
configUi->selectBackgroundButton->setImagePath(themeConfig->group("General").readEntry("background"));
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment