wilderjds
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KCM KWinTabbox use KCModuleData

Browse Source 
Allow to display a dot in the category list when settings has changed
from default.

CCBUG: 426775
remotes/origin/work/screencast-fencing
Cyril Rossi 6 years ago
parent cc763e063c
commit d11daecce5
5 changed files with 154 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      kcmkwin/kwintabbox/CMakeLists.txt
  2. 59
      kcmkwin/kwintabbox/kwintabboxdata.cpp
  3. 50
      kcmkwin/kwintabbox/kwintabboxdata.h
  4. 88
      kcmkwin/kwintabbox/main.cpp
  5. 9
      kcmkwin/kwintabbox/main.h

1
kcmkwin/kwintabbox/CMakeLists.txt
Unescape View File

@ -11,6 +11,7 @@ set(kcm_kwintabbox_PART_SRCS
main.cpp
thumbnailitem.cpp
kwintabboxconfigform.cpp
kwintabboxdata.cpp
)
ki18n_wrap_ui(kcm_kwintabbox_PART_SRCS main.ui)

59
kcmkwin/kwintabbox/kwintabboxdata.cpp
Unescape View File

@ -0,0 +1,59 @@
/*
KWin - the KDE window manager
This file is part of the KDE project.
SPDX-FileCopyrightText: 2020 Cyril Rossi <cyril.rossi@enioka.com>
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "kwintabboxdata.h"
#include "kwintabboxsettings.h"
#include "kwinswitcheffectsettings.h"
#include "kwinpluginssettings.h"
namespace KWin
{
namespace TabBox
{
KWinTabboxData::KWinTabboxData(QObject *parent, const QVariantList &args)
: KCModuleData(parent, args)
, m_tabBoxConfig(new TabBoxSettings(QStringLiteral("TabBox"), this))
, m_tabBoxAlternativeConfig(new TabBoxSettings(QStringLiteral("TabBoxAlternative"), this))
, m_coverSwitchConfig(new SwitchEffectSettings(QStringLiteral("Effect-CoverSwitch"), this))
, m_flipSwitchConfig(new SwitchEffectSettings(QStringLiteral("Effect-FlipSwitch"), this))
, m_pluginsConfig(new PluginsSettings(this))
{
autoRegisterSkeletons();
}
TabBoxSettings *KWinTabboxData::tabBoxConfig() const
{
return m_tabBoxConfig;
}
TabBoxSettings *KWinTabboxData::tabBoxAlternativeConfig() const
{
return m_tabBoxAlternativeConfig;
}
SwitchEffectSettings *KWinTabboxData::coverSwitchConfig() const
{
return m_coverSwitchConfig;
}
SwitchEffectSettings *KWinTabboxData::flipSwitchConfig() const
{
return m_flipSwitchConfig;
}
PluginsSettings *KWinTabboxData::pluginsConfig() const
{
return m_pluginsConfig;
}
}
}

50
kcmkwin/kwintabbox/kwintabboxdata.h
Unescape View File

@ -0,0 +1,50 @@
/*
KWin - the KDE window manager
This file is part of the KDE project.
SPDX-FileCopyrightText: 2020 Cyril Rossi <cyril.rossi@enioka.com>
SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef KWINTABBOXDATA_H
#define KWINTABBOXDATA_H
#include <QObject>
#include <KCModuleData>
namespace KWin
{
namespace TabBox
{
class TabBoxSettings;
class SwitchEffectSettings;
class PluginsSettings;
class KWinTabboxData : public KCModuleData
{
Q_OBJECT
public:
explicit KWinTabboxData(QObject *parent = nullptr, const QVariantList &args = QVariantList());
TabBoxSettings *tabBoxConfig() const;
TabBoxSettings *tabBoxAlternativeConfig() const;
SwitchEffectSettings *coverSwitchConfig() const;
SwitchEffectSettings *flipSwitchConfig() const;
PluginsSettings *pluginsConfig() const;
private:
TabBoxSettings *m_tabBoxConfig;
TabBoxSettings *m_tabBoxAlternativeConfig;
SwitchEffectSettings *m_coverSwitchConfig;
SwitchEffectSettings *m_flipSwitchConfig;
PluginsSettings *m_pluginsConfig;
};
}
}
#endif // KWINTABBOXDATA_H

88
kcmkwin/kwintabbox/main.cpp
Unescape View File

@ -38,26 +38,22 @@
// own
#include "kwintabboxconfigform.h"
#include "layoutpreview.h"
#include "kwintabboxdata.h"
#include "kwintabboxsettings.h"
#include "kwinswitcheffectsettings.h"
#include "kwinpluginssettings.h"
K_PLUGIN_FACTORY(KWinTabBoxConfigFactory, registerPlugin<KWin::KWinTabBoxConfig>();)
K_PLUGIN_FACTORY(KWinTabBoxConfigFactory, registerPlugin<KWin::KWinTabBoxConfig>(); registerPlugin<KWin::TabBox::KWinTabboxData>();)
namespace KWin
{
using namespace TabBox;
KWinTabBoxConfig::KWinTabBoxConfig(QWidget* parent, const QVariantList& args)
: KCModule(parent, args)
, m_config(KSharedConfig::openConfig("kwinrc"))
, m_tabBoxConfig(new TabBoxSettings(QStringLiteral("TabBox"), this))
, m_tabBoxAlternativeConfig(new TabBoxSettings(QStringLiteral("TabBoxAlternative"), this))
, m_coverSwitchConfig(new SwitchEffectSettings(QStringLiteral("Effect-CoverSwitch"), this))
, m_flipSwitchConfig(new SwitchEffectSettings(QStringLiteral("Effect-FlipSwitch"), this))
, m_pluginsConfig(new PluginsSettings(this))
, m_data(new KWinTabboxData(this))
{
QTabWidget* tabWidget = new QTabWidget(this);
m_primaryTabBoxUi = new KWinTabBoxConfigForm(KWinTabBoxConfigForm::TabboxType::Main, tabWidget);
@ -83,8 +79,8 @@ KWinTabBoxConfig::KWinTabBoxConfig(QWidget* parent, const QVariantList& args)
layout->addLayout(buttonBar);
setLayout(layout);
addConfig(m_tabBoxConfig, m_primaryTabBoxUi);
addConfig(m_tabBoxAlternativeConfig, m_alternativeTabBoxUi);
addConfig(m_data->tabBoxConfig(), m_primaryTabBoxUi);
addConfig(m_data->tabBoxAlternativeConfig(), m_alternativeTabBoxUi);
connect(this, &KWinTabBoxConfig::defaultsIndicatorsVisibleChanged, this, &KWinTabBoxConfig::updateUnmanagedState);
createConnections(m_primaryTabBoxUi);
@ -102,8 +98,8 @@ KWinTabBoxConfig::KWinTabBoxConfig(QWidget* parent, const QVariantList& args)
infoLabel->hide();
}
setEnabledUi(m_primaryTabBoxUi, m_tabBoxConfig);
setEnabledUi(m_alternativeTabBoxUi, m_tabBoxAlternativeConfig);
setEnabledUi(m_primaryTabBoxUi, m_data->tabBoxConfig());
setEnabledUi(m_alternativeTabBoxUi, m_data->tabBoxAlternativeConfig());
}
KWinTabBoxConfig::~KWinTabBoxConfig()
@ -235,14 +231,14 @@ void KWinTabBoxConfig::createConnections(KWinTabBoxConfigForm *form)
void KWinTabBoxConfig::updateUnmanagedState()
{
bool isNeedSave = false;
isNeedSave |= updateUnmanagedIsNeedSave(m_primaryTabBoxUi, m_tabBoxConfig);
isNeedSave |= updateUnmanagedIsNeedSave(m_alternativeTabBoxUi, m_tabBoxAlternativeConfig);
isNeedSave |= updateUnmanagedIsNeedSave(m_primaryTabBoxUi, m_data->tabBoxConfig());
isNeedSave |= updateUnmanagedIsNeedSave(m_alternativeTabBoxUi, m_data->tabBoxAlternativeConfig());
unmanagedWidgetChangeState(isNeedSave);
bool isDefault = true;
isDefault &= updateUnmanagedIsDefault(m_primaryTabBoxUi, m_tabBoxConfig);
isDefault &= updateUnmanagedIsDefault(m_alternativeTabBoxUi, m_tabBoxAlternativeConfig);
isDefault &= updateUnmanagedIsDefault(m_primaryTabBoxUi, m_data->tabBoxConfig());
isDefault &= updateUnmanagedIsDefault(m_alternativeTabBoxUi, m_data->tabBoxAlternativeConfig());
unmanagedWidgetDefaultState(isDefault);
}
@ -291,30 +287,30 @@ void KWinTabBoxConfig::load()
{
KCModule::load();
m_tabBoxConfig->load();
m_tabBoxAlternativeConfig->load();
m_data->tabBoxConfig()->load();
m_data->tabBoxAlternativeConfig()->load();
updateUiFromConfig(m_primaryTabBoxUi, m_tabBoxConfig);
updateUiFromConfig(m_alternativeTabBoxUi , m_tabBoxAlternativeConfig);
updateUiFromConfig(m_primaryTabBoxUi, m_data->tabBoxConfig());
updateUiFromConfig(m_alternativeTabBoxUi , m_data->tabBoxAlternativeConfig());
m_coverSwitchConfig->load();
m_flipSwitchConfig->load();
m_data->coverSwitchConfig()->load();
m_data->flipSwitchConfig()->load();
m_pluginsConfig->load();
m_data->pluginsConfig()->load();
if (m_pluginsConfig->coverswitchEnabled()) {
if (m_coverSwitchConfig->tabBox()) {
if (m_data->pluginsConfig()->coverswitchEnabled()) {
if (m_data->coverSwitchConfig()->tabBox()) {
m_primaryTabBoxUi->setLayoutName(m_coverSwitch);
}
if (m_coverSwitchConfig->tabBoxAlternative()) {
if (m_data->coverSwitchConfig()->tabBoxAlternative()) {
m_alternativeTabBoxUi->setLayoutName(m_coverSwitch);
}
}
if (m_pluginsConfig->flipswitchEnabled()) {
if (m_flipSwitchConfig->tabBox()) {
if (m_data->pluginsConfig()->flipswitchEnabled()) {
if (m_data->flipSwitchConfig()->tabBox()) {
m_primaryTabBoxUi->setLayoutName(m_flipSwitch);
}
if (m_flipSwitchConfig->tabBoxAlternative()) {
if (m_data->flipSwitchConfig()->tabBoxAlternative()) {
m_alternativeTabBoxUi->setLayoutName(m_flipSwitch);
}
}
@ -340,29 +336,29 @@ void KWinTabBoxConfig::save()
// activate effects if not active
if (coverSwitch || coverSwitchAlternative) {
m_pluginsConfig->setCoverswitchEnabled(true);
m_data->pluginsConfig()->setCoverswitchEnabled(true);
}
if (flipSwitch || flipSwitchAlternative) {
m_pluginsConfig->setFlipswitchEnabled(true);
m_data->pluginsConfig()->setFlipswitchEnabled(true);
}
if (highlightWindows) {
m_pluginsConfig->setHighlightwindowEnabled(true);
m_data->pluginsConfig()->setHighlightwindowEnabled(true);
}
m_pluginsConfig->save();
m_data->pluginsConfig()->save();
m_coverSwitchConfig->setTabBox(coverSwitch);
m_coverSwitchConfig->setTabBoxAlternative(coverSwitchAlternative);
m_coverSwitchConfig->save();
m_data->coverSwitchConfig()->setTabBox(coverSwitch);
m_data->coverSwitchConfig()->setTabBoxAlternative(coverSwitchAlternative);
m_data->coverSwitchConfig()->save();
m_flipSwitchConfig->setTabBox(flipSwitch);
m_flipSwitchConfig->setTabBoxAlternative(flipSwitchAlternative);
m_flipSwitchConfig->save();
m_data->flipSwitchConfig()->setTabBox(flipSwitch);
m_data->flipSwitchConfig()->setTabBoxAlternative(flipSwitchAlternative);
m_data->flipSwitchConfig()->save();
updateConfigFromUi(m_primaryTabBoxUi, m_tabBoxConfig);
updateConfigFromUi(m_alternativeTabBoxUi, m_tabBoxAlternativeConfig);
updateConfigFromUi(m_primaryTabBoxUi, m_data->tabBoxConfig());
updateConfigFromUi(m_alternativeTabBoxUi, m_data->tabBoxAlternativeConfig());
m_tabBoxConfig->save();
m_tabBoxAlternativeConfig->save();
m_data->tabBoxConfig()->save();
m_data->tabBoxAlternativeConfig()->save();
KCModule::save();
updateUnmanagedState();
@ -380,11 +376,11 @@ void KWinTabBoxConfig::save()
void KWinTabBoxConfig::defaults()
{
m_coverSwitchConfig->setDefaults();
m_flipSwitchConfig->setDefaults();
m_data->coverSwitchConfig()->setDefaults();
m_data->flipSwitchConfig()->setDefaults();
updateUiFromDefaultConfig(m_primaryTabBoxUi, m_tabBoxConfig);
updateUiFromDefaultConfig(m_alternativeTabBoxUi, m_tabBoxAlternativeConfig);
updateUiFromDefaultConfig(m_primaryTabBoxUi, m_data->tabBoxConfig());
updateUiFromDefaultConfig(m_alternativeTabBoxUi, m_data->tabBoxAlternativeConfig());
m_primaryTabBoxUi->resetShortcuts();
m_alternativeTabBoxUi->resetShortcuts();

9
kcmkwin/kwintabbox/main.h
Unescape View File

@ -21,9 +21,8 @@ class KWinTabBoxConfigForm;
enum class BuiltInEffect;
namespace TabBox
{
class KWinTabboxData;
class TabBoxSettings;
class SwitchEffectSettings;
class PluginsSettings;
}
@ -60,11 +59,7 @@ private:
KWinTabBoxConfigForm *m_alternativeTabBoxUi = nullptr;
KSharedConfigPtr m_config;
TabBox::TabBoxSettings *m_tabBoxConfig;
TabBox::TabBoxSettings *m_tabBoxAlternativeConfig;
TabBox::SwitchEffectSettings *m_coverSwitchConfig;
TabBox::SwitchEffectSettings *m_flipSwitchConfig;
TabBox::PluginsSettings *m_pluginsConfig;
TabBox::KWinTabboxData *m_data;
// Builtin effects' names
QString m_coverSwitch;

Write Preview
Loading…
Cancel
Save