Merge branch 'Plasma/5.12'

src/CMakeLists.txt

-set(SDDM_CONFIG_FILE         "/etc/sddm.conf"             CACHE PATH      "Path of the sddm config file")
+set(SDDM_CONFIG_FILE                 "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"        CACHE PATH      "Path of the sddm config file")
+set(SDDM_CONFIG_DIR                  "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d"      CACHE PATH      "Path of the sddm config directory")
+set(SDDM_SYSTEM_CONFIG_DIR           "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d"      CACHE PATH      "Path of the system sddm config directory")
 
 configure_file(config.h.in config.h IMMEDIATE @ONLY)
 # add_subdirectory(configwidgets)

src/advanceconfig.cpp

@@ -33,11 +33,10 @@
 const int MIN_UID = 1000;
 const int MAX_UID = 65000;
 
-AdvanceConfig::AdvanceConfig(QWidget *parent) :
-    QWidget(parent)
+AdvanceConfig::AdvanceConfig(const KSharedConfigPtr &config, QWidget *parent) :
+    QWidget(parent),
+    mConfig(config)
 {
-    mConfig = KSharedConfig::openConfig(SDDM_CONFIG_FILE, KConfig::SimpleConfig);
-
     configUi = new Ui::AdvanceConfig();
     configUi->setupUi(this);
 

src/advanceconfig.h

@@ -34,7 +34,7 @@ class AdvanceConfig : public QWidget
 {
     Q_OBJECT
 public:
-    explicit AdvanceConfig(QWidget *parent = 0);
+    explicit AdvanceConfig(const KSharedConfigPtr &config, QWidget *parent = 0);
     ~AdvanceConfig();
     
     QVariantMap save();

src/config.h.in

 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define SDDM_CONFIG_FILE    "@SDDM_CONFIG_FILE@"
+#define SDDM_CONFIG_FILE                 "@SDDM_CONFIG_FILE@"
+#define SDDM_CONFIG_DIR                  "@SDDM_CONFIG_DIR@"
+#define SDDM_SYSTEM_CONFIG_DIR           "@SDDM_SYSTEM_CONFIG_DIR@"
 
-#endif //CONFIG_H
+#endif //CONFIG_H
\ No newline at end of file

src/cursortheme/thememodel.cpp

@@ -306,11 +306,6 @@ void CursorThemeModel::processThemeDir(const QDir &themeDir)
     if (!themeDir.exists("index.theme") && !haveCursors)
         return;
 
-    static bool isX11 = QX11Info::isPlatformX11();
-    if (!isX11) {
-        // TODO: implement Wayland Cursor Theme support
-        return;
-    }
     // Create a cursor theme object for the theme dir
     XCursorTheme *theme = new XCursorTheme(themeDir);
 

src/cursortheme/xcursortheme.cpp

@@ -158,6 +158,9 @@ int XCursorTheme::autodetectCursorSize() const
     int size = 0;
     int dpi = 0;
     Display *dpy = QX11Info::display();
+    // Fallback on wayland
+    if (!dpy)
+        return 24;
     // The string "v" is owned and will be destroyed by Xlib
     char *v = XGetDefault(dpy, "Xft", "dpi");
     if (v)

src/sddmkcm.cpp

@@ -16,6 +16,9 @@
  */
 #include "sddmkcm.h"
 
+#include <algorithm>
+
+#include <QDir>
 #include <QHBoxLayout>
 #include <QTabWidget>
 
@@ -54,7 +57,19 @@ SddmKcm::SddmKcm(QWidget *parent, const QVariantList &args) :
 
     setAboutData(aboutData);
     setNeedsAuthorization(true);
-    
+
+    mSddmConfig = KSharedConfig::openConfig(SDDM_CONFIG_FILE, KConfig::CascadeConfig);
+
+    // This does not listen for new config files in the directory.
+    QStringList configFiles = QDir(SDDM_CONFIG_DIR).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware),
+                systemConfigFiles = QDir(SDDM_SYSTEM_CONFIG_DIR).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
+    std::transform(systemConfigFiles.begin(), systemConfigFiles.end(), systemConfigFiles.begin(),
+                    [](const QString &filename) { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; });
+    std::transform(configFiles.begin(), configFiles.end(), configFiles.begin(),
+                    [](const QString &filename) { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; });
+
+    mSddmConfig->addConfigSources(systemConfigFiles + configFiles);
+
     prepareUi();
 }
 
@@ -101,12 +116,12 @@ void SddmKcm::prepareUi()
     QTabWidget* tabHolder = new QTabWidget(this);
     layout->addWidget(tabHolder);
     
-    mThemeConfig = new ThemeConfig(this);
+    mThemeConfig = new ThemeConfig(mSddmConfig, this);
     connect(mThemeConfig, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
     
     tabHolder->addTab(mThemeConfig, i18n("Theme"));
     
-    mAdvanceConfig = new AdvanceConfig(this);
+    mAdvanceConfig = new AdvanceConfig(mSddmConfig, this);
     connect(mAdvanceConfig, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
     
     tabHolder->addTab(mAdvanceConfig, i18n("Advanced"));

src/sddmkcm.h

@@ -18,6 +18,7 @@
 #define SDDMKCM_H
 
 #include <KCModule>
+#include <KSharedConfig>
 
 class ThemeConfig;
 class AdvanceConfig;
@@ -36,6 +37,7 @@ private:
     void prepareUi();
     
 private:
+    KSharedConfigPtr mSddmConfig;
     ThemeConfig *mThemeConfig;
     AdvanceConfig *mAdvanceConfig;
 };

src/themeconfig.cpp

@@ -37,11 +37,10 @@
 
 #include "config.h"
 
-ThemeConfig::ThemeConfig(QWidget *parent) :
-    QWidget(parent)
+ThemeConfig::ThemeConfig(const KSharedConfigPtr &config, QWidget *parent) :
+    QWidget(parent),
+    mConfig(config)
 {
-    mConfig = KSharedConfig::openConfig(SDDM_CONFIG_FILE, KConfig::SimpleConfig);
-    
     configUi = new Ui::ThemeConfig();
     configUi->setupUi(this);
     configUi->messageWidget->setVisible(false);

src/themeconfig.h

@@ -31,7 +31,7 @@ class ThemeConfig : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ThemeConfig(QWidget *parent = 0);
+    explicit ThemeConfig(const KSharedConfigPtr &config, QWidget *parent = 0);
     ~ThemeConfig();
     
     QVariantMap save();