diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 4bda101b2e..dffcbc3ab0 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -80,7 +80,7 @@ Name[x-test]=xxScreen Edgesxx Name[zh_CN]=屏幕边缘 Name[zh_TW]=螢幕邊緣 -Comment=Active Screen Corners and Edges +Comment=Configure active screen corners and edges Comment[bs]=Ivice i uglovi aktivnog ekrana Comment[ca]=Cantonades i vores actives de la pantalla Comment[ca@valencia]=Cantons i vores actives de la pantalla diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index c04d625f39..ab13151486 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -48,7 +48,7 @@ Name[uk]=Сенсорна панель Name[x-test]=xxTouch Screenxx Name[zh_CN]=触摸屏 Name[zh_TW]=觸控螢幕 -Comment=Touch screen swipe gestures +Comment=Configure touch screen swipe gestures Comment[ca]=Gestos de lliscament en la pantalla tàctil Comment[ca@valencia]=Gestos de lliscament en la pantalla tàctil Comment[da]=Strygegestusser til touchskærm diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp index 72c14bc4e5..a06604a042 100644 --- a/kcmkwin/kwinscreenedges/main.cpp +++ b/kcmkwin/kwinscreenedges/main.cpp @@ -61,7 +61,7 @@ KWinScreenEdgesConfig::KWinScreenEdgesConfig(QWidget* parent, const QVariantList connect(m_ui->triggerCooldownSpin, SIGNAL(valueChanged(int)), this, SLOT(changed())); connect(m_ui->quickMaximizeBox, SIGNAL(stateChanged(int)), this, SLOT(changed())); connect(m_ui->quickTileBox, SIGNAL(stateChanged(int)), this, SLOT(changed())); - connect(m_ui->electricBorderCornerRatio, SIGNAL(valueChanged(int)), this, SLOT(changed())); + connect(m_ui->electricBorderCornerRatioSpin, SIGNAL(valueChanged(int)), this, SLOT(changed())); // Visual feedback of action group conflicts connect(m_ui->desktopSwitchCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(groupChanged())); @@ -102,7 +102,7 @@ void KWinScreenEdgesConfig::load() m_ui->triggerCooldownSpin->setValue(config.readEntry("ElectricBorderCooldown", 350)); m_ui->quickMaximizeBox->setChecked(config.readEntry("ElectricBorderMaximize", true)); m_ui->quickTileBox->setChecked(config.readEntry("ElectricBorderTiling", true)); - m_ui->electricBorderCornerRatio->setValue(qRound(config.readEntry("ElectricBorderCornerRatio", 0.25)*100)); + m_ui->electricBorderCornerRatioSpin->setValue(qRound(config.readEntry("ElectricBorderCornerRatio", 0.25)*100)); emit changed(false); } @@ -120,7 +120,7 @@ void KWinScreenEdgesConfig::save() config.writeEntry("ElectricBorderCooldown", m_ui->triggerCooldownSpin->value()); config.writeEntry("ElectricBorderMaximize", m_ui->quickMaximizeBox->isChecked()); config.writeEntry("ElectricBorderTiling", m_ui->quickTileBox->isChecked()); - config.writeEntry("ElectricBorderCornerRatio", m_ui->electricBorderCornerRatio->value()/100.0); + config.writeEntry("ElectricBorderCornerRatio", m_ui->electricBorderCornerRatioSpin->value()/100.0); config.sync(); @@ -147,7 +147,7 @@ void KWinScreenEdgesConfig::defaults() m_ui->triggerCooldownSpin->setValue(350); m_ui->quickMaximizeBox->setChecked(true); m_ui->quickTileBox->setChecked(true); - m_ui->electricBorderCornerRatio->setValue(25); + m_ui->electricBorderCornerRatioSpin->setValue(25); emit changed(true); } diff --git a/kcmkwin/kwinscreenedges/main.ui b/kcmkwin/kwinscreenedges/main.ui index b3813f36f1..59c75f7da9 100644 --- a/kcmkwin/kwinscreenedges/main.ui +++ b/kcmkwin/kwinscreenedges/main.ui @@ -6,281 +6,262 @@ 0 0 - 488 - 511 + 500 + 525 + + + 500 + 525 + + - - - Active Screen Corners and Edges + + + You can trigger an action by pushing the mouse cursor against the corresponding screen edge or corner. - - - - - - 200 - 200 - - - - Qt::StrongFocus - - - - - - - Trigger an action by pushing the mouse cursor against the corresponding screen edge or corner - - - Qt::AlignCenter - - - true - - - - - - - - - - Window Management - - - - - - Maximize windows by dragging them to the top edge of the screen - - - - - - - Tile windows by dragging them to the left or right edges of the screen - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - false - - - Quarter tiling triggered in the outer - - - electricBorderCornerRatio - - - - - - - false - - - % - - - 1 - - - 49 - - - - - - - false - - - of the screen - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - + true - - Other Settings - - - - QFormLayout::AllNonFixedFieldsGrow - - - 0 - - - - - Change desktop when the mouse cursor is pushed against the edge of the screen - - - &Switch desktop on edge: - - - desktopSwitchCombo - - - - - - - - Disabled - - - - - Only When Moving Windows - - - - - Always Enabled - - - - - - - - Amount of time required for the mouse cursor to be pushed against the edge of the screen before the action is triggered - - - Activation &delay: - - - activationDelaySpin - - - - - - - ms - - - 1000 - - - 50 - - - 0 - - - - - - - true - - - Amount of time required after triggering an action until the next trigger can occur - - - &Reactivation delay: - - - triggerCooldownSpin - - - - - - - true - - - ms - - - 1000 - - - 50 - - - 0 - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - + Qt::Vertical + + QSizePolicy::Minimum + 20 - 0 + 20 + + + + + 200 + 200 + + + + Qt::StrongFocus + + + + + + + Qt::AlignHCenter|Qt::AlignTop + + + + + &Maximize: + + + quickMaximizeBox + + + + + + + Windows dragged to top edge + + + + + + + &Tile: + + + quickTileBox + + + + + + + Windows dragged to left or right edge + + + + + + + Trigger &quarter tiling in: + + + electricBorderCornerRatioSpin + + + + + + + + + false + + + % + + + Outer + + + 1 + + + 49 + + + + + + + false + + + of the screen + + + + + + + + + Change desktop when the mouse cursor is pushed against the edge of the screen + + + &Switch desktop on edge: + + + desktopSwitchCombo + + + + + + + + Disabled + + + + + Only When Moving Windows + + + + + Always Enabled + + + + + + + + Amount of time required for the mouse cursor to be pushed against the edge of the screen before the action is triggered + + + Activation &delay: + + + activationDelaySpin + + + + + + + ms + + + 1000 + + + 50 + + + 0 + + + + + + + true + + + Amount of time required after triggering an action until the next trigger can occur + + + &Reactivation delay: + + + triggerCooldownSpin + + + + + + + true + + + ms + + + 1000 + + + 50 + + + 0 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 4 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + @@ -296,59 +277,53 @@ 1 - - monitor - desktopSwitchCombo - activationDelaySpin - triggerCooldownSpin - quickTileBox toggled(bool) - label_3 + label_1 setEnabled(bool) - 93 - 306 + 20 + 20 - 105 - 329 + 20 + 20 quickTileBox toggled(bool) - electricBorderCornerRatio + electricBorderCornerRatioSpin setEnabled(bool) - 164 - 312 + 20 + 20 - 301 - 345 + 20 + 20 quickTileBox toggled(bool) - label_4 + electricBorderCornerRatioLabel setEnabled(bool) - 220 - 305 + 20 + 20 - 340 - 329 + 20 + 20 diff --git a/kcmkwin/kwinscreenedges/touch.ui b/kcmkwin/kwinscreenedges/touch.ui index 997989bb95..e82c5af447 100644 --- a/kcmkwin/kwinscreenedges/touch.ui +++ b/kcmkwin/kwinscreenedges/touch.ui @@ -6,19 +6,39 @@ 0 0 - 748 - 332 + 500 + 500 - - - - 0 - 0 - + + + You can trigger an action by swiping from the screen edge towards the center of the screen. + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 20 + + + + + + 200 @@ -31,29 +51,10 @@ - - - Trigger an action by swiping from the screen edge towards the center of the screen - - - Qt::AlignCenter - - - true - - - - - + Qt::Vertical - - - 20 - 0 - -