Changeset View
Changeset View
Standalone View
Standalone View
src/advancedconfig.cpp
Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Line(s) | 71 | { | |||
---|---|---|---|---|---|
102 | configUi->haltCommand->setUrl(QUrl::fromLocalFile(mConfig->group("General").readEntry("HaltCommand"))); | 102 | configUi->haltCommand->setUrl(QUrl::fromLocalFile(mConfig->group("General").readEntry("HaltCommand"))); | ||
103 | configUi->rebootCommand->setUrl(QUrl::fromLocalFile(mConfig->group("General").readEntry("RebootCommand"))); | 103 | configUi->rebootCommand->setUrl(QUrl::fromLocalFile(mConfig->group("General").readEntry("RebootCommand"))); | ||
104 | } | 104 | } | ||
105 | 105 | | |||
106 | QVariantMap AdvancedConfig::save() | 106 | QVariantMap AdvancedConfig::save() | ||
107 | { | 107 | { | ||
108 | QVariantMap args; | 108 | QVariantMap args; | ||
109 | 109 | | |||
110 | args[QStringLiteral("kde_settings.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); | 110 | args[QStringLiteral("sddm.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); | ||
111 | args[QStringLiteral("kde_settings.conf/Autologin/Session")] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString(); | 111 | args[QStringLiteral("sddm.conf/Autologin/Session")] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString(); | ||
112 | 112 | | |||
113 | args[QStringLiteral("kde_settings.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); | 113 | args[QStringLiteral("sddm.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); | ||
114 | //TODO session | 114 | //TODO session | ||
115 | 115 | | |||
116 | int minUid = configUi->minimumUid->text().toInt(); | 116 | int minUid = configUi->minimumUid->text().toInt(); | ||
117 | int maxUid = configUi->maximumUid->text().toInt(); | 117 | int maxUid = configUi->maximumUid->text().toInt(); | ||
118 | if (isUidRangeValid(minUid, maxUid)) { | 118 | if (isUidRangeValid(minUid, maxUid)) { | ||
119 | args[QStringLiteral("kde_settings.conf/Users/MinimumUid")] = configUi->minimumUid->text(); | 119 | args[QStringLiteral("sddm.conf/Users/MinimumUid")] = configUi->minimumUid->text(); | ||
120 | args[QStringLiteral("kde_settings.conf/Users/MaximumUid")] = configUi->maximumUid->text(); | 120 | args[QStringLiteral("sddm.conf/Users/MaximumUid")] = configUi->maximumUid->text(); | ||
121 | } | 121 | } | ||
122 | 122 | | |||
123 | args[QStringLiteral("kde_settings.conf/General/HaltCommand")] = configUi->haltCommand->url().toLocalFile(); | 123 | args[QStringLiteral("sddm.conf/General/HaltCommand")] = configUi->haltCommand->url().toLocalFile(); | ||
124 | args[QStringLiteral("kde_settings.conf/General/RebootCommand")] = configUi->rebootCommand->url().toLocalFile(); | 124 | args[QStringLiteral("sddm.conf/General/RebootCommand")] = configUi->rebootCommand->url().toLocalFile(); | ||
125 | 125 | | |||
126 | return args; | 126 | return args; | ||
127 | } | 127 | } | ||
128 | 128 | | |||
129 | void AdvancedConfig::slotUidRangeChanged() | 129 | void AdvancedConfig::slotUidRangeChanged() | ||
130 | { | 130 | { | ||
131 | int minUid = configUi->minimumUid->text().toInt(); | 131 | int minUid = configUi->minimumUid->text().toInt(); | ||
132 | int maxUid = configUi->maximumUid->text().toInt(); | 132 | int maxUid = configUi->maximumUid->text().toInt(); | ||
Show All 40 Lines | 150 | { | |||
173 | 173 | | |||
174 | // define paths | 174 | // define paths | ||
175 | const QString fontconfigPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("fontconfig"), QStandardPaths::LocateDirectory); | 175 | const QString fontconfigPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("fontconfig"), QStandardPaths::LocateDirectory); | ||
176 | const QString kdeglobalsPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("kdeglobals")); | 176 | const QString kdeglobalsPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("kdeglobals")); | ||
177 | const QString plasmarcPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("plasmarc")); | 177 | const QString plasmarcPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("plasmarc")); | ||
178 | 178 | | |||
179 | // send values and paths to helper, debug if it fails | 179 | // send values and paths to helper, debug if it fails | ||
180 | QVariantMap args; | 180 | QVariantMap args; | ||
181 | | ||||
182 | args[QStringLiteral("kde_settings.conf")] = QString {QLatin1String(SDDM_CONFIG_DIR "/") + QStringLiteral("kde_settings.conf")}; | | |||
183 | | ||||
184 | args[QStringLiteral("sddm.conf")] = QLatin1String(SDDM_CONFIG_FILE); | 181 | args[QStringLiteral("sddm.conf")] = QLatin1String(SDDM_CONFIG_FILE); | ||
185 | 182 | | |||
186 | if (!cursorTheme.isNull()) { | 183 | if (!cursorTheme.isNull()) { | ||
187 | args[QStringLiteral("kde_settings.conf/Theme/CursorTheme")] = cursorTheme; | 184 | args[QStringLiteral("sddm.conf/Theme/CursorTheme")] = cursorTheme; | ||
188 | } | 185 | } | ||
189 | else { | 186 | else { | ||
190 | qDebug() << "Cannot find cursor theme value."; | 187 | qDebug() << "Cannot find cursor theme value."; | ||
191 | } | 188 | } | ||
192 | 189 | | |||
193 | if (!dpiValue.isEmpty()) { | 190 | if (!dpiValue.isEmpty()) { | ||
194 | args[QStringLiteral("kde_settings.conf/X11/ServerArguments")] = dpiArgument; | 191 | args[QStringLiteral("sddm.conf/X11/ServerArguments")] = dpiArgument; | ||
195 | } | 192 | } | ||
196 | else { | 193 | else { | ||
197 | qDebug() << "Cannot find scaling DPI value."; | 194 | qDebug() << "Cannot find scaling DPI value."; | ||
198 | } | 195 | } | ||
199 | 196 | | |||
200 | if (!numLock.isEmpty()) { | 197 | if (!numLock.isEmpty()) { | ||
201 | if (numLock == QStringLiteral("0")) { | 198 | if (numLock == QStringLiteral("0")) { | ||
202 | args[QStringLiteral("kde_settings.conf/General/Numlock")] = QStringLiteral("on"); | 199 | args[QStringLiteral("sddm.conf/General/Numlock")] = QStringLiteral("on"); | ||
203 | } | 200 | } | ||
204 | else if (numLock == QStringLiteral("1")) { | 201 | else if (numLock == QStringLiteral("1")) { | ||
205 | args[QStringLiteral("kde_settings.conf/General/Numlock")] = QStringLiteral("off"); | 202 | args[QStringLiteral("sddm.conf/General/Numlock")] = QStringLiteral("off"); | ||
206 | } | 203 | } | ||
207 | else if (numLock == QStringLiteral("2")) { | 204 | else if (numLock == QStringLiteral("2")) { | ||
208 | args[QStringLiteral("kde_settings.conf/General/Numlock")] = QStringLiteral("none"); | 205 | args[QStringLiteral("sddm.conf/General/Numlock")] = QStringLiteral("none"); | ||
209 | } | 206 | } | ||
210 | } | 207 | } | ||
211 | else { | 208 | else { | ||
212 | qDebug() << "Cannot find NumLock value."; | 209 | qDebug() << "Cannot find NumLock value."; | ||
213 | } | 210 | } | ||
214 | 211 | | |||
215 | if (!fontconfigPath.isEmpty()) { | 212 | if (!fontconfigPath.isEmpty()) { | ||
216 | args[QStringLiteral("fontconfig")] = fontconfigPath; | 213 | args[QStringLiteral("fontconfig")] = fontconfigPath; | ||
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s) | 252 | { | |||
260 | if (sddmHomeDirPath.isEmpty()) { | 257 | if (sddmHomeDirPath.isEmpty()) { | ||
261 | KMessageBox::error(this, QStringLiteral("Cannot proceed, user 'sddm' does not exist. Please check your SDDM install.")); | 258 | KMessageBox::error(this, QStringLiteral("Cannot proceed, user 'sddm' does not exist. Please check your SDDM install.")); | ||
262 | return; | 259 | return; | ||
263 | } | 260 | } | ||
264 | 261 | | |||
265 | // send paths to helper | 262 | // send paths to helper | ||
266 | QVariantMap args; | 263 | QVariantMap args; | ||
267 | 264 | | |||
268 | args[QStringLiteral("kde_settings.conf")] = QString {QLatin1String(SDDM_CONFIG_DIR "/") + QStringLiteral("kde_settings.conf")}; | | |||
269 | | ||||
270 | args[QStringLiteral("sddm.conf")] = QLatin1String(SDDM_CONFIG_FILE); | 265 | args[QStringLiteral("sddm.conf")] = QLatin1String(SDDM_CONFIG_FILE); | ||
271 | 266 | | |||
272 | args[QStringLiteral("kde_settings.conf/Theme/CursorTheme")] = QVariant(); | 267 | args[QStringLiteral("sddm.conf/Theme/CursorTheme")] = QVariant(); | ||
273 | 268 | | |||
274 | args[QStringLiteral("kde_settings.conf/X11/ServerArguments")] = QVariant(); | 269 | args[QStringLiteral("sddm.conf/X11/ServerArguments")] = QVariant(); | ||
275 | 270 | | |||
276 | args[QStringLiteral("kde_settings.conf/General/Numlock")] = QVariant(); | 271 | args[QStringLiteral("sddm.conf/General/Numlock")] = QVariant(); | ||
277 | 272 | | |||
278 | KAuth::Action resetAction(QStringLiteral("org.kde.kcontrol.kcmsddm.reset")); | 273 | KAuth::Action resetAction(QStringLiteral("org.kde.kcontrol.kcmsddm.reset")); | ||
279 | resetAction.setHelperId(QStringLiteral("org.kde.kcontrol.kcmsddm")); | 274 | resetAction.setHelperId(QStringLiteral("org.kde.kcontrol.kcmsddm")); | ||
280 | resetAction.setArguments(args); | 275 | resetAction.setArguments(args); | ||
281 | 276 | | |||
282 | auto job = resetAction.execute(); | 277 | auto job = resetAction.execute(); | ||
283 | job->exec(); | 278 | job->exec(); | ||
284 | 279 | | |||
Show All 10 Lines |