Git commit f10ef4dcc4cee58e1df654004079caccd6ce0c1e by Burkhard L?ck. Committed on 06/12/2013 at 15:58. Pushed by lueck into branch 'KDE/4.11'.
proofreading/updating/bump version to 4.12 of workspace kcm docs (kcmaccess+kwincompositing+kwindecoration) (cherry picked from commit 02054ab1b55eeab13dafadbc633371f21705b6dc) doc backport M +2 -2 doc/kcontrol/kcmaccess/index.docbook M +15 -90 doc/kcontrol/kwincompositing/index.docbook M +- -- doc/kcontrol/kwindecoration/decoration.png M +3 -3 doc/kcontrol/kwindecoration/index.docbook http://commits.kde.org/kde-workspace/f10ef4dcc4cee58e1df654004079caccd6ce0c1e diff --git a/doc/kcontrol/kcmaccess/index.docbook b/doc/kcontrol/kcmaccess/index.docbook index e057dfa..bc7658f 100644 --- a/doc/kcontrol/kcmaccess/index.docbook +++ b/doc/kcontrol/kcmaccess/index.docbook @@ -13,8 +13,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2009-11-20</date> -<releaseinfo>&kde; 4.4</releaseinfo> +<date>2013-13-05</date> +<releaseinfo>&kde; 4.12</releaseinfo> <keywordset> <keyword>KDE</keyword> diff --git a/doc/kcontrol/kwincompositing/index.docbook b/doc/kcontrol/kwincompositing/index.docbook index 9aec413..dce55c3 100644 --- a/doc/kcontrol/kwincompositing/index.docbook +++ b/doc/kcontrol/kwincompositing/index.docbook @@ -14,8 +14,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2009-02-10</date> -<releaseinfo>&kde; 4.2</releaseinfo> +<date>2013-12-05</date> +<releaseinfo>&kde; 4.12</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -40,60 +40,15 @@ for &kde;.</para> <sect3 id="desktop-effects-general"> <title><guilabel>General</guilabel> tab</title> -<para>At the top of this tab is a checkbox labeled <guilabel>Enable -desktop effects</guilabel>. If there is no mark in front of this checkbox, then all -visual effects of this panel are disabled. To edit any of these effects, simply -place a mark in this checkbox.</para> - -<para>Below that checkbox there are some common settings for the desktop effects like -improved window management, shadows, various animations, effects for desktop and -window switching and the animation speed.</para> -<!-- outdated needs a rewrite -<variablelist> -<varlistentry> -<term><guilabel>Combobox effect:</guilabel></term> -<listitem><para>This combobox has two options. If this option is set to <guilabel>Animate</guilabel> -then when a combo box is selected, it will appear to scroll down. If <guilabel>Disable</guilabel> -is selected, then the combobox list appears instantly.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Tool tip effect:</guilabel></term> -<listitem><para>This combobox has three options. If this option is set to <guilabel>Animate</guilabel> -then when a tool tip appears, it will have a short animation. If <guilabel>Fade</guilabel> is -selected, the tool tip appears to fade from the background. If <guilabel>Disable</guilabel> -is selected, then the tool tip appears instantly.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Menu effect:</guilabel></term> -<listitem><para>This combobox has four options. If this option is set to <guilabel>Animate</guilabel> -then when a menu list appears, it will appear to scroll downward. If <guilabel>Fade</guilabel> is -selected, the menu list appears to fade from the background. If <guilabel>Make Transparent</guilabel> -is selected, the menu list will have a transparent look to it. The details of that transparency is -configured in the next part of the dialog. If <guilabel>Disable</guilabel> -is selected, then the menu list appears instantly.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Menu tear-off handles:</guilabel></term> -<listitem><para>If this option is set to <guilabel>Disable</guilabel>, then no menus can be separated -from the application. If <guilabel>Application Level</guilabel> is selected, then it is left up -to each individual application to determine which menus can be torn separated from the application.</para> -<note><para>Many applications do not have tear off menus. You cannot tell &kde; to force an -application to allow tear off menus. This is determined by the authors of the application.</para></note></listitem> -</varlistentry> -</variablelist> - -<para>The next checkbox, labeled <guilabel>Menu drop shadow</guilabel> is used to toggle the drop shadow behind all -&kde; menus. A drop shadow is a dark, soft line on the bottom and right sides of the menu, which give the menus the -appearance that the menu is lifted off the application, and the menu is creating a shadow on the application.</para> - -<para>The next section only applies if the combobox labeled <guilabel>Menu Effect</guilabel> is set to -<guilabel>Make Transparent</guilabel>. You can use the combo box labeled <guilabel>Menu transparency type:</guilabel> -to select the method &kde; uses to generate the transparency. You can use the slider to determine the level of -transparency in menus. A preview is visible on the right side of this section.</para> ---> +<para>At the top of this tab in the section <guilabel>Activation</guilabel> is a checkbox labeled <guilabel>Enable +desktop effects at startup</guilabel>. If there is no mark in front of this checkbox, then all +visual effects are disabled.</para> +<para>All desktop effects can be turned on and off using the global shortcut +<keycombo action="simul">&Alt;&Shift;<keycap>F12</keycap></keycombo>. +</para> +<para>Below that section there are some settings for the simple desktop effects like +improved window management, various animations, effects for desktop switching and +the animation speed.</para> </sect3> <sect3 id="desktop-alleffects"> @@ -101,51 +56,21 @@ transparency in menus. A preview is visible on the right side of this section.< <para>The main part of this page is a list of all available effects grouped by <guilabel>Accessibility</guilabel>, <guilabel>Appearance</guilabel>, -<guilabel>Candy</guilabel>, <guilabel>Focus</guilabel> and <guilabel>Tools</guilabel>. +<guilabel>Candy</guilabel>, <guilabel>Focus</guilabel>, <guilabel>Tools</guilabel> +and <guilabel>Window Management</guilabel>. Use the incremental search bar above the list window to find items in the list.</para> <para>Check an effect in the list to enable it. Display the <guilabel>About</guilabel> dialog by clicking the info button at the right side of the list item. Some effects have settings options, in this case there is a tool button at the left of the info button. Click it to open a configuration dialog.</para> -<!-- -<variablelist> - -<varlistentry> -<term><guilabel>Highlight buttons under mouse.</guilabel></term> -<listitem> -<para>If there is a mark in this checkbox, when the mouse pointer is above a toolbar -button, that button will be highlighted with a square around the button. This is a good visual -indicator of which button will be selected with a mouse click.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Transparent toolbars when moving</guilabel></term> -<listitem> -<para>As the title suggests, if this option is selected, the toolbars will be transparent when -you are moving them around on the screen.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Text position</guilabel></term> -<listitem> -<para>This combo box lets you determine where on the button the text name of the button will appear as the default. -If <guilabel>Icon Only</guilabel> is selected, then there is no text on the toolbar buttons. If <guilabel>Text Only</guilabel> is selected, then the button's icon is replaced with a text name of the button. If <guilabel>Text Alongside Icons</guilabel> is selected, then the name of the button will be placed to the <emphasis>right</emphasis> of the icon. If <guilabel>Text Under Icons</guilabel> is selected, the default will be to have the text of the button <emphasis>below</emphasis> the icon.</para> -<tip><para>This option only specifies the <emphasis>default</emphasis> location. Each application can override the setting used in this panel.</para></tip> -</listitem> -</varlistentry> - -</variablelist> ---> </sect3> <sect3 id="desktop-advanced"> <title><guilabel>Advanced</guilabel> tab</title> -<para>On this tab you can select a <guilabel>Compositing type</guilabel> (<guilabel>OpenGL</guilabel> or <guilabel>XRender</guilabel>) -and set some options for the selected type. +<para>On this tab you can select a <guilabel>Compositing type</guilabel> and the <guilabel>Qt graphics system</guilabel>. +In the next two sections you can configure <guilabel>General Options</guilabel> and <guilabel>OpenGL Options</guilabel>. </para> </sect3> diff --git a/doc/kcontrol/kwindecoration/decoration.png b/doc/kcontrol/kwindecoration/decoration.png index cc93e4d..9fc84e5 100644 Binary files a/doc/kcontrol/kwindecoration/decoration.png and b/doc/kcontrol/kwindecoration/decoration.png differ diff --git a/doc/kcontrol/kwindecoration/index.docbook b/doc/kcontrol/kwindecoration/index.docbook index 4d658ee..17ea824 100644 --- a/doc/kcontrol/kwindecoration/index.docbook +++ b/doc/kcontrol/kwindecoration/index.docbook @@ -14,8 +14,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2010-06-23</date> -<releaseinfo>&kde; 4.5</releaseinfo> +<date>2013-12-05</date> +<releaseinfo>&kde; 4.12</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -53,7 +53,7 @@ windows.</para> <para>Choose a window decoration style from the preview list, using the search field at the top of the screen.</para> -<para>&kde; 4.5 default window decoration is called "Oxygen".</para> +<para>The &kde; default window decoration is called "Oxygen".</para> <para>Each style has a different look, but also a different <quote>feel</quote>. Some have (sometimes invisible)
