-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
+ 0
+ 0
@@ -830,6 +739,9 @@
coTiInAct2
coTiAct3
coTiInAct3
+ leftClickMaximizeButton
+ middleClickMaximizeButton
+ rightClickMaximizeButton
diff --git a/kcmkwin/kwinoptions/moving.ui b/kcmkwin/kwinoptions/moving.ui
index eb04689a0f..97f38a8bdb 100644
--- a/kcmkwin/kwinoptions/moving.ui
+++ b/kcmkwin/kwinoptions/moving.ui
@@ -6,259 +6,159 @@
0
0
- 624
- 354
+ 600
+ 500
-
+
+
+ Qt::AlignHCenter|Qt::AlignTop
+
-
-
-
- Qt::Horizontal
+
+
+ Window &geometry:
-
-
- 40
- 20
-
+
+ geometryTipOn
-
+
-
-
-
-
-
-
- Here you can set that windows will be only snapped if you try to overlap them, i.e. they will not be snapped if the windows comes only near another window or border.
-
-
- Snap windows onl&y when overlapping
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Here you can set the snap zone for the screen center, i.e. the 'strength' of the magnetic field which will make windows snap to the center of the screen when moved near it.
-
-
- 10
-
-
- 0
-
-
- 100
-
-
- pixel
-
-
- no center snap zone
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 107
- 20
-
-
-
-
- -
-
-
- &Border snap zone:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- borderSnap
-
-
-
- -
-
-
- &Center snap zone:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- centerSnap
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Here you can set the snap zone for windows, i.e. the 'strength' of the magnetic field which will make windows snap to each other when they are moved near another window.
-
-
- 10
-
-
- 0
-
-
- 100
-
-
- pixel
-
-
- no window snap zone
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Here you can set the snap zone for screen borders, i.e. the 'strength' of the magnetic field which will make windows snap to the border when moved near it.
-
-
- 10
-
-
- 0
-
-
- 100
-
-
- pixel
-
-
- no border snap zone
-
-
-
- -
-
-
- Enable this option if you want a window's geometry to be displayed while it is being moved or resized. The window position relative to the top-left corner of the screen is displayed together with its size.
-
-
- Display window &geometry when moving or resizing
-
-
-
- -
-
-
- &Window snap zone:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- windowSnap
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 90
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- Windows
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- Snap Zones
-
-
-
-
+
+
+ Enable this option if you want a window's geometry to be displayed while it is being moved or resized. The window position relative to the top-left corner of the screen is displayed together with its size.
+
+
+ Display when moving or resizing
+
+
- -
-
-
- Qt::Horizontal
+
-
+
+
+ Screen &edge snap zone:
-
-
- 40
- 20
-
+
+ borderSnap
-
+
+
+ -
+
+
+ Here you can set the snap zone for screen edges, i.e. the 'strength' of the magnetic field which will make windows snap to the border when moved near it.
+
+
+ None
+
+
+ px
+
+
+ 0
+
+
+ 100
+
+
+ 10
+
+
+
+ -
+
+
+ Here you can set the snap zone for windows, i.e. the 'strength' of the magnetic field which will make windows snap to each other when they are moved near another window.
+
+
+ None
+
+
+ px
+
+
+ 0
+
+
+ 100
+
+
+ 10
+
+
+
+ -
+
+
+ Here you can set the snap zone for the screen center, i.e. the 'strength' of the magnetic field which will make windows snap to the center of the screen when moved near it.
+
+
+ None
+
+
+ px
+
+
+ 0
+
+
+ 100
+
+
+
+ -
+
+
+ Here you can set that windows will be only snapped if you try to overlap them, i.e. they will not be snapped if the windows comes only near another window or border.
+
+
+ Only when overlapping
+
+
+
+ -
+
+
+ &Window snap zone:
+
+
+ windowSnap
+
+
+
+ -
+
+
+ &Center snap zone:
+
+
+ centerSnap
+
+
+
+ -
+
+
+ &Snap windows:
+
+
+ OverlapSnap
+
+
-
-
+
Qt::Vertical
+
+ QSizePolicy::Fixed
+
20
- 112
+ 2
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index b1d640d5c4..1fe6a88daf 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -95,10 +95,10 @@ KFocusConfig::KFocusConfig(bool _standAlone, KConfig *_config, QWidget * parent)
, m_ui(new KWinFocusConfigForm(this))
{
connect(m_ui->focusStealing, SIGNAL(activated(int)), SLOT(changed()));
- connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), this, SLOT(focusPolicyChanged()));
- connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), this, SLOT(setDelayFocusEnabled()));
- connect(m_ui->windowFocusPolicy, SIGNAL(valueChanged(int)), this, SLOT(updateActiveMouseScreen()));
+ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), SLOT(changed()));
+ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(focusPolicyChanged()));
+ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setDelayFocusEnabled()));
+ connect(m_ui->windowFocusPolicyCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateActiveMouseScreen()));
connect(m_ui->autoRaiseOn, SIGNAL(clicked()), SLOT(changed()));
connect(m_ui->autoRaiseOn, SIGNAL(toggled(bool)), SLOT(autoRaiseOnTog(bool)));
connect(m_ui->clickRaiseOn, SIGNAL(clicked()), SLOT(changed()));
@@ -115,13 +115,15 @@ KFocusConfig::KFocusConfig(bool _standAlone, KConfig *_config, QWidget * parent)
void KFocusConfig::updateMultiScreen()
{
- m_ui->multiscreenBox->setVisible(QApplication::screens().count() > 1);
+ m_ui->multiscreenBehaviorLabel->setVisible(QApplication::screens().count() > 1);
+ m_ui->activeMouseScreen->setVisible(QApplication::screens().count() > 1);
+ m_ui->separateScreenFocus->setVisible(QApplication::screens().count() > 1);
}
int KFocusConfig::getFocus()
{
- int policy = m_ui->windowFocusPolicy->value();
+ int policy = m_ui->windowFocusPolicyCombo->currentIndex();
if (policy == 1 || policy == 3)
--policy; // fix the NextFocusPrefersMouse condition
return policy;
@@ -129,7 +131,7 @@ int KFocusConfig::getFocus()
void KFocusConfig::setFocus(int foc)
{
- m_ui->windowFocusPolicy->setValue(foc);
+ m_ui->windowFocusPolicyCombo->setCurrentIndex(foc);
// this will disable/hide the auto raise delay widget if focus==click
focusPolicyChanged();
@@ -167,6 +169,27 @@ void KFocusConfig::setClickRaise(bool on)
void KFocusConfig::focusPolicyChanged()
{
+ switch (m_ui->windowFocusPolicyCombo->currentIndex()) {
+ case 0:
+ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("
Click to focus: A window becomes active when you click into it. This behavior is common on other operating systems and likely what you want.
"));
+ break;
+ case 1:
+ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n(" Click to focus (mouse precedence): Mostly the same as Click to focus. 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 Click to focus.
"));
+ break;
+ case 2:
+ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("Focus follows mouse: Moving the mouse onto a window will activate it. Eg. windows randomly appearing under the mouse will not gain the focus. Focus stealing prevention takes place as usual. Think as Click to focus just without having to actually click.
"));
+ break;
+ case 3:
+ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("This is mostly the same as Focus follows mouse. 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.
"));
+ break;
+ case 4:
+ m_ui->windowFocusPolicyDescriptionLabel->setText(i18n("