packages (DEVEL): kde4-kdebase/kde4-kdebase.spec, kde4-kdebase/kde4-kdebase...
arekm
arekm at pld-linux.org
Fri Feb 12 08:41:15 CET 2010
Author: arekm Date: Fri Feb 12 07:41:15 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- rel 3; branch diff updated
---- Files affected:
packages/kde4-kdebase:
kde4-kdebase.spec (1.104.2.24 -> 1.104.2.25) , kde4-kdebase-branch.diff (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: packages/kde4-kdebase/kde4-kdebase.spec
diff -u packages/kde4-kdebase/kde4-kdebase.spec:1.104.2.24 packages/kde4-kdebase/kde4-kdebase.spec:1.104.2.25
--- packages/kde4-kdebase/kde4-kdebase.spec:1.104.2.24 Fri Feb 5 19:06:02 2010
+++ packages/kde4-kdebase/kde4-kdebase.spec Fri Feb 12 08:41:10 2010
@@ -20,12 +20,12 @@
Summary(zh_CN.UTF-8): KDE核心
Name: kde4-kdebase
Version: 4.4.0
-Release: 2
+Release: 3
License: GPL
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
# Source0-md5: ddfc358aebe5dc8f5de6f5d1ff7cb018
-#Patch100: %{name}-branch.diff
+Patch100: %{name}-branch.diff
Patch0: %{name}-wordchars.patch
URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.2.2
@@ -343,7 +343,7 @@
%prep
%setup -q -n %{orgname}-%{version}
-#%patch100 -p0
+%patch100 -p0
%patch0 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Audio;Mixer;/' \
@@ -682,6 +682,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.104.2.25 2010/02/12 07:41:10 arekm
+- rel 3; branch diff updated
+
Revision 1.104.2.24 2010/02/05 18:06:02 arekm
- rel 2; new tarball
================================================================
Index: packages/kde4-kdebase/kde4-kdebase-branch.diff
diff -u /dev/null packages/kde4-kdebase/kde4-kdebase-branch.diff:1.1.2.3
--- /dev/null Fri Feb 12 08:41:16 2010
+++ packages/kde4-kdebase/kde4-kdebase-branch.diff Fri Feb 12 08:41:10 2010
@@ -0,0 +1,1503 @@
+Index: apps/dolphin/src/dolphinapplication.cpp
+===================================================================
+--- apps/dolphin/src/dolphinapplication.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/dolphin/src/dolphinapplication.cpp (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -72,23 +72,27 @@
+ int DolphinApplication::newInstance()
+ {
+ KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
++ static bool first = true;
+
+- QList<KUrl> urls;
+ const int argsCount = args->count();
+- for (int i = 0; i < argsCount; ++i) {
+- urls.append(args->url(i));
+- }
++ if ((argsCount > 0) || !first || !isSessionRestored()) {
++ QList<KUrl> urls;
++ for (int i = 0; i < argsCount; ++i) {
++ urls.append(args->url(i));
++ }
+
+- DolphinMainWindow* win = createMainWindow();
+- if (urls.count() > 0) {
+- if (args->isSet("select")) {
+- win->openFiles(urls);
+- } else {
+- win->openDirectories(urls);
++ DolphinMainWindow* win = createMainWindow();
++ if (urls.count() > 0) {
++ if (args->isSet("select")) {
++ win->openFiles(urls);
++ } else {
++ win->openDirectories(urls);
++ }
+ }
++ win->show();
+ }
+- win->show();
+
++ first = false;
+ args->clear();
+ return 0;
+ }
+Index: apps/dolphin/src/kcm/kcmdolphinservices.desktop
+===================================================================
+--- apps/dolphin/src/kcm/kcmdolphinservices.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/dolphin/src/kcm/kcmdolphinservices.desktop (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -219,7 +219,7 @@
+ Comment[sv]=Anpassa filhanterarens tjänster
+ Comment[tg]=Танзимоти файли мудири хизматҳо
+ Comment[tr]=Dosya yöneticisi servislerini yapılandır
+-Comment[uk]=Налаштувати служби менеджера файлів
++Comment[uk]=Налаштувати служб керування файлами
+ Comment[wa]=Apontyî les siervices do manaedjeu di fitchîs
+ Comment[x-test]=xxConfigure file manager servicesxx
+ Comment[zh_CN]=配置文件管理器服务
+Index: apps/dolphin/src/kcm/kcmdolphingeneral.desktop
+===================================================================
+--- apps/dolphin/src/kcm/kcmdolphingeneral.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/dolphin/src/kcm/kcmdolphingeneral.desktop (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -260,7 +260,7 @@
+ Comment[sv]=Anpassa filhanterarens allmänna inställningar
+ Comment[tg]=Танзимоти умумии мудири файлҳо насб кунед
+ Comment[tr]=Genel dosya yöneticisi ayarlarını yapılandır
+-Comment[uk]=Налаштувати загальні параметри менеджера файлів
++Comment[uk]=Налаштування загальних параметрів керування файлами
+ Comment[wa]=Apontyî les tchuzes djeneråles do manaedjeu di fitchîs
+ Comment[x-test]=xxConfigure general file manager settingsxx
+ Comment[zh_CN]=配置常规文件管理器设置
+Index: apps/doc/kdepasswd/password.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = image/png
+Index: apps/doc/kdepasswd/index.docbook
+===================================================================
+--- apps/doc/kdepasswd/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/doc/kdepasswd/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -5,6 +5,7 @@
+ <!ENTITY % English "INCLUDE">
+ ]>
+ <article lang="&language;">
++<title>User Information</title>
+ <articleinfo>
+ <authorgroup>
+ <author>
+@@ -22,8 +23,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2008-05-29</date>
+-<releaseinfo>1.0</releaseinfo>
++<date>2010-01-06</date>
++<releaseinfo>&kde; 4.4</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -58,20 +59,36 @@
+ applications (mail programs and word processors for example) if they are filled. You can:</para>
+
+ <itemizedlist>
++<listitem><para>change your user icon</para></listitem>
++<listitem><para>change your user login password</para></listitem>
+ <listitem><para>fill in personal information</para></listitem>
+-<listitem><para>change your user login password</para></listitem>
+ <listitem><para>set up the password prompt</para></listitem>
+ </itemizedlist>
+
+ </sect2>
+
+ <sect2 id="themes">
+-<title>User Icon</title>
++<title>User Icon and Password</title>
+
++<variablelist>
++<varlistentry><term>User Icon</term>
++<listitem>
+ <para>
+ This icon is used when the user logs in using a login manager. Clicking on it will allow you to change the image, either by using a provided icon or by setting one of yours. Click <guibutton>Apply</guibutton> to validate your change.
+ </para>
++</listitem>
++</varlistentry>
++
++<varlistentry><term><guibutton>Change password...</guibutton></term>
++<listitem>
++<para>
++Clicking this button will display a dialog to change your user password. Your user password is the one you log in your system with. You will be asked for your current password then twice for your new password.
++</para>
++</listitem>
++</varlistentry>
++</variablelist>
+ </sect2>
++
+ <sect2 id="user-info">
+ <title>User Information</title>
+ <variablelist>
+@@ -111,13 +128,6 @@
+ </para>
+ </listitem>
+ </varlistentry>
+-<varlistentry><term><guibutton>Change password...</guibutton></term>
+-<listitem>
+-<para>
+-Clicking this button will display a dialog to change your user password. Your user password is the one you log in your system with. You will be asked for your current password then twice for your new password.
+-</para>
+-</listitem>
+-</varlistentry>
+ </variablelist>
+
+ </sect2>
+@@ -126,7 +136,7 @@
+ <title>At Password Prompt</title>
+
+ <para>
+-This section allows you to choose how you want to input your password when you are asked for it. Default is to have one star for each letter you type. You can change that to have three stars for each letter you type (making it more difficult to guess the number of letters if someone is looking). You can also choose to have nothing displayed while you type your password, making this operation even more secure.
++This section allows you to choose how you want to input your password when you are asked for it. Default is to have one bullet for each letter you type. You can change that to have three bullets for each letter you type (making it more difficult to guess the number of letters if someone is looking). You can also choose to have nothing displayed while you type your password, making this operation even more secure.
+ </para>
+
+ </sect2>
+Index: apps/doc/konqueror/shortcut1.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = image/png
+Index: apps/doc/konqueror/shortcut2.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = image/png
+Index: apps/doc/konqueror/basics.docbook
+===================================================================
+--- apps/doc/konqueror/basics.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/doc/konqueror/basics.docbook (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -6,8 +6,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2003-10-20</date>
+-<releaseinfo>3.2</releaseinfo>
++<date>2010-02-08</date>
++<releaseinfo>4.4.0</releaseinfo>
+ </chapterinfo>
+
+ <title>&konqueror; Basics</title>
+@@ -34,6 +34,7 @@
+ to be able to choose which mode is to be used when you start it up.</para>
+
+ <itemizedlist>
++<!--
+ <listitem><para>If you have a <guiicon>house</guiicon> shaped icon on the panel
+ or desktop, then <mousebutton>left</mousebutton> click on it to open
+ &konqueror; as a file manager.</para></listitem>
+@@ -41,25 +42,25 @@
+ <listitem><para>Or <mousebutton>left</mousebutton> click on <guiicon>world
+ </guiicon> shaped icon on the panel or desktop to open &konqueror; in browser
+ mode.</para></listitem>
+-
+-<listitem><para>From the <guimenu>K</guimenu> menu, select
+-<menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Konqueror Web
+-Browser</guimenuitem></menuchoice> to start it as a browser, or
+-<guimenuitem>Home</guimenuitem> to launch &konqueror; in file manager mode.
++-->
++<listitem><para>From the application launcher menu, select
++<menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Konqueror (Web
++Browser)</guimenuitem></menuchoice> to start it as a browser.
+ </para></listitem>
+
+ <listitem><para><keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>
+-will open a <guilabel>Run Command</guilabel> dialog box, type
+-<userinput><command>konqueror</command></userinput> (lower case) and press
+-<keycap>Enter</keycap> or the <guibutton>Run</guibutton> button to start in
+-file
+-manager mode, or just enter a &URL; such as
++will open &krunner;, enter a path to a folder and press
++&Enter; to start in file manager mode, or just enter a &URL; such as
+ <userinput>http://www.konqueror.org</userinput> to start &konqueror; as a
+ browser.</para></listitem>
+
+ </itemizedlist>
+
+-<para>&konqueror; is also started automatically when you
++<note><para>Click on the black arrow right to the <guiicon>Home Page</guiicon> icon
++to switch to your <guiicon>Home Folder</guiicon> in the file manager mode and vice versa.
++</para></note>
++
++<para>If &konqueror; is the default file manager it also starts automatically when you
+ <mousebutton>left</mousebutton> click on a desktop icon that represents a
+ folder, such as a hard disk drive or the <guiicon>Trash</guiicon> icon.
+ </para>
+@@ -95,14 +96,13 @@
+
+ <para>The <interface>Toolbar</interface> contains icons for commonly used
+ operations. <mousebutton>Left</mousebutton> clicking on an icon will activate
+-it. If you have enabled tooltips in the Control Center <menuchoice><guimenu>
+-Appearance &
+-Themes</guimenu><guisubmenu>Style</guisubmenu></menuchoice>
+-dialog a brief description of what that icon does will appear when you hover
++it. If you have enabled tooltips in the &systemsettings; <menuchoice><guimenu>Appearance</guimenu>
++<guisubmenu>Windows</guisubmenu></menuchoice>, <guilabel>Buttons</guilabel> tab
++a brief description of what that icon does will appear when you hover
+ the pointer over it.</para>
+
+ <para>Some icons, for example the Up and Back icons in the previous screenshot,
+-have a small black triangle at their bottom right corner. If you hold the &LMB;
++have a small black arrow at the right. If you hold the &LMB;
+ pressed while the cursor is over this type of icon a small dropdown menu will
+ appear.</para> <para><mousebutton>Right</mousebutton> clicking on the
+ <interface>Toolbar </interface> will bring up the <link
+@@ -113,7 +113,7 @@
+ directory, &URL; or file being viewed. You can type a path or &URL; here and
+ press &Enter; or <mousebutton>left</mousebutton> click on the
+ <guiicon>Go</guiicon> icon at the right hand end of the <interface>Location
+-Toolbar</interface> to go to it. The black icon at the left hand end of the
++Toolbar</interface> to go to it. The black icon at the right hand end of the
+ <interface>Location Toolbar</interface> clears the text entry box.</para>
+
+ <para>The <interface>Bookmark Toolbar</interface> is the area under the
+@@ -149,9 +149,9 @@
+ linkend="menu-settings"><guimenu>Settings</guimenu></link> menu to choose
+ whether to show or hide the Menubar, Main Toolbar, Location Toolbar and
+ Bookmark Toolbar, or even to add an Extra Toolbar.</para></listitem>
+-<listitem><para>You can also <quote>flatten</quote> the toolbars by
+-<mousebutton>left</mousebutton> clicking on the vertical lines at the left hand end
+-of the bars, or move them around by holding the &LMB; down while you
++<listitem><para>You can also drag the toolbars by
++<mousebutton>left</mousebutton> clicking on the handle at the left hand end
++of the bars and move them around by holding the &LMB; down while you
+ drag these bars around. </para></listitem>
+ <listitem><para>This screenshot does not show the optional <link linkend="sidebar">
+ Navigation Panel</link>.</para></listitem>
+@@ -171,11 +171,10 @@
+ the
+ <guimenuitem>What's This?</guimenuitem> feature.</para>
+
+-<para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (K menu
+- <menuchoice><guimenu>Control Center</guimenu><guisubmenu>Appearance &
+- Themes</guisubmenu><guisubmenu>Style</guisubmenu></menuchoice>,
+- <guilabel>Style</guilabel> dialog) then when you hover the mouse pointer
+- over a Toolbar or Navigation Panel
++<para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (
++in &systemsettings; <menuchoice><guimenu>Appearance</guimenu>
++<guisubmenu>Windows</guisubmenu></menuchoice>, <guilabel>Buttons</guilabel> tab)
++then when you hover the mouse pointer over a Toolbar or Navigation Panel
+ button it should bring up a terse description of what that button does.</para>
+
+ <para><guimenuitem>What's This?</guimenuitem> is invoked by the Menubar
+@@ -241,9 +240,8 @@
+ same as <mousebutton>left</mousebutton> clicking except that it usually does it
+ in a new &konqueror; window, unless the <guilabel>Open links in new tab instead
+ of in new window</guilabel> box has been checked in the
+-<guimenuitem>Behavior</guimenuitem> page of the
++<guimenuitem>General</guimenuitem> page of the
+ <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+-
+ Konqueror...</guimenuitem></menuchoice> dialog. &konqueror; can open
+ links on pages and <menuchoice><guimenu>Bookmarks</guimenu></menuchoice>,
+ as well as the
+@@ -253,10 +251,12 @@
+
+ <para>Holding the &Shift; key down while pressing the &MMB; will open the link
+ in the background.</para>
++<!-- not in 4.4.0
+ <important><para>If you click the &MMB; when the mouse cursor is over a blank
+ part of the main view (not over a link or file name or icon) &konqueror; will
+ copy the contents of the clipboard into the Location Toolbar and try to use
+ that as a &URL;.</para></important>
++-->
+ </sect1>
+
+ <sect1 id="rmb-menus">
+@@ -303,14 +303,6 @@
+ </varlistentry>
+
+ <varlistentry>
+-<term>On the Bookmark Toolbar</term>
+-<listitem><para> If you have the Bookmark Toolbar showing, then
+-<mousebutton>right</mousebutton> click on any free part of it to bring up the
+-Bookmark Toolbar Menu which lets you change its position and whether items are
+-shown as text, icons, or both. </para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+ <term>Within a View</term>
+ <listitem><para>If you <mousebutton>right</mousebutton> click on any free area
+ of a view then you will get a menu that contains, among other options, the
+@@ -326,8 +318,7 @@
+ clicking on the name or icon of any file or folder not only
+ <quote>selects</quote> that item but also brings up a menu allowing you to
+ <guiicon>Cut</guiicon>, Move, <guiicon>Copy</guiicon> or Remove the item in
+-various
+-ways, add it to your <guimenu>Bookmarks</guimenu>, open it with the program of
++various ways, open it with the program of
+ your choice or preview it, rename it, or edit the file type or
+ properties.</para></listitem> </varlistentry>
+
+Index: apps/doc/konqueror/config.docbook
+===================================================================
+--- apps/doc/konqueror/config.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/doc/konqueror/config.docbook (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -6,8 +6,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2003-11-06</date>
+-<releaseinfo>3.2</releaseinfo>
++<date>2010-02-07</date>
++<releaseinfo>4.4.0</releaseinfo>
+ </chapterinfo>
+
+
+@@ -23,8 +23,8 @@
+ <para>When &kde; is newly installed, &konqueror;'s window contains a Menubar,
+ Main and Location Toolbars and possibly a Bookmark Toolbar.</para>
+
+-<para>Maybe you don't need all these toolbars. To hide one of them, go into
+-the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Toolbars</guisubmenu>
++<para>Maybe you don not need all these toolbars. To hide one of them, go into
++the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Toolbars Shown</guisubmenu>
+ </menuchoice> menu and uncheck its box. To show a hidden toolbar, just check
+ the box.</para>
+
+@@ -32,24 +32,19 @@
+ combination <keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>.
+ </para>
+
+-<!-- FIXME -->
+-<para>On the left hand end of each bar you can see some vertical
+-lines. By &LMB; clicking on them, you <quote>flatten</quote> the bar, meaning
+-that it is hidden but can be quickly restored by clicking on the now
+-horizontal lines. You can also drag a bar into a new position with these
+-lines.</para>
+-
+ <para>If you <mousebutton>right</mousebutton> click on a Toolbar, you
+-will get a menu to configure this bar. You can choose the orientation, text
+-position and icon size</para>
++will get a menu to configure this bar. You can lock or unlock the toolbar position
++and choose the text position, icon size and the orientation of unlocked bars.</para>
+
++<para>If the toolbars are unlocked, on the left hand end of each bar you can see
++some handles. By &LMB; clicking on them, you can drag a bar into a new position
++and even detach it from the window and place it anywhere on your screen.</para>
++
+ <para>The icons shown in the various bars can be changed by using the
+ <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
+ Toolbars...</guimenuitem></menuchoice> option, which brings up the
+-<guilabel>Configure Toolbars</guilabel> dialog box. The Main and Extra Toolbars
+-are divided into sections, such as Main Toolbar <&konqueror;>, Main
+-Toolbar <khtmlpart> and Extra Toolbar <khtmlsettingsplugin>. The
+-number and type of these sections will depend on whether &konqueror; is in Web
++<guilabel>Configure Toolbars</guilabel> dialog box. The
++number and type of these toolbars will depend on whether &konqueror; is in Web
+ Browser or File Manager mode and whether you have &konqueror; plugins
+ installed.</para>
+
+@@ -69,16 +64,16 @@
+ <phrase>Shortcut config screenshot 1</phrase>
+ </textobject>
+ </mediaobject>
+-<para>Search through the combo box to find the action you want to add or
++<para>Use the search box to find the action you want to add or
+ change the shortcut keys for and select it by <mousebutton>left</mousebutton>
+-clicking on the name. You will then be able to change the shortcut by
+-selecting the <guilabel>None</guilabel>, <guilabel>Default</guilabel> or
+-<guilabel>Custom</guilabel> radio button or by clicking on the large button in
+-the <guilabel>Shortcut for Selected Action</guilabel> area.</para>
++clicking on the name. </para>
+
+-<para>If you select <guilabel>Define Shortcut</guilabel>, and then
+-select <guilabel>Advanced</guilabel>, the dialog box below will be shown:
+-</para>
++<para>After you have selected an action in the list you will notice that
++this item is highlighted and you see two additional check boxes below
++this item in the list view. There you can configure a
++combination of keys or maybe no key binding at all for the selected
++action. </para>
++
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="shortcut2.png" format="PNG"/>
+@@ -87,37 +82,95 @@
+ <phrase>Shortcut config screenshot 2</phrase>
+ </textobject>
+ </mediaobject>
+-<para>Choose whether you want to change the <guilabel>Primary</guilabel> or
+-<guilabel>Alternate</guilabel> shortcut then press the key combination you
+-want to act as the shortcut, for example <keycombo action="simul">
+-&Ctrl;&Shift;<keycap>S</keycap></keycombo>.
+-If the <guilabel>Auto-Close</guilabel> box is checked the dialog will vanish
+-as soon as you enter the key combination, otherwise it will remain until you
+-press <guibutton>OK</guibutton> or <guibutton>Cancel</guibutton>. Clicking on
+-the little black icon with a white cross in it clears the shortcut.</para>
+
++<itemizedlist>
++<listitem><para><guilabel>Default</guilabel>: the selected action
++will be associated with &kde;'s default value. This is a good choice
++for most actions, as &kde; comes with reasonable key bindings we have
++thought about. </para></listitem>
++<listitem><para><guilabel>Custom</guilabel>: if this option is
++enabled, you can create a key combination for the selected
++action. Click on the button labeled either <guibutton>None</guibutton>
++or labeled with the previously selected custom shortcut. Now the button label
++changes to <guibutton>Input</guibutton>. Then press any modifier key
++(&ie; &Shift;, &Ctrl;, or &Alt;) and then normal key or a function key (⪚ <keycap>F11</keycap>)
++you want to assign to this key combination.</para></listitem>
++<listitem><para>You can reset the shortcut to <guilabel>None</guilabel> by using
++this button: <inlinemediaobject><imageobject> <imagedata
++fileref="reset.png" format="PNG"/></imageobject></inlinemediaobject>.
++</para>
++<para>Clicking on the <guilabel>Alternate</guilabel> column of a row in the list
++allows to edit the second shortcut for the action.</para></listitem>
++</itemizedlist>
++
++<!--not in 4.4 ?-->
+ <sect2 id="userdefmenus">
+ <title>User Defined Menus</title>
+ <para>You can add your own pop up menu to &konqueror; so that pressing one key
+ combination will make the menu appear then pressing a second key, or using the
+ <keysym>Up arrow</keysym> and <keysym>Down arrow</keysym> keys and pressing
+-<keycap>Enter</keycap>, will select an item from it.</para>
++&Enter;, will select an item from it.</para>
+ <para>To do this add a <guilabel>Custom</guilabel> shortcut for each of the
+ actions you want to appear in the menu and in the <guilabel>Define Shortcut
+ </guilabel> dialog check the <guilabel>Multi-Key</guilabel> box, press the
+ key combination that you want to bring up your new menu then, separately,
+ press the key that will choose that item from the menu.</para>
+ </sect2>
++<!--not in 4.4 ?-->
+ </sect1>
+
+ <sect1 id="othersettings">
+ <title>Other Settings</title>
+ <para>Selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>
+ Configure Konqueror...</guimenuitem></menuchoice> brings up a dialog box
+-which you can use to control most aspects of &konqueror;'s behavior.
+-It contains several sections which are selected by <mousebutton>left
++which you can use to control most aspects of &konqueror;'s behavior.</para>
++<para>It contains these sections which are selected by <mousebutton>left
+ </mousebutton> clicking on one of the icons at the left of the dialog
+-box.</para>
++box:</para>
++<itemizedlist>
++<listitem><para><ulink url="help:/kcontrol/khtml-general/index.html">General</ulink>:
++Configure general &konqueror; behavior</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/performance/index.html">Performance</ulink>:
++Configure settings that can improve &konqueror; performance</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/bookmarks/index.html">Bookmarks</ulink>:
++Configure the bookmarks home page</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/filemanager/index.html">File Management</ulink>:
++You can configure how Konqueror behaves as a file manager here</para></listitem>
++<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-viewmodes">View Modes</ulink>:
++Configure file manager view modes</para></listitem>
++<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-navigation">Navigation</ulink>:
++Configure file manager navigation</para></listitem>
++<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-services">Services</ulink>:
++Configure file manager services</para></listitem>
++<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-general">General</ulink>:
++Configure general file manager settings</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/filetypes/index.html">File Associations</ulink>:
++Configure file associations</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/trash/index.html">Trash</ulink>:
++Configure trash settings</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/khtml-behavior/index.html">Web Browsing</ulink>:
++Configure the browser behavior</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/proxy/index.html">Proxy</ulink>:
++Configure the proxy servers used</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/kcmcss/index.html">Appearance</ulink>:
++Configure how to display web pages</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/khtml-adblock/index.html">AdBlocK Filters</ulink>:
++Configure &konqueror; AdBlocK filters</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/ebrowsing/index.html">Web Shortcuts</ulink>:
++Configure enhanced browsing</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/cache/index.html">Cache</ulink>:
++Configure web cache settings</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/history/index.html">History</ulink>:
++Configure the history sidebar</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/cookies/index.html">Cookies</ulink>:
++Configure the way cookies work</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/useragent/index.html">Browser Identification</ulink>:
++Configure the way Konqueror reports itself</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/khtml-java-js/index.html">Java & JavaScript</ulink>:
++Configure the behavior of Java and JavaScript</para></listitem>
++<listitem><para><ulink url="help:/kcontrol/khtml-plugins/index.html">Plugins</ulink>:
++Configure the browser plugins</para></listitem>
++</itemizedlist>
+ <para>Pressing the <guibutton>Help</guibutton> button will give you
+ detailed instructions about how to use each of these sections, or you can
+ use the <link linkend="bubble">What's This?</link> feature.</para>
+Index: apps/doc/konqueror/introduction.docbook
+===================================================================
+--- apps/doc/konqueror/introduction.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1089014)
++++ apps/doc/konqueror/introduction.docbook (.../branches/KDE/4.4/kdebase) (wersja 1089014)
+@@ -5,15 +5,15 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2003-10-20</date>
+-<releaseinfo>3.2</releaseinfo>
++<date>2010-02-08</date>
++<releaseinfo>4.4</releaseinfo>
+ </chapterinfo>
+
+ <title>Overview</title>
+
+ <para><emphasis>&konqueror;</emphasis> is an advanced
+ <link linkend="filemanager">file manager</link> for the
+-K Desktop Environment, providing file management functions ranging from simple
++&kde; Software compilation, providing file management functions ranging from simple
+ cut/copy and paste operations to advanced local and remote network file
+ browsing. Folder contents can be displayed in a variety of text and icon
+ <link linkend="viewmode">view modes</link>, which can include thumbnail
+@@ -21,11 +21,16 @@
+ examined and changed and applications launched with a simple click of the
+ &LMB;.</para>
+
++<para>In &kde; SC 4 &dolphin; is the default file manger. To change the
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.104.2.24&r2=1.104.2.25&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase-branch.diff?r1=1.1.2.2&r2=1.1.2.3&f=u
More information about the pld-cvs-commit
mailing list