diff --git a/kcfg/kscreenlockersettings.kcfg b/kcfg/kscreenlockersettings.kcfg
index 52d646d..c07673f 100644
--- a/kcfg/kscreenlockersettings.kcfg
+++ b/kcfg/kscreenlockersettings.kcfg
@@ -1,47 +1,47 @@
trueSets whether the screen will be locked after the specified time.51Sets the minutes after which the screen is locked.true50300true
- org.kde.image
+ org.kde.color
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index 1becb9e..c601a9e 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -1,271 +1,271 @@
/********************************************************************
KSld - the KDE Screenlocker Daemon
This file is part of the KDE project.
Copyright (C) 2014 Martin Gräßlin
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*********************************************************************/
#include "kcm.h"
#include "kscreensaversettings.h"
#include "ui_kcm.h"
#include "screenlocker_interface.h"
#include "../greeter/wallpaper_integration.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
static const QString s_lockActionName = QStringLiteral("Lock Session");
-static const QString s_defaultWallpaperPackage = QStringLiteral("org.kde.image");
+static const QString s_defaultWallpaperPackage = QStringLiteral("org.kde.color");
class ScreenLockerKcmForm : public QWidget, public Ui::ScreenLockerKcmForm
{
Q_OBJECT
public:
explicit ScreenLockerKcmForm(QWidget *parent);
};
ScreenLockerKcmForm::ScreenLockerKcmForm(QWidget *parent)
: QWidget(parent)
{
setupUi(this);
kcfg_Timeout->setSuffix(ki18ncp("Spinbox suffix. Short for minutes"," min"," mins"));
kcfg_LockGrace->setSuffix(ki18ncp("Spinbox suffix. Short for seconds"," sec"," secs"));
}
ScreenLockerKcm::ScreenLockerKcm(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
, m_actionCollection(new KActionCollection(this, QStringLiteral("ksmserver")))
, m_ui(new ScreenLockerKcmForm(this))
{
QVBoxLayout* layout = new QVBoxLayout(this);
layout->addWidget(m_ui);
KConfigDialogManager::changedMap()->insert(QStringLiteral("SelectImageButton"), SIGNAL(imagePathChanged(QString)));
addConfig(KScreenSaverSettings::self(), m_ui);
m_actionCollection->setConfigGlobal(true);
QAction *a = m_actionCollection->addAction(s_lockActionName);
a->setProperty("isConfigurationAction", true);
m_ui->lockscreenShortcut->setCheckForConflictsAgainst(KKeySequenceWidget::None);
a->setText(i18n("Lock Session"));
KGlobalAccel::self()->setShortcut(a, QList{Qt::ALT+Qt::CTRL+Qt::Key_L, Qt::Key_ScreenSaver});
connect(m_ui->lockscreenShortcut, &KKeySequenceWidget::keySequenceChanged, this, &ScreenLockerKcm::shortcutChanged);
loadWallpapers();
auto wallpaperChangedSignal = static_cast(&QComboBox::currentIndexChanged);
connect(m_ui->wallpaperCombo, wallpaperChangedSignal, this, static_cast(&ScreenLockerKcm::changed));
connect(m_ui->wallpaperCombo, wallpaperChangedSignal, this, &ScreenLockerKcm::loadWallpaperConfig);
m_ui->wallpaperCombo->installEventFilter(this);
m_ui->wallpaperConfigWidget->setClearColor(m_ui->palette().color(QPalette::Active, QPalette::Window));
m_ui->wallpaperConfigWidget->rootContext()->setContextProperty("configDialog", this);
m_ui->wallpaperConfigWidget->setSource(QUrl(QStringLiteral("qrc:/kscreenlocker-kcm-resources/config.qml")));
connect(m_ui->wallpaperConfigWidget->rootObject(), SIGNAL(configurationChanged()), this, SLOT(changed()));
m_ui->installEventFilter(this);
}
void ScreenLockerKcm::shortcutChanged(const QKeySequence &key)
{
if (QAction *a = m_actionCollection->action(s_lockActionName)) {
auto shortcuts = KGlobalAccel::self()->shortcut(a);
m_ui->lockscreenShortcut->setProperty("changed", !shortcuts.contains(key));
}
changed();
}
void ScreenLockerKcm::load()
{
KCModule::load();
m_package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
KConfigGroup cg(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "KDE");
const QString packageName = cg.readEntry("LookAndFeelPackage", QString());
if (!packageName.isEmpty()) {
m_package.setPath(packageName);
}
if (QAction *a = m_actionCollection->action(s_lockActionName)) {
auto shortcuts = KGlobalAccel::self()->shortcut(a);
if (!shortcuts.isEmpty()) {
m_ui->lockscreenShortcut->setKeySequence(shortcuts.first());
}
}
selectWallpaper(KScreenSaverSettings::self()->wallpaperPlugin());
loadWallpaperConfig();
}
void ScreenLockerKcm::test(const QString &plugin)
{
if (plugin.isEmpty() || plugin == QLatin1String("none")) {
return;
}
QProcess proc;
QStringList arguments;
arguments << plugin << QStringLiteral("--testing");
if (proc.execute(KSCREENLOCKER_GREET_BIN, arguments)) {
QMessageBox::critical(this, i18n("Error"), i18n("Failed to successfully test the screen locker."));
}
}
void ScreenLockerKcm::save()
{
if (!shouldSaveShortcut()) {
QMetaObject::invokeMethod(this, "changed", Qt::QueuedConnection);
return;
}
KCModule::save();
QMetaObject::invokeMethod(m_ui->wallpaperConfigWidget->rootObject(), "saveConfig");
// set the wallpaper config
KScreenSaverSettings::self()->setWallpaperPlugin(m_ui->wallpaperCombo->currentData().toString());
KScreenSaverSettings::self()->save();
if (m_ui->lockscreenShortcut->property("changed").toBool()) {
if (QAction *a = m_actionCollection->action(s_lockActionName)) {
KGlobalAccel::self()->setShortcut(a, QList{m_ui->lockscreenShortcut->keySequence()}, KGlobalAccel::NoAutoloading);
m_actionCollection->writeSettings();
}
m_ui->lockscreenShortcut->setProperty("changed", false);
}
// reconfigure through DBus
OrgKdeScreensaverInterface interface(QStringLiteral("org.kde.screensaver"),
QStringLiteral("/ScreenSaver"),
QDBusConnection::sessionBus());
if (interface.isValid()) {
interface.configure();
}
}
bool ScreenLockerKcm::shouldSaveShortcut()
{
if (m_ui->lockscreenShortcut->property("changed").toBool()) {
const QKeySequence &sequence = m_ui->lockscreenShortcut->keySequence();
auto conflicting = KGlobalAccel::getGlobalShortcutsByKey(sequence);
if (!conflicting.isEmpty()) {
// Inform and ask the user about the conflict and reassigning
// the keys sequence
if (!KGlobalAccel::promptStealShortcutSystemwide(this, conflicting, sequence)) {
return false;
}
KGlobalAccel::stealShortcutSystemwide(sequence);
}
}
return true;
}
void ScreenLockerKcm::defaults()
{
KCModule::defaults();
m_ui->lockscreenShortcut->setKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_L);
selectWallpaper(s_defaultWallpaperPackage);
}
void ScreenLockerKcm::loadWallpapers()
{
const auto wallpaperPackages = KPackage::PackageLoader::self()->listPackages(QStringLiteral("Plasma/Wallpaper"));
for (auto &package : wallpaperPackages) {
m_ui->wallpaperCombo->addItem(package.name(), package.pluginId());
}
}
void ScreenLockerKcm::selectWallpaper(const QString &pluginId)
{
const auto index = m_ui->wallpaperCombo->findData(pluginId);
if (index != -1) {
m_ui->wallpaperCombo->setCurrentIndex(index);
} else if (pluginId != s_defaultWallpaperPackage) {
// fall back to default plugin
selectWallpaper(s_defaultWallpaperPackage);
}
}
void ScreenLockerKcm::loadWallpaperConfig()
{
if (m_wallpaperIntegration) {
if (m_wallpaperIntegration->pluginName() == m_ui->wallpaperCombo->currentData().toString()) {
// nothing changed
return;
}
delete m_wallpaperIntegration;
}
emit currentWallpaperChanged();
m_wallpaperIntegration = new ScreenLocker::WallpaperIntegration(this);
m_wallpaperIntegration->setConfig(KScreenSaverSettings::self()->sharedConfig());
m_wallpaperIntegration->setPluginName(m_ui->wallpaperCombo->currentData().toString());
m_wallpaperIntegration->init();
m_ui->wallpaperConfigWidget->rootContext()->setContextProperty(QStringLiteral("wallpaper"), m_wallpaperIntegration);
emit wallpaperConfigurationChanged();
m_ui->wallpaperConfigWidget->rootObject()->setProperty("sourceFile", m_wallpaperIntegration->package().filePath(QByteArrayLiteral("ui"), QStringLiteral("config.qml")));
}
KDeclarative::ConfigPropertyMap * ScreenLockerKcm::wallpaperConfiguration() const
{
if (!m_wallpaperIntegration) {
return nullptr;
}
return m_wallpaperIntegration->configuration();
}
QString ScreenLockerKcm::currentWallpaper() const
{
return m_ui->wallpaperCombo->currentData().toString();
}
bool ScreenLockerKcm::eventFilter(QObject *watched, QEvent *event)
{
if (watched == m_ui) {
if (event->type() == QEvent::PaletteChange) {
m_ui->wallpaperConfigWidget->setClearColor(m_ui->palette().color(QPalette::Active, QPalette::Window));
}
return false;
}
if (watched != m_ui->wallpaperCombo) {
return false;
}
if (event->type() == QEvent::Move) {
if (auto object = m_ui->wallpaperConfigWidget->rootObject()) {
object->setProperty("formAlignment", m_ui->wallpaperCombo->x());
}
}
return false;
}
K_PLUGIN_FACTORY_WITH_JSON(ScreenLockerKcmFactory,
"screenlocker.json",
registerPlugin();)
#include "kcm.moc"