Differential D23615 Diff 65697 kcmkwin/kwinoptions/windows.cpp

Changeset View

Standalone View

View Options

kcmkwin/kwinoptions/windows.cpp

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s)
90} 90​}
91 91​
92// removed the LCD display over the slider - this is not good GUI design :) RNolden 051701 92​// removed the LCD display over the slider - this is not good GUI design :) RNolden 051701
93KFocusConfig::KFocusConfig(bool _standAlone, KConfig *_config, QWidget * parent) 93​KFocusConfig::KFocusConfig(bool _standAlone, KConfig *_config, QWidget * parent)
94 : KCModule(parent), config(_config), standAlone(_standAlone) 94​ : KCModule(parent), config(_config), standAlone(_standAlone)
95 , m_ui(new KWinFocusConfigForm(this)) 95​ , m_ui(new KWinFocusConfigForm(this))
96{ 96​{
97 connect(m_ui->focusStealing, SIGNAL(activated(int)), SLOT(changed())); 97​ connect(m_ui->focusStealing, SIGNAL(activated(int)), SLOT(changed()));
98 connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), SLOT(changed())); 98​ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), SLOT(changed()));
99 connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), this, SLOT(focusPolicyChanged())); 99​ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(focusPolicyChanged()));
100 connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), this, SLOT(setDelayFocusEnabled())); 100​ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setDelayFocusEnabled()));
101 connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), this, SLOT(updateActiveMouseScreen())); 101​ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateActiveMouseScreen()));
102 connect(m_ui->autoRaiseOn, SIGNAL(clicked()), SLOT(changed())); 102​ connect(m_ui->autoRaiseOn, SIGNAL(clicked()), SLOT(changed()));
103 connect(m_ui->autoRaiseOn, SIGNAL(toggled(bool)), SLOT(autoRaiseOnTog(bool))); 103​ connect(m_ui->autoRaiseOn, SIGNAL(toggled(bool)), SLOT(autoRaiseOnTog(bool)));
104 connect(m_ui->clickRaiseOn, SIGNAL(clicked()), SLOT(changed())); 104​ connect(m_ui->clickRaiseOn, SIGNAL(clicked()), SLOT(changed()));
105 connect(m_ui->autoRaise, SIGNAL(valueChanged(int)), SLOT(changed())); 105​ connect(m_ui->autoRaise, SIGNAL(valueChanged(int)), SLOT(changed()));
106 connect(m_ui->delayFocus, SIGNAL(valueChanged(int)), SLOT(changed())); 106​ connect(m_ui->delayFocus, SIGNAL(valueChanged(int)), SLOT(changed()));
107 connect(m_ui->separateScreenFocus, SIGNAL(clicked()), SLOT(changed())); 107​ connect(m_ui->separateScreenFocus, SIGNAL(clicked()), SLOT(changed()));
108 connect(m_ui->activeMouseScreen, SIGNAL(clicked()), SLOT(changed())); 108​ connect(m_ui->activeMouseScreen, SIGNAL(clicked()), SLOT(changed()));
109 109​
110 connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), SLOT(updateMultiScreen())); 110​ connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), SLOT(updateMultiScreen()));
111 updateMultiScreen(); 111​ updateMultiScreen();
112 112​
113 load(); 113​ load();
114} 114​}
115 115​
116void KFocusConfig::updateMultiScreen() 116​void KFocusConfig::updateMultiScreen()
117{ 117​{
118 m_ui->multiscreenBox->setVisible(QApplication::screens().count() > 1); 118​ m_ui->multiscreenBehaviorLabel->setVisible(QApplication::screens().count() > 1);
119​ m_ui->activeMouseScreen->setVisible(QApplication::screens().count() > 1);
120​ m_ui->separateScreenFocus->setVisible(QApplication::screens().count() > 1);
119} 121​}
120 122​
121 123​
122int KFocusConfig::getFocus() 124​int KFocusConfig::getFocus()
123{ 125​{
124 int policy = m_ui->windowFocusPolicy->value(); 126​ int policy = m_ui->windowFocusPolicyCombo->currentIndex();
125 if (policy == 1 || policy == 3) 127​ if (policy == 1 || policy == 3)
126 --policy; // fix the NextFocusPrefersMouse condition 128​ --policy; // fix the NextFocusPrefersMouse condition
127 return policy; 129​ return policy;
128} 130​}
129 131​
130void KFocusConfig::setFocus(int foc) 132​void KFocusConfig::setFocus(int foc)
131{ 133​{
132 m_ui->windowFocusPolicy->setValue(foc); 134​ m_ui->windowFocusPolicyCombo->setCurrentIndex(foc);
133 135​
134 // this will disable/hide the auto raise delay widget if focus==click 136​ // this will disable/hide the auto raise delay widget if focus==click
135 focusPolicyChanged(); 137​ focusPolicyChanged();
136} 138​}
137 139​
138void KFocusConfig::setAutoRaiseInterval(int tb) 140​void KFocusConfig::setAutoRaiseInterval(int tb)
139{ 141​{
140 m_ui->autoRaise->setValue(tb); 142​ m_ui->autoRaise->setValue(tb);
Show All 21 Lines
162 164​
163void KFocusConfig::setClickRaise(bool on) 165​void KFocusConfig::setClickRaise(bool on)
164{ 166​{
165 m_ui->clickRaiseOn->setChecked(on); 167​ m_ui->clickRaiseOn->setChecked(on);
166} 168​}
167 169​
168void KFocusConfig::focusPolicyChanged() 170​void KFocusConfig::focusPolicyChanged()
169{ 171​{
172​ switch (m_ui->windowFocusPolicyCombo->currentIndex()) {
zzagUnsubmitted
Done

Style: a switch statement should look like

switch (foo) {
case Foo:
    break;
case Bar:
    break;
}

i.e. cases are not indented and opening brace is kept on the same line as switch keyword.

zzag: Style: a switch statement should look like ```lang=cpp switch (foo) { case Foo: break…
173​ case 0:
174​ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("<html><head/><body><p><span style=\" font-style:italic;\">Click to focus:</span> A window becomes active when you click into it. This behavior is common on other operating systems and likely what you want.</p></body></html>"));
175​ break;
176​ case 1:
177​ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("<html><head/><body><p><span style=\" font-style:italic;\">Click to focus (mouse precedence):</span> Mostly the same as <span style=\" font-style:italic;\">Click to focus</span>. If an active window has to be chosen by the system (eg. because the currently active one was closed) the window under the mouse is the preferred candidate. Unusual, but possible variant of <span style=\" font-style:italic;\">Click to focus</span>.</p></body></html>"));
178​ break;
179​ case 2:
180​ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("<html><head/><body><p><span style=\" font-style:italic;\">Focus follows mouse:</span> Moving the mouse onto a window will activate it. Eg. windows randomly appearing under the mouse will not gain the focus. <span style=\" font-style:italic;\">Focus stealing prevention</span> takes place as usual. Think as <span style=\" font-style:italic;\">Click to focus</span> just without having to actually click.</p></body></html>"));
181​ break;
182​ case 3:
183​ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("<html><head/><body><p>This is mostly the same as <span style=\" font-style:italic;\">Focus follows mouse</span>. If an active window has to be chosen by the system (eg. because the currently active one was closed) the window under the mouse is the preferred candidate. Choose this, if you want a hover controlled focus.</p></body></html>"));
184​ break;
185​ case 4:
186​ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("<html><head/><body><p><span style=\" font-style:italic;\">Focus under mouse:</span> The focus always remains on the window under the mouse.<br/><span style=\" font-weight:600;\">Warning: </span><span style=\" font-style:italic;\">Focus stealing prevention</span> and the <span style=\" font-style:italic;\">tabbox ('Alt+Tab') </span>contradict the activation policy and will not work. You very likely want to use <span style=\" font-style:italic;\">Focus follows mouse (mouse precedence)</span> instead!</p></body></html>"));
187​ break;
188​ case 5:
189​ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("<html><head/><body><p><span style=\" font-style:italic;\">Focus strictly under mouse:</span> The focus is always on the window under the mouse (in doubt nowhere) very much like the focus behavior in an unmanaged legacy X11 environment.<br/><span style=\" font-weight:600;\">Warning: </span><span style=\" font-style:italic;\">Focus stealing prevention</span> and the <span style=\" font-style:italic;\">tabbox ('Alt+Tab') </span>contradict the activation policy and will not work. You very likely want to use <span style=\" font-style:italic;\">Focus follows mouse (mouse precedence)</span> instead!</p></body></html>"));
190​ break;
191​ }
192​
170 int policyIndex = getFocus(); 193​ int policyIndex = getFocus();
171 194​
172 // the auto raise related widgets are: autoRaise 195​ // the auto raise related widgets are: autoRaise
173 m_ui->autoRaiseOn->setEnabled(policyIndex != CLICK_TO_FOCUS); 196​ m_ui->autoRaiseOn->setEnabled(policyIndex != CLICK_TO_FOCUS);
174 autoRaiseOnTog(policyIndex != CLICK_TO_FOCUS && m_ui->autoRaiseOn->isChecked()); 197​ autoRaiseOnTog(policyIndex != CLICK_TO_FOCUS && m_ui->autoRaiseOn->isChecked());
175 198​
176 m_ui->focusStealing->setDisabled(policyIndex == FOCUS_UNDER_MOUSE || policyIndex == FOCUS_STRICTLY_UNDER_MOUSE); 199​ m_ui->focusStealing->setDisabled(policyIndex == FOCUS_UNDER_MOUSE || policyIndex == FOCUS_STRICTLY_UNDER_MOUSE);
177 m_ui->focusStealingLabel->setEnabled(m_ui->focusStealing->isEnabled()); 200​ m_ui->focusStealingLabel->setEnabled(m_ui->focusStealing->isEnabled());
▲ Show 20 Lines • Show All 106 Lines • ▼ Show 20 Line(s)306 if (v == CLICK_TO_FOCUS)
284 cg.writeEntry(KWIN_FOCUS, "ClickToFocus"); 307​ cg.writeEntry(KWIN_FOCUS, "ClickToFocus");
285 else if (v == FOCUS_UNDER_MOUSE) 308​ else if (v == FOCUS_UNDER_MOUSE)
286 cg.writeEntry(KWIN_FOCUS, "FocusUnderMouse"); 309​ cg.writeEntry(KWIN_FOCUS, "FocusUnderMouse");
287 else if (v == FOCUS_STRICTLY_UNDER_MOUSE) 310​ else if (v == FOCUS_STRICTLY_UNDER_MOUSE)
288 cg.writeEntry(KWIN_FOCUS, "FocusStrictlyUnderMouse"); 311​ cg.writeEntry(KWIN_FOCUS, "FocusStrictlyUnderMouse");
289 else 312​ else
290 cg.writeEntry(KWIN_FOCUS, "FocusFollowsMouse"); 313​ cg.writeEntry(KWIN_FOCUS, "FocusFollowsMouse");
291 314​
292 cg.writeEntry("NextFocusPrefersMouse", v != m_ui->windowFocusPolicy->value()); 315​ cg.writeEntry("NextFocusPrefersMouse", v != m_ui->windowFocusPolicyCombo->currentIndex());
293 316​
294 v = getAutoRaiseInterval(); 317​ v = getAutoRaiseInterval();
295 if (v < 0) v = 0; 318​ if (v < 0) v = 0;
296 cg.writeEntry(KWIN_AUTORAISE_INTERVAL, v); 319​ cg.writeEntry(KWIN_AUTORAISE_INTERVAL, v);
297 320​
298 v = getDelayFocusInterval(); 321​ v = getDelayFocusInterval();
299 if (v < 0) v = 0; 322​ if (v < 0) v = 0;
300 cg.writeEntry(KWIN_DELAYFOCUS_INTERVAL, v); 323​ cg.writeEntry(KWIN_DELAYFOCUS_INTERVAL, v);
Show All 14 Lines
315 if (standAlone) { 338​ if (standAlone) {
316 config->sync(); 339​ config->sync();
317 // Send signal to all kwin instances 340​ // Send signal to all kwin instances
318 QDBusMessage message = 341​ QDBusMessage message =
319 QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); 342​ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
320 QDBusConnection::sessionBus().send(message); 343​ QDBusConnection::sessionBus().send(message);
321 } 344​ }
322 emit KCModule::changed(false); 345​ emit KCModule::changed(false);
323} 346​}
324 347​
zzagUnsubmitted
Done

Why is it here?

zzag: Why is it here?
325void KFocusConfig::defaults() 348​void KFocusConfig::defaults()
326{ 349​{
327 setAutoRaiseInterval(0); 350​ setAutoRaiseInterval(0);
328 setDelayFocusInterval(0); 351​ setDelayFocusInterval(0);
329 setFocus(CLICK_TO_FOCUS); 352​ setFocus(CLICK_TO_FOCUS);
330 setAutoRaise(false); 353​ setAutoRaise(false);
331 setClickRaise(true); 354​ setClickRaise(true);
332 setSeparateScreenFocus(false); 355​ setSeparateScreenFocus(false);
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s)382{
376 m_ui->inactiveTabsSkipTaskbar->setVisible(false); // TODO: We want translations in case this is fixed... 399​ m_ui->inactiveTabsSkipTaskbar->setVisible(false); // TODO: We want translations in case this is fixed...
377 load(); 400​ load();
378 401​
379} 402​}
380 403​
381void KAdvancedConfig::setShadeHover(bool on) 404​void KAdvancedConfig::setShadeHover(bool on)
382{ 405​{
383 m_ui->shadeHoverOn->setChecked(on); 406​ m_ui->shadeHoverOn->setChecked(on);
384 m_ui->shadeHoverLabel->setEnabled(on); ​
385 m_ui->shadeHover->setEnabled(on); 407​ m_ui->shadeHover->setEnabled(on);
386} 408​}
387 409​
388void KAdvancedConfig::setShadeHoverInterval(int k) 410​void KAdvancedConfig::setShadeHoverInterval(int k)
389{ 411​{
390 m_ui->shadeHover->setValue(k); 412​ m_ui->shadeHover->setValue(k);
391} 413​}
392 414​
393int KAdvancedConfig::getShadeHoverInterval() 415​int KAdvancedConfig::getShadeHoverInterval()
394{ 416​{
395 417​
396 return m_ui->shadeHover->value(); 418​ return m_ui->shadeHover->value();
397} 419​}
398 420​
399void KAdvancedConfig::shadeHoverChanged(bool a) 421​void KAdvancedConfig::shadeHoverChanged(bool a)
400{ 422​{
401 m_ui->shadeHoverLabel->setEnabled(a); ​
402 m_ui->shadeHover->setEnabled(a); 423​ m_ui->shadeHover->setEnabled(a);
403} 424​}
404 425​
405void KAdvancedConfig::showEvent(QShowEvent *ev) 426​void KAdvancedConfig::showEvent(QShowEvent *ev)
406{ 427​{
407 if (!standAlone) { 428​ if (!standAlone) {
408 QWidget::showEvent(ev); 429​ QWidget::showEvent(ev);
409 return; 430​ return;
▲ Show 20 Lines • Show All 241 Lines • Show Last 20 Lines