Commit 0619c1d7 authored by Thomas Lübking's avatar Thomas Lübking
Browse files

fix kwinoptions layouts

THIS INTRODUCES NEW STRINGS, see
http://lists.kde.org/?l=kde-i18n-doc&m=135403060327161&w=2

REVIEW: 107083
BUG: 310623
parent c0f1501b
This diff is collapsed.
......@@ -6,76 +6,45 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<width>504</width>
<height>387</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="KButtonGroup" name="shBox">
<property name="title">
<string>Shading</string>
<layout class="QGridLayout" name="gridLayout" columnstretch="2,1,5">
<item row="2" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<layout class="QGridLayout" name="kLay">
<item row="1" column="1">
<widget class="KIntNumInput" name="shadeHover">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window.</string>
</property>
<property name="value">
<number>500</number>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
<property name="suffix">
<string> ms</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="shadeHoverLabel">
<property name="text">
<string>Dela&amp;y:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>shadeHover</cstring>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="shadeHoverOn">
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>&amp;Enable hover</string>
</property>
</widget>
</item>
</layout>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<item row="2" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="KButtonGroup" name="wtBox">
<property name="title">
<string>Window Tabbing</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="wtLay">
<item>
<widget class="QCheckBox" name="inactiveTabsSkipTaskbar">
......@@ -110,18 +79,38 @@
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout" name="vLay">
<item row="0" column="1">
<widget class="KComboBox" name="placementCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>The placement policy determines where a new window will appear on the desktop.
<item row="4" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>&amp;Placement:</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="KComboBox" name="placementCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>The placement policy determines where a new window will appear on the desktop.
&lt;ul&gt;
&lt;li&gt;&lt;em&gt;Smart&lt;/em&gt; will try to achieve a minimum overlap of windows&lt;/li&gt;
&lt;li&gt;&lt;em&gt;Maximizing&lt;/em&gt; 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.&lt;/li&gt;
......@@ -131,78 +120,141 @@
&lt;li&gt;&lt;em&gt;Zero-Cornered&lt;/em&gt; will place the window in the top-left corner&lt;/li&gt;
&lt;li&gt;&lt;em&gt;Under Mouse&lt;/em&gt; will place the window under the pointer&lt;/li&gt;
&lt;/ul&gt;</string>
</property>
<item>
<property name="text">
<string>Smart</string>
</property>
</item>
<item>
<item>
<property name="text">
<string>Smart</string>
</property>
</item>
<item>
<property name="text">
<string>Maximizing</string>
</property>
</item>
<item>
<property name="text">
<string>Cascade</string>
</property>
</item>
<item>
<property name="text">
<string>Random</string>
</property>
</item>
<item>
<property name="text">
<string>Centered</string>
</property>
</item>
<item>
<property name="text">
<string>Zero-Cornered</string>
</property>
</item>
<item>
<property name="text">
<string>Under Mouse</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="KButtonGroup" name="shBox">
<property name="title">
<string>Shading</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="1">
<widget class="QLabel" name="shadeHoverLabel">
<property name="text">
<string>Maximizing</string>
<string>Dela&amp;y:</string>
</property>
</item>
<item>
<property name="text">
<string>Cascade</string>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</item>
<item>
<property name="text">
<string>Random</string>
<property name="buddy">
<cstring>shadeHover</cstring>
</property>
</item>
<item>
<property name="text">
<string>Centered</string>
</widget>
</item>
<item row="3" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</item>
<item>
<property name="text">
<string>Zero-Cornered</string>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>24</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" rowspan="3" colspan="5">
<widget class="QCheckBox" name="shadeHoverOn">
<property name="whatsThis">
<string>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.</string>
</property>
</item>
<item>
<property name="text">
<string>Under Mouse</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Placement:</string>
</property>
<property name="buddy">
<cstring>placementCombo</cstring>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="hideUtilityWindowsForInactive">
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>Hide utility windows for inactive applications</string>
</property>
</widget>
</item>
</layout>
<string>&amp;Enable hover</string>
</property>
</widget>
</item>
<item row="3" column="2" colspan="3">
<widget class="KIntNumInput" name="shadeHover">
<property name="whatsThis">
<string>Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window.</string>
</property>
<property name="value">
<number>500</number>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
<property name="suffix">
<string> ms</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="3" column="1">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Special Windows</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
<property name="flat">
<bool>true</bool>
</property>
</spacer>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="hideUtilityWindowsForInactive">
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>Hide utility windows for inactive applications</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
......@@ -224,6 +276,15 @@
<header>knuminput.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>shadeHoverOn</tabstop>
<tabstop>shadeHover</tabstop>
<tabstop>inactiveTabsSkipTaskbar</tabstop>
<tabstop>autogroupSimilarWindows</tabstop>
<tabstop>autogroupInForeground</tabstop>
<tabstop>placementCombo</tabstop>
<tabstop>hideUtilityWindowsForInactive</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
......@@ -6,163 +6,100 @@
<rect>
<x>0</x>
<y>0</y>
<width>470</width>
<height>224</height>
<width>574</width>
<height>313</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1">
<widget class="KComboBox" name="focusCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>The focus policy is used to determine the active window, i.e. the window you can work in. &lt;ul&gt;
<layout class="QHBoxLayout" name="horizontalLayout" stretch="2,1,5">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>&amp;Policy:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>focusCombo</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KComboBox" name="focusCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>The focus policy is used to determine the active window, i.e. the window you can work in. &lt;ul&gt;
&lt;li&gt;&lt;em&gt;Click to focus:&lt;/em&gt; A window becomes active when you click into it. This is the behavior you might know from other operating systems.&lt;/li&gt; &lt;li&gt;&lt;em&gt;Focus follows mouse:&lt;/em&gt; 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.&lt;/li&gt;
&lt;li&gt;&lt;em&gt;Focus under mouse:&lt;/em&gt; 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.&lt;/li&gt;
&lt;li&gt;&lt;em&gt;Focus strictly under mouse:&lt;/em&gt; Only the window under the mouse pointer is active. If the mouse points nowhere, nothing has focus.&lt;/li&gt;
&lt;/ul&gt;
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.</string>
</property>
<item>
<property name="text">
<string>Click to Focus</string>
</property>
</property>
<item>
<property name="text">
<string>Click to Focus</string>
</property>
</item>
<item>
<property name="text">
<string>Focus Follows Mouse</string>
</property>
</item>
<item>
<property name="text">
<string>Focus Under Mouse</string>
</property>
</item>
<item>
<property name="text">
<string>Focus Strictly Under Mouse</string>
</property>
</item>
</widget>
</item>
<item>
<property name="text">
<string>Focus Follows Mouse</string>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Focus &amp;stealing prevention level:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>focusStealing</cstring>
</property>
</widget>
</item>
<item>
<property name="text">
<string>Focus Under Mouse</string>
</property>
</item>
<item>
<property name="text">
<string>Focus Strictly Under Mouse</string>
</property>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="delayFocusOnLabel">
<property name="text">
<string>&amp;Delay focus by:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>delayFocus</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="KIntNumInput" name="delayFocus">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>This is the delay after which the window the mouse pointer is over will automatically receive focus.</string>
</property>
<property name="value">
<number>100</number>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
<property name="suffix">
<string> ms</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="separateScreenFocus">
<property name="whatsThis">
<string>When this option is enabled, focus operations are limited only to the active Xinerama screen</string>
</property>
<property name="text">
<string>S&amp;eparate screen focus</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="autoRaiseOn">
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>&amp;Raise, with the following delay:</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="activeMouseScreen">
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>Active screen follows &amp;mouse</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="focusNextToMouse">
<property name="text">
<string>&amp;When the active window disappears, pass focus to window under mouse</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Focus &amp;stealing prevention level:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>focusStealing</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>&amp;Policy:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>focusCombo</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="KComboBox" name="focusStealing">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>&lt;p&gt;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.)
<item row="1" column="1">
<widget class="KComboBox" name="focusStealing">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">