[kde-doc-english] [krusader] /: Sync docs with code. Avoid shortcuts conflict.
Yuri Chornoivan
yurchor at ukr.net
Tue Jul 12 17:35:08 UTC 2016
Git commit d1876e0c24a1627575f8050791400720b482f337 by Yuri Chornoivan.
Committed on 12/07/2016 at 17:34.
Pushed by yurchor into branch 'master'.
Sync docs with code. Avoid shortcuts conflict.
M +2 -2 doc/basic-functions.docbook
M +2 -2 doc/features.docbook
M +17 -3 doc/keyboard-commands.docbook
M +16 -10 doc/konfigurator.docbook
M +16 -0 doc/menu-commands.docbook
M +1 -1 doc/user-interface.docbook
M +1 -1 krusader/Panel/listpanelactions.cpp
http://commits.kde.org/krusader/d1876e0c24a1627575f8050791400720b482f337
diff --git a/doc/basic-functions.docbook b/doc/basic-functions.docbook
index 25ad83b..785ed2b 100644
--- a/doc/basic-functions.docbook
+++ b/doc/basic-functions.docbook
@@ -214,7 +214,7 @@
Files</link>.</para>
</sect2>
<sect2 id="quicksearch">
- <title>Quicksearch</title>
+ <title>Quick search</title>
<!-- Thanks to Heiner Eichmann -->
<para>This feature will do a quick search for the file name
in the Active List Panel.</para>
@@ -243,7 +243,7 @@
<guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice>).</para>
</sect2>
<sect2 id="quickfilter">
- <title>Quickfilter</title>
+ <title>Quick filter</title>
<para>This feature will do a quick filter for the file list
in the Active Panel.</para>
<para>Press <keycombo>&Ctrl;<keycap>I</keycap></keycombo> to open Quickfilter bar.
diff --git a/doc/features.docbook b/doc/features.docbook
index 9da699a..d839ba0 100644
--- a/doc/features.docbook
+++ b/doc/features.docbook
@@ -185,7 +185,7 @@
Editor/Viewer</link>.</para>
</listitem>
<listitem>
- <para><link linkend="quicksearch">Quick search</link></para>
+ <para><link linkend="quicksearch">Quick search, select and filter</link></para>
</listitem>
<listitem>
<para>
@@ -439,7 +439,7 @@
</para>
</listitem>
<listitem>
- <para>The Quicksearch supports regular expressions for searching files.
+ <para>The quick search, select and filter bar supports regular expressions for matching files.
</para>
</listitem>
<listitem>
diff --git a/doc/keyboard-commands.docbook b/doc/keyboard-commands.docbook
index 0605fb6..cf1f972 100644
--- a/doc/keyboard-commands.docbook
+++ b/doc/keyboard-commands.docbook
@@ -46,7 +46,7 @@
to jump back to the active panel. If
you want to jump to a file or directory that starts with <literal>f</literal>,
then simply press <keycap>f</keycap> on the keyboard to use the
- <link linkend="quicksearch">Quick search</link>. Use the &Enter; key to execute
+ <link linkend="quicksearch">search bar</link>. Use the &Enter; key to execute
the file or to open a directory that has the focus. Be sure to
remember the Function Keys - <keycap>F3</keycap> to View, <keycap>F4</keycap> to Edit,
<keycap>F5</keycap> to Copy, <keycombo action="simul">&Alt;&Shift;<keycap>U</keycap></keycombo> to Unpack, &etc;</para>
@@ -1095,7 +1095,7 @@
<para>
<keycombo action="simul">
&Ctrl;&Shift;
- <keycap>F</keycap></keycombo>
+ <keycap>D</keycap></keycombo>
</para>
</entry>
<entry>
@@ -1110,6 +1110,20 @@
<para>
<keycombo action="simul">
&Ctrl;&Shift;
+ <keycap>F</keycap></keycombo>
+ </para>
+ </entry>
+ <entry>
+ <para>
+ Activate <link linkend="remote-connections">search bar</link> to find entries in the active tab.
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <keycombo action="simul">
+ &Ctrl;&Shift;
<keycap>J</keycap></keycombo>
</para>
</entry>
@@ -1444,7 +1458,7 @@
</para>
</entry>
<entry>
- <para><link linkend="quicksearch">Quick search</link></para>
+ <para><link linkend="quicksearch">Quick search</link>, quick select or <link linkend="quickfilter">quick filter</link>. See <link linkend="konfig-panel-general">this configuration page</link> on how to configure the default mode.</para>
</entry>
</row>
<row>
diff --git a/doc/konfigurator.docbook b/doc/konfigurator.docbook
index acf1a42..2542f6c 100644
--- a/doc/konfigurator.docbook
+++ b/doc/konfigurator.docbook
@@ -264,19 +264,20 @@
</itemizedlist>
<itemizedlist>
<title>
- <guilabel>Quicksearch/Quickfilter</guilabel>
+ <guilabel>Search bar</guilabel>
</title>
<listitem>
<para>
- <guilabel>New style Quicksearch</guilabel>: The new
- <link linkend="quicksearch">Quicksearch</link> feature is
- used.</para>
+ <guilabel>Start by typing</guilabel>: allows to select if
+ <link linkend="quicksearch">quick search</link> feature is
+ used. When checked, you can open search bar and start searching
+ by typing something while viewing folder contents in the active panel.</para>
</listitem>
<listitem>
<para>
- <guilabel>Case sensitive Quicksearch/Quickfilter</guilabel>: When you
- use the <link linkend="quicksearch">Quicksearch</link>
- or <link linkend="quickfilter">Quickfilter</link> feature:
+ <guilabel>Case sensitive</guilabel>: When you
+ use the <link linkend="quicksearch">search</link>
+ or <link linkend="quickfilter">filter</link> feature:
If checked (the &UNIX; default), all files
beginning with capital letters appear before files
beginning with lower case letters; otherwise, all files
@@ -285,12 +286,17 @@
</listitem>
<listitem>
<para>
- <guilabel>Up/Down cancels Quicksearch</guilabel>: Pressing <keycap>Arrow Up</keycap> or <keycap>Arrow Down</keycap> cancels <link linkend="quicksearch">Quicksearch</link> dialog.</para>
+ <guilabel>Up/Down cancels search</guilabel>: Pressing <keycap>Arrow Up</keycap> or <keycap>Arrow Down</keycap> cancels <link linkend="quicksearch">search</link> bar.</para>
</listitem>
<listitem>
<para>
- <guilabel>Position</guilabel>: Lets you choose <link linkend="quicksearch">Quicksearch</link>
- and <link linkend="quickfilter">Quickfilter</link> bar position (<guimenuitem>Bottom</guimenuitem> or <guimenuitem>Top</guimenuitem>).</para>
+ <guilabel>Position</guilabel>: Lets you choose <link linkend="quicksearch">search</link>
+ and <link linkend="quickfilter">filter</link> bar position (<guimenuitem>Bottom</guimenuitem> or <guimenuitem>Top</guimenuitem>).</para>
+ </listitem>
+ <listitem>
+ <para>
+ <guilabel>Default mode</guilabel>: Lets you choose the search bar default mode between <link linkend="quicksearch">Search</link>, <guilabel>Select</guilabel>
+ and <link linkend="quickfilter">Filter</link>. You can change the mode later using the search bar itself.</para>
</listitem>
</itemizedlist>
<itemizedlist>
diff --git a/doc/menu-commands.docbook b/doc/menu-commands.docbook
index 6bb1644..bc88fb6 100644
--- a/doc/menu-commands.docbook
+++ b/doc/menu-commands.docbook
@@ -558,6 +558,22 @@
<term>
<menuchoice>
<shortcut>
+ <keycombo action="simul">&Ctrl;&Shift;
+ <keycap>F</keycap></keycombo>
+ </shortcut>
+ <guimenu>Edit</guimenu>
+ <guimenuitem>Find in folder</guimenuitem>
+ </menuchoice>
+ </term>
+ <listitem>
+ <para>Toggles &krusader;
+ <link linkend="quicksearch">quick search</link> function.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <menuchoice>
+ <shortcut>
<keycombo action="simul">&Alt;&Shift;
<keycap>C</keycap></keycombo>
</shortcut>
diff --git a/doc/user-interface.docbook b/doc/user-interface.docbook
index 411ef75..1c69633 100644
--- a/doc/user-interface.docbook
+++ b/doc/user-interface.docbook
@@ -402,7 +402,7 @@
<emphasis>
<guilabel>File List</guilabel>
</emphasis>: displays the files and directories in the
- browsed directory. The <link linkend="quicksearch">Quick search</link>
+ browsed directory. The <link linkend="quicksearch">search bar</link>
allows you to search for files by typing their names, or
the first few characters of a file name. Pressing
&Enter; or double clicking on a file will
diff --git a/krusader/Panel/listpanelactions.cpp b/krusader/Panel/listpanelactions.cpp
index 3ffd084..a324860 100644
--- a/krusader/Panel/listpanelactions.cpp
+++ b/krusader/Panel/listpanelactions.cpp
@@ -111,7 +111,7 @@ ListPanelActions::ListPanelActions(QObject *parent, FileManagerWindow *mainWindo
action(i18n("&Reload"), "view-refresh", Qt::CTRL + Qt::Key_R, _func, SLOT(refresh()), "std_redisplay");
actCancelRefresh = action(i18n("Cancel Refresh of View"), "dialog-cancel", 0, _gui, SLOT(inlineRefreshCancel()), "cancel refresh");
actFTPNewConnect = action(i18n("New Net &Connection..."), "network-connect", Qt::CTRL + Qt::Key_N, _func, SLOT(newFTPconnection()), "ftp new connection");
- actFTPDisconnect = action(i18n("Disconnect &from Net"), "network-disconnect", Qt::SHIFT + Qt::CTRL + Qt::Key_F, _func, SLOT(FTPDisconnect()), "ftp disconnect");
+ actFTPDisconnect = action(i18n("Disconnect &from Net"), "network-disconnect", Qt::SHIFT + Qt::CTRL + Qt::Key_D, _func, SLOT(FTPDisconnect()), "ftp disconnect");
action(i18n("Sync Panels"), 0, Qt::ALT + Qt::SHIFT + Qt::Key_O, _func, SLOT(syncOtherPanel()), "sync panels");
actJumpBack = action(i18n("Jump Back"), "go-jump", Qt::CTRL + Qt::Key_J, _gui, SLOT(jumpBack()), "jump_back");
actSetJumpBack = action(i18n("Set Jump Back Point"), "go-jump-definition", Qt::CTRL + Qt::SHIFT + Qt::Key_J, _gui, SLOT(setJumpBack()), "set_jump_back");
More information about the kde-doc-english
mailing list