D21832: [sddm-kcm] WIP: Write settings to /etc/sddm.conf.d instead of etc/sddm.conf

[David Edmundson]

davidedmundson requested changes to this revision.
davidedmundson added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> sddmauthhelper.cpp:86
> +            // see: https://github.com/sddm/sddm/blob/develop/src/common/ConfigReader.cpp#L144
> +            if (fileName == QStringLiteral("sddm.conf") && (args.count(keyName) > 1)) {
> +                sddmOldConfig->group(groupName).deleteEntry(keyName);

if something is going into the file "kde_settings.conf" then we want to remove it from sddmOldConfig

Nothing in args is sent with this filename

> sddmkcm.cpp:60
>  
> -    mSddmConfig = KSharedConfig::openConfig(QStringLiteral(SDDM_CONFIG_FILE), KConfig::CascadeConfig);
> +    mSddmConfig = KSharedConfig::openConfig(QStringLiteral("kde_settings.conf"), KConfig::CascadeConfig);
> +

This file doesn't need to be changed at all

> sddmkcm.cpp:74
>  
>      mSddmConfig->addConfigSources(systemConfigFiles + configFiles);
> +    mSddmOldConfig->addConfigSources(systemConfigFiles + configFiles);

as it's all done here

> themesmodel.cpp:93
>  
> -    QString themesBaseDir = KSharedConfig::openConfig(QStringLiteral(SDDM_CONFIG_FILE), KConfig::SimpleConfig)->group("Theme").readEntry("ThemeDir");
> +    QString themesBaseDir = KSharedConfig::openConfig(QStringLiteral("kde_settings.conf"), KConfig::SimpleConfig)->group("Theme").readEntry("ThemeDir");
>  

this needs to be using the same logic as sddmkcm.cpp

probably easier if they share the same kconfig instance

REPOSITORY
  R123 SDDM Configuration Panel (KCM)

REVISION DETAIL
  https://phabricator.kde.org/D21832

To: filipf, davidedmundson, ngraham, #plasma
Cc: plasma-devel, LeGast00n, jraleigh, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20190615/db4dc7cc/attachment-0001.html>