00c9b4c1c9
Summary: If user selects a shortcut to trigger the effect, that shortcut won't work after the KCM is closed because we don't save it. BUG: 400351 FIXED-IN: 5.14.3 Test Plan: * Specified custom shortcut to trigger the effect; * Closed the KCM; * Pressed the shortcut, a thumbnail appeared. Reviewers: #kwin, graesslin Reviewed By: #kwin, graesslin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16456
101 lines
3.4 KiB
C++
101 lines
3.4 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2007 Christian Nitschkowski <christian.nitschkowski@kdemail.net>
|
|
|
|
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 <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
|
|
#include "thumbnailaside_config.h"
|
|
// KConfigSkeleton
|
|
#include "thumbnailasideconfig.h"
|
|
#include <config-kwin.h>
|
|
#include <kwineffects_interface.h>
|
|
|
|
#include <QAction>
|
|
|
|
#include <KLocalizedString>
|
|
#include <kconfiggroup.h>
|
|
#include <KActionCollection>
|
|
#include <KAboutData>
|
|
#include <KGlobalAccel>
|
|
#include <KPluginFactory>
|
|
|
|
#include <QWidget>
|
|
#include <QVBoxLayout>
|
|
|
|
K_PLUGIN_FACTORY_WITH_JSON(ThumbnailAsideEffectConfigFactory,
|
|
"thumbnailaside_config.json",
|
|
registerPlugin<KWin::ThumbnailAsideEffectConfig>();)
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
ThumbnailAsideEffectConfigForm::ThumbnailAsideEffectConfigForm(QWidget* parent) : QWidget(parent)
|
|
{
|
|
setupUi(this);
|
|
}
|
|
|
|
ThumbnailAsideEffectConfig::ThumbnailAsideEffectConfig(QWidget* parent, const QVariantList& args) :
|
|
KCModule(KAboutData::pluginData(QStringLiteral("thumbnailaside")), parent, args)
|
|
{
|
|
m_ui = new ThumbnailAsideEffectConfigForm(this);
|
|
|
|
QVBoxLayout* layout = new QVBoxLayout(this);
|
|
|
|
layout->addWidget(m_ui);
|
|
|
|
connect(m_ui->editor, SIGNAL(keyChange()), this, SLOT(changed()));
|
|
|
|
ThumbnailAsideConfig::instance(KWIN_CONFIG);
|
|
addConfig(ThumbnailAsideConfig::self(), this);
|
|
|
|
// Shortcut config. The shortcut belongs to the component "kwin"!
|
|
m_actionCollection = new KActionCollection(this, QStringLiteral("kwin"));
|
|
|
|
m_actionCollection->setComponentDisplayName(i18n("KWin"));
|
|
m_actionCollection->setConfigGroup(QStringLiteral("ThumbnailAside"));
|
|
m_actionCollection->setConfigGlobal(true);
|
|
|
|
QAction* a = m_actionCollection->addAction(QStringLiteral("ToggleCurrentThumbnail"));
|
|
a->setText(i18n("Toggle Thumbnail for Current Window"));
|
|
a->setProperty("isConfigurationAction", true);
|
|
KGlobalAccel::self()->setDefaultShortcut(a, QList<QKeySequence>() << Qt::META + Qt::CTRL + Qt::Key_T);
|
|
KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << Qt::META + Qt::CTRL + Qt::Key_T);
|
|
|
|
m_ui->editor->addCollection(m_actionCollection);
|
|
|
|
load();
|
|
}
|
|
|
|
ThumbnailAsideEffectConfig::~ThumbnailAsideEffectConfig()
|
|
{
|
|
// Undo (only) unsaved changes to global key shortcuts
|
|
m_ui->editor->undoChanges();
|
|
}
|
|
|
|
void ThumbnailAsideEffectConfig::save()
|
|
{
|
|
KCModule::save();
|
|
m_ui->editor->save();
|
|
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
|
|
QStringLiteral("/Effects"),
|
|
QDBusConnection::sessionBus());
|
|
interface.reconfigureEffect(QStringLiteral("thumbnailaside"));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
#include "thumbnailaside_config.moc"
|