Git commit 17ef5346bec35228d4c58ca16faafe0ae5206d0e by Burkhard L?ck.
Committed on 22/03/2014 at 20:13.
Pushed by lueck into branch 'KDE/4.11'.

update to 4.11
CCMAIL:kde-i18n-doc at kde.org

M  +24   -6    doc/kcontrol/kwinscreenedges/index.docbook
M  +30   -28   doc/kcontrol/kwintabbox/index.docbook

http://commits.kde.org/kde-workspace/17ef5346bec35228d4c58ca16faafe0ae5206d0e

diff --git a/doc/kcontrol/kwinscreenedges/index.docbook 
b/doc/kcontrol/kwinscreenedges/index.docbook
index 3c10926..1a2b023 100644
--- a/doc/kcontrol/kwinscreenedges/index.docbook
+++ b/doc/kcontrol/kwinscreenedges/index.docbook
@@ -14,8 +14,8 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2010-10-28</date>
-<releaseinfo>&kde; 4.5</releaseinfo>
+<date>2014-10-05</date>
+<releaseinfo>&kde; 4.13</releaseinfo>
 
 <keywordset>
 <keyword>KDE</keyword>
@@ -37,14 +37,32 @@ a grey colored square indicates that no effect is selected 
for this edge.</para>
 <para>The number of accessible items in the context menu depends on the 
settings in the module
 <ulink url="help:/kcontrol/kwincompositing/index.html">
 <guilabel>Desktop Effects</guilabel></ulink> in the <guilabel>Workspace 
Appearance and Behavior</guilabel>
-category. Select <guilabel>Enable desktop 
-effects</guilabel> to activate compositing, select the compositing type 
-<guilabel>OpenGL</guilabel>, and then choose your favorite effects on the 
+category. Enable desktop effects to activate compositing, select the 
compositing type, 
+and then choose your favorite effects on the 
 <guilabel>All Effects</guilabel> tab from the <guilabel>Windows 
Management</guilabel> 
 group. This activates the corresponding items in the context menu.</para>
 
-<para>If you are looking for the setting to enable switching of desktops by 
+<para><!--Obsolete?-->If you are looking for the setting to enable switching 
of desktops by 
 pushing your mouse cursor against the edge of the screen choose one of the 
<guilabel>Present 
 Windows</guilabel> effects from the context menu.</para>
 
+<para>The section <guilabel>Window Management</guilabel> has two additional 
options when moving windows to screen edges:
+<itemizedlist> 
+<listitem><para>Maximize windows by dragging them to the top of the screen.
+</para></listitem>
+<listitem><para>Tile windows by dragging them to the side of the screen. The 
windows will be tiled to a quarter of the screen if dragged to the upper or 
lower part of the screen height determined by the value in the spinbox, 
otherwise to the full height of the screen.
+</para></listitem>
+</itemizedlist>
+</para>
+
+<para>The <guilabel>Other Settings</guilabel> configure the behavior pushing 
the mouse cursor to a screen edge.</para>
+<para><guilabel>Switch desktop on edge</guilabel>: Change desktop when the 
mouse cursor is pushed against the edge of the screen.
+If <guilabel>Always Enabled</guilabel> is selected all effects configured for 
screen edges in the first section of this module will be disabled. 
+</para>
+<para><guilabel>Activation delay</guilabel>: The amount of time required for 
the mouse cursor to be pushed against the edge 
+of the screen before the action is triggered
+</para>
+<para><guilabel>Reactivation delay</guilabel>: The amount of time required 
after triggering an action until the next trigger can occur.
+</para>
+
 </article>
diff --git a/doc/kcontrol/kwintabbox/index.docbook 
b/doc/kcontrol/kwintabbox/index.docbook
index 1a2af27..276f663 100644
--- a/doc/kcontrol/kwintabbox/index.docbook
+++ b/doc/kcontrol/kwintabbox/index.docbook
@@ -12,8 +12,8 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2010-10-28</date>
-<releaseinfo>&kde; 4.5</releaseinfo>
+<date>2014-03-10</date>
+<releaseinfo>&kde; 4.13</releaseinfo>
 
 <keywordset>
 <keyword>KDE</keyword>
@@ -33,24 +33,20 @@
 <note><para>
 The first set of effects on the <guilabel>Main</guilabel> tab has predefined 
shortcuts. If you want to use the second set of effects on the 
<guilabel>Alternative</guilabel> tab, you have to set a shortcut for these 
effects in the Shortcut Editor manually.</para></note>
 
-<para>The following documentation of options applies to the general settings 
and the alternative settings as well.</para>
+<note><para>
+For navigating through windows without <keycombo>&Alt;&Tab;</keycombo>, you 
can define screen edge actions in the &systemsettings; module <ulink 
url="help:/kcontrol/kwinscreenedges/index.html"><guilabel>Screen 
Edges</guilabel></ulink>.
+</para></note>
 
-<sect2 id="sort-order">
-<title>List windows and Sort order</title>
-<para>You can configure which windows should be shown in the list initiated by 
pressing <keycombo>&Alt;&Tab;</keycombo> (predefined for the settings on the 
<guilabel>Main</guilabel> tab) or the user defined shortcut for the alternative 
settings. So it is possible to only show windows on the current desktop or 
windows from all desktops. It is also possible to influence the sort order, you 
can either use a sort order based on the last usage of the windows or the 
stacking order of the windows.
-</para>
-<para>If you check <guilabel>Include desktop</guilabel> an entry for the 
desktop will be added to list with application windows. Then you can select 
this entry in the list to minimize all windows.</para>
-</sect2>
+<para>The following documentation of options applies to the general settings 
and the alternative settings as well.</para>
 
-<sect2 id="desktop-effects">
-<title>Desktop Effects</title>
+<sect2 id="visualization">
+<title>Visualization</title>
 <para>
-There are several effects which can be used instead of the normal window list 
when compositing is enabled. By default the <guilabel>Box Switch</guilabel> 
effect is used. This effect displays a small thumbnail of each window inside a 
box and the currently selected window is highlighted.
-</para>
-<para>
-The <guilabel>Present Windows</guilabel> effect arranges the windows in a 
regular grid and by that provides thumbnails in the best possible size. This 
effect can be used for navigating through windows without 
<keycombo>&Alt;&Tab;</keycombo> as well, if it is selected as screen edge 
action in the &systemsettings; module <ulink 
url="help:/kcontrol/kwinscreenedges/index.html">
-<guilabel>Screen Edges</guilabel></ulink>. This effect provides additional 
setting options and shortcuts in a dialog opened by clicking on the tools icon 
beside the drop down box.
-</para>
+There are several effects which can be used instead of the normal window list 
when compositing is enabled. By default the <guilabel>Thumbnails</guilabel> 
effect is used. This effect displays a small thumbnail of each window inside a 
box and the currently selected window is highlighted.
+There are several additional predefined layouts which provide an informative 
or compact view, small or large icons, a grid  and window title only.</para>
+<para>Selecting one of these layouts you will have a button to show a 
preview.</para> 
+<para>If you enable <guilabel>Show selected window</guilabel> it will be shown 
as background of the task switcher window.</para>
+
 <para>
 <guilabel>Cover Switch</guilabel> and <guilabel>Flip Switch</guilabel> effect 
are more fancy effects which require OpenGL. <guilabel>Cover Switch</guilabel> 
displays the windows in a gallery with a large thumbnail of the currently 
selected window in the center of the screen while all other windows are rotated 
on the left and right. <guilabel>Flip Switch</guilabel> displays all windows on 
a 3D stack. The selected window is on top of the stack and navigating through 
the windows will move the stack so that the new selected window is on the top.
 </para>
@@ -61,23 +57,29 @@ If the effect provides additional settings the configure 
button will be activate
 When compositing is not active or gets suspended the normal window list will 
be shown. There is no loss in functionality if an effect is selected and 
compositing is not active.</para></note>
 </sect2>
 
-<sect2 id="lists">
-<title>Display list</title>
-<para>
-When no effect is used an outline illustrating position and size of the 
selected window can be shown while switching. The list can be combined with the 
<guilabel>Highlight selected windows</guilabel> effect when compositing is 
active. This effect will highlight the currently selected window by fading out 
all other windows.
-</para>
+<sect2 id="shortcuts">
+<title>Shortcuts</title>
 <para>
-If you want to configure the layout of one item you can use the dialog which 
opens by clicking <guibutton>Configure Layout</guibutton>. There are several 
predefined layouts which provide an informative or compact view, small or large 
icons and window title only. You can change the way the items are laid out: 
horizontal, vertical or in a tabular layout.
+The shortcut editor provides the configuration interface for the keyboard 
shortcuts for navigating through windows. Each of the two possible sets of 
effects has two shortcuts: one for the forward direction and one for the 
reverse direction. Please note that the window list can only be shown if you 
select a shortcut with a keyboard modifier such as the &Alt; or &Ctrl; key. 
This modifier has to be hold while switching. Selecting a shortcut without a 
modifier key can break the behaviour of navigating through windows.
 </para>
-<para>
-There is an additional configuration group for an optional view of the 
selected item. It is possible to place this view next to the list with all 
items. This is useful if you use an icon only layout mode and want to see the 
name of the current selected window as well.
+</sect2>
+
+<sect2 id="content-and-sort-order">
+<title>Content</title>
+<para>It is possible to influence the sort order, you can either use a sort 
order based on the last usage of the windows or the stacking order of the 
windows.
 </para>
+<para>If you check <guilabel>Include "Show Desktop" icon</guilabel> an entry 
for the desktop will be added to list with application windows. Then you can 
select this entry in the list to minimize all windows.</para>
+<para>If <guilabel>Only one window per application</guilabel> is selected then 
only the last used instance of an application is contained in the list. 
Switching to other instances is possible only via the panel then.</para>
 </sect2>
 
-<sect2 id="shortcuts">
-<title>Shortcuts</title>
+<sect2 id="filter">
+<title>Filter windows</title>
 <para>
-The shortcut editor provides the configuration interface for the keyboard 
shortcuts for navigating through windows. Each of the two possible sets of 
effects has two shortcuts: one for the forward direction and one for the 
reverse direction. Please note that the window list can only be shown if you 
select a shortcut with a keyboard modifier such as the &Alt; or &Ctrl; key. 
This modifier has to be hold while switching. Selecting a shortcut without a 
modifier key can break the behaviour of navigating through windows.
+You can configure which windows should be shown in the list initiated by 
pressing <keycombo>&Alt;&Tab;</keycombo> (predefined for the settings on the 
<guilabel>Main</guilabel> tab) or the user defined shortcut for the alternative 
settings. 
+</para>
+<para>So it is possible to only show windows on the current virtual desktop or 
windows from all other desktops. Additionally you can apply similar rules for 
windows in activities or on screens for a multimonitor setup.
+</para>
+<para>The last option allows you to filter on the minimization status of 
windows.
 </para>
 </sect2>
 

Reply via email to