Differential D27784 Diff 76906 kcmkwin/kwintabbox/kwintabboxconfigform.cpp

Changeset View

Standalone View

View Options

kcmkwin/kwintabbox/kwintabboxconfigform.cpp

  • This file was added.
1​/********************************************************************
2​ KWin - the KDE window manager
3​ This file is part of the KDE project.
4​
5​Copyright (C) 2009 Martin Gräßlin <mgraesslin@kde.org>
6​Copyright (C) 2020 Cyril Rossi <cyril.rossi@enioka.com>
7​
8​This program is free software; you can redistribute it and/or modify
9​it under the terms of the GNU General Public License as published by
10​the Free Software Foundation; either version 2 of the License, or
11​(at your option) any later version.
12​
13​This program is distributed in the hope that it will be useful,
14​but WITHOUT ANY WARRANTY; without even the implied warranty of
15​MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16​GNU General Public License for more details.
17​
18​You should have received a copy of the GNU General Public License
19​along with this program. If not, see <http://www.gnu.org/licenses/>.
20​*********************************************************************/
21​
22​#include "kwintabboxconfigform.h"
23​
24​namespace KWin
25​{
26​
27​using namespace TabBox;
28​
29​KWinTabBoxConfigForm::KWinTabBoxConfigForm(QWidget *parent)
30​ : QWidget(parent)
31​{
32​ setupUi(this);
33​
34​ effectConfigButton->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
35​
36​ if (QApplication::screens().count() < 2) {
37​ filterScreens->hide();
38​ screenFilter->hide();
39​ }
40​
41​ connect(kcfg_ShowTabBox, SIGNAL(clicked(bool)), SLOT(tabBoxToggled(bool)));
ervinUnsubmitted
Done

This is leaked, you got to have a dtor now. It can be empty (or = default) if you use QScopedPointer, otherwise it'll have to contain delete ui;.

ervin: This is leaked, you got to have a dtor now. It can be empty (or = default) if you use…
42​
43​ connect(filterScreens, SIGNAL(clicked(bool)), SLOT(onFilterScreen()));
44​ connect(currentScreen, SIGNAL(clicked(bool)), SLOT(onFilterScreen()));
45​ connect(otherScreens, SIGNAL(clicked(bool)), SLOT(onFilterScreen()));
46​
47​ connect(filterDesktops, SIGNAL(clicked(bool)), SLOT(onFilterDesktop()));
48​ connect(currentDesktop, SIGNAL(clicked(bool)), SLOT(onFilterDesktop()));
49​ connect(otherDesktops, SIGNAL(clicked(bool)), SLOT(onFilterDesktop()));
50​
51​ connect(filterActivities, SIGNAL(clicked(bool)), SLOT(onFilterActivites()));
52​ connect(currentActivity, SIGNAL(clicked(bool)), SLOT(onFilterActivites()));
53​ connect(otherActivities, SIGNAL(clicked(bool)), SLOT(onFilterActivites()));
54​
55​ connect(filterMinimization, SIGNAL(clicked(bool)), SLOT(onFilterMinimization()));
56​ connect(visibleWindows, SIGNAL(clicked(bool)), SLOT(onFilterMinimization()));
57​ connect(hiddenWindows, SIGNAL(clicked(bool)), SLOT(onFilterMinimization()));
58​
59​ connect(oneAppWindow, SIGNAL(clicked(bool)), SLOT(onApplicationMode()));
60​ connect(showDesktop, SIGNAL(clicked(bool)), SLOT(onShowDesktopMode()));
61​
62​ connect(switchingModeCombo, SIGNAL(currentIndexChanged(int)), SLOT(onSwitchingMode()));
63​ connect(effectCombo, SIGNAL(currentIndexChanged(int)), SLOT(onEffectCombo()));
64​}
65​
66​void KWinTabBoxConfigForm::setFilterScreen(TabBox::TabBoxConfig::ClientMultiScreenMode mode)
67​{
68​ filterScreens->setChecked(mode != TabBoxConfig::IgnoreMultiScreen);
69​ currentScreen->setChecked(mode == TabBoxConfig::OnlyCurrentScreenClients);
70​ otherScreens->setChecked(mode == TabBoxConfig::ExcludeCurrentScreenClients);
71​}
72​
73​void KWinTabBoxConfigForm::setFilterDesktop(TabBox::TabBoxConfig::ClientDesktopMode mode)
74​{
75​ filterDesktops->setChecked(mode != TabBoxConfig::AllDesktopsClients);
76​ currentDesktop->setChecked(mode == TabBoxConfig::OnlyCurrentDesktopClients);
77​ otherDesktops->setChecked(mode == TabBoxConfig::ExcludeCurrentDesktopClients);
78​}
79​
80​void KWinTabBoxConfigForm::setFilterActivities(TabBox::TabBoxConfig::ClientActivitiesMode mode)
81​{
82​ filterActivities->setChecked(mode != TabBoxConfig::AllActivitiesClients);
83​ currentActivity->setChecked(mode == TabBoxConfig::OnlyCurrentActivityClients);
84​ otherActivities->setChecked(mode == TabBoxConfig::ExcludeCurrentActivityClients);
85​}
86​
87​void KWinTabBoxConfigForm::setFilterMinimization(TabBox::TabBoxConfig::ClientMinimizedMode mode)
88​{
89​ filterMinimization->setChecked(mode != TabBoxConfig::IgnoreMinimizedStatus);
90​ visibleWindows->setChecked(mode == TabBoxConfig::ExcludeMinimizedClients);
91​ hiddenWindows->setChecked(mode == TabBoxConfig::OnlyMinimizedClients);
ervinUnsubmitted
Done

Space on the wrong side of the *, also probably a good idea to initialize with nullptr.

Or even better maybe adjust the macro to declare a scope and have the QAction declared and initialized within the scope. This would avoid this odd namespace pollution.

ervin: Space on the wrong side of the *, also probably a good idea to initialize with nullptr. Or…
92​}
93​
94​void KWinTabBoxConfigForm::setApplicationMode(TabBox::TabBoxConfig::ClientApplicationsMode mode)
95​{
96​ oneAppWindow->setChecked(mode == TabBoxConfig::OneWindowPerApplication);
97​}
98​
99​void KWinTabBoxConfigForm::setShowDesktopMode(TabBox::TabBoxConfig::ShowDesktopMode mode)
100​{
101​ showDesktop->setChecked(mode == TabBoxConfig::ShowDesktopClient);
102​}
103​
104​void KWinTabBoxConfigForm::setSwitchingModeChanged(TabBox::TabBoxConfig::ClientSwitchingMode mode)
105​{
106​ switchingModeCombo->setCurrentIndex(mode);
107​}
108​
109​void KWinTabBoxConfigForm::setLayoutName(const QString &layoutName)
110​{
111​ effectCombo->setCurrentIndex(effectCombo->findData(layoutName));
112​}
113​
114​void KWinTabBoxConfigForm::tabBoxToggled(bool on)
115​{
116​ // Highlight Windows options is availabled if no TabBox effect is selected
117​ // or if Tabbox is not builtin effet.
118​ on = !on || effectCombo->currentData(Qt::UserRole + 2).toBool();
119​ kcfg_HighlightWindows->setEnabled(on);
zzagUnsubmitted
Done

s/Qt::UserRole + 2/AddonEffect/?

zzag: s/Qt::UserRole + 2/AddonEffect/?
120​}
121​
122​void KWinTabBoxConfigForm::onFilterScreen()
123​{
124​ if (filterScreens->isChecked()) {
125​ emit filterScreenChanged(currentScreen->isChecked() ? TabBoxConfig::OnlyCurrentScreenClients : TabBoxConfig::ExcludeCurrentScreenClients);
126​ } else {
127​ emit filterScreenChanged(TabBoxConfig::IgnoreMultiScreen);
128​ }
129​}
130​
131​void KWinTabBoxConfigForm::onFilterDesktop()
132​{
133​ if (filterDesktops->isChecked()) {
134​ emit filterDesktopChanged(currentDesktop->isChecked() ? TabBoxConfig::OnlyCurrentDesktopClients : TabBoxConfig::ExcludeCurrentDesktopClients);
135​ } else {
136​ emit filterDesktopChanged(TabBoxConfig::AllDesktopsClients);
137​ }
138​}
139​
140​void KWinTabBoxConfigForm::onFilterActivites()
141​{
142​ if (filterActivities->isChecked()) {
143​ emit filterActivitiesChanged(currentActivity->isChecked() ? TabBoxConfig::OnlyCurrentActivityClients : TabBoxConfig::ExcludeCurrentActivityClients);
144​ } else {
145​ emit filterActivitiesChanged(TabBoxConfig::AllActivitiesClients);
146​ }
147​}
148​
149​void KWinTabBoxConfigForm::onFilterMinimization()
150​{
151​ if (filterMinimization->isChecked()) {
152​ emit filterMinimizationChanged(visibleWindows->isChecked() ? TabBoxConfig::ExcludeMinimizedClients : TabBoxConfig::OnlyMinimizedClients);
153​ } else {
154​ emit filterMinimizationChanged(TabBoxConfig::IgnoreMinimizedStatus);
155​ }
156​}
157​
158​void KWin::KWinTabBoxConfigForm::onApplicationMode()
159​{
160​ emit applicationModeChanged(oneAppWindow->isChecked() ? TabBoxConfig::OneWindowPerApplication : TabBoxConfig::AllWindowsAllApplications);
161​}
162​
163​void KWinTabBoxConfigForm::onShowDesktopMode()
164​{
165​ emit showDesktopModeChanged(showDesktop->isChecked() ? TabBoxConfig::ShowDesktopClient : TabBoxConfig::DoNotShowDesktopClient);
166​}
167​
168​void KWinTabBoxConfigForm::onSwitchingMode()
169​{
170​ emit switchingModeChanged(switchingModeCombo->currentIndex());
171​}
172​
173​void KWinTabBoxConfigForm::onEffectCombo()
174​{
175​ const bool isAddonEffect = effectCombo->currentData(AddonEffect).toBool();
176​ effectConfigButton->setIcon(QIcon::fromTheme(isAddonEffect ? "view-preview" : "configure"));
177​ if (!kcfg_ShowTabBox->isChecked()) {
178​ return;
179​ }
180​ kcfg_HighlightWindows->setEnabled(isAddonEffect);
181​
182​ emit layoutNameChanged(effectCombo->currentData().toString());
183​}
184​
185​} // namespace
zzagUnsubmitted
Done

RESET_SHORTCUT is not a macro. So maybe resetShortcut?

zzag: RESET_SHORTCUT is not a macro. So maybe resetShortcut?
ervinUnsubmitted
Done

man this is so much better than the old macros ;-)

(not saying you have to clean them up, it's just that seeing both like this the contrast is telling).

ervin: man this is so much better than the old macros ;-) (not saying you have to clean them up, it's…