Differential D27477 Diff 77993 kcmkwin/kwinoptions/main.cpp

Changeset View

Standalone View

View Options

kcmkwin/kwinoptions/main.cpp

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Line(s)68{
73 tab = new QTabWidget(this); 73​ tab = new QTabWidget(this);
74 layout->addWidget(tab); 74​ layout->addWidget(tab);
75 75​
76 mFocus = new KFocusConfig(false, mConfig, this); 76​ mFocus = new KFocusConfig(false, mConfig, this);
77 mFocus->setObjectName(QLatin1String("KWin Focus Config")); 77​ mFocus->setObjectName(QLatin1String("KWin Focus Config"));
78 tab->addTab(mFocus, i18n("&Focus")); 78​ tab->addTab(mFocus, i18n("&Focus"));
79 connect(mFocus, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed)); 79​ connect(mFocus, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
80 80​
81 mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this); 81​ mTitleBarActions = new KTitleBarActionsConfig(false, this);
82 mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions")); 82​ mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions"));
83 tab->addTab(mTitleBarActions, i18n("Titlebar A&ctions")); 83​ tab->addTab(mTitleBarActions, i18n("Titlebar A&ctions"));
84 connect(mTitleBarActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed)); 84​ connect(mTitleBarActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
85​ connect(mTitleBarActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
85 86​
86 mWindowActions = new KWindowActionsConfig(false, mConfig, this); 87​ mWindowActions = new KWindowActionsConfig(false, this);
87 mWindowActions->setObjectName(QLatin1String("KWin Window Actions")); 88​ mWindowActions->setObjectName(QLatin1String("KWin Window Actions"));
88 tab->addTab(mWindowActions, i18n("W&indow Actions")); 89​ tab->addTab(mWindowActions, i18n("W&indow Actions"));
89 connect(mWindowActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed)); 90​ connect(mWindowActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
91​ connect(mWindowActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
90 92​
91 mMoving = new KMovingConfig(false, this); 93​ mMoving = new KMovingConfig(false, this);
92 mMoving->setObjectName(QLatin1String("KWin Moving")); 94​ mMoving->setObjectName(QLatin1String("KWin Moving"));
93 tab->addTab(mMoving, i18n("Mo&vement")); 95​ tab->addTab(mMoving, i18n("Mo&vement"));
94 connect(mMoving, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed)); 96​ connect(mMoving, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
95 connect(mMoving, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted)); 97​ connect(mMoving, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
96 98​
97 mAdvanced = new KAdvancedConfig(false, this); 99​ mAdvanced = new KAdvancedConfig(false, this);
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s)140{
144 146​
145 emit KCModule::changed(false); 147​ emit KCModule::changed(false);
146 // Send signal to kwin 148​ // Send signal to kwin
147 mConfig->sync(); 149​ mConfig->sync();
148 // Send signal to all kwin instances 150​ // Send signal to all kwin instances
149 QDBusMessage message = 151​ QDBusMessage message =
150 QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); 152​ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
151 QDBusConnection::sessionBus().send(message); 153​ QDBusConnection::sessionBus().send(message);
152 ​
153 ​
154} 154​}
155 155​
156 156​
157void KWinOptions::defaults() 157​void KWinOptions::defaults()
158{ 158​{
159 mFocus->defaults(); 159​ mFocus->defaults();
160 mTitleBarActions->defaults(); 160​ mTitleBarActions->defaults();
161 mWindowActions->defaults(); 161​ mWindowActions->defaults();
162 mMoving->defaults(); 162​ mMoving->defaults();
163 mAdvanced->defaults(); 163​ mAdvanced->defaults();
164} 164​}
165 165​
166QString KWinOptions::quickHelp() const 166​QString KWinOptions::quickHelp() const
167{ 167​{
168 return i18n("<p><h1>Window Behavior</h1> Here you can customize the way windows behave when being" 168​ return i18n("<p><h1>Window Behavior</h1> Here you can customize the way windows behave when being"
169 " moved, resized or clicked on. You can also specify a focus policy as well as a placement" 169​ " moved, resized or clicked on. You can also specify a focus policy as well as a placement"
170 " policy for new windows.</p>" 170​ " policy for new windows.</p>"
171 " <p>Please note that this configuration will not take effect if you do not use" 171​ " <p>Please note that this configuration will not take effect if you do not use"
172 " KWin as your window manager. If you do use a different window manager, please refer to its documentation" 172​ " KWin as your window manager. If you do use a different window manager, please refer to its documentation"
173 " for how to customize window behavior.</p>"); 173​ " for how to customize window behavior.</p>");
174} 174​}
175 175​
176void KWinOptions::moduleChanged(bool state) ​
177{ ​
178 emit KCModule::changed(state); ​
179} ​
180 ​
181KActionsOptions::KActionsOptions(QWidget *parent, const QVariantList &) 176​KActionsOptions::KActionsOptions(QWidget *parent, const QVariantList &)
182 : KCModule(parent) 177​ : KCModule(parent)
183{ 178​{
184 mConfig = new KConfig("kwinrc"); 179​ mConfig = new KConfig("kwinrc");
185 180​
186 QVBoxLayout *layout = new QVBoxLayout(this); 181​ QVBoxLayout *layout = new QVBoxLayout(this);
187 layout->setContentsMargins(0, 0, 0, 0); 182​ layout->setContentsMargins(0, 0, 0, 0);
188 tab = new QTabWidget(this); 183​ tab = new QTabWidget(this);
189 layout->addWidget(tab); 184​ layout->addWidget(tab);
190 185​
191 mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this); 186​ mTitleBarActions = new KTitleBarActionsConfig(false, this);
192 mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions")); 187​ mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions"));
193 tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); 188​ tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
194 connect(mTitleBarActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed)); 189​ connect(mTitleBarActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
190​ connect(mTitleBarActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
195 191​
196 mWindowActions = new KWindowActionsConfig(false, mConfig, this); 192​ mWindowActions = new KWindowActionsConfig(false, this);
mevenAuthorUnsubmitted
Done

That's wrong, those lines should not be removed

meven: That's wrong, those lines should not be removed
197 mWindowActions->setObjectName(QLatin1String("KWin Window Actions")); 193​ mWindowActions->setObjectName(QLatin1String("KWin Window Actions"));
198 tab->addTab(mWindowActions, i18n("Window Actio&ns")); 194​ tab->addTab(mWindowActions, i18n("Window Actio&ns"));
199 connect(mWindowActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed)); 195​ connect(mWindowActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
196​ connect(mWindowActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
200} 197​}
201 198​
202KActionsOptions::~KActionsOptions() 199​KActionsOptions::~KActionsOptions()
203{ 200​{
204 delete mConfig; 201​ delete mConfig;
205} 202​}
206 203​
207void KActionsOptions::load() 204​void KActionsOptions::load()
208{ 205​{
209 mTitleBarActions->load(); 206​ mTitleBarActions->load();
210 mWindowActions->load(); 207​ mWindowActions->load();
ervinUnsubmitted
Done

Sure about that?

ervin: Sure about that?
211 emit KCModule::changed(false); ​
212} 208​}
213 209​
214 ​
215void KActionsOptions::save() 210​void KActionsOptions::save()
216{ 211​{
217 mTitleBarActions->save(); 212​ mTitleBarActions->save();
218 mWindowActions->save(); 213​ mWindowActions->save();
219 214​
220 emit KCModule::changed(false); 215​ emit KCModule::changed(false);
221 // Send signal to kwin 216​ // Send signal to kwin
222 mConfig->sync(); 217​ mConfig->sync();
223 // Send signal to all kwin instances 218​ // Send signal to all kwin instances
224 QDBusMessage message = 219​ QDBusMessage message =
225 QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); 220​ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
226 QDBusConnection::sessionBus().send(message); 221​ QDBusConnection::sessionBus().send(message);
227 ​
228} 222​}
229 223​
230 ​
231void KActionsOptions::defaults() 224​void KActionsOptions::defaults()
232{ 225​{
233 mTitleBarActions->defaults(); 226​ mTitleBarActions->defaults();
234 mWindowActions->defaults(); 227​ mWindowActions->defaults();
ervinUnsubmitted
Done

Sure about that?

(This comment and the previous one are due to you apparently reverting a past mistake but I wonder if you missed a bit of it)

ervin: Sure about that? (This comment and the previous one are due to you apparently reverting a past…
235 ​
236 emit defaulted(true); ​
237} 228​}
238 229​
239void KActionsOptions::moduleChanged(bool state) 230​void KActionsOptions::moduleChanged(bool state)
240{ 231​{
241 emit KCModule::changed(state); 232​ emit KCModule::changed(state);
242} 233​}
243 234​
244K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory, 235​K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory,
Show All 9 Lines