(&KCModule::defaulted));
KAboutData *about =
new KAboutData(QStringLiteral("kcmkwinoptions"), i18n("Window Behavior Configuration Module"),
QString(), QString(), KAboutLicense::GPL,
i18n("(c) 1997 - 2002 KWin and KControl Authors"));
about->addAuthor(i18n("Matthias Ettrich"), QString(), "ettrich@kde.org");
about->addAuthor(i18n("Waldo Bastian"), QString(), "bastian@kde.org");
about->addAuthor(i18n("Cristian Tibirna"), QString(), "tibirna@kde.org");
about->addAuthor(i18n("Matthias Kalle Dalheimer"), QString(), "kalle@kde.org");
about->addAuthor(i18n("Daniel Molkentin"), QString(), "molkentin@kde.org");
about->addAuthor(i18n("Wynn Wilkes"), QString(), "wynnw@caldera.com");
about->addAuthor(i18n("Pat Dowler"), QString(), "dowler@pt1B1106.FSH.UVic.CA");
about->addAuthor(i18n("Bernd Wuebben"), QString(), "wuebben@kde.org");
about->addAuthor(i18n("Matthias Hoelzer-Kluepfel"), QString(), "hoelzer@kde.org");
setAboutData(about);
}
KWinOptions::~KWinOptions()
{
delete mConfig;
}
void KWinOptions::load()
{
mConfig->reparseConfiguration();
mFocus->load();
mTitleBarActions->load();
mWindowActions->load();
mMoving->load();
mAdvanced->load();
emit KCModule::changed(false);
}
void KWinOptions::save()
{
mFocus->save();
mTitleBarActions->save();
mWindowActions->save();
mMoving->save();
mAdvanced->save();
emit KCModule::changed(false);
// Send signal to kwin
mConfig->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
-
-
}
void KWinOptions::defaults()
{
mFocus->defaults();
mTitleBarActions->defaults();
mWindowActions->defaults();
mMoving->defaults();
mAdvanced->defaults();
}
QString KWinOptions::quickHelp() const
{
return i18n("Window Behavior
Here you can customize the way windows behave when being"
" moved, resized or clicked on. You can also specify a focus policy as well as a placement"
" policy for new windows."
" Please note that this configuration will not take effect if you do not use"
" KWin as your window manager. If you do use a different window manager, please refer to its documentation"
" for how to customize window behavior.
");
}
-void KWinOptions::moduleChanged(bool state)
-{
- emit KCModule::changed(state);
-}
-
KActionsOptions::KActionsOptions(QWidget *parent, const QVariantList &)
: KCModule(parent)
{
mConfig = new KConfig("kwinrc");
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
tab = new QTabWidget(this);
layout->addWidget(tab);
- mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this);
+ mTitleBarActions = new KTitleBarActionsConfig(false, this);
mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions"));
tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
connect(mTitleBarActions, qOverload(&KCModule::changed), this, qOverload(&KCModule::changed));
+ connect(mTitleBarActions, qOverload(&KCModule::defaulted), this, qOverload(&KCModule::defaulted));
- mWindowActions = new KWindowActionsConfig(false, mConfig, this);
+ mWindowActions = new KWindowActionsConfig(false, this);
mWindowActions->setObjectName(QLatin1String("KWin Window Actions"));
tab->addTab(mWindowActions, i18n("Window Actio&ns"));
connect(mWindowActions, qOverload(&KCModule::changed), this, qOverload(&KCModule::changed));
+ connect(mWindowActions, qOverload(&KCModule::defaulted), this, qOverload(&KCModule::defaulted));
}
KActionsOptions::~KActionsOptions()
{
delete mConfig;
}
void KActionsOptions::load()
{
mTitleBarActions->load();
mWindowActions->load();
- emit KCModule::changed(false);
}
-
void KActionsOptions::save()
{
mTitleBarActions->save();
mWindowActions->save();
emit KCModule::changed(false);
// Send signal to kwin
mConfig->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
-
}
-
void KActionsOptions::defaults()
{
mTitleBarActions->defaults();
mWindowActions->defaults();
-
- emit defaulted(true);
}
void KActionsOptions::moduleChanged(bool state)
{
emit KCModule::changed(state);
}
K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory,
registerPlugin("kwinactions");
registerPlugin("kwinfocus");
registerPlugin("kwinmoving");
registerPlugin("kwinadvanced");
registerPlugin("kwinoptions");
)
#include "main.moc"
#include "moc_main.cpp"
diff --git a/kcmkwin/kwinoptions/main.h b/kcmkwin/kwinoptions/main.h
index 903cd720c..50a8bcd8a 100644
--- a/kcmkwin/kwinoptions/main.h
+++ b/kcmkwin/kwinoptions/main.h
@@ -1,99 +1,93 @@
/*
* main.h
*
* Copyright (c) 2001 Waldo Bastian
*
* Requires the Qt widget libraries, available at no cost at
* https://www.qt.io/
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __MAIN_H__
#define __MAIN_H__
#include
#include
class KConfig;
class KFocusConfig;
class KTitleBarActionsConfig;
class KWindowActionsConfig;
class KAdvancedConfig;
class KMovingConfig;
class KWinOptions : public KCModule
{
Q_OBJECT
public:
KWinOptions(QWidget *parent, const QVariantList &args);
~KWinOptions() override;
void load() override;
void save() override;
void defaults() override;
QString quickHelp() const override;
-
-protected Q_SLOTS:
-
- void moduleChanged(bool state);
-
-
private:
QTabWidget *tab;
KFocusConfig *mFocus;
KTitleBarActionsConfig *mTitleBarActions;
KWindowActionsConfig *mWindowActions;
KMovingConfig *mMoving;
KAdvancedConfig *mAdvanced;
KConfig *mConfig;
};
class KActionsOptions : public KCModule
{
Q_OBJECT
public:
KActionsOptions(QWidget *parent, const QVariantList &args);
~KActionsOptions() override;
void load() override;
void save() override;
void defaults() override;
protected Q_SLOTS:
void moduleChanged(bool state);
private:
QTabWidget *tab;
KTitleBarActionsConfig *mTitleBarActions;
KWindowActionsConfig *mWindowActions;
KConfig *mConfig;
};
#endif
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index 10626f88b..8be4dc6ff 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -1,562 +1,223 @@
/*
*
* Copyright (c) 1998 Matthias Ettrich
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "mouse.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
-#include
-#include
#include
#include
#include
#include
#include
+#include "kwinoptions_settings.h"
+
namespace
{
-char const * const cnf_Max[] = {
- "MaximizeButtonLeftClickCommand",
- "MaximizeButtonMiddleClickCommand",
- "MaximizeButtonRightClickCommand",
-};
-
-char const * const tbl_Max[] = {
- "Maximize",
- "Maximize (vertical only)",
- "Maximize (horizontal only)",
- ""
-};
-
QPixmap maxButtonPixmaps[3];
void createMaxButtonPixmaps()
{
- char const * maxButtonXpms[][3 + 13] = {
+ char const *maxButtonXpms[][3 + 13] = {
{
nullptr, nullptr, nullptr,
"...............",
".......#.......",
"......###......",
".....#####.....",
"..#....#....#..",
".##....#....##.",
"###############",
".##....#....##.",
"..#....#....#..",
".....#####.....",
"......###......",
".......#.......",
"..............."
},
{
nullptr, nullptr, nullptr,
"...............",
".......#.......",
"......###......",
".....#####.....",
".......#.......",
".......#.......",
".......#.......",
".......#.......",
".......#.......",
".....#####.....",
"......###......",
".......#.......",
"..............."
},
{
nullptr, nullptr, nullptr,
"...............",
"...............",
"...............",
"...............",
"..#.........#..",
".##.........##.",
"###############",
".##.........##.",
"..#.........#..",
"...............",
"...............",
"...............",
"..............."
},
};
QByteArray baseColor(". c " + KColorScheme(QPalette::Active, KColorScheme::View).background().color().name().toLatin1());
QByteArray textColor("# c " + KColorScheme(QPalette::Active, KColorScheme::View).foreground().color().name().toLatin1());
for (int t = 0; t < 3; ++t) {
maxButtonXpms[t][0] = "15 13 2 1";
maxButtonXpms[t][1] = baseColor.constData();
maxButtonXpms[t][2] = textColor.constData();
maxButtonPixmaps[t] = QPixmap(maxButtonXpms[t]);
maxButtonPixmaps[t].setMask(maxButtonPixmaps[t].createHeuristicMask());
}
}
} // namespace
KWinMouseConfigForm::KWinMouseConfigForm(QWidget *parent)
: QWidget(parent)
{
setupUi(parent);
}
KWinActionsConfigForm::KWinActionsConfigForm(QWidget *parent)
: QWidget(parent)
{
setupUi(parent);
}
void KTitleBarActionsConfig::paletteChanged()
{
createMaxButtonPixmaps();
for (int i=0; i<3; ++i) {
- m_ui->leftClickMaximizeButton->setItemIcon(i, maxButtonPixmaps[i]);
- m_ui->middleClickMaximizeButton->setItemIcon(i, maxButtonPixmaps[i]);
- m_ui->rightClickMaximizeButton->setItemIcon(i, maxButtonPixmaps[i]);
+ m_ui->kcfg_MaximizeButtonLeftClickCommand->setItemIcon(i, maxButtonPixmaps[i]);
+ m_ui->kcfg_MaximizeButtonMiddleClickCommand->setItemIcon(i, maxButtonPixmaps[i]);
+ m_ui->kcfg_MaximizeButtonRightClickCommand->setItemIcon(i, maxButtonPixmaps[i]);
}
}
-KTitleBarActionsConfig::KTitleBarActionsConfig(bool _standAlone, KConfig *_config, QWidget * parent)
- : KCModule(parent), config(_config), standAlone(_standAlone)
+KTitleBarActionsConfig::KTitleBarActionsConfig(bool _standAlone, QWidget *parent)
+ : KCModule(parent), standAlone(_standAlone)
, m_ui(new KWinMouseConfigForm(this))
{
+ addConfig(KWinOptionsSettings::self(), this);
+
// create the items for the maximize button actions
createMaxButtonPixmaps();
for (int i=0; i<3; ++i) {
- m_ui->leftClickMaximizeButton->addItem(maxButtonPixmaps[i], QString());
- m_ui->middleClickMaximizeButton->addItem(maxButtonPixmaps[i], QString());
- m_ui->rightClickMaximizeButton->addItem(maxButtonPixmaps[i], QString());
+ m_ui->kcfg_MaximizeButtonLeftClickCommand->addItem(maxButtonPixmaps[i], QString());
+ m_ui->kcfg_MaximizeButtonMiddleClickCommand->addItem(maxButtonPixmaps[i], QString());
+ m_ui->kcfg_MaximizeButtonRightClickCommand->addItem(maxButtonPixmaps[i], QString());
}
- createMaximizeButtonTooltips(m_ui->leftClickMaximizeButton);
- createMaximizeButtonTooltips(m_ui->middleClickMaximizeButton);
- createMaximizeButtonTooltips(m_ui->rightClickMaximizeButton);
-
- connect(m_ui->coTiDbl, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiAct1, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiAct2, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiAct3, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiAct4, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiInAct1, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiInAct2, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coTiInAct3, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->leftClickMaximizeButton, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->middleClickMaximizeButton, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->rightClickMaximizeButton, SIGNAL(activated(int)), SLOT(changed()));
+ createMaximizeButtonTooltips(m_ui->kcfg_MaximizeButtonLeftClickCommand);
+ createMaximizeButtonTooltips(m_ui->kcfg_MaximizeButtonMiddleClickCommand);
+ createMaximizeButtonTooltips(m_ui->kcfg_MaximizeButtonRightClickCommand);
load();
}
-KTitleBarActionsConfig::~KTitleBarActionsConfig()
-{
- if (standAlone)
- delete config;
-}
-
void KTitleBarActionsConfig::createMaximizeButtonTooltips(KComboBox *combo)
{
combo->setItemData(0, i18n("Maximize"), Qt::ToolTipRole);
combo->setItemData(1, i18n("Maximize (vertical only)"), Qt::ToolTipRole);
combo->setItemData(2, i18n("Maximize (horizontal only)"), Qt::ToolTipRole);
}
-// do NOT change the texts below, they are written to config file
-// and are not shown in the GUI
-// they have to match the order of items in GUI elements though
-const char* const tbl_TiDbl[] = {
- "Maximize",
- "Maximize (vertical only)",
- "Maximize (horizontal only)",
- "Minimize",
- "Shade",
- "Lower",
- "Close",
- "OnAllDesktops",
- "Nothing",
- ""
-};
-
-const char* const tbl_TiAc[] = {
- "Raise",
- "Lower",
- "Toggle raise and lower",
- "Minimize",
- "Shade",
- "Close",
- "Operations menu",
- "Nothing",
- ""
-};
-
-const char* const tbl_TiInAc[] = {
- "Activate and raise",
- "Activate and lower",
- "Activate",
- "Raise",
- "Lower",
- "Toggle raise and lower",
- "Minimize",
- "Shade",
- "Close",
- "Operations menu",
- "Nothing",
- ""
-};
-
-const char* const tbl_Win[] = {
- "Activate, raise and pass click",
- "Activate and pass click",
- "Activate",
- "Activate and raise",
- ""
-};
-
-const char* const tbl_WinWheel[] = {
- "Scroll",
- "Activate and scroll",
- "Activate, raise and scroll",
- ""
-};
-
-const char* const tbl_AllKey[] = {
- "Alt",
- "Meta",
- ""
-};
-
-const char* const tbl_All[] = {
- "Move",
- "Activate, raise and move",
- "Toggle raise and lower",
- "Resize",
- "Raise",
- "Lower",
- "Minimize",
- "Decrease Opacity",
- "Increase Opacity",
- "Nothing",
- ""
-};
-
-const char* const tbl_TiWAc[] = {
- "Raise/Lower",
- "Shade/Unshade",
- "Maximize/Restore",
- "Above/Below",
- "Previous/Next Desktop",
- "Change Opacity",
- "Nothing",
- ""
-};
-
-const char* const tbl_AllW[] = {
- "Raise/Lower",
- "Shade/Unshade",
- "Maximize/Restore",
- "Above/Below",
- "Previous/Next Desktop",
- "Change Opacity",
- "Nothing",
- ""
-};
-
-static const char* tbl_num_lookup(const char* const arr[], int pos)
-{
- for (int i = 0;
- arr[ i ][ 0 ] != '\0' && pos >= 0;
- ++i) {
- if (pos == 0)
- return arr[ i ];
- --pos;
- }
- abort(); // should never happen this way
-}
-
-static int tbl_txt_lookup(const char* const arr[], const char* txt)
-{
- int pos = 0;
- for (int i = 0;
- arr[ i ][ 0 ] != '\0';
- ++i) {
- if (qstricmp(txt, arr[ i ]) == 0)
- return pos;
- ++pos;
- }
- return 0;
-}
-
-void KTitleBarActionsConfig::setComboText(KComboBox* combo, const char*txt)
-{
- if (combo == m_ui->coTiDbl)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_TiDbl, txt));
- else if (combo == m_ui->coTiAct1 || combo == m_ui->coTiAct2 || combo == m_ui->coTiAct3)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_TiAc, txt));
- else if (combo == m_ui->coTiInAct1 || combo == m_ui->coTiInAct2 || combo == m_ui->coTiInAct3)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_TiInAc, txt));
- else if (combo == m_ui->coTiAct4)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_TiWAc, txt));
- else if (combo == m_ui->leftClickMaximizeButton ||
- combo == m_ui->middleClickMaximizeButton ||
- combo == m_ui->rightClickMaximizeButton) {
- combo->setCurrentIndex(tbl_txt_lookup(tbl_Max, txt));
- } else
- abort();
-}
-
-const char* KTitleBarActionsConfig::functionTiDbl(int i)
-{
- return tbl_num_lookup(tbl_TiDbl, i);
-}
-
-const char* KTitleBarActionsConfig::functionTiAc(int i)
-{
- return tbl_num_lookup(tbl_TiAc, i);
-}
-
-const char* KTitleBarActionsConfig::functionTiInAc(int i)
-{
- return tbl_num_lookup(tbl_TiInAc, i);
-}
-
-const char* KTitleBarActionsConfig::functionTiWAc(int i)
-{
- return tbl_num_lookup(tbl_TiWAc, i);
-}
-
-const char* KTitleBarActionsConfig::functionMax(int i)
-{
- return tbl_num_lookup(tbl_Max, i);
-}
-
void KTitleBarActionsConfig::showEvent(QShowEvent *ev)
{
if (!standAlone) {
// Workaround KCModule::showEvent() calling load(), see bug 163817
QWidget::showEvent(ev);
return;
}
KCModule::showEvent(ev);
}
void KTitleBarActionsConfig::changeEvent(QEvent *ev)
{
if (ev->type() == QEvent::PaletteChange) {
paletteChanged();
}
ev->accept();
}
-
-void KTitleBarActionsConfig::load()
-{
- KConfigGroup windowsConfig(config, "Windows");
- setComboText(m_ui->coTiDbl, windowsConfig.readEntry("TitlebarDoubleClickCommand", "Maximize").toLatin1());
- setComboText(m_ui->leftClickMaximizeButton, windowsConfig.readEntry(cnf_Max[0], tbl_Max[0]).toLatin1());
- setComboText(m_ui->middleClickMaximizeButton, windowsConfig.readEntry(cnf_Max[1], tbl_Max[1]).toLatin1());
- setComboText(m_ui->rightClickMaximizeButton, windowsConfig.readEntry(cnf_Max[2], tbl_Max[2]).toLatin1());
-
- KConfigGroup cg(config, "MouseBindings");
- setComboText(m_ui->coTiAct1, cg.readEntry("CommandActiveTitlebar1", "Raise").toLatin1());
- setComboText(m_ui->coTiAct2, cg.readEntry("CommandActiveTitlebar2", "Nothing").toLatin1());
- setComboText(m_ui->coTiAct3, cg.readEntry("CommandActiveTitlebar3", "Operations menu").toLatin1());
- setComboText(m_ui->coTiAct4, cg.readEntry("CommandTitlebarWheel", "Nothing").toLatin1());
- setComboText(m_ui->coTiInAct1, cg.readEntry("CommandInactiveTitlebar1", "Activate and raise").toLatin1());
- setComboText(m_ui->coTiInAct2, cg.readEntry("CommandInactiveTitlebar2", "Nothing").toLatin1());
- setComboText(m_ui->coTiInAct3, cg.readEntry("CommandInactiveTitlebar3", "Operations menu").toLatin1());
-}
-
void KTitleBarActionsConfig::save()
{
- KConfigGroup windowsConfig(config, "Windows");
- windowsConfig.writeEntry("TitlebarDoubleClickCommand", functionTiDbl(m_ui->coTiDbl->currentIndex()));
- windowsConfig.writeEntry(cnf_Max[0], functionMax(m_ui->leftClickMaximizeButton->currentIndex()));
- windowsConfig.writeEntry(cnf_Max[1], functionMax(m_ui->middleClickMaximizeButton->currentIndex()));
- windowsConfig.writeEntry(cnf_Max[2], functionMax(m_ui->rightClickMaximizeButton->currentIndex()));
-
- KConfigGroup cg(config, "MouseBindings");
- cg.writeEntry("CommandActiveTitlebar1", functionTiAc(m_ui->coTiAct1->currentIndex()));
- cg.writeEntry("CommandActiveTitlebar2", functionTiAc(m_ui->coTiAct2->currentIndex()));
- cg.writeEntry("CommandActiveTitlebar3", functionTiAc(m_ui->coTiAct3->currentIndex()));
- cg.writeEntry("CommandInactiveTitlebar1", functionTiInAc(m_ui->coTiInAct1->currentIndex()));
- cg.writeEntry("CommandTitlebarWheel", functionTiWAc(m_ui->coTiAct4->currentIndex()));
- cg.writeEntry("CommandInactiveTitlebar2", functionTiInAc(m_ui->coTiInAct2->currentIndex()));
- cg.writeEntry("CommandInactiveTitlebar3", functionTiInAc(m_ui->coTiInAct3->currentIndex()));
+ KCModule::save();
if (standAlone) {
- config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
-
}
}
-void KTitleBarActionsConfig::defaults()
-{
- setComboText(m_ui->coTiDbl, "Maximize");
- setComboText(m_ui->coTiAct1, "Raise");
- setComboText(m_ui->coTiAct2, "Nothing");
- setComboText(m_ui->coTiAct3, "Operations menu");
- setComboText(m_ui->coTiAct4, "Nothing");
- setComboText(m_ui->coTiInAct1, "Activate and raise");
- setComboText(m_ui->coTiInAct2, "Nothing");
- setComboText(m_ui->coTiInAct3, "Operations menu");
- setComboText(m_ui->leftClickMaximizeButton, tbl_Max[0]);
- setComboText(m_ui->middleClickMaximizeButton, tbl_Max[1]);
- setComboText(m_ui->rightClickMaximizeButton, tbl_Max[2]);
-}
-
-
-KWindowActionsConfig::KWindowActionsConfig(bool _standAlone, KConfig *_config, QWidget * parent)
- : KCModule(parent), config(_config), standAlone(_standAlone)
+KWindowActionsConfig::KWindowActionsConfig(bool _standAlone, QWidget *parent)
+ : KCModule(parent), standAlone(_standAlone)
, m_ui(new KWinActionsConfigForm(this))
{
- connect(m_ui->coWin1, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coWin2, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coWin3, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coWinWheel, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coAllKey, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coAll1, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coAll2, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coAll3, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->coAllW, SIGNAL(activated(int)), SLOT(changed()));
+ addConfig(KWinOptionsSettings::self(), this);
load();
}
-KWindowActionsConfig::~KWindowActionsConfig()
-{
- if (standAlone)
- delete config;
-}
-
-void KWindowActionsConfig::setComboText(KComboBox* combo, const char*txt)
-{
- if (combo == m_ui->coWin1 || combo == m_ui->coWin2 || combo == m_ui->coWin3)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_Win, txt));
- else if (combo == m_ui->coWinWheel)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_WinWheel, txt));
- else if (combo == m_ui->coAllKey)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_AllKey, txt));
- else if (combo == m_ui->coAll1 || combo == m_ui->coAll2 || combo == m_ui->coAll3)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_All, txt));
- else if (combo == m_ui->coAllW)
- combo->setCurrentIndex(tbl_txt_lookup(tbl_AllW, txt));
- else
- abort();
-}
-
-const char* KWindowActionsConfig::functionWin(int i)
-{
- return tbl_num_lookup(tbl_Win, i);
-}
-
-const char* KWindowActionsConfig::functionWinWheel(int i)
-{
- return tbl_num_lookup(tbl_WinWheel, i);
-}
-
-const char* KWindowActionsConfig::functionAllKey(int i)
-{
- return tbl_num_lookup(tbl_AllKey, i);
-}
-
-const char* KWindowActionsConfig::functionAll(int i)
-{
- return tbl_num_lookup(tbl_All, i);
-}
-
-const char* KWindowActionsConfig::functionAllW(int i)
-{
- return tbl_num_lookup(tbl_AllW, i);
-}
-
void KWindowActionsConfig::showEvent(QShowEvent *ev)
{
if (!standAlone) {
QWidget::showEvent(ev);
return;
}
KCModule::showEvent(ev);
}
-void KWindowActionsConfig::load()
-{
- KConfigGroup cg(config, "MouseBindings");
- setComboText(m_ui->coWin1, cg.readEntry("CommandWindow1", "Activate, raise and pass click").toLatin1());
- setComboText(m_ui->coWin2, cg.readEntry("CommandWindow2", "Activate and pass click").toLatin1());
- setComboText(m_ui->coWin3, cg.readEntry("CommandWindow3", "Activate and pass click").toLatin1());
- setComboText(m_ui->coWinWheel, cg.readEntry("CommandWindowWheel", "Scroll").toLatin1());
- setComboText(m_ui->coAllKey, cg.readEntry("CommandAllKey", "Alt").toLatin1());
- setComboText(m_ui->coAll1, cg.readEntry("CommandAll1", "Move").toLatin1());
- setComboText(m_ui->coAll2, cg.readEntry("CommandAll2", "Toggle raise and lower").toLatin1());
- setComboText(m_ui->coAll3, cg.readEntry("CommandAll3", "Resize").toLatin1());
- setComboText(m_ui->coAllW, cg.readEntry("CommandAllWheel", "Nothing").toLatin1());
-}
-
void KWindowActionsConfig::save()
{
- KConfigGroup cg(config, "MouseBindings");
- cg.writeEntry("CommandWindow1", functionWin(m_ui->coWin1->currentIndex()));
- cg.writeEntry("CommandWindow2", functionWin(m_ui->coWin2->currentIndex()));
- cg.writeEntry("CommandWindow3", functionWin(m_ui->coWin3->currentIndex()));
- cg.writeEntry("CommandWindowWheel", functionWinWheel(m_ui->coWinWheel->currentIndex()));
- cg.writeEntry("CommandAllKey", functionAllKey(m_ui->coAllKey->currentIndex()));
- cg.writeEntry("CommandAll1", functionAll(m_ui->coAll1->currentIndex()));
- cg.writeEntry("CommandAll2", functionAll(m_ui->coAll2->currentIndex()));
- cg.writeEntry("CommandAll3", functionAll(m_ui->coAll3->currentIndex()));
- cg.writeEntry("CommandAllWheel", functionAllW(m_ui->coAllW->currentIndex()));
+ KCModule::save();
if (standAlone) {
- config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
}
-
-void KWindowActionsConfig::defaults()
-{
- setComboText(m_ui->coWin1, "Activate, raise and pass click");
- setComboText(m_ui->coWin2, "Activate and pass click");
- setComboText(m_ui->coWin3, "Activate and pass click");
- setComboText(m_ui->coWinWheel, "Scroll");
- setComboText(m_ui->coAllKey, "Alt");
- setComboText(m_ui->coAll1, "Move");
- setComboText(m_ui->coAll2, "Toggle raise and lower");
- setComboText(m_ui->coAll3, "Resize");
- setComboText(m_ui->coAllW, "Nothing");
-}
diff --git a/kcmkwin/kwinoptions/mouse.h b/kcmkwin/kwinoptions/mouse.h
index 1dee6eb34..cbb5f4352 100644
--- a/kcmkwin/kwinoptions/mouse.h
+++ b/kcmkwin/kwinoptions/mouse.h
@@ -1,132 +1,96 @@
/*
* mouse.h
*
* Copyright (c) 1998 Matthias Ettrich
*
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __KKWMMOUSECONFIG_H__
#define __KKWMMOUSECONFIG_H__
class KConfig;
#include
#include
#include
#include "ui_actions.h"
#include "ui_mouse.h"
class KWinMouseConfigForm : public QWidget, public Ui::KWinMouseConfigForm
{
Q_OBJECT
public:
explicit KWinMouseConfigForm(QWidget* parent);
};
class KWinActionsConfigForm : public QWidget, public Ui::KWinActionsConfigForm
{
Q_OBJECT
public:
explicit KWinActionsConfigForm(QWidget* parent);
};
class KTitleBarActionsConfig : public KCModule
{
Q_OBJECT
public:
- KTitleBarActionsConfig(bool _standAlone, KConfig *_config, QWidget *parent);
- ~KTitleBarActionsConfig() override;
+ KTitleBarActionsConfig(bool _standAlone, QWidget *parent);
- void load() override;
void save() override;
- void defaults() override;
protected:
void showEvent(QShowEvent *ev) override;
void changeEvent(QEvent *ev) override;
-public Q_SLOTS:
- void changed() {
- emit KCModule::changed(true);
- }
-
private:
-
- KConfig *config;
bool standAlone;
KWinMouseConfigForm *m_ui;
- const char* functionTiDbl(int);
- const char* functionTiAc(int);
- const char* functionTiWAc(int);
- const char* functionTiInAc(int);
- const char* functionMax(int);
-
- void setComboText(KComboBox* combo, const char* text);
void createMaximizeButtonTooltips(KComboBox* combo);
- const char* fixup(const char* s);
private Q_SLOTS:
void paletteChanged();
};
class KWindowActionsConfig : public KCModule
{
Q_OBJECT
public:
- KWindowActionsConfig(bool _standAlone, KConfig *_config, QWidget *parent);
- ~KWindowActionsConfig() override;
+ KWindowActionsConfig(bool _standAlone, QWidget *parent);
- void load() override;
void save() override;
- void defaults() override;
protected:
void showEvent(QShowEvent *ev) override;
-public Q_SLOTS:
- void changed() {
- emit KCModule::changed(true);
- }
-
private:
- KConfig *config;
bool standAlone;
KWinActionsConfigForm *m_ui;
-
- const char* functionWin(int);
- const char* functionWinWheel(int);
- const char* functionAllKey(int);
- const char* functionAll(int);
- const char* functionAllW(int);
-
- void setComboText(KComboBox* combo, const char* text);
- const char* fixup(const char* s);
};
#endif
diff --git a/kcmkwin/kwinoptions/mouse.ui b/kcmkwin/kwinoptions/mouse.ui
index 4de09409b..c600d313a 100644
--- a/kcmkwin/kwinoptions/mouse.ui
+++ b/kcmkwin/kwinoptions/mouse.ui
@@ -1,713 +1,713 @@
KWinMouseConfigForm
0
0
600
500
-
Titlebar Actions
Qt::AlignHCenter|Qt::AlignTop
-
&Double-click:
- coTiDbl
+ kcfg_TitlebarDoubleClickCommand
-
-
+
Behavior on <em>double</em> click into the titlebar.
-
Maximize
-
Maximize (vertical only)
-
Maximize (horizontal only)
-
Minimize
-
Shade
-
Lower
-
Close
-
Show on all desktops
-
Do nothing
-
Mouse &wheel:
- coTiAct4
+ kcfg_CommandTitlebarWheel
-
-
+
Behavior on <em>mouse wheel</em> scroll over the titlebar.
-
Raise/lower
-
Shade/unshade
-
Maximize/restore
-
Keep above/below
-
Move to previous/next desktop
-
Change opacity
-
Do nothing
-
Titlebar and Frame Actions
Qt::AlignCenter
-
Qt::Horizontal
0
0
-
-
Active
Qt::AlignCenter
-
&Left click:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- coTiAct1
+ kcfg_CommandActiveTitlebar1
-
Inactive
Qt::AlignCenter
-
&Middle click:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- coTiAct2
+ kcfg_CommandActiveTitlebar2
-
&Right click:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- coTiAct3
+ kcfg_CommandActiveTitlebar3
-
-
+
0
0
Behavior on <em>left</em> click into the titlebar or frame of an <em>active</em> window.
-
Raise
-
Lower
-
Toggle raise and lower
-
Minimize
-
Shade
-
Close
-
Show actions menu
-
Do nothing
-
-
+
Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window.
-
Activate and raise
-
Activate and lower
-
Activate
-
Raise
-
Lower
-
Toggle raise and lower
-
Minimize
-
Shade
-
Close
-
Show actions menu
-
Do nothing
-
-
+
0
0
Behavior on <em>left</em> click into the titlebar or frame of an <em>active</em> window.
-
Raise
-
Lower
-
Toggle raise and lower
-
Minimize
-
Shade
-
Close
-
Show actions menu
-
Do nothing
-
-
+
Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window.
-
Activate and raise
-
Activate and lower
-
Activate
-
Raise
-
Lower
-
Toggle raise and lower
-
Minimize
-
Shade
-
Close
-
Show actions menu
-
Do nothing
-
-
+
0
0
Behavior on <em>left</em> click into the titlebar or frame of an <em>active</em> window.
-
Raise
-
Lower
-
Toggle raise and lower
-
Minimize
-
Shade
-
Close
-
Show actions menu
-
Do nothing
-
-
+
Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window.
-
Activate and raise
-
Activate and lower
-
Activate
-
Raise
-
Lower
-
Toggle raise and lower
-
Minimize
-
Shade
-
Close
-
Show actions menu
-
Do nothing
-
Qt::Horizontal
0
0
-
Maximize Button Actions
Qt::AlignHCenter|Qt::AlignTop
-
Behavior on <em>left</em> click onto the maximize button.
L&eft click:
- leftClickMaximizeButton
+ kcfg_MaximizeButtonLeftClickCommand
-
-
+
0
0
Behavior on <em>left</em> click onto the maximize button.
-
Behavior on <em>middle</em> click onto the maximize button.
Middle c&lick:
- middleClickMaximizeButton
+ kcfg_MaximizeButtonMiddleClickCommand
-
-
+
0
0
Behavior on <em>middle</em> click onto the maximize button.
-
Behavior on <em>right</em> click onto the maximize button.
Right clic&k:
- rightClickMaximizeButton
+ kcfg_MaximizeButtonRightClickCommand
-
-
+
0
0
Behavior on <em>right</em> click onto the maximize button.
-
Qt::Vertical
0
0
KComboBox
QComboBox
- coTiDbl
- coTiAct4
- coTiAct1
- coTiInAct1
- coTiAct2
- coTiInAct2
- coTiAct3
- coTiInAct3
- leftClickMaximizeButton
- middleClickMaximizeButton
- rightClickMaximizeButton
+ kcfg_TitlebarDoubleClickCommand
+ kcfg_CommandTitlebarWheel
+ kcfg_CommandActiveTitlebar1
+ kcfg_CommandInactiveTitlebar1
+ kcfg_CommandActiveTitlebar2
+ kcfg_CommandInactiveTitlebar2
+ kcfg_CommandActiveTitlebar3
+ kcfg_CommandInactiveTitlebar3
+ kcfg_MaximizeButtonLeftClickCommand
+ kcfg_MaximizeButtonMiddleClickCommand
+ kcfg_MaximizeButtonRightClickCommand