diff --git a/doc/klipper/index.docbook b/doc/klipper/index.docbook
index 43276bb7f..8e4286e6d 100644
--- a/doc/klipper/index.docbook
+++ b/doc/klipper/index.docbook
@@ -30,11 +30,11 @@
&FDLNotice;
-2013-06-02
-0.9.7 (&kde; 4.11)
+2015-07-20
+Plasma 5.4
-&klipper; is the &kde; clipboard cut & paste utility.
+&klipper; is the &plasma; clipboard cut & paste utility.
@@ -44,14 +44,13 @@
clipboard
-
+
Introduction
-&klipper; is the &kde; clipboard utility. It stores clipboard
+&klipper; is the &plasma; clipboard utility. It stores clipboard
history, and allows you to link clipboard contents to application
actions. Please report any problems or feature requests to KDEs bugzilla or use the Report Bug
-item in the Help menu.
+url="http://bugs.kde.org">KDEs bugzilla.
@@ -60,6 +59,11 @@ item in the Help menu.
Basic Usage
+You can use &klipper; in the systemtray either as &plasma; widget or classic application.
+Both share the same functionality but have a different &GUI; and show the last item of the history
+when hoovering the &klipper; icon in the systemtray:
+
+
The &klipper; icon.
@@ -72,36 +76,70 @@ item in the Help menu.
+The &klipper; widget is hidden if the clipboard is empty.
+
To display the clipboard history, click on the &klipper; icon in
- the &kde; panel, or press &Ctrl;&Alt;V. Previous
- clipboard entries are shown at the top of the popup menu which
- appears. Selecting one of these copies it to the clipboard, from
- where it can be pasted into any &kde; or X application as
- usual.
+the systemtray.
-The shortcut for this action has to be configured in the
-System Tray Settings on the Entries
-page.
+
+&klipper; Widget
+
+The &klipper; Widget.
+
+
+
+
+
+The &klipper; Widget
+
+
+
+
+Hoover an entry with the mouse pointer and four icons appear which enable you to
+invoke an action, show the barcode, edit the content or remove the entry from the history.
+Use &ksnapshot; to capture the barcodes and save them.
+You can search through the clipboard history by opening it
(click on &klipper;) and typing your query. The results are updated as
-you type. In case you're wondering how to use the accelerator keys in
-the &klipper; menu, just press &Alt; and the accelerator you want. For
-example, to clear the clipboard history when the &klipper; menu is
-open, press &Alt; and the underlined letter in Clear Clipboard History
-.
-
-Select Show Barcode from the &klipper; popup menu to open a
-dialog with a QRCode and a
-DataMatrix barcode.
-Use &ksnapshot; to capture the barcodes and save them.
+you type. To clear the clipboard history click on the icon at the right of
+the search field.
+
+
+The Configure action in the context menu opens the
+settings dialog.
-To disable &klipper;, click on its icon and
-from the menu that appears, select
-Quit.
+To disable the &klipper; widget, deselect it in the General page
+of the System Tray Settings (&Alt;D, S).
+
+
+
+
+&klipper; Application
+
+The &klipper; Application.
+
+
+
+
+
+The &klipper; Application
+
+
+
+
+At the top of the available menu actions previous clipboard entries are shown.
+Selecting one of these copies it to the clipboard, from
+where it can be pasted into any &kde; or X application as usual.
+You can search through the clipboard history by typing your query
+in the seach field at the top. The results are updated as
+you type.
+
+
+
@@ -112,7 +150,7 @@ based on whether they match a particular regular expression. For
example, any clipboard contents starting with http:// can
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
+type. ⪚, if the path to a PDF file is copied to the clipboard, the file can be
viewed in &okular;.
To use this feature, just select a &URL; or path.
@@ -126,19 +164,18 @@ selection.
contents, select Disable This Popup 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 Configure Klipper...
+that the menu remains for in the settings
dialog, with the option Timeout for action popups
under the General page. You can separately disable the
file path part using the option Enable MIME-based actions under
the Actions page.
-
-Actions can be disabled completely by clicking on &klipper; and
-deselecting Enable Clipboard Actions, or by pressing
-&Ctrl;&Alt;X.
+
+Actions can be disabled completely by pressing
+the shortcut &Ctrl;&Alt;X.Clipboard contents which match a regular expression can also be
edited before performing an action on them. Select Edit
-contents... on the &klipper; pop-up menu, and you can
+contents... at the right of the clipboard entry, and you can
change the clipboard contents in the dialog which appears, before
clicking the OK button to run the appropriate
action.
@@ -156,7 +193,7 @@ menu to repeat the last action which &klipper; performed.
General
&klipper; can be used to set the behavior of the clipboard and selection in
-&kde;.
+&plasma;.
The &X-Window; uses two separate clipboard buffers: the
@@ -167,9 +204,8 @@ the clipboard buffer, select it and press
&Ctrl;X or
&Ctrl;C. Text from the
clipboard buffer is pasted using &Ctrl;V
- or by selecting
-EditPaste
-.
+ or by selecting Paste
+in a context menu.
-
-
-
&documentation.index;
diff --git a/doc/klipper/klipper-application.png b/doc/klipper/klipper-application.png
new file mode 100644
index 000000000..e8ac7197b
Binary files /dev/null and b/doc/klipper/klipper-application.png differ
diff --git a/doc/klipper/klipper-widget.png b/doc/klipper/klipper-widget.png
new file mode 100644
index 000000000..ca017fcc8
Binary files /dev/null and b/doc/klipper/klipper-widget.png differ
diff --git a/doc/klipper/screenshot.png b/doc/klipper/screenshot.png
index 6c6605764..b9cc1146e 100644
Binary files a/doc/klipper/screenshot.png and b/doc/klipper/screenshot.png differ