SOURCES: kde4-kdebase-branch.diff, kde4-kdebase-runtime-branch.diff, kde4-k...
arekm
arekm at pld-linux.org
Wed Mar 11 10:45:28 CET 2009
Author: arekm Date: Wed Mar 11 09:45:28 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kde4-kdebase-branch.diff (1.6 -> 1.7) , kde4-kdebase-runtime-branch.diff (1.7 -> 1.8) , kde4-kdebase-workspace-branch.diff (1.7 -> 1.8) , kde4-kdelibs-branch.diff (1.8 -> 1.9) , kde4-kdepim-branch.diff (1.4 -> 1.5) , kde4-kdepimlibs-branch.diff (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/kde4-kdebase-branch.diff
diff -u SOURCES/kde4-kdebase-branch.diff:1.6 SOURCES/kde4-kdebase-branch.diff:1.7
--- SOURCES/kde4-kdebase-branch.diff:1.6 Sat Mar 7 16:03:43 2009
+++ SOURCES/kde4-kdebase-branch.diff Wed Mar 11 10:45:19 2009
@@ -1,7 +1,7 @@
Index: apps/kappfinder/apps/System/Terminal/vmstat.desktop
===================================================================
---- apps/kappfinder/apps/System/Terminal/vmstat.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 936422)
-+++ apps/kappfinder/apps/System/Terminal/vmstat.desktop (.../branches/KDE/4.2/kdebase) (wersja 936422)
+--- apps/kappfinder/apps/System/Terminal/vmstat.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/kappfinder/apps/System/Terminal/vmstat.desktop (.../branches/KDE/4.2/kdebase) (wersja 938088)
@@ -43,7 +43,7 @@
GenericName[gu]=વર્ચ્યુઅલ મેમરી આંકડાઓ
GenericName[he]=סטטיסטיקה לגבי הזיכרון הווירטואלי
@@ -13,8 +13,8 @@
GenericName[hu]=Memóriastatisztika
Index: apps/konqueror/src/konqbookmarkbar.cpp
===================================================================
---- apps/konqueror/src/konqbookmarkbar.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 936422)
-+++ apps/konqueror/src/konqbookmarkbar.cpp (.../branches/KDE/4.2/kdebase) (wersja 936422)
+--- apps/konqueror/src/konqbookmarkbar.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/konqueror/src/konqbookmarkbar.cpp (.../branches/KDE/4.2/kdebase) (wersja 938088)
@@ -301,10 +301,21 @@
{
KBookmarkActionInterface * action = dynamic_cast<KBookmarkActionInterface *>( m_toolBar->actionAt(pos) );
@@ -41,10 +41,723 @@
}
// TODO *** drop improvements ***
+Index: apps/konqueror/settings/filetypes/filetypesview.cpp
+===================================================================
+--- apps/konqueror/settings/filetypes/filetypesview.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/konqueror/settings/filetypes/filetypesview.cpp (.../branches/KDE/4.2/kdebase) (wersja 938088)
+@@ -190,33 +190,39 @@
+ setEnabled( true );
+ }
+
+-// only call this method once on startup, then never again! Otherwise, newly
+-// added Filetypes will be lost.
++// To order the mimetype list
++static bool mimeTypeLessThan(const KMimeType::Ptr& m1, const KMimeType::Ptr& m2)
++{
++ return m1->name() < m2->name();
++}
++
++// Note that this method loses any newly-added (and not saved yet) mimetypes.
++// So this is really only for load().
+ void FileTypesView::readFileTypes()
+ {
+ typesLV->clear();
+ m_majorMap.clear();
+ m_itemList.clear();
+
+- const KMimeType::List mimetypes = KMimeType::allMimeTypes();
++ KMimeType::List mimetypes = KMimeType::allMimeTypes();
++ qSort(mimetypes.begin(), mimetypes.end(), mimeTypeLessThan);
+ KMimeType::List::const_iterator it2(mimetypes.constBegin());
+ for (; it2 != mimetypes.constEnd(); ++it2) {
+- QString mimetype = (*it2)->name();
+- int index = mimetype.indexOf('/');
+- QString maj = mimetype.left(index);
+- QString min = mimetype.right(mimetype.length() - index+1);
++ const QString mimetype = (*it2)->name();
++ const int index = mimetype.indexOf('/');
++ const QString maj = mimetype.left(index);
++ const QString min = mimetype.right(mimetype.length() - index+1);
+
+ TypesListItem* groupItem = m_majorMap.value(maj);
+- if ( !groupItem ) {
+- groupItem = new TypesListItem( typesLV, maj );
+- m_majorMap.insert( maj, groupItem );
+- }
++ if ( !groupItem ) {
++ groupItem = new TypesListItem(typesLV, maj);
++ m_majorMap.insert(maj, groupItem);
++ }
+
+ TypesListItem *item = new TypesListItem(groupItem, (*it2));
+ m_itemList.append( item );
+ }
+ updateDisplay(0L);
+-
+ }
+
+ void FileTypesView::slotEmbedMajor(const QString &major, bool &embed)
+Index: apps/kfind/kquery.cpp
+===================================================================
+--- apps/kfind/kquery.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/kfind/kquery.cpp (.../branches/KDE/4.2/kdebase) (wersja 938088)
+@@ -336,7 +336,7 @@
+ kWarning() << "Cannot open supposed ZIP file " << file.url() ;
+ }
+ } else if( !m_search_binary && !file.mimetype().startsWith("text/") &&
+- file.url().isLocalFile() ) {
++ file.url().isLocalFile() && !file.url().path().startsWith("/dev") ) {
+ if ( KMimeType::isBinaryData(file.url().path()) ) {
+ kDebug() << "ignoring, not a text file: " << file.url();
+ return;
+Index: apps/kfind/kfinddlg.cpp
+===================================================================
+--- apps/kfind/kfinddlg.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/kfind/kfinddlg.cpp (.../branches/KDE/4.2/kdebase) (wersja 938088)
+@@ -58,7 +58,7 @@
+ setStatusMsg(i18n("Ready."));
+ mStatusBar->setItemAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
+ mStatusBar->insertPermanentItem(QString(), 1, 1);
+- mStatusBar->setItemAlignment(1, Qt::AlignLeft | Qt::AlignVCenter);
++ mStatusBar->setItemAlignment(1, Qt::AlignRight | Qt::AlignVCenter);
+
+ QVBoxLayout *vBox = new QVBoxLayout(frame);
+ vBox->addWidget(tabWidget, 0);
+Index: apps/dolphin/src/dolphinpart.cpp
+===================================================================
+--- apps/dolphin/src/dolphinpart.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/dolphin/src/dolphinpart.cpp (.../branches/KDE/4.2/kdebase) (wersja 938088)
+@@ -274,6 +274,7 @@
+ emit started(0); // get the wheel to spin
+ m_dirLister->setNameFilter(m_nameFilter);
+ m_view->setUrl(url);
++ updatePasteAction();
+ emit aboutToOpenURL();
+ if (reload)
+ m_view->reload();
+Index: apps/doc/kwrite/index.docbook
+===================================================================
+--- apps/doc/kwrite/index.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/doc/kwrite/index.docbook (.../branches/KDE/4.2/kdebase) (wersja 938088)
+@@ -40,8 +40,8 @@
+ </copyright>
+ <legalnotice>&FDLNotice;</legalnotice>
+
+-<date>2008-09-01</date>
+-<releaseinfo>4.1.1</releaseinfo>
++<date>2009-02-05</date>
++<releaseinfo>4.2.00</releaseinfo>
+
+ <abstract>
+ <para>&kwrite; is a text editor for &kde; allowing you to edit one file at the time per window.</para>
+@@ -76,7 +76,7 @@
+ &kappname; features two different modes, a simple mode with a straightforward interface
+ and an advanced mode with more features and more extensive menu items.
+ The advanced mode is enabled by checking the option <link linkend="appearance">
+-Enable Power User Mode (&kde; 3 mode)</link>
++Enable power user mode (&kde; 3 mode)</link>
+ on the <guilabel>Appearance</guilabel> page in &kappname;s
+ settings.
+ </para>
+@@ -125,10 +125,10 @@
+ </informalexample>
+ </sect2>
+ <sect2 id="editing-files-on-the-internet">
+-<title>Specify a file on the internet</title>
++<title>Specify a file on the Internet</title>
+
+ <para>The above-mentioned method could even be used to open files on the
+-internet (if the user has an active connection at the time.) An example of
++Internet (if the user has an active connection at the time.) An example of
+ this might look like the following:</para>
+
+ <informalexample><screen>
+@@ -222,7 +222,7 @@
+ </sect2>
+ </sect1>
+
+-<sect1 id="keybindings"> <!--to be checked lueck-->
++<sect1 id="keybindings"> <!--has to be checked lueck-->
+ <title>Shortcuts</title>
+
+ <para>Many of the shortcuts are configurable by way of the <link
+@@ -304,7 +304,7 @@
+ <row>
+ <entry><para><keycombo action="simul">&Shift;<keycap>Enter</keycap></keycombo></para></entry>
+ <entry><para>Insert newline including leading characters of the current line which are not letters or numbers.
+-It is usefull ⪚ to write comments in the code: At the end of the line <quote>// some text</quote> press
++It is useful ⪚ to write comments in the code: At the end of the line <quote>// some text</quote> press
+ this shortcut and the next line starts already with <quote>// </quote>. So you do not have to enter the comment
+ characters at the beginning of each new line with comments.</para></entry>
+ </row>
+@@ -500,13 +500,11 @@
+ action="simul">&Ctrl;&Shift;<keycap>+</keycap></keycombo></para></entry>
+ <entry><para>Expand Toplevel</para></entry>
+ </row>
+-<!-- only in 4.2 uncomment after backport to 4.1
+ <row>
+ <entry><para><keycombo
+-action="simul">Meta&Ctrl;<keycap>V</keycap></keycombo></para></entry>
++action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo></para></entry>
+ <entry><para>VI input mode</para></entry>
+ </row>
+--->
+ <row>
+ <entry><para><keycombo
+ action="simul">&Ctrl;<keycap>Space</keycap></keycombo></para></entry>
+@@ -553,9 +551,9 @@
+
+ <para>There are different menus and menu items in simple and advanced mode.
+ The advanced mode is enabled by checking the option <link linkend="appearance">
+-Enable Power User Mode (&kde; 3 mode)</link>
++Enable power user mode (&kde; 3 mode)</link>
+ on the <guilabel>Appearance</guilabel> page in &kappname;s settings.</para>
+-<!-- This is also valid for kates menu file, kate has additional Save All Ctrl+L, Reload All, Close Other, Close All items-->
++<!-- This is also valid for kates menu file, kate has additional Save All Ctrl+L, Reload All, Close Other, Close All-->
+ <sect1 id="file">
+ <title>The <guimenu>File</guimenu> Menu</title>
+
+@@ -731,7 +729,7 @@
+ <term id="export-as-html">
+ <menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>Export as HTML...</guimenuitem>
++<guimenuitem>Export as HTML</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+@@ -893,6 +891,22 @@
+ <guilabel>LINE</guilabel>.</para>
+ </listitem>
+ </varlistentry>
++<varlistentry><!-- only in power user mode -->
++<term><anchor id="vi-input-mode"/><menuchoice>
++<shortcut>
++<keycombo action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo>
++</shortcut>
++<guimenu>Edit</guimenu><guimenuitem>VI input
++Mode</guimenuitem></menuchoice></term>
++<listitem>
++<para>Switch to a vi-like, modal editing mode. This mode supports the most used commands
++and motions from vim's normal and visual mode and has an optional vi mode statusbar.
++This status bar shows commands while they are being entered, output from commands and
++the current mode.The behavior of this mode can be configured in the
++<link linkend="pref-edit-vi-input-mode">Vi Input Mode</link> section of the
++<guilabel>Editing</guilabel> page in &kappname;'s settings dialog.</para>
++</listitem>
++</varlistentry>
+ <varlistentry>
+ <term><anchor id="overwrite-mode"/><menuchoice>
+ <shortcut>
+@@ -925,7 +939,7 @@
+ and <guilabel>Not found</guilabel> is displayed at the right side of the bar.</para>
+ <para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button
+ to jump to the next or previous match in the document.</para>
+-<para>You can modify the search behaviour by selecting different
++<para>You can modify the search behavior by selecting different
+ <guilabel>Options</guilabel>:
+ The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
+ Selecting <guilabel>Match case</guilabel> will limit finds to entries that match the
+@@ -993,20 +1007,23 @@
+ <para>This command opens the power search and replace bar.
+ On the upper left side of the bar is an icon to close the bar, followed by a small text
+ box for entering the search pattern.</para>
+-<para>You can control the search mode by selecting <guilabel>Plain Text</guilabel>,
+-<guilabel>Whole Words</guilabel>, <guilabel>Escape Sequences</guilabel> or
+-<guilabel>Regular Expression</guilabel>. For the last two options the
+-<guibutton>Add</guibutton> button is enabled and allows you to add special items to the
+-search pattern from a predefined list.
++<para>You can control the search mode by selecting <guilabel>Plain text</guilabel>
++<keycombo action="simul">&Alt;<keycap>1</keycap></keycombo>,
++<guilabel>Whole words</guilabel><keycombo action="simul">&Alt;<keycap>2</keycap></keycombo>,
++<guilabel>Escape sequences</guilabel><keycombo action="simul">&Alt;<keycap>3</keycap></keycombo>
++or <guilabel>Regular expression</guilabel><keycombo action="simul">&Alt;<keycap>4</keycap></keycombo>.
+ </para>
++<para>If <guilabel>Escape sequences</guilabel> or <guilabel>Regular expression</guilabel> are
++selected, the <guibutton>Add...</guibutton> menuitem at the bottom of the context menu of the text boxes will be enabled
++and allows you to add escape sequences or regular expression items to the
++search or replace pattern from predefined lists.</para>
+ <para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button to jump
+ to the next or previous match in the document.</para>
+ <para>Enter the text to replace with in the text box labeled <guilabel>Replace</guilabel>
+ and click the <guibutton>Replace</guibutton> button to replace only the highlighted text or
+ the <guibutton>Replace All</guibutton> button to replace the search text in the whole document.
+-If the option <guilabel>Use placeholders</guilabel> is checked you can add special items
+-to the replacement text by clicking the <guibutton>Add</guibutton> button.</para>
+-<para>You can modify the search and replace behaviour by selecting different
++</para>
++<para>You can modify the search and replace behavior by selecting different
+ options on the right side of the bar.
+ The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
+ Selecting <guilabel>Match case</guilabel> will limit finds to entries that match the
+@@ -1073,7 +1090,7 @@
+
+ </sect1>
+ <sect1 id="view-menu">
+-<!-- This is also valid for kates menu edit, only New Window is replaced by Vi input mode-->
++<!-- This is also valid for kates menu view, but kate does not have the New Window item -->
+ <title>The <guimenu>View</guimenu> menu</title>
+
+ <para>The <guimenu>View</guimenu> menu allows you to manage settings
+@@ -1094,7 +1111,7 @@
+ document in one window are reflected in the other window and vice versa.</para>
+ </listitem>
+ </varlistentry>
+-<!--kwrite in 4.2 has VI Input mode Meta+Ctrl+V -->
++
+ <varlistentry>
+ <term>
+ <anchor id="view-command-line"/><!-- only in power user mode -->
+@@ -1273,7 +1290,6 @@
+ </listitem>
+ </varlistentry>
+
+-<!-- only in 4.2, uncomment when backported to 4.1
+ <varlistentry>
+ <term><menuchoice><guimenuitem>Enlarge Font</guimenuitem></menuchoice>
+ </term>
+@@ -1285,7 +1301,6 @@
+ </term>
+ <listitem><para>This decreases the display font size.</para></listitem>
+ </varlistentry>
+--->
+ </variablelist>
+
+ </sect1>
+@@ -1360,7 +1375,7 @@
+ </sect1>
+
+ <!-- This is also valid for kates menu tools, kate has additional items:
+-Pipe to Terminal, Syncronizise Terminal with Current Dokument, Focus Terminal at top-->
++Pipe to Terminal, Syncronizise Terminal with Current Document, Focus Terminal at top-->
+ <sect1 id="tools">
+ <title>The <guimenu>Tools</guimenu> Menu</title>
+
+@@ -1865,7 +1880,7 @@
+ <sect1 id="help">
+ <title>The <guimenu>Help</guimenu> Menu</title>
+
+-<!-- additional "About Editor Component" + "Tip of the Day", but no "Switch Language"-->
++<!-- additional "About Editor Component" + "Tip of the Day"-->
+
+ &help.menu.documentation;
+
+@@ -1891,7 +1906,7 @@
+ <guibutton>OK</guibutton> button, or <guibutton>Cancel</guibutton> the
+ process. The categories <guilabel>Appearance</guilabel>,
+ <guilabel>Fonts & Colors</guilabel>, <guilabel>Editing</guilabel>,
+-<guilabel>Open/Save</guilabel>, <guilabel>Shortcuts</guilabel> and
++<guilabel>Open/Save</guilabel> and
+ <guilabel>Extensions</guilabel> are detailed below.
+ </para>
+
+@@ -1904,7 +1919,7 @@
+ <listitem>
+ <variablelist>
+ <varlistentry id="appearance-settings">
+-<term><guilabel>Dynamic word wrap</guilabel></term>
++<term><guilabel>Dynamic Word Wrap</guilabel></term>
+ <listitem><para>If this option is checked, the text lines
+ will be wrapped at the view border on the screen.</para></listitem>
+ </varlistentry>
+@@ -1967,7 +1982,7 @@
+ <varlistentry>
+ <term><guilabel>Sort Bookmarks Menu
+ </guilabel></term>
+-<listitem><para>These options are only displayed, if <guilabel>Enable Power User Mode
++<listitem><para>These options are only displayed, if <guilabel>Enable power user mode
+ (&kde; 3 mode)</guilabel> in the next section is checked.</para>
+ <para>
+ <variablelist>
+@@ -1993,14 +2008,14 @@
+ <listitem><para>
+ <variablelist>
+ <varlistentry>
+-<term><guilabel>Enable Power User Mode (&kde; 3 mode)
++<term><guilabel>Enable power user mode (&kde; 3 mode)
+ </guilabel></term>
+ <listitem><para>Switch between simple and advanced mode.
+ Changing this mode affects only newly opened / created documents.
+ In &kappname; a restart is recommended.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+-<term><guilabel>Show identation lines
++<term><guilabel>Show indentation lines
+ </guilabel></term>
+ <listitem><para>If this is checked, the editor will display
+ vertical lines to help identifying indent lines.</para></listitem>
+@@ -2126,7 +2141,7 @@
+ <title>Normal Text Styles</title>
+ <para>The normal text styles are inherited by the highlight text styles,
+ allowing the editor to present text in a very consistent way, for example comment
+-text is using the same style in allmost all of the text formats that &kappname; can
++text is using the same style in almost all of the text formats that &kappname; can
+ highlight.</para>
+ <para>The name in the list of styles is using the style configured for
+ the item, providing you with an immediate preview when configuring a style.
+@@ -2180,7 +2195,7 @@
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+-<term><guilabel>Show tabulators</guilabel></term>
++<term><guilabel>Highlight tabulators</guilabel></term>
+ <listitem>
+ <para>When this is enabled &kappname; will display a small dot as a visual
+ representation of tabulator characters.</para>
+@@ -2474,6 +2489,45 @@
+
+ </sect2>
+
++<sect2 id="pref-edit-vi-input-mode">
++<title>Vi Input Mode</title>
++<variablelist>
++<varlistentry>
++<term><guilabel>General</guilabel></term>
++<listitem>
++<variablelist>
++<varlistentry>
++<term><guilabel>Use the VI Input mode</guilabel></term>
++<listitem>
++<para>When selected, the vi input mode will be enabled when opening a new view.
++You can still toggle the vi input mode on/off for a particular view in the
++<guilabel>Edit</guilabel> menu.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Let VI commands override Kate shortcuts</guilabel></term>
++<listitem>
++<para>When selected, vi commands will override &kate;'s built-in commands. For
++example: <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> will redo,
++and override the standard action (showing the search and replace dialog).</para>
++</listitem>
++</varlistentry>
++<varlistentry>
++<term><guilabel>Hide the VI mode status bar</guilabel></term>
++<listitem>
++<para>By default, an extra status bar will be used when the Vi input mode is
++enabled. This status bar shows commands while they are being typed and
++messages/errors produced by Vi commands.</para>
++<para>Checking this options will hide this extra status line.</para>
++</listitem>
++</varlistentry>
++</variablelist>
++</listitem>
++</varlistentry>
++</variablelist>
++
++</sect2>
++
+ </sect1>
+
+ <sect1 id="pref-open-save">
+@@ -2495,6 +2549,15 @@
+ </listitem>
+ </varlistentry>
+ <varlistentry>
++<term><guilabel>Encoding autodetection</guilabel></term>
++<listitem>
++<para>Select an item from the drop down box, either to disable autodetection or
++use <guilabel>Universal</guilabel> to enable autodetection for all encodings. But as
++this may probably only detect utf-8/utf-16, selecting a region will use custom heuristics
++for better results.</para>
++</listitem>
++</varlistentry>
++<varlistentry>
+ <term><guilabel>End of line:</guilabel></term>
+ <listitem>
+ <para>Choose your preferred end of line mode for your active
+@@ -2686,16 +2749,6 @@
+
+ </sect1>
+
+-<sect1 id="pref-shortcuts">
+-<title>Shortcuts</title> <!-- this is only in 4.1 in kate and kwrite only cursor shortcuts??? -->
+-<para>You can change here the shortcut keys configuration. Select an
+-action and click on <guilabel>None</guilabel> next to the <guilabel>Custom</guilabel> radio button
+-and press the key combination, if you want a different shortcut
+-for this action.</para>
+-<para>The search line allows you to look for a specific action and see
+-its associated shortcut.</para>
+-</sect1>
+-
+ <sect1 id="pref-plugins">
+ <title>Extensions</title>
+ <para>This <guilabel>Plugins</guilabel> tab lists all available plugins and you can check those you
+@@ -2749,7 +2802,7 @@
+ </listitem>
+
+ <listitem>
+-<para>Jochen Wilhely <email>digisnap at cs.tu-berlin.de</email></para>
++<para>Jochen Wilhelmy <email>digisnap at cs.tu-berlin.de</email></para>
+ </listitem>
+
+ <listitem>
+Index: apps/doc/konsole/index.docbook
+===================================================================
+--- apps/doc/konsole/index.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 938088)
++++ apps/doc/konsole/index.docbook (.../branches/KDE/4.2/kdebase) (wersja 938088)
+@@ -40,14 +40,14 @@
+ <holder>&Jonathan.Singer;</holder>
+ </copyright>
+ <copyright>
+-<year>2005</year><year>2008</year>
++<year>2005</year><year>2008</year><year>2009</year>
+ <holder>&Kurt.Hindenburg;</holder>
+ </copyright>
+
+ <legalnotice>&FDLNotice;</legalnotice>
+
+-<date>2008-09-07</date>
+-<releaseinfo>2.1.0</releaseinfo>
++<date>2009-02-23</date>
++<releaseinfo>2.2.0</releaseinfo>
+
+ <abstract><para>&konsole; is &kde;'s terminal emulator.</para></abstract>
+
+@@ -303,7 +303,7 @@
+ <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>M</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice>
+ </term>
+-<listitem><para><action>Opens a new seperate &konsole; window with the default profile</action>
++<listitem><para><action>Opens a new separate &konsole; window with the default profile</action>
+ </para></listitem></varlistentry>
+
+ <varlistentry>
+@@ -381,12 +381,16 @@
+ action="simul">&Ctrl;&Alt;<keycap>S</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Rename Tab...</guimenuitem></menuchoice></term>
+ <listitem><para><action>Opens a dialog box allowing you to change
+-the name of the current tab</action></para></listitem>
++the name of the current tab</action>
++(<link linkend="rename-tab-dialog">more info</link>)
++</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy Input To...</guimenuitem></menuchoice></term>
+-<listitem><para><action>Allows input from the current session to be inputted simultaneously to other sessions</action></para>
++<listitem><para><action>Allows input from the current session to be sent simultaneously to other sessions</action>
++(<link linkend="copy-input-dialog">more info</link>)
++</para>
+ </listitem>
+ </varlistentry>
+
+@@ -604,6 +608,7 @@
+ <term><menuchoice><guimenu>Scrollback</guimenu><guimenuitem>Scrollback
+ Options...</guimenuitem></menuchoice></term>
+ <listitem><para><action>Opens a dialog to configure number of lines to save</action>
++(<link linkend="scrollback-options-dialog">more info</link>)
+ </para></listitem>
+ </varlistentry>
+
+@@ -658,7 +663,7 @@
+ <listitem><para><action>Opens the bookmark editor</action></para>
+
+ <note><para>You can use the bookmark editor to manually add URLs
+-like ssh://user@host or telnet://host to open remote connections.</para></note>
++like ssh://user@host:port to open remote connections.</para></note>
+ </listitem>
+ </varlistentry>
+
+@@ -715,6 +720,97 @@
+ </sect2>
+ </sect1>
+
++<sect1 id="rename-tab-dialog">
++<title>Rename Tab Dialog</title>
++
++<para>The name of the current tab can be changed from this dialog.
++The dialog can be display via the menu, the shortcut or by
++double-clicking on the tab in the tab bar.
++These changes can be made permanent by editing the current profile.
++</para>
++
++<para>
++&konsole; will subsitute these tokens:
++<itemizedlist mark='opencircle'>
++<listitem><para>%n : program name</para></listitem>
++<listitem><para>%d : current directory (short)</para></listitem>
++<listitem><para>%D : current directory (long)</para></listitem>
++<listitem><para>%w : window title set by shell</para></listitem>
++<listitem><para>%# : session number</para></listitem>
++
++<!--
++<listitem><para>%u : user name [Remote]</para></listitem>
++<listitem><para>%h : remote host name (short) [Remote]</para></listitem>
++<listitem><para>%H : remote host name (long) [Remote]</para></listitem>
++-->
++</itemizedlist>
++
++</para>
++<para>
++Examples:
++<itemizedlist mark='opencircle'>
++
++<listitem><para>
++<userinput>%d : %n</userinput>
++ with /usr/src as current directory and running
++<application>bash</application> will display
++<guibutton>usr/s : bash</guibutton>
++</para></listitem>
++
++<listitem><para>
++<userinput>%D : %n</userinput>
++ with /usr/src as current directory and running
++<application>top</application> will display
++<guibutton>/usr/src : top</guibutton>
++</para></listitem>
++
++<listitem><para>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-branch.diff?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-runtime-branch.diff?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-workspace-branch.diff?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepim-branch.diff?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepimlibs-branch.diff?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list