packages (DEVEL): kde4-kdebase-workspace/kde4-kdebase-workspace.spec, kde4-...

arekm arekm at pld-linux.org
Fri Feb 12 08:38:40 CET 2010


Author: arekm                        Date: Fri Feb 12 07:38:40 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- rel 4; branch diff updated

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace.spec (1.168.2.43 -> 1.168.2.44) , kde4-kdebase-workspace-branch.diff (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.168.2.43 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.168.2.44
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.168.2.43	Tue Feb  9 18:23:44 2010
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Fri Feb 12 08:38:34 2010
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
 Version:	4.4.0
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -27,7 +27,7 @@
 Source11:	kdebase-kdm.Xsession
 Source15:	%{name}.desktop
 Source16:	%{name}-session
-#Patch100: %{name}-branch.diff
+Patch100: %{name}-branch.diff
 Patch0:		%{name}-rootprivs.patch
 Patch1:		%{name}-kdmconfig.patch
 Patch2:		%{name}-installFP.patch
@@ -539,7 +539,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
-#%patch100 -p1
+%patch100 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
@@ -1760,6 +1760,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168.2.44  2010/02/12 07:38:34  arekm
+- rel 4; branch diff updated
+
 Revision 1.168.2.43  2010/02/09 17:23:44  shadzik
 - update akonadi BR
 

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff
diff -u /dev/null packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.1.2.3
--- /dev/null	Fri Feb 12 08:38:40 2010
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff	Fri Feb 12 08:38:34 2010
@@ -0,0 +1,3446 @@
+--- workspace/doc/klipper/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/klipper/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -30,8 +30,8 @@
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2005-01-31</date>
+-<releaseinfo>2.92.00</releaseinfo>
++<date>2010-01-14</date>
++<releaseinfo>0.9.7 (&kde; 4.4)</releaseinfo>
+ 
+ <abstract>
+ <para>&klipper; is the &kde; clipboard cut &amp; paste utility.</para>
+@@ -49,10 +49,8 @@
+ <title>Introduction</title>
+ <para>&klipper; is the &kde; clipboard utility. It stores clipboard
+ history, and allows you to link clipboard contents to application
+-actions. Please report any problems or feature requests to Esben Mose
+-Hansen (see <ulink
+-url="http://mosehansen.dk/about">http://mosehansen.dk/about</ulink>
+-for contact details).</para>
++actions. Please report any problems or feature requests to<ulink
++url="http://bugs.kde.org">KDEs bugzilla</ulink> or use the "report bug" feature.</para>
+ 
+ </chapter>
+ 
+@@ -89,9 +87,9 @@
+ open, press <keycombo action="simul">&Alt;<keycap>L</keycap>
+ </keycombo>.</para>
+ 
+-<para>To remove &klipper;, click on the handle next to it (a small
+-black triangle), and from the menu that appears, select
+-<guimenuitem>Remove Klipper</guimenuitem>.</para>
++<para>To disable &klipper;, click on its icon and 
++from the menu that appears, select
++<guimenuitem>Quit</guimenuitem>.</para>
+ 
+ </sect1>
+ 
+@@ -101,30 +99,35 @@
+ <para>&klipper; can perform actions on the contents of the clipboard,
+ based on whether they match a particular regular expression. For
+ example, any clipboard contents starting with <quote>http://</quote> can
+-be passed to &Netscape; or &konqueror; as &URL;s to open.</para>
++be passed to Firefox or &konqueror; as &URL;s to open. In addition, if the 
++contents matches a path, similar actions can be performed according to the file's
++type. E.g, if the path to a pdf file is copied to the clipboard, the file can be 
++view in Okular</para>
+ 
+-<para>To use this feature, just copy a &URL; or filename to the
+-clipboard. If there is a matching regular expression in &klipper;'s
+-list, a menu will appear showing you the options you have (&eg; Open
+-&URL; in &konqueror;, open &URL; in &Netscape;). Use the mouse or
+-keyboard to select the option you want, and &klipper; will run the
+-program you have selected, opening the address pointed to by the
+-clipboard contents.</para>
++<para>To use this feature, just select a &URL; or path. <!-- starting with slash ?-->
++If there is a matching regular expression in &klipper;'s
++list, a menu will appear showing you the programs for your selection. 
++Use the mouse or cursor keys to select a program, and &klipper; will run 
++this program, opening the address pointed to by the
++selection.</para>
+ 
+ <para>If you do not want to perform any actions on the clipboard
+-contents, select <guimenuitem>Do Nothing</guimenuitem> on the pop-up menu
++contents, select <guimenuitem>Disable This Popup</guimenuitem> on the pop-up menu
+ to return to what you were doing before. If you leave the menu, it will
+ disappear, leaving you to continue your work. You can change the time
+ that the menu remains for in the <guilabel>Configure Klipper...</guilabel>
+-dialog, with the option <guilabel>Timeout for action pop-ups</guilabel>
+-under the <guilabel>General</guilabel> tab.</para>
+-	  
++dialog, with the option <guilabel>Timeout for action popups</guilabel>
++under the <guilabel>General</guilabel> tab. You can separately disable the 
++file path part using the option <guilabel>Enable MIME-based actions</guilabel> under
++the <guilabel>Actions</guilabel> tab.</para>
++  
+ <para>Actions can be disabled completely by clicking on &klipper; and
+-selecting <guimenuitem>Actions Enabled</guimenuitem>, or by pressing
++deselecting <guimenuitem>Actions Enabled</guimenuitem>, or by pressing
+ <keycombo action="simul">&Ctrl;&Alt;<keycap>X</keycap></keycombo>.</para>
+ 
+ <para>Clipboard contents which match a regular expression can also be
+-edited before performing an action on them. Select <guimenuitem>Edit contents...</guimenuitem> on the &klipper; pop-up menu, and you can
++edited before performing an action on them. Select <guimenuitem>Edit 
++contents...</guimenuitem> on the &klipper; pop-up menu, and you can
+ change the clipboard contents in the dialog which appears, before
+ clicking the <guibutton>OK</guibutton> button to run the appropriate
+ action.</para>
+@@ -178,10 +181,11 @@
+ <sect2 id="changing-clipboard-modes">
+ <title>Changing Clipboard/Selection Behavior</title>
+ <para>
++<!-- this has changed in kde 4.4-->
+ In order to change clipboard/selection behavior, select
+-<guimenuitem>Configure Klipper...</guimenuitem> from the &klipper; pop-up menu,
++<guimenuitem>Configure &klipper;...</guimenuitem> from the &klipper; pop-up menu,
+ and in the dialog box that appears, select the
+-<guilabel>General</guilabel> tab. Selecting <guilabel>Separate clipboard and
++<guilabel>General</guilabel> tab. Unchecking <guilabel>Synchronize contents of the clipboard and the
+ selection</guilabel> makes the clipboard and selection function as completely
+ separate buffers as described above. With this option set, the option
+ <guilabel>Ignore selection</guilabel> will prevent &klipper; from
+@@ -243,13 +247,10 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Remove white space when executing actions</guilabel></term>
+-<listitem><para>If selected, any white space (spaces, tabs, &etc;) at the
+-beginning and end of the clipboard contents will be removed before passing the
+-clipboard contents to an application. This is useful, for example, if the
+-clipboard contains a &URL; with spaces which, if opened by a web browser, would
+-cause an error.</para>
+-</listitem>
++<term><guilabel>Prevent empty clipboard</guilabel></term>
++<listitem><para>If selected, the clipboard will never be empty: &klipper; will
++insert the most recent item from the clipboard history into the clipboard
++instead of allowing it to be empty.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+@@ -262,36 +263,59 @@
+ </varlistentry>
+ 
+ <varlistentry>
+-<term><guilabel>Prevent empty clipboard</guilabel></term>
+-<listitem><para>If selected, the clipboard will never be empty: &klipper; will
+-insert the most recent item from the clipboard history into the clipboard
+-instead of allowing it to be empty.</para></listitem>
++<term><guilabel>Remove white space when executing actions</guilabel></term>
++<listitem><para>If selected, any white space (spaces, tabs, &etc;) at the
++beginning and end of the clipboard contents will be removed before passing the
++clipboard contents to an application. This is useful, for example, if the
++clipboard contains a &URL; with spaces which, if opened by a web browser, would
++cause an error.</para>
++</listitem>
+ </varlistentry>
+ 
+ <varlistentry>
++<term><guilabel>Ignore images</guilabel></term>
++<listitem><para>When an area of the screen is selected with mouse or keyboard, 
++this is called the <quote>selection</quote>. If this option is selected, only text 
++selections are stored in the history, while images and other selections are not.
++</para>
++</listitem>
++</varlistentry> 
++
++<varlistentry>
+ <term><guilabel>Ignore selection</guilabel></term>
+-<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>.
++<listitem><para>Sets the clipboard mode. This option will prevent &klipper; from
++including the contents of the selection in its clipboard history and from
++performing actions on the contents of the selection. See <xref linkend="clipboard-modes"/>.
+ </para>
+ </listitem>
+ </varlistentry> 
+ 
+-
+ <varlistentry>
+-<term><guilabel>Synchronize contents of the clipboard and the
+-selection</guilabel></term>
+-<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>.
++<term><guilabel>Text selection only</guilabel></term>
++<listitem><para>When an area of the screen is selected with mouse or keyboard, this is 
++called the <quote>selection</quote>. If this option is selected, only text selections 
++are stored in the history, while images and other selections are not.
++See <xref linkend="clipboard-modes"/>.
+ </para>
+ </listitem>
+ </varlistentry> 
+ 
+ <varlistentry>
+-<term><guilabel>Separate clipboard and selection</guilabel></term>
+-<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>.
++<term><guilabel>Synchronize contents of the clipboard and the
++selection</guilabel></term>
++<listitem><para>Sets the clipboard mode. 
++When an area of the screen is selected with mouse or keyboard, this is 
++called the <quote>selection</quote>. If this option is selected, the selection and the 
++clipboard is kept the same, so that anything in the selection is immediately 
++"available for pasting elsewhere using any method, including the traditional 
++middle mouse button. Otherwise, the selection is recorded in the clipboard 
++history, but the selection can only be pasted using the middle mouse button. 
++Also see the <guilabel>Ignore selection</guilabel> option. 
++See <xref linkend="clipboard-modes"/>.
+ </para>
+ </listitem>
+ </varlistentry> 
+ 
+-
+ <varlistentry>
+ <term><guilabel>Timeout for Action pop-ups</guilabel></term>
+ <listitem><para>Set the time that a popup menu will remain for if you do
+@@ -317,7 +341,7 @@
+ <listitem><para>On the <guilabel>Actions</guilabel> tab, double-click
+ the regular expression or action that you want to edit. An in-place text editing
+ box will appear in which the text can be edited as you wish. Make sure you
+-press <keysym>Enter</keysym> when you are done.</para></listitem>
++press &Enter; when you are done.</para></listitem>
+ </varlistentry>
+ 
+ <varlistentry>
+@@ -344,15 +368,15 @@
+ 
+ <para>Note that <token>%s</token> in the command line is replaced with
+ the clipboard contents, &eg; if your command definition is
+-<userinput><command>kedit</command> <token>%s</token></userinput> and
++<userinput><command>kwrite</command> <token>%s</token></userinput> and
+ your clipboard contents are <filename>/home/phil/textfile</filename>,
+-the command <userinput><command>kedit</command>
++the command <userinput><command>kwrite</command>
+ <filename>/home/phil/textfile</filename></userinput> will be run. To
+ include <token>%s</token> in the command line, escape it with a
+ backslash, as so: <userinput>\%s</userinput>.</para></listitem>
+ </varlistentry>
+ 
+-<varlistentry><term><guibutton>Advanced...</guibutton></term>
++<varlistentry><term><guibutton>Advanced</guibutton></term>
+ <listitem><para>Brings up the <guilabel>Disable Actions for windows of type
+ WM_CLASS</guilabel> dialog.</para>
+ <para>Some programs, such as &konqueror;,
+@@ -398,9 +422,9 @@
+ <varlistentry>
+ <term><guilabel>Custom</guilabel></term>
+ <listitem><para>The selected action is assigned to the keys you choose.</para>
+-<para>To choose a custom key for the action you have selected, click on the
+-representation of a key in the lower right of the screen to activate it, and
+-type the desired key combination on your keyboard, as in any &kde; application. 
++<para>To choose a custom key for the action you have selected, click on 
++<guilabel>Custom</guilabel> and then <guilabel>None</guilabel>.
++Now type the desired key combination on your keyboard, as in any &kde; application. 
+ </para> </listitem>
+ </varlistentry>
+ </variablelist>
+@@ -447,12 +471,7 @@
+ 
+ <sect1 id="compilation">
+ <title>Compilation and Installation</title>
+-<para>&klipper; should compile and install along with the kdebase
+-package, and appear on your &kde; panel (&kicker;) when you run &kde;
+-3. If it does not appear, you can start it by selecting
+-<guimenuitem>Add Applet to Panel...</guimenuitem> 
+-in any context menu in &kicker;, the &kde; Panel 
+-and choosing <guilabel>Klipper</guilabel> in the dialog.</para> 
++&install.compile.documentation; 
+ 
+ <screenshot>
+ <screeninfo>&klipper; icon</screeninfo>
+--- workspace/doc/kcontrol/kwinscreenedges/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/kwinscreenedges/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -14,12 +14,12 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ 
+-<date>2009-11-17</date>
++<date>2010-02-04</date>
+ <releaseinfo>&kde; 4.4</releaseinfo>
+ 
+ <keywordset>
+ <keyword>KDE</keyword>
+-<keyword>KControl</keyword>
++<keyword>Systemsettings</keyword>
+ <keyword>desktop</keyword>
+ <keyword>effects</keyword>
+ </keywordset>
+@@ -34,12 +34,19 @@
+ in the context menu. Edges with a black square have already an attached effect, 
+ a grey colored square indicates that no effect is selected for this edge.</para>
+ 
+-<!-- apparently not in kde4
++<para>The number of accessible items in the context menu depends on the settings in the module
++<menuchoice><guilabel>Look &amp; Feel</guilabel> <guilabel>Desktop</guilabel>
++</menuchoice> on the <ulink url="help:/kcontrol/kwincompositing/index.html">
++<guilabel>Desktop Effects</guilabel></ulink> page. Select <guilabel>Enable desktop 
++effects</guilabel> to activate compositing, select the compositing type 
++<guilabel>OpenGL</guilabel>, 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 
+ pushing your mouse cursor against the edge of the screen you can find it in 
+-the settings module <ulink url="help:/kcontrol/windowbehaviour/index.html#action-advanced">
+-<guilabel>Window Behavior</guilabel></ulink> on the <guilabel>Advanced</guilabel> 
+-tab in the section <guilabel>Active Desktop Borders</guilabel>.
+-</para>
+--->
++the settings module <menuchoice><guilabel>Look &amp; Feel</guilabel> <guilabel>Window 
++Behaviour</guilabel></menuchoice> on the <ulink url="help:/kcontrol/kwintabbox/index.html">
++<guilabel>Navigate Through Windows</guilabel></ulink> page.</para>
++
+ </article>
+--- workspace/doc/kcontrol/mouse/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/mouse/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -174,9 +174,8 @@
+ whereas larger movements of the physical device will move the mouse
+ pointer rapidly to different areas on the screen.</para>
+ 
+-<para>You can set the threshold value by dragging the slider button or
+-by clicking the up/down arrows on the spin-button to the left of the
+-slider.</para>
++<para>You can set the threshold by entering a value into the edit box or
++by clicking the up/down arrows to the right of the box.</para>
+ 
+ <tip><para>In general, the higher you set the <guilabel>Pointer
+ acceleration</guilabel> value, the higher you will want to set the
+--- workspace/doc/kcontrol/clock/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/clock/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -43,7 +43,12 @@
+ <sect2 id="date-change">
+ <title><guilabel>Date and Time</guilabel> tab</title>
+ 
+-<para>You set the date using the left half of the tab.  Simply
++<para>If you check <guilabel>Set date and time automatically</guilabel> you are able
++to select a <guilabel>Time server</guilabel> from the drop down box and all other 
++settings in this dialog are disabled.</para>
++
++<para>If you do not use a time server, you are able to set the date manually 
++using the left half of the tab.  Simply
+ choose your month and year using the controls at the top of the calendar
+ and the day of the month by clicking on the day in the
+ calendar.</para>
+@@ -67,12 +72,6 @@
+ <para>To set a new time zone, simply select your area from the list below.</para>
+ </sect2>
+ 
+-<sect2 id="date-ntp">
+-<title><guilabel>NTP</guilabel> tab</title>
+-<para>If you check <guilabel>Set date and time automatically</guilabel> you are able
+-to select a <guilabel>Time server</guilabel> from the drop down box.</para>
+-</sect2>
+-
+ </sect1>
+ 
+ </article>
+--- workspace/doc/kcontrol/kcmaccess/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/kcmaccess/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -97,7 +97,8 @@
+ <sect3 id="access-modifier-keys">
+ <title><guilabel>Modifier keys</guilabel></title>
+ 
+-<para>There are two sections to this panel.</para>
++<para>There are the two sections <guilabel>Sticky Keys</guilabel>
++and <guilabel>Locking Keys</guilabel> to this panel.</para>
+ 
+ <variablelist>
+ <varlistentry>
+--- workspace/doc/kcontrol/desktopthemedetails/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/desktopthemedetails/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -13,77 +13,80 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ 
+-<date>2009-05-18</date>
+-<releaseinfo>0.9</releaseinfo>
++<date>2010-01-20</date>
++<releaseinfo>1.0</releaseinfo>
+ 
+ <keywordset>
+ <keyword>KDE</keyword>
+ <keyword>System Settings</keyword>
+ <keyword>desktop</keyword>
+ <keyword>theme</keyword>
++<keyword>plasma</keyword>
+ </keywordset>
+ </articleinfo>
+ 
+ <sect1 id="kcm_desktopthemedetails">
+ <title><guilabel>Desktop Theme Details</guilabel></title>
+ 
+-<para>The KDE plasma desktop theme is made up of several components or items.  This 
+-module allows you to customize your desktop Plasma theme and to replace theme items 
++<para>A &kde; plasma desktop theme is made up of several components or items,
++consisting mostly in svg backgrounds and colors schemes. This module allows you
++to customize your desktop Plasma theme and to replace theme items 
+ with items from other themes or from files.
+ </para>
+-<para>Desktop theme items consist in panel theme item, kickoff theme item,... all in default
+-theme.</para>
++
++<para>Desktop theme items consist in panel theme item, kickoff theme item,
++analog clock, ...</para>
++
++<note><para>
++If you want to change your current theme for a full new theme (for example from
++Air to Glassified) then you can do so in <interface>System Settings -&gt;
++General -&gt; Appearance -&gt; Style -&gt; Workspace tab</interface>.
++</para></note>
++
+ <sect2 id="start">
+ <title>Quick start</title>
+ <para>First download one or several themes you want to use to customize your 
+-desktop items by clicking the <guibutton>Get New Theme...</guibutton> button.</para>
+-<para>You can then start customizing each item you want to change with a new theme, 
+-for example you can have the panel in Glassified theme, ...</para>
+-<para>When you have finished, click the <guibutton>Apply</guibutton> button. You will then get an information 
+-message that tells you to enable the <guilabel>(Customized)</guilabel> theme on the 
+-Desktop settings dialog.</para>
++desktop items by clicking the <guibutton>Get New Theme...</guibutton>
++button in <interface>System Settings -&gt;
++General -&gt; Appearance -&gt; Style -&gt; Workspace tab</interface>.</para>
+ 
++<para>All the available themes will be displayed on top, the current one being highlighted.</para>
++
++<para>In the theme list, select a base theme that will be used for most widgets and start
++customizing each item you want to change with a new theme, for example you can
++have the panel in Glassified theme, the widget
++backgrounds in Air and so on.</para>
++
++<para>Here Air is the theme for most widgets and we changed the panel background
++to Glassified, the Analog clock to Glassified and the Notes to Oxygen.</para>
++
+ <para>
+ <screenshot>
+-<screeninfo>The information message</screeninfo>
++<screeninfo>Customizing your plasma theme</screeninfo>
+   <mediaobject>
+     <imageobject>
+-      <imagedata fileref="message.png" format="PNG"/>
++      <imagedata fileref="customizing.png" format="PNG"/>
+     </imageobject>
+     <textobject>
+-      <phrase>The information message</phrase>
++      <phrase>Customizing your plasma theme</phrase>
+     </textobject>
+   </mediaobject>
+ </screenshot>
+ </para>
+ 
+-<para>You then need to change the Desktop settings to <guilabel>(Customized)</guilabel> 
+-in order for the theme details to be applied to your desktop.</para>
+-
+ <para>
+-<screenshot>
+-<screeninfo>Desktop Settings Dialog</screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="desktop-settings.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase>Desktop Settings Dialog</phrase>
+-    </textobject>
+-  </mediaobject>
+-</screenshot>
++Clicking the <guibutton>Apply</guibutton> will create a new theme named
++<guilabel>(Customized)</guilabel> and will apply it to your desktop.
+ </para>
+-
+-<para>Click the <guibutton>Apply</guibutton> button on the dialog above to get the desktop settings applying your 
+-new choice.</para>
+ </sect2>
+ 
+ <sect2 id="custom">
+ <title>Creating a custom theme</title>
+-<para>When the module is opened, it will show items from the current desktop theme. 
+-If you would like to start customizing with a different theme, select it from 
+-the drop box above the list of theme items. This theme from the drop box is the starting 
+-theme, the base for your new customized desktop theme.</para>
++<para>When the module is opened, it will show items from the current desktop
++theme. If you would like to start customizing with a different theme, select it
++from 
++the drop box above the list of theme items. This theme from the drop box is the
++starting theme, the base for your new customized desktop theme.</para>
+ 
+ <para>
+ In the list of items, for each item you would like to replace, select 
+@@ -94,11 +97,25 @@
+ </para>
+ 
+ <para>
+-Click <guibutton>Apply</guibutton> when all the changes have been made.  This will create a new 
+-theme named <guilabel>(Customized)</guilabel> which you can select from the Appearance Settings 
+-dialog on the desktop.
++Click <guibutton>Apply</guibutton> when all the changes have been made.  This
++will create a new theme named <guilabel>(Customized)</guilabel> which you can
++select from the Appearance Settings dialog on the desktop.
+ </para>
+ 
++<para>
++<screenshot>
++<screeninfo>Your custom theme</screeninfo>
++  <mediaobject>
++    <imageobject>
++      <imagedata fileref="clicking-apply.png" format="PNG"/>
++    </imageobject>
++    <textobject>
++      <phrase>Customized</phrase>
++    </textobject>
++  </mediaobject>
++</screenshot>
++</para>
++
+ <note><para>
+ The theme items listed are the most visible components of the plasma 
+ desktop theme.  Other theme components are not listed.  Your newly created 
+@@ -110,9 +127,11 @@
+ <sect2 id="naming">
+ <title>Naming a custom theme</title>
+ <para>
+-To provide a name for your customized theme, click on the <guilabel>More</guilabel> checkbox and 
++To provide a name for your customized theme, click on the
++<guilabel>More</guilabel> checkbox and 
+ enter the name of the theme.  You may also provide your name (author), a theme 
+-version and a description of your theme.  Click <guibutton>Apply</guibutton> when done.
++version and a description of your theme.  Click <guibutton>Apply</guibutton>
++when done.
+ </para>
+ </sect2>
+ 
+@@ -120,7 +139,8 @@
+ <title>Removing a theme</title>
+ <para>
+ Select the theme you would like to remove from the drop box above the list of 
+-theme items. Click on the <guilabel>More</guilabel> check box. Click the <guibutton>Remove Theme</guibutton> button to 
++theme items. Click on the <guilabel>More</guilabel> check box. Click the
++<guibutton>Remove Theme</guibutton> button to 
+ remove the selected theme.
+ </para>
+ </sect2>
+@@ -130,8 +150,10 @@
+ <para>
+ You can share your newly customized theme with the community by exporting the 
+ theme to a file. Select your customized theme from the drop box above the list 
+-of theme items.  Click on the <guilabel>More</guilabel> check box.  Click the <guibutton>Export Theme to 
+-File...</guibutton>.  Enter the name of the zip file to which the theme will be saved.
++of theme items.  Click on the <guilabel>More</guilabel> check box.  Click the
++<guibutton>Export Theme to 
++File...</guibutton>.  Enter the name of the zip file to which the theme will be
++saved.
+ </para>
+ </sect2>
+ 
+--- workspace/doc/kcontrol/fontinst/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/fontinst/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -94,7 +94,7 @@
+ <sect2 id="font-preview">
+ <title>Preview</title>
+ <para>This displays a preview text in different font sizes.</para>
+-<para>Using the context menu enables you to zoom in and out, select a preview type (<guilabel>Standard Preview</guilabel>, <guilabel>All Characters</guilabel>, &etc;) and change the preview text.</para>
++<para>Using the context menu enables you to zoom in and out, select a preview type (<guilabel>Standard Preview</guilabel> or <guilabel>All Characters</guilabel>) and change the preview text.</para>
+ </sect2>
+ </sect1>
+ </article>
+--- workspace/doc/kcontrol/kwintabbox/index.docbook	(.../tags/KDE/4.4.0/kdebase)	(wersja 1089014)
++++ workspace/doc/kcontrol/kwintabbox/index.docbook	(.../branches/KDE/4.4/kdebase)	(wersja 1089014)
+@@ -11,7 +11,7 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+ 
+-<date>2009-09-22</date>
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.168.2.43&r2=1.168.2.44&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff?r1=1.1.2.2&r2=1.1.2.3&f=u



More information about the pld-cvs-commit mailing list