diff --git a/kcmkwin/kwinoptions/actions.ui b/kcmkwin/kwinoptions/actions.ui index b2bb2f3f6f..cc9d5de830 100644 --- a/kcmkwin/kwinoptions/actions.ui +++ b/kcmkwin/kwinoptions/actions.ui @@ -6,531 +6,631 @@ 0 0 - 556 - 320 + 509 + 309 - + - - - Here you can customize mouse click behavior when clicking on an inactive inner window ('inner' means: not titlebar, not frame). - - - Inactive Inner Window - - - - - - &Left button: - - - coWin1 - - - - - - - - 0 - 0 - - - - In this row you can customize left click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). - - - - Activate, Raise & Pass Click - - - - - Activate & Pass Click - - - - - Activate - - - - - Activate & Raise - - - - - - - - M&iddle button: - - - coWin2 - - - - - - - - 0 - 0 - - - - In this row you can customize middle click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). - - - - Activate, Raise & Pass Click - - - - - Activate & Pass Click - - - - - Activate - - - - - Activate & Raise - - - - - - - - &Right button: - - - coWin3 - - - - - - - - 0 - 0 - - - - In this row you can customize right click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). - - - - Activate, Raise & Pass Click - - - - - Activate & Pass Click - - - - - Activate - - - - - Activate & Raise - - - - - - - - &Wheel - - - coWinWheel - - - - - - - - 0 - 0 - - - - In this row you can customize behavior when scrolling into an inactive inner window ('inner' means: not titlebar, not frame). - - - - Scroll - - - - - Activate & Scroll - - - - - Activate, Raise & Scroll - - - - - - - - - - - Here you can customize KDE's behavior when clicking somewhere into a window while pressing a modifier key. - - - Inner Window, Titlebar && Frame - - - - - - Modifier &key: - - - coAllKey - - - - - - - Here you select whether holding the Meta key or Alt key will allow you to perform the following actions. - - - - Meta - - - - - Alt - - - - - - - - + - - - - - - - - - Left &button - - - coAll1 - - - - - - - - 0 - 0 - - - - In this row you can customize left click behavior when clicking into the titlebar or the frame. - - - - Move - - - - - Activate, Raise & Move - - - - - Toggle Raise & Lower - - - - - Resize - - - - - Raise - - - - - Lower - - - - - Minimize - - - - - Decrease Opacity - - - - - Increase Opacity - - - - - Nothing - - - - - - - - - 0 - 0 - - - - In this row you can customize middle click behavior when clicking into the titlebar or the frame. - - - - Move - - - - - Activate, Raise & Move - - - - - Toggle Raise & Lower - - - - - Resize - - - - - Raise - - - - - Lower - - - - - Minimize - - - - - Decrease Opacity - - - - - Increase Opacity - - - - - Nothing - - - - - - - - - 0 - 0 - - - - In this row you can customize right click behavior when clicking into the titlebar or the frame. - - - - Move - - - - - Activate, Raise & Move - - - - - Toggle Raise & Lower - - - - - Resize - - - - - Raise - - - - - Lower - - - - - Minimize - - - - - Decrease Opacity - - - - - Increase Opacity - - - - - Nothing - - - - - - - - Middle b&utton: - - - coAll2 - - - - - - - Ri&ght button: - - - coAll3 - - - - - - - M&ouse wheel: - - - coAllW - - - - - - - - 0 - 0 - - - - Here you can customize KDE's behavior when scrolling with the mouse wheel in a window while pressing the modifier key. - - - - Raise/Lower - - - - - Shade/Unshade - - - - - Maximize/Restore - - - - - Keep Above/Below - - - - - Move to Previous/Next Desktop - - - - - Change Opacity - - - - - Switch to Window Tab to the Left/Right - - - - - Nothing - - - - - - - - - - - + - Qt::Vertical + Qt::Horizontal - 20 - 40 + 40 + 20 + + + + + + + + + + M&ouse wheel: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coAllW + + + + + + + + 0 + 0 + + + + In this row you can customize middle click behavior when clicking into the titlebar or the frame. + + + + Move + + + + + Activate, Raise & Move + + + + + Toggle Raise & Lower + + + + + Resize + + + + + Raise + + + + + Lower + + + + + Minimize + + + + + Decrease Opacity + + + + + Increase Opacity + + + + + Nothing + + + + + + + + Ri&ght button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coAll3 + + + + + + + &Wheel + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coWinWheel + + + + + + + Middle b&utton: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coAll2 + + + + + + + + 0 + 0 + + + + In this row you can customize right click behavior when clicking into the titlebar or the frame. + + + + Move + + + + + Activate, Raise & Move + + + + + Toggle Raise & Lower + + + + + Resize + + + + + Raise + + + + + Lower + + + + + Minimize + + + + + Decrease Opacity + + + + + Increase Opacity + + + + + Nothing + + + + + + + + Qt::Horizontal + + + + + + + &Left button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coWin1 + + + + + + + + 75 + true + + + + Inner Window, Titlebar & Frame + + + + + + + + 0 + 0 + + + + In this row you can customize middle click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). + + + + Activate, Raise & Pass Click + + + + + Activate & Pass Click + + + + + Activate + + + + + Activate & Raise + + + + + + + + &Right button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coWin3 + + + + + + + + 0 + 0 + + + + In this row you can customize behavior when scrolling into an inactive inner window ('inner' means: not titlebar, not frame). + + + + Scroll + + + + + Activate & Scroll + + + + + Activate, Raise & Scroll + + + + + + + + + 0 + 0 + + + + In this row you can customize left click behavior when clicking into the titlebar or the frame. + + + + Move + + + + + Activate, Raise & Move + + + + + Toggle Raise & Lower + + + + + Resize + + + + + Raise + + + + + Lower + + + + + Minimize + + + + + Decrease Opacity + + + + + Increase Opacity + + + + + Nothing + + + + + + + + + 0 + 0 + + + + Here you can customize KDE's behavior when scrolling with the mouse wheel in a window while pressing the modifier key. + + + + Raise/Lower + + + + + Shade/Unshade + + + + + Maximize/Restore + + + + + Keep Above/Below + + + + + Move to Previous/Next Desktop + + + + + Change Opacity + + + + + Switch to Window Tab to the Left/Right + + + + + Nothing + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + In this row you can customize left click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). + + + + Activate, Raise & Pass Click + + + + + Activate & Pass Click + + + + + Activate + + + + + Activate & Raise + + + + + + + + + 0 + 0 + + + + In this row you can customize right click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). + + + + Activate, Raise & Pass Click + + + + + Activate & Pass Click + + + + + Activate + + + + + Activate & Raise + + + + + + + + M&iddle button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coWin2 + + + + + + + Qt::Horizontal + + + + + + + + 75 + true + + + + Inactive Inner Window + + + + + + + Left &button + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coAll1 + + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + Modifier &key: + + + coAllKey + + + + + + + Here you select whether holding the Meta key or Alt key will allow you to perform the following actions. + + + + Meta + + + + + Alt + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 @@ -544,6 +644,17 @@
kcombobox.h
+ + coWin1 + coWin2 + coWin3 + coWinWheel + coAllKey + coAll1 + coAll2 + coAll3 + coAllW + diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui index 22c7f1aab7..f8b6c57a7d 100644 --- a/kcmkwin/kwinoptions/advanced.ui +++ b/kcmkwin/kwinoptions/advanced.ui @@ -6,76 +6,45 @@ 0 0 - 400 - 300 + 504 + 387 - - - - - Shading + + + + + Qt::Horizontal - - - - - - 0 - 0 - - - - Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window. - - - 500 - - - 0 - - - 3000 - - - 100 - - - ms - - - - - - - Dela&y: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - shadeHover - - - - - - - If Shade Hover is enabled, a shaded window will un-shade automatically when the mouse pointer has been over the title bar for some time. - - - &Enable hover - - - - - + + + 40 + 20 + + + - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + Window Tabbing + + true + @@ -110,88 +79,7 @@ - - - - - - - 0 - 0 - - - - The placement policy determines where a new window will appear on the desktop. -<ul> -<li><em>Smart</em> will try to achieve a minimum overlap of windows</li> -<li><em>Maximizing</em> will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.</li> -<li><em>Cascade</em> will cascade the windows</li> -<li><em>Random</em> will use a random position</li> -<li><em>Centered</em> will place the window centered</li> -<li><em>Zero-Cornered</em> will place the window in the top-left corner</li> -<li><em>Under Mouse</em> will place the window under the pointer</li> -</ul> - - - - Smart - - - - - Maximizing - - - - - Cascade - - - - - Random - - - - - Centered - - - - - Zero-Cornered - - - - - Under Mouse - - - - - - - - &Placement: - - - placementCombo - - - - - - - When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be hidden and will be shown only when the application becomes active. Note that applications have to mark the windows with the proper window type for this feature to work. - - - Hide utility windows for inactive applications - - - - - - + Qt::Vertical @@ -204,6 +92,170 @@ + + + + &Placement: + + + true + + + + + + + 0 + 0 + + + + The placement policy determines where a new window will appear on the desktop. +<ul> +<li><em>Smart</em> will try to achieve a minimum overlap of windows</li> +<li><em>Maximizing</em> will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.</li> +<li><em>Cascade</em> will cascade the windows</li> +<li><em>Random</em> will use a random position</li> +<li><em>Centered</em> will place the window centered</li> +<li><em>Zero-Cornered</em> will place the window in the top-left corner</li> +<li><em>Under Mouse</em> will place the window under the pointer</li> +</ul> + + + + Smart + + + + + Maximizing + + + + + Cascade + + + + + Random + + + + + Centered + + + + + Zero-Cornered + + + + + Under Mouse + + + + + + + + + + + Shading + + + true + + + + + + Dela&y: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + shadeHover + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 24 + 20 + + + + + + + + If Shade Hover is enabled, a shaded window will un-shade automatically when the mouse pointer has been over the title bar for some time. + + + &Enable hover + + + + + + + Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window. + + + 500 + + + 0 + + + 3000 + + + 100 + + + ms + + + + + + + + + + Special Windows + + + true + + + + + + When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be hidden and will be shown only when the application becomes active. Note that applications have to mark the windows with the proper window type for this feature to work. + + + Hide utility windows for inactive applications + + + + + + @@ -224,6 +276,15 @@
knuminput.h
 + + shadeHoverOn + shadeHover + inactiveTabsSkipTaskbar + autogroupSimilarWindows + autogroupInForeground + placementCombo + hideUtilityWindowsForInactive + diff --git a/kcmkwin/kwinoptions/focus.ui b/kcmkwin/kwinoptions/focus.ui index afbc467d45..4744dd8677 100644 --- a/kcmkwin/kwinoptions/focus.ui +++ b/kcmkwin/kwinoptions/focus.ui @@ -6,163 +6,100 @@ 0 0 - 470 - 224 + 574 + 313 - - - - - - 0 - 0 - + + + + + Qt::Horizontal - - The focus policy is used to determine the active window, i.e. the window you can work in. <ul> + + + 40 + 20 + + + + + + + + + + &Policy: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + focusCombo + + + + + + + + 0 + 0 + + + + The focus policy is used to determine the active window, i.e. the window you can work in. <ul> <li><em>Click to focus:</em> A window becomes active when you click into it. This is the behavior you might know from other operating systems.</li> <li><em>Focus follows mouse:</em> Moving the mouse pointer actively on to a normal window activates it. New windows will receive the focus, without you having to point the mouse at them explicitly. Very practical if you are using the mouse a lot.</li> <li><em>Focus under mouse:</em> The window that happens to be under the mouse pointer is active. If the mouse points nowhere, the last window that was under the mouse has focus. New windows will not automatically receive the focus.</li> <li><em>Focus strictly under mouse:</em> Only the window under the mouse pointer is active. If the mouse points nowhere, nothing has focus.</li> </ul> Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent certain features such as the Alt+Tab walk through windows dialog in the KDE mode from working properly. - - - - Click to Focus - + + + + Click to Focus + + + + + Focus Follows Mouse + + + + + Focus Under Mouse + + + + + Focus Strictly Under Mouse + + + - - - Focus Follows Mouse - + + + + Focus &stealing prevention level: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + focusStealing + + - - - Focus Under Mouse - - - - - Focus Strictly Under Mouse - - - - - - - - &Delay focus by: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - delayFocus - - - - - - - - 0 - 0 - - - - This is the delay after which the window the mouse pointer is over will automatically receive focus. - - - 100 - - - 0 - - - 3000 - - - 100 - - - ms - - - - - - - When this option is enabled, focus operations are limited only to the active Xinerama screen - - - S&eparate screen focus - - - - - - - When this option is enabled, a window in the background will automatically come to the front when the mouse pointer has been over it for some time. - - - &Raise, with the following delay: - - - - - - - When this option is enabled, the active Xinerama screen (where new windows appear, for example) is the screen containing the mouse pointer. When disabled, the active Xinerama screen is the screen containing the focused window. By default this option is disabled for Click to focus and enabled for other focus policies. - - - Active screen follows &mouse - - - - - - - &When the active window disappears, pass focus to window under mouse - - - - - - - Focus &stealing prevention level: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - focusStealing - - - - - - - &Policy: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - focusCombo - - - - - - - - 0 - 0 - - - - <p>This option specifies how much KWin will try to prevent unwanted focus stealing caused by unexpected activation of new windows. (Note: This feature does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus policies.) + + + + + 0 + 0 + + + + <p>This option specifies how much KWin will try to prevent unwanted focus stealing caused by unexpected activation of new windows. (Note: This feature does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus policies.) <ul> <li><em>None:</em> Prevention is turned off and new windows always become activated.</li> <li><em>Low:</em> Prevention is enabled; when some window does not have support for the underlying mechanism and KWin cannot reliably decide whether to activate the window or not, it will be activated. This setting may have both worse and better results than the medium level, depending on the applications.</li> @@ -171,71 +108,177 @@ Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent certain f <li><em>Extreme:</em> All windows must be explicitly activated by the user.</li> </ul></p> <p>Windows that are prevented from stealing focus are marked as demanding attention, which by default means their taskbar entry will be highlighted. This can be changed in the Notifications control module.</p> - - - - None - + + + + None + + + + + Low + + + + + Medium + + + + + High + + + + + Extreme + + + - - - Low - + + + + When this option is enabled, a window in the background will automatically come to the front when the mouse pointer has been over it for some time. + + + &Raise, with the following delay: + + - - - Medium - + + + + + 0 + 0 + + + + This is the delay after which the window that the mouse pointer is over will automatically come to the front. + + + 100 + + + 0 + + + 3000 + + + 100 + + + ms + + - - - High - + + + + &Delay focus by: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + delayFocus + + - - - Extreme - + + + + + 0 + 0 + + + + This is the delay after which the window the mouse pointer is over will automatically receive focus. + + + 100 + + + 0 + + + 3000 + + + 100 + + + ms + + - + + + + &When the active window disappears, pass focus to window under mouse + + + + + + + When this option is enabled, the active window will be brought to the front when you click somewhere into the window contents. To change it for inactive windows, you need to change the settings in the Actions tab. + + + C&lick raises active window + + + + + + + When this option is enabled, focus operations are limited only to the active Xinerama screen + + + S&eparate screen focus + + + + + + + When this option is enabled, the active Xinerama screen (where new windows appear, for example) is the screen containing the mouse pointer. When disabled, the active Xinerama screen is the screen containing the focused window. By default this option is disabled for Click to focus and enabled for other focus policies. + + + Active screen follows &mouse + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - When this option is enabled, the active window will be brought to the front when you click somewhere into the window contents. To change it for inactive windows, you need to change the settings in the Actions tab. + + + + Qt::Horizontal - - C&lick raises active window + + + 40 + 20 + - - - - - - - 0 - 0 - - - - This is the delay after which the window that the mouse pointer is over will automatically come to the front. - - - 100 - - - 0 - - - 3000 - - - 100 - - - ms - - + diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp index 2191054cf8..7ade064050 100644 --- a/kcmkwin/kwinoptions/mouse.cpp +++ b/kcmkwin/kwinoptions/mouse.cpp @@ -135,13 +135,13 @@ void createMaxButtonPixmaps() KWinMouseConfigForm::KWinMouseConfigForm(QWidget *parent) : QWidget(parent) { - setupUi(this); + setupUi(parent); } KWinActionsConfigForm::KWinActionsConfigForm(QWidget *parent) : QWidget(parent) { - setupUi(this); + setupUi(parent); } void KTitleBarActionsConfig::paletteChanged() diff --git a/kcmkwin/kwinoptions/mouse.ui b/kcmkwin/kwinoptions/mouse.ui index 0ad283a98c..a2f1abab86 100644 --- a/kcmkwin/kwinoptions/mouse.ui +++ b/kcmkwin/kwinoptions/mouse.ui @@ -6,34 +6,40 @@ 0 0 - 550 - 446 + 696 + 416 - + - - + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + - &Titlebar double-click: + &Double-click: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter coTiDbl - - - - Titlebar wheel event: - - - coTiAct4 - - - - + @@ -91,7 +97,20 @@ - + + + + Wheel event: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + coTiAct4 + + + + @@ -144,627 +163,651 @@ + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + In this column you can customize mouse clicks into the titlebar or the frame of an active window. + + + Active + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + In this column you can customize mouse clicks into the titlebar or the frame of an inactive window. + + + Inactive + + + Qt::AlignCenter + + + + + + + In this row you can customize left click behavior when clicking into the titlebar or the frame. + + + Left button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Behavior on <em>left</em> click into the titlebar or frame of an <em>active</em> window. + + + + Raise + + + + + Lower + + + + + Toggle Raise & Lower + + + + + Minimize + + + + + Shade + + + + + Close + + + + + Operations Menu + + + + + Start Window Tab Drag + + + + + Nothing + + + + + + + + + 0 + 0 + + + + Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. + + + + Activate & Raise + + + + + Activate & Lower + + + + + Activate + + + + + Raise + + + + + Lower + + + + + Toggle Raise & Lower + + + + + Minimize + + + + + Shade + + + + + Close + + + + + Operations Menu + + + + + Start Window Tab Drag + + + + + Nothing + + + + + + + + In this row you can customize middle click behavior when clicking into the titlebar or the frame. + + + Middle button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window. + + + + Raise + + + + + Lower + + + + + Toggle Raise & Lower + + + + + Minimize + + + + + Shade + + + + + Close + + + + + Operations Menu + + + + + Start Window Tab Drag + + + + + Nothing + + + + + + + + + 0 + 0 + + + + Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. + + + + Activate & Raise + + + + + Activate & Lower + + + + + Activate + + + + + Raise + + + + + Lower + + + + + Toggle Raise & Lower + + + + + Minimize + + + + + Shade + + + + + Close + + + + + Operations Menu + + + + + Start Window Tab Drag + + + + + Nothing + + + + + + + + In this row you can customize right click behavior when clicking into the titlebar or the frame. + + + Right button: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Behavior on <em>right</em> click into the titlebar or frame of an <em>active</em> window. + + + + Raise + + + + + Lower + + + + + Toggle Raise & Lower + + + + + Minimize + + + + + Shade + + + + + Close + + + + + Operations Menu + + + + + Start Window Tab Drag + + + + + Nothing + + + + + + + + + 0 + 0 + + + + Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. + + + + Activate & Raise + + + + + Activate & Lower + + + + + Activate + + + + + Raise + + + + + Lower + + + + + Toggle Raise & Lower + + + + + Minimize + + + + + Shade + + + + + Close + + + + + Operations Menu + + + + + Start Window Tab Drag + + + + + Nothing + + + + + + + + Qt::Horizontal + + + + + + + + + Behavior on <em>left</em> click onto the maximize button. + + + Left button: + + + Qt::AlignCenter + + + leftClickMaximizeButton + + + + + + + Behavior on <em>middle</em> click onto the maximize button. + + + Middle button: + + + Qt::AlignCenter + + + middleClickMaximizeButton + + + + + + + Behavior on <em>right</em> click onto the maximize button. + + + Right button: + + + Qt::AlignCenter + + + rightClickMaximizeButton + + + + + + + + 0 + 0 + + + + Behavior on <em>left</em> click onto the maximize button. + + + + + + + + 0 + 0 + + + + Behavior on <em>middle</em> click onto the maximize button. + + + + + + + + 0 + 0 + + + + Behavior on <em>right</em> click onto the maximize button. + + + + + + + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 75 + true + + + + Titlebar & Frame + + + + + + + + 75 + true + + + + Titlebar + + + + + + + + 75 + true + + + + Maximize Button + + + - - - Here you can customize mouse click behavior when clicking on the titlebar or the frame of a window. - - - Titlebar && Frame - - - - - - - 0 - 0 - - - - Behavior on <em>left</em> click into the titlebar or frame of an <em>active</em> window. - - - - Raise - - - - - Lower - - - - - Toggle Raise & Lower - - - - - Minimize - - - - - Shade - - - - - Close - - - - - Operations Menu - - - - - Start Window Tab Drag - - - - - Nothing - - - - - - - - In this row you can customize left click behavior when clicking into the titlebar or the frame. - - - Left button: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - In this column you can customize mouse clicks into the titlebar or the frame of an active window. - - - Active - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window. - - - - Raise - - - - - Lower - - - - - Toggle Raise & Lower - - - - - Minimize - - - - - Shade - - - - - Close - - - - - Operations Menu - - - - - Start Window Tab Drag - - - - - Nothing - - - - - - - - In this row you can customize right click behavior when clicking into the titlebar or the frame. - - - Right button: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - Behavior on <em>right</em> click into the titlebar or frame of an <em>active</em> window. - - - - Raise - - - - - Lower - - - - - Toggle Raise & Lower - - - - - Minimize - - - - - Shade - - - - - Close - - - - - Operations Menu - - - - - Start Window Tab Drag - - - - - Nothing - - - - - - - - In this row you can customize middle click behavior when clicking into the titlebar or the frame. - - - Middle button: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - In this column you can customize mouse clicks into the titlebar or the frame of an inactive window. - - - Inactive - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. - - - - Activate & Raise - - - - - Activate & Lower - - - - - Activate - - - - - Raise - - - - - Lower - - - - - Toggle Raise & Lower - - - - - Minimize - - - - - Shade - - - - - Close - - - - - Operations Menu - - - - - Start Window Tab Drag - - - - - Nothing - - - - - - - - - 0 - 0 - - - - Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. - - - - Activate & Raise - - - - - Activate & Lower - - - - - Activate - - - - - Raise - - - - - Lower - - - - - Toggle Raise & Lower - - - - - Minimize - - - - - Shade - - - - - Close - - - - - Operations Menu - - - - - Start Window Tab Drag - - - - - Nothing - - - - - - - - - 0 - 0 - - - - Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. - - - - Activate & Raise - - - - - Activate & Lower - - - - - Activate - - - - - Raise - - - - - Lower - - - - - Toggle Raise & Lower - - - - - Minimize - - - - - Shade - - - - - Close - - - - - Operations Menu - - - - - Start Window Tab Drag - - - - - Nothing - - - - - - - - - - - Here you can customize behavior when clicking on the maximize button. - - - Maximize Button - - - - - - - 0 - 0 - - - - Behavior on <em>left</em> click onto the maximize button. - - - Left button: - - - leftClickMaximizeButton - - - - - - - - 0 - 0 - - - - Behavior on <em>left</em> click onto the maximize button. - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 5 - 5 - - - - - - - - - 0 - 0 - - - - Behavior on <em>middle</em> click onto the maximize button. - - - Middle button: - - - middleClickMaximizeButton - - - - - - - - 0 - 0 - - - - Behavior on <em>middle</em> click onto the maximize button. - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 5 - 5 - - - - - - - - - 0 - 0 - - - - Behavior on <em>right</em> click onto the maximize button. - - - Right button: - - - rightClickMaximizeButton - - - - - - - - 0 - 0 - - - - Behavior on <em>right</em> click onto the maximize button. - - - - - - - - + - Qt::Vertical + Qt::Horizontal - 20 - 40 + 40 + 20 @@ -778,6 +821,16 @@
kcombobox.h
+ + coTiDbl + coTiAct4 + coTiAct1 + coTiInAct1 + coTiAct2 + coTiInAct2 + coTiAct3 + coTiInAct3 + diff --git a/kcmkwin/kwinoptions/moving.ui b/kcmkwin/kwinoptions/moving.ui index 86667c0830..18a3395978 100644 --- a/kcmkwin/kwinoptions/moving.ui +++ b/kcmkwin/kwinoptions/moving.ui @@ -6,221 +6,273 @@ 0 0 - 404 - 329 + 539 + 352 - + - - - Windows - - - - - - Display window &geometry when moving or resizing - - - geometryTipOn - - - - - - - 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. - - - - - - - - - - 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 - - - moveResizeMaximized - - - - - - - - - - Snap Zones - - - - - - &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 - - - - - - - - 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 - - - - - - - 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 - - - OverlapSnap - - - - - - - - + - Qt::Vertical + Qt::Horizontal - 20 - 40 + 40 + 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 + + + geometryTipOn + + + + + + + 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 + + + moveResizeMaximized + + + + + + + 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 + + + + + + + + 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 + + + + + + + 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 + + + OverlapSnap + + + + + + + Qt::Horizontal + + + + + + + + 75 + true + + + + Windows + + + + + + + + 75 + true + + + + Snap Zones + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 @@ -228,12 +280,6 @@ - - KButtonGroup - QGroupBox -
kbuttongroup.h
- 1 - KIntNumInput QWidget diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp index 1f36c3b37d..0c8d450cf4 100644 --- a/kcmkwin/kwinoptions/windows.cpp +++ b/kcmkwin/kwinoptions/windows.cpp @@ -86,7 +86,7 @@ KFocusConfig::~KFocusConfig() KWinFocusConfigForm::KWinFocusConfigForm(QWidget* parent) : QWidget(parent) { - setupUi(this); + setupUi(parent); } // removed the LCD display over the slider - this is not good GUI design :) RNolden 051701 @@ -333,7 +333,7 @@ void KFocusConfig::defaults() KWinAdvancedConfigForm::KWinAdvancedConfigForm(QWidget* parent) : QWidget(parent) { - setupUi(this); + setupUi(parent); } KAdvancedConfig::~KAdvancedConfig() @@ -487,7 +487,7 @@ void KAdvancedConfig::setAutogroupInForeground(bool s) KWinMovingConfigForm::KWinMovingConfigForm(QWidget* parent) : QWidget(parent) { - setupUi(this); + setupUi(parent); } KMovingConfig::~KMovingConfig()