Changeset View
Changeset View
Standalone View
Standalone View
src/sddmkcm.cpp
Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s) | 47 | { | |||
---|---|---|---|---|---|
52 | aboutData->setHomepage(QStringLiteral("https://projects.kde.org/projects/kde/workspace/sddm-kcm")); | 52 | aboutData->setHomepage(QStringLiteral("https://projects.kde.org/projects/kde/workspace/sddm-kcm")); | ||
53 | 53 | | |||
54 | aboutData->addAuthor(QStringLiteral("Reza Fatahilah Shah"), i18n("Author"), QStringLiteral("rshah0385@kireihana.com")); | 54 | aboutData->addAuthor(QStringLiteral("Reza Fatahilah Shah"), i18n("Author"), QStringLiteral("rshah0385@kireihana.com")); | ||
55 | aboutData->addAuthor(QStringLiteral("David Edmundson"), i18n("Author"), QStringLiteral("davidedmundson@kde.org")); | 55 | aboutData->addAuthor(QStringLiteral("David Edmundson"), i18n("Author"), QStringLiteral("davidedmundson@kde.org")); | ||
56 | 56 | | |||
57 | setAboutData(aboutData); | 57 | setAboutData(aboutData); | ||
58 | setNeedsAuthorization(true); | 58 | setNeedsAuthorization(true); | ||
59 | 59 | | |||
60 | mSddmConfig = KSharedConfig::openConfig(QStringLiteral(SDDM_CONFIG_FILE), KConfig::CascadeConfig); | 60 | mSddmConfig = KSharedConfig::openConfig(QStringLiteral(SDDM_CONFIG_FILE), KConfig::CascadeConfig); | ||
davidedmundson: This file doesn't need to be changed at all | |||||
61 | 61 | | |||
62 | mSddmOldConfig = KSharedConfig::openConfig(QStringLiteral("sddm.conf"), KConfig::CascadeConfig); | ||||
63 | | ||||
62 | // This does not listen for new config files in the directory. | 64 | // This does not listen for new config files in the directory. | ||
63 | QStringList configFiles = QDir(QLatin1String(SDDM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware), | 65 | QStringList configFiles = QDir(QLatin1String(SDDM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware), | ||
64 | systemConfigFiles = QDir(QLatin1String(SDDM_SYSTEM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware); | 66 | systemConfigFiles = QDir(QLatin1String(SDDM_SYSTEM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware); | ||
65 | 67 | | |||
66 | // QStringBuilder keeps dangling references, so force return of QString (QTBUG-47066) | 68 | // QStringBuilder keeps dangling references, so force return of QString (QTBUG-47066) | ||
67 | std::transform(systemConfigFiles.begin(), systemConfigFiles.end(), systemConfigFiles.begin(), | 69 | std::transform(systemConfigFiles.begin(), systemConfigFiles.end(), systemConfigFiles.begin(), | ||
68 | [](const QString &filename) -> QString { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; }); | 70 | [](const QString &filename) -> QString { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; }); | ||
69 | std::transform(configFiles.begin(), configFiles.end(), configFiles.begin(), | 71 | std::transform(configFiles.begin(), configFiles.end(), configFiles.begin(), | ||
70 | [](const QString &filename) -> QString { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; }); | 72 | [](const QString &filename) -> QString { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; }); | ||
71 | 73 | | |||
72 | mSddmConfig->addConfigSources(systemConfigFiles + configFiles); | 74 | mSddmConfig->addConfigSources(systemConfigFiles + configFiles); | ||
75 | mSddmOldConfig->addConfigSources(systemConfigFiles + configFiles); | ||||
davidedmundson: as it's all done here
| |||||
73 | 76 | | |||
74 | prepareUi(); | 77 | prepareUi(); | ||
75 | } | 78 | } | ||
76 | 79 | | |||
77 | SddmKcm::~SddmKcm() | 80 | SddmKcm::~SddmKcm() | ||
78 | { | 81 | { | ||
79 | } | 82 | } | ||
80 | 83 | | |||
81 | void SddmKcm::save() | 84 | void SddmKcm::save() | ||
82 | { | 85 | { | ||
83 | QVariantMap args; | 86 | QVariantMap args; | ||
84 | 87 | | |||
88 | args[QStringLiteral("kde_settings.conf")] = QString {QLatin1String(SDDM_CONFIG_DIR "/") + QStringLiteral("kde_settings.conf")}; | ||||
85 | args[QStringLiteral("sddm.conf")] = QLatin1String(SDDM_CONFIG_FILE); | 89 | args[QStringLiteral("sddm.conf")] = QLatin1String(SDDM_CONFIG_FILE); | ||
86 | 90 | | |||
87 | if (!mThemeConfig->themeConfigPath().isEmpty()) { | 91 | if (!mThemeConfig->themeConfigPath().isEmpty()) { | ||
88 | args[QStringLiteral("theme.conf.user")] = QString(mThemeConfig->themeConfigPath() + QLatin1String(".user")); | 92 | args[QStringLiteral("theme.conf.user")] = QString(mThemeConfig->themeConfigPath() + QLatin1String(".user")); | ||
89 | } | 93 | } | ||
90 | 94 | | |||
91 | qDebug() << "Ovr:" << args[QStringLiteral("theme.conf.user")].toString(); | 95 | qDebug() << "Ovr:" << args[QStringLiteral("theme.conf.user")].toString(); | ||
92 | args.unite(mThemeConfig->save()); | 96 | args.unite(mThemeConfig->save()); | ||
Show All 39 Lines |
This file doesn't need to be changed at all