diff --git a/kcmkwin/kwinoptions/moving.ui b/kcmkwin/kwinoptions/moving.ui index b6cb0bc759..de2c0919e6 100644 --- a/kcmkwin/kwinoptions/moving.ui +++ b/kcmkwin/kwinoptions/moving.ui @@ -25,156 +25,25 @@ - - - + + + + + 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 - - - 90 - 20 - - - - - - - - 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 - - - - - - - Qt::Horizontal - - - - 100 - 20 - - - - - - - - When enabled, this feature activates the border of maximized windows and allows you to move or resize them, just like for normal windows - - - Display borders on &maximized windows - - - - - - - Qt::Horizontal - - - - - - - &Border snap zone: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - borderSnap - - - - - - - - 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 - - - - - - - &Window snap zone: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - windowSnap - - - - - 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 - - - - - - - &Center snap zone: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - centerSnap - - - - @@ -202,7 +71,7 @@ - + Qt::Horizontal @@ -215,18 +84,126 @@ - - - - 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 + &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 @@ -245,7 +222,7 @@ - + diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp index 3660e5ccb9..3deabc89a1 100644 --- a/kcmkwin/kwinoptions/windows.cpp +++ b/kcmkwin/kwinoptions/windows.cpp @@ -52,7 +52,6 @@ #define KWIN_AUTORAISE "AutoRaise" #define KWIN_DELAYFOCUS_INTERVAL "DelayFocusInterval" #define KWIN_CLICKRAISE "ClickRaise" -#define KWIN_MOVE_RESIZE_MAXIMIZED "MoveResizeMaximizedWindows" #define KWIN_SHADEHOVER "ShadeHover" #define KWIN_SHADEHOVER_INTERVAL "ShadeHoverInterval" #define KWIN_FOCUS_STEALING "FocusStealingPreventionLevel" @@ -502,7 +501,6 @@ KMovingConfig::KMovingConfig(bool _standAlone, KConfig *_config, const KComponen { // Any changes goes to slotChanged() connect(m_ui->geometryTipOn, SIGNAL(clicked()), SLOT(changed())); - connect(m_ui->moveResizeMaximized, SIGNAL(toggled(bool)), SLOT(changed())); connect(m_ui->borderSnap, SIGNAL(valueChanged(int)), SLOT(changed())); connect(m_ui->windowSnap, SIGNAL(valueChanged(int)), SLOT(changed())); connect(m_ui->centerSnap, SIGNAL(valueChanged(int)), SLOT(changed())); @@ -521,11 +519,6 @@ bool KMovingConfig::getGeometryTip() return m_ui->geometryTipOn->isChecked(); } -void KMovingConfig::setMoveResizeMaximized(bool a) -{ - m_ui->moveResizeMaximized->setChecked(a); -} - void KMovingConfig::showEvent(QShowEvent *ev) { if (!standAlone) { @@ -546,8 +539,6 @@ void KMovingConfig::load(void) setGeometryTip(showGeomTip); - setMoveResizeMaximized(cg.readEntry(KWIN_MOVE_RESIZE_MAXIMIZED, false)); - int v; v = cg.readEntry(KWM_BRDR_SNAP_ZONE, KWM_BRDR_SNAP_ZONE_DEFAULT); @@ -573,7 +564,6 @@ void KMovingConfig::save(void) { KConfigGroup cg(config, "Windows"); cg.writeEntry(KWIN_GEOMETRY, getGeometryTip()); - cg.writeEntry(KWIN_MOVE_RESIZE_MAXIMIZED, m_ui->moveResizeMaximized->isChecked()); cg.writeEntry(KWM_BRDR_SNAP_ZONE, getBorderSnapZone()); @@ -596,7 +586,6 @@ void KMovingConfig::save(void) void KMovingConfig::defaults() { setGeometryTip(false); - setMoveResizeMaximized(false); //copied from kcontrol/konq/kwindesktop, aleXXX setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT); diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h index 939ba21c3e..068196c688 100644 --- a/kcmkwin/kwinoptions/windows.h +++ b/kcmkwin/kwinoptions/windows.h @@ -149,7 +149,6 @@ private: bool getGeometryTip(void); //KS void setGeometryTip(bool); //KS - void setMoveResizeMaximized(bool); KConfig *config; bool standAlone;