Differential D12936 Diff 34387 kcms/workspaceoptions/workspaceoptions.cpp

Changeset View

Standalone View

View Options

kcms/workspaceoptions/workspaceoptions.cpp

1/* 1​/*
2 * Copyright (C) 2009 Marco Martin <notmart@gmail.com> 2​ * Copyright (C) 2018 <furkantokac34@gmail.com>
3 * 3​ *
4 * This program is free software; you can redistribute it and/or modify 4​ * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5​ * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or 6​ * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version. 7​ * (at your option) any later version.
8 * 8​ *
9 * This program is distributed in the hope that it will be useful, 9​ * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10​ * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12​ * GNU General Public License for more details.
13 * 13​ *
14 * You should have received a copy of the GNU General Public License 14​ * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software 15​ * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 16​ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 * ​
18 */ 17​ */
19#include "workspaceoptions.h" 18​#include "workspaceoptions.h"
20 19​
21#include "ui_mainpage.h" ​
22 ​
23#include <KAboutData> ​
24#include <KPluginFactory> 20​#include <KPluginFactory>
21​#include <KAboutData>
22​#include <KLocalizedString>
25#include <KConfigGroup> 23​#include <KConfigGroup>
26 24​
27using namespace KAuth; 25​#include <ksharedconfig.h>
28 26​
29K_PLUGIN_FACTORY(WorkspaceOptionsModuleFactory, registerPlugin<WorkspaceOptionsModule>();) 27​K_PLUGIN_FACTORY_WITH_JSON(KCMWorkspaceOptionsFactory, "kcm_workspace.json", registerPlugin<KCMWorkspaceOptions>();)
30K_EXPORT_PLUGIN(WorkspaceOptionsModuleFactory("kcmworkspaceoptions")) ​
31 28​
32static const QString s_osdKey = QStringLiteral("OSD"); 29​KCMWorkspaceOptions::KCMWorkspaceOptions(QObject *parent, const QVariantList& args)
33 30​ : KQuickAddons::ConfigModule(parent, args),
34WorkspaceOptionsModule::WorkspaceOptionsModule(QWidget *parent, const QVariantList &args) 31​ m_stateToolTip(true),
35 : KCModule(parent, args), 32​ m_stateVisualFeedback(true)
36 m_kwinConfig( KSharedConfig::openConfig(QStringLiteral("kwinrc"))), 33​{
37 m_ownConfig( KSharedConfig::openConfig(QStringLiteral("workspaceoptionsrc"))), 34​ KAboutData* about = new KAboutData(QStringLiteral("kcm_workspace"),
yurchorUnsubmitted
Done

This might not work with translations as the translation catalog is named "kcm_workspaceoptions".

yurchor: This might not work with translations as the translation catalog is named…
ltoscanoUnsubmitted
Done

Iirc that's unrelated. The catalog name is not set by this call.

ltoscano: Iirc that's unrelated. The catalog name is not set by this call.
romanggUnsubmitted
Done

So do we need to change this here, in the CMake file, or can the translation catalog be renamed (or a new one created) with the name kcm_workspace to make the naming consistent?

Before in this KCM we used kcm_workspaceoptions, workspaceoptions and kcmworkspaceoptions at different places. I want to use kcm_workspace only now everywhere.

romangg: So do we need to change this here, in the CMake file, or can the translation catalog be renamed…
ltoscanoUnsubmitted
Done

Either you keep the old name, or you change it to kcm5_<name> (which may help avoiding headaches in future). The values in TRANSLATION_DOMAIN and Messages.sh should be consistent.

ltoscano: Either you keep the old name, or you change it to kcm5_<name> (which may help avoiding…
38 m_plasmaShellAutostart(QStringLiteral("plasmashell")), 35​ i18n("Plasma Workspace global options"),
39 m_krunnerAutostart(QStringLiteral("krunner")), 36​ QStringLiteral("1.1"),
40 m_ui(new Ui::MainPage) 37​ i18n("System Settings module for managing global options for the Plasma Workspace."),
41{ 38​ KAboutLicense::GPL);
42 KAboutData *about = ​
43 new KAboutData(QStringLiteral("kcmworkspaceoptions"), i18n("Global options for the Plasma Workspace"), ​
44 QStringLiteral("1.0"), QString(), KAboutLicense::GPL, ​
45 i18n("(c) 2009 Marco Martin")); ​
46 ​
47 about->addAuthor(i18n("Marco Martin"), i18n("Maintainer"), QStringLiteral("notmart@gmail.com")); ​
48 39​
40​ about->addAuthor(i18n("Furkan Tokac"), QString(), QStringLiteral("furkantokac34@gmail.com"));
49 setAboutData(about); 41​ setAboutData(about);
50 42​
51 setButtons(Apply); 43​ setButtons( Default | Apply );
44​}
52 45​
53 m_ui->setupUi(this); 46​/*ConfigModule functions*/
47​void KCMWorkspaceOptions::load()
48​{
49​ bool state = false;
50​ KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasmarc"));
54 51​
55 connect(m_ui->showToolTips, SIGNAL(toggled(bool)), this, SLOT(changed())); 52​ // Load toolTip
56 connect(m_ui->showOsd, &QCheckBox::toggled, this, static_cast<void(WorkspaceOptionsModule::*)()>(&WorkspaceOptionsModule::changed)); 53​ {
54​ const KConfigGroup cg(config, QStringLiteral("PlasmaToolTips"));
55​ state = cg.readEntry("Delay", 0.7) > 0;
56​ setToolTip(state);
57​ m_ostateToolTip = getToolTip();
57} 58​ }
58 59​
59WorkspaceOptionsModule::~WorkspaceOptionsModule() 60​ // Load visualFeedback
60{ 61​ {
61 delete m_ui; 62​ const KConfigGroup cg(config, QStringLiteral("OSD"));
63​ state = cg.readEntry(QStringLiteral("Enabled"), true);
64​ setVisualFeedback(state);
65​ m_ostateVisualFeedback = getVisualFeedback();
62} 66​ }
63 67​
68​ setNeedsSave(false);
69​}
64 70​
65void WorkspaceOptionsModule::save() 71​void KCMWorkspaceOptions::save()
66{ 72​{
67 KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasmarc")); 73​ KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasmarc"));
68 74​
75​ // Save toolTip
69 { 76​ {
70 KConfigGroup cg(config, "PlasmaToolTips"); 77​ KConfigGroup cg(config, QStringLiteral("PlasmaToolTips"));
71 cg.writeEntry("Delay", m_ui->showToolTips->isChecked() ? 0.7 : -1); 78​ cg.writeEntry("Delay", getToolTip() ? 0.7 : -1);
79​ m_ostateToolTip = getToolTip();
72 } 80​ }
73 81​
82​ // Save visualFeedback
74 { 83​ {
75 KConfigGroup cg(config, QStringLiteral("OSD")); 84​ KConfigGroup cg(config, QStringLiteral("OSD"));
76 cg.writeEntry("Enabled", m_ui->showOsd->isChecked()); 85​ cg.writeEntry("Enabled", getVisualFeedback());
86​ m_ostateVisualFeedback = getVisualFeedback();
77 } 87​ }
78 88​
79 config->sync(); 89​ config->sync();
90​ setNeedsSave(false);
80} 91​}
81 92​
82void WorkspaceOptionsModule::load() 93​void KCMWorkspaceOptions::defaults()
83{ 94​{
84 KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasmarc")); 95​ setToolTip(true);
96​ setVisualFeedback(true);
85 97​
98​ handleNeedsSave();
99​}
100​
101​/*ToolTip functions*/
102​bool KCMWorkspaceOptions::getToolTip() const
103​{
104​ return m_stateToolTip;
105​}
106​
107​void KCMWorkspaceOptions::setToolTip(bool state)
108​{
109​ // Prevent from binding loop
110​ if( m_stateToolTip == state ) {
zzagUnsubmitted
Done

Coding style nitpick: No whitespace after ( and before ). Also, I believe, there should be a whitespace between control statement keyword and opening parentheses.

zzag: Coding style nitpick: No whitespace after `(` and before `)`. Also, I believe, there should be…
furkantokacAuthorUnsubmitted
Done

Done. Thanks. I avoid small changes for better diff revision so now I'm reviewing the whole patch.

furkantokac: Done. Thanks. I avoid small changes for better diff revision so now I'm reviewing the whole…
111​ return;
112​ }
113​
114​ m_stateToolTip = state;
115​
116​ emit toolTipChanged();
117​ handleNeedsSave();
118​}
119​
120​/*VisualFeedback functions*/
121​bool KCMWorkspaceOptions::getVisualFeedback() const
86 { 122​{
87 const KConfigGroup cg(config, "PlasmaToolTips"); 123​ return m_stateVisualFeedback;
88 m_ui->showToolTips->setChecked(cg.readEntry("Delay", 0.7) > 0); ​
89 } 124​}
90 125​
126​void KCMWorkspaceOptions::setVisualFeedback(bool state)
91 { 127​{
92 const KConfigGroup cg(config, s_osdKey); 128​ // Prevent from binding loop
93 m_ui->showOsd->setChecked(cg.readEntry(QStringLiteral("Enabled"), true)); 129​ if( m_stateVisualFeedback == state ) {
130​ return;
94 } 131​ }
132​
133​ m_stateVisualFeedback = state;
134​
135​ emit visualFeedbackChanged();
136​ handleNeedsSave();
95} 137​}
96 138​
97void WorkspaceOptionsModule::defaults() 139​/*Other functions*/
140​// Checks if the current states are different than the first states.
141​// If yes, setNeedsSave(true).
142​void KCMWorkspaceOptions::handleNeedsSave()
98{ 143​{
99 m_ui->showToolTips->setChecked(true); 144​ setNeedsSave(m_ostateToolTip != getToolTip() ||
100 m_ui->showOsd->setChecked(true); 145​ m_ostateVisualFeedback != getVisualFeedback());
101} 146​}
102 147​
103#include "workspaceoptions.moc" 148​#include "workspaceoptions.moc"