Differential D27784 Diff 77996 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​#include "ui_main.h"
24​
25​#include <QDebug>
26​
27​#include <KActionCollection>
28​#include <KGlobalAccel>
29​#include <KShortcutsEditor>
30​
31​
32​namespace KWin
33​{
34​
35​using namespace TabBox;
36​
37​KWinTabBoxConfigForm::KWinTabBoxConfigForm(TabboxType type, QWidget *parent)
38​ : QWidget(parent)
39​ , m_type(type)
40​ , ui(new Ui::KWinTabBoxConfigForm)
41​{
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​ ui->setupUi(this);
43​
44​ ui->effectConfigButton->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
45​
46​ if (QApplication::screens().count() < 2) {
47​ ui->filterScreens->hide();
48​ ui->screenFilter->hide();
49​ }
50​
51​ connect(ui->effectConfigButton, &QPushButton::clicked, this, &KWinTabBoxConfigForm::effectConfigButtonClicked);
52​
53​ connect(ui->kcfg_ShowTabBox, SIGNAL(clicked(bool)), SLOT(tabBoxToggled(bool)));
54​
55​ connect(ui->filterScreens, SIGNAL(clicked(bool)), SLOT(onFilterScreen()));
56​ connect(ui->currentScreen, SIGNAL(clicked(bool)), SLOT(onFilterScreen()));
57​ connect(ui->otherScreens, SIGNAL(clicked(bool)), SLOT(onFilterScreen()));
58​
59​ connect(ui->filterDesktops, SIGNAL(clicked(bool)), SLOT(onFilterDesktop()));
60​ connect(ui->currentDesktop, SIGNAL(clicked(bool)), SLOT(onFilterDesktop()));
61​ connect(ui->otherDesktops, SIGNAL(clicked(bool)), SLOT(onFilterDesktop()));
62​
63​ connect(ui->filterActivities, SIGNAL(clicked(bool)), SLOT(onFilterActivites()));
64​ connect(ui->currentActivity, SIGNAL(clicked(bool)), SLOT(onFilterActivites()));
65​ connect(ui->otherActivities, SIGNAL(clicked(bool)), SLOT(onFilterActivites()));
66​
67​ connect(ui->filterMinimization, SIGNAL(clicked(bool)), SLOT(onFilterMinimization()));
68​ connect(ui->visibleWindows, SIGNAL(clicked(bool)), SLOT(onFilterMinimization()));
69​ connect(ui->hiddenWindows, SIGNAL(clicked(bool)), SLOT(onFilterMinimization()));
70​
71​ connect(ui->oneAppWindow, SIGNAL(clicked(bool)), SLOT(onApplicationMode()));
72​ connect(ui->showDesktop, SIGNAL(clicked(bool)), SLOT(onShowDesktopMode()));
73​
74​ connect(ui->switchingModeCombo, SIGNAL(currentIndexChanged(int)), SLOT(onSwitchingMode()));
75​ connect(ui->effectCombo, SIGNAL(currentIndexChanged(int)), SLOT(onEffectCombo()));
76​
77​ auto addShortcut = [this](const char *name, KKeySequenceWidget *widget, const QKeySequence &sequence = QKeySequence()) {
78​ QAction *a = m_actionCollection->addAction(name);
79​ a->setProperty("isConfigurationAction", true);
80​ widget->setProperty("shortcutAction", name);
81​ a->setText(i18n(name));
82​ KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << sequence);
83​ connect(widget, SIGNAL(keySequenceChanged(QKeySequence)), this, SLOT(shortcutChanged(QKeySequence)));
84​ };
85​
86​ // Shortcut config. The shortcut belongs to the component "kwin"!
87​ m_actionCollection = new KActionCollection(this, QStringLiteral("kwin"));
88​ m_actionCollection->setComponentDisplayName(i18n("KWin"));
89​ m_actionCollection->setConfigGroup("Navigation");
90​ m_actionCollection->setConfigGlobal(true);
91​
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​ if (TabboxType::Main == m_type) {
93​ addShortcut("Walk Through Windows", ui->scAll, Qt::ALT + Qt::Key_Tab);
94​ addShortcut("Walk Through Windows (Reverse)", ui->scAllReverse, Qt::ALT + Qt::SHIFT + Qt::Key_Backtab);
95​ addShortcut("Walk Through Windows of Current Application", ui->scCurrent, Qt::ALT + Qt::Key_QuoteLeft);
96​ addShortcut("Walk Through Windows of Current Application (Reverse)", ui->scCurrentReverse, Qt::ALT + Qt::Key_AsciiTilde);
97​ } else if (TabboxType::Alternative == m_type) {
98​ addShortcut("Walk Through Windows Alternative", ui->scAll);
99​ addShortcut("Walk Through Windows Alternative (Reverse)", ui->scAllReverse);
100​ addShortcut("Walk Through Windows of Current Application Alternative", ui->scCurrent);
101​ addShortcut("Walk Through Windows of Current Application Alternative (Reverse)", ui->scCurrentReverse);
102​ }
103​}
104​
105​KWinTabBoxConfigForm::~KWinTabBoxConfigForm()
106​{
107​ delete ui;
108​}
109​
110​bool KWinTabBoxConfigForm::highlightWindows() const
111​{
112​ return ui->kcfg_HighlightWindows->isChecked();
113​}
114​
115​bool KWinTabBoxConfigForm::showTabBox() const
116​{
117​ return ui->kcfg_ShowTabBox->isChecked();
118​}
119​
zzagUnsubmitted
Done

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

zzag: s/Qt::UserRole + 2/AddonEffect/?
120​int KWinTabBoxConfigForm::filterScreen() const
121​{
122​ if (ui->filterScreens->isChecked()) {
123​ return ui->currentScreen->isChecked() ? TabBoxConfig::OnlyCurrentScreenClients : TabBoxConfig::ExcludeCurrentScreenClients;
124​ } else {
125​ return TabBoxConfig::IgnoreMultiScreen;
126​ }
127​}
128​
129​int KWinTabBoxConfigForm::filterDesktop() const
130​{
131​ if (ui->filterDesktops->isChecked()) {
132​ return ui->currentDesktop->isChecked() ? TabBoxConfig::OnlyCurrentDesktopClients : TabBoxConfig::ExcludeCurrentDesktopClients;
133​ } else {
134​ return TabBoxConfig::AllDesktopsClients;
135​ }
136​}
137​
138​int KWinTabBoxConfigForm::filterActivities() const
139​{
140​ if (ui->filterActivities->isChecked()) {
141​ return ui->currentActivity->isChecked() ? TabBoxConfig::OnlyCurrentActivityClients : TabBoxConfig::ExcludeCurrentActivityClients;
142​ } else {
143​ return TabBoxConfig::AllActivitiesClients;
144​ }
145​}
146​
147​int KWinTabBoxConfigForm::filterMinimization() const
148​{
149​ if (ui->filterMinimization->isChecked()) {
150​ return ui->visibleWindows->isChecked() ? TabBoxConfig::ExcludeMinimizedClients : TabBoxConfig::OnlyMinimizedClients;
151​ } else {
152​ return TabBoxConfig::IgnoreMinimizedStatus;
153​ }
154​}
155​
156​int KWinTabBoxConfigForm::applicationMode() const
157​{
158​ return ui->oneAppWindow->isChecked() ? TabBoxConfig::OneWindowPerApplication : TabBoxConfig::AllWindowsAllApplications;
159​}
160​
161​int KWinTabBoxConfigForm::showDesktopMode() const
162​{
163​ return ui->showDesktop->isChecked() ? TabBoxConfig::ShowDesktopClient : TabBoxConfig::DoNotShowDesktopClient;
164​}
165​
166​int KWinTabBoxConfigForm::switchingMode() const
167​{
168​ return ui->switchingModeCombo->currentIndex();
169​}
170​
171​QString KWinTabBoxConfigForm::layoutName() const
172​{
173​ return ui->effectCombo->currentData().toString();
174​}
175​
176​void KWinTabBoxConfigForm::setFilterScreen(TabBox::TabBoxConfig::ClientMultiScreenMode mode)
177​{
178​ ui->filterScreens->setChecked(mode != TabBoxConfig::IgnoreMultiScreen);
179​ ui->currentScreen->setChecked(mode == TabBoxConfig::OnlyCurrentScreenClients);
180​ ui->otherScreens->setChecked(mode == TabBoxConfig::ExcludeCurrentScreenClients);
181​}
182​
183​void KWinTabBoxConfigForm::setFilterDesktop(TabBox::TabBoxConfig::ClientDesktopMode mode)
184​{
185​ ui->filterDesktops->setChecked(mode != TabBoxConfig::AllDesktopsClients);
186​ ui->currentDesktop->setChecked(mode == TabBoxConfig::OnlyCurrentDesktopClients);
187​ ui->otherDesktops->setChecked(mode == TabBoxConfig::ExcludeCurrentDesktopClients);
188​}
189​
190​void KWinTabBoxConfigForm::setFilterActivities(TabBox::TabBoxConfig::ClientActivitiesMode mode)
191​{
192​ ui->filterActivities->setChecked(mode != TabBoxConfig::AllActivitiesClients);
193​ ui->currentActivity->setChecked(mode == TabBoxConfig::OnlyCurrentActivityClients);
194​ ui->otherActivities->setChecked(mode == TabBoxConfig::ExcludeCurrentActivityClients);
195​}
196​
197​void KWinTabBoxConfigForm::setFilterMinimization(TabBox::TabBoxConfig::ClientMinimizedMode mode)
198​{
199​ ui->filterMinimization->setChecked(mode != TabBoxConfig::IgnoreMinimizedStatus);
200​ ui->visibleWindows->setChecked(mode == TabBoxConfig::ExcludeMinimizedClients);
201​ ui->hiddenWindows->setChecked(mode == TabBoxConfig::OnlyMinimizedClients);
202​}
203​
204​void KWinTabBoxConfigForm::setApplicationMode(TabBox::TabBoxConfig::ClientApplicationsMode mode)
205​{
206​ ui->oneAppWindow->setChecked(mode == TabBoxConfig::OneWindowPerApplication);
207​}
208​
209​void KWinTabBoxConfigForm::setShowDesktopMode(TabBox::TabBoxConfig::ShowDesktopMode mode)
210​{
211​ ui->showDesktop->setChecked(mode == TabBoxConfig::ShowDesktopClient);
212​}
213​
214​void KWinTabBoxConfigForm::setSwitchingModeChanged(TabBox::TabBoxConfig::ClientSwitchingMode mode)
215​{
216​ ui->switchingModeCombo->setCurrentIndex(mode);
217​}
218​
219​void KWinTabBoxConfigForm::setLayoutName(const QString &layoutName)
220​{
221​ ui->effectCombo->setCurrentIndex(ui->effectCombo->findData(layoutName));
222​}
223​
224​void KWinTabBoxConfigForm::setEffectComboModel(QStandardItemModel *model)
225​{
226​ int index = ui->effectCombo->currentIndex();
227​ QVariant data = ui->effectCombo->itemData(index);
228​
229​ ui->effectCombo->setModel(model);
230​
231​ if (data.isValid()) {
232​ ui->effectCombo->setCurrentIndex(ui->effectCombo->findData(data));
233​ } else if (index != -1) {
234​ ui->effectCombo->setCurrentIndex(index);
235​ }
236​}
237​
238​QVariant KWinTabBoxConfigForm::effectComboCurrentData(int role) const
239​{
240​ return ui->effectCombo->currentData(role);
241​}
242​
243​void KWinTabBoxConfigForm::loadShortcuts()
244​{
245​ auto loadShortcut = [this](KKeySequenceWidget *widget) {
246​ QString actionName = widget->property("shortcutAction").toString();
247​ qDebug() << "load shortcut for " << actionName;
248​ if (QAction *action = m_actionCollection->action(actionName)) {
249​ auto shortcuts = KGlobalAccel::self()->shortcut(action);
250​ if (!shortcuts.isEmpty()) {
251​ widget->setKeySequence(shortcuts.first());
252​ }
253​ }
254​ };
255​
256​ loadShortcut(ui->scAll);
257​ loadShortcut(ui->scAllReverse);
258​ loadShortcut(ui->scCurrent);
259​ loadShortcut(ui->scCurrentReverse);
260​}
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…
261​
262​void KWinTabBoxConfigForm::resetShortcuts()
263​{
264​ QString action;
265​ auto resetShortcut = [this](KKeySequenceWidget *widget, const QKeySequence &sequence = QKeySequence()) {
266​ const QString action = widget->property("shortcutAction").toString();
267​ QAction *a = m_actionCollection->action(action);
268​ KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << sequence, KGlobalAccel::NoAutoloading);
269​ };
270​ if (TabboxType::Main == m_type) {
271​ resetShortcut(ui->scAll, Qt::ALT + Qt::Key_Tab);
272​ resetShortcut(ui->scAllReverse, Qt::ALT + Qt::SHIFT + Qt::Key_Backtab);
273​ resetShortcut(ui->scCurrent, Qt::ALT + Qt::Key_QuoteLeft);
274​ resetShortcut(ui->scCurrentReverse, Qt::ALT + Qt::Key_AsciiTilde);
275​ } else if (TabboxType::Alternative == m_type) {
276​ resetShortcut(ui->scAll);
277​ resetShortcut(ui->scAllReverse);
278​ resetShortcut(ui->scCurrent);
279​ resetShortcut(ui->scCurrentReverse);
280​ }
281​ m_actionCollection->writeSettings();
282​}
283​
284​void KWinTabBoxConfigForm::tabBoxToggled(bool on)
285​{
286​ // Highlight Windows options is availabled if no TabBox effect is selected
287​ // or if Tabbox is not builtin effet.
288​ on = !on || ui->effectCombo->currentData(AddonEffect).toBool();
289​ ui->kcfg_HighlightWindows->setEnabled(on);
290​}
291​
292​void KWinTabBoxConfigForm::onFilterScreen()
293​{
294​ emit filterScreenChanged(filterScreen());
295​}
296​
297​void KWinTabBoxConfigForm::onFilterDesktop()
298​{
299​ emit filterDesktopChanged(filterDesktop());
300​}
301​
302​void KWinTabBoxConfigForm::onFilterActivites()
303​{
304​ emit filterActivitiesChanged(filterActivities());
305​}
306​
307​void KWinTabBoxConfigForm::onFilterMinimization()
308​{
309​ emit filterMinimizationChanged(filterMinimization());
310​}
311​
312​void KWin::KWinTabBoxConfigForm::onApplicationMode()
313​{
314​ emit applicationModeChanged(applicationMode());
315​}
316​
317​void KWinTabBoxConfigForm::onShowDesktopMode()
318​{
319​ emit showDesktopModeChanged(showDesktopMode());
320​}
321​
322​void KWinTabBoxConfigForm::onSwitchingMode()
323​{
324​ emit switchingModeChanged(switchingMode());
325​}
326​
327​void KWinTabBoxConfigForm::onEffectCombo()
328​{
329​ const bool isAddonEffect = ui->effectCombo->currentData(AddonEffect).toBool();
330​ ui->effectConfigButton->setIcon(QIcon::fromTheme(isAddonEffect ? "view-preview" : "configure"));
331​ if (!ui->kcfg_ShowTabBox->isChecked()) {
332​ return;
333​ }
334​ ui->kcfg_HighlightWindows->setEnabled(isAddonEffect);
335​
336​ emit layoutNameChanged(layoutName());
337​}
338​
339​void KWinTabBoxConfigForm::shortcutChanged(const QKeySequence &seq)
340​{
341​ QString action;
342​ if (sender()) {
343​ action = sender()->property("shortcutAction").toString();
344​ }
345​ if (action.isEmpty()) {
346​ return;
347​ }
348​ QAction *a = m_actionCollection->action(action);
349​ KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << seq, KGlobalAccel::NoAutoloading);
350​ m_actionCollection->writeSettings();
351​}
352​
353​} // namespace