diff --git a/doc/annotations.png b/doc/annotations.png
index 07a7f6a29..ae4c5d9e3 100644
Binary files a/doc/annotations.png and b/doc/annotations.png differ
diff --git a/doc/index.docbook b/doc/index.docbook
index b79948962..3f044804f 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -33,7 +33,7 @@ Context menu actions like Rename Bookmarks etc.)
&FDLNotice;
- 2020-04-08
+ 2020-06-051.11 (Applications 20.08)
@@ -182,7 +182,7 @@ Context menu actions like Rename Bookmarks etc.)
- If the document has annotations, enable the Reviews view
+ If the document has annotations, enable the Annotations view
and click the annotations or select them with the Up Arrow and Down Arrow keys and press Return to go to the associated page.
@@ -496,7 +496,7 @@ Context menu actions like Rename Bookmarks etc.)
Text annotations like Yellow Highlighter and Black Underlining
for files with text like ⪚ &PDF;.Graphic annotations like Pop-up Note, Inline Note, Freehand Line, Highlighter, Straight Line, Polygon, Stamp, Underline, Ellipse, and Typewriter for all formats supported by &okular;.
- Using the context menu either in the Reviews view of the sidebar or in the main window you can open a Pop up Note for any kind of annotation and add or edit comments.
+ Using the context menu either in the Annotations view of the sidebar or in the main window you can open a Pop up Note for any kind of annotation and add or edit comments.Annotations are not only limited to &PDF; files, they can be used for any format &okular; supports.
&okular; has the "document archiving" feature. This is an &okular;-specific format for carrying the document plus various metadata related to it (currently only annotations). You can save a "document archive" from the open document by choosing FileSave As and selecting Okular document archive in the Filter selector. Documents saved this way will get .okular as their filename extension. To open an &okular; document archive, just open it with &okular; as it would be ⪚ a &PDF; document.
@@ -521,9 +521,9 @@ Context menu actions like Rename Bookmarks etc.)
Adding annotations
- To add some annotations to the document, you have to activate the annotating toolbar.
+ To add some annotations to the document, you have to use Quick Annotations button on the main &okular; toolbar or activate the annotating toolbar.
This is done by either selecting
- ToolsReview or
+ ToolsAnnotations or
pressing F6. Once the annotating toolbar is shown, just press one of
its buttons or use keyboard shortcuts (keys from 1 to 9) to start constructing that annotation.
@@ -551,25 +551,133 @@ Context menu actions like Rename Bookmarks etc.)
-
+
- Pop-up Note
+ Highlighter
- To draw multiline note. The note will can be viewed by double clicking on an icon in the document.
+ To highlight text in the document with some given background color.
- Click on the tool button, then click on the place in the document where the pop-up note should be added. Enter the text of pop-up note then click on the Close this note button in the top right corner of the pop-up window.
+ Click on the tool button, then click with the &LMB; and hold to place the beginning of the highlighted text snippet, then drag to highlight it.
- It is possible to define the Color, Opacity, and Icon for the note. Just right-click on the note icon created and select the Properties menu item.
+ It is possible to define the Type (Highlight, Squiggle, Underline or Strike out), Color, and Opacity for the highlighter. Just right-click on the highlighted text and select the Properties menu item.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Underline
+
+
+
+
+ To underline some text.
+
+
+ Click on the tool button, then click with the &LMB; and hold to place the beginning of the underlined text snippet, then drag to underline it.
+
+
+ It is possible to define the Type (Highlight, Squiggle, Underline or Strike out), Color, and Opacity for the underline. Just right-click on the underlined text and select the Properties menu item.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Squiggle
+
+
+
+
+ To underline some text by a squiggle line.
+
+
+ Click on the tool button, then click with the &LMB; and hold to place the beginning of the underlined text snippet, then drag to underline it.
+
+
+ It is possible to define the Type (Highlight, Squiggle, Underline or Strike out), Color, and Opacity for the underline. Just right-click on the underlined text and select the Properties menu item.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Strike Out
+
+
+
+
+ To strike out some text.
+
+
+ Click on the tool button, then click with the &LMB; and hold to place the beginning of the underlined text snippet, then drag to underline it.
+
+
+ It is possible to define the Type (Highlight, Squiggle, Underline or Strike out), Color, and Opacity for the underline. Just right-click on the underlined text and select the Properties menu item.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Typewriter
+
+
+
+
+ Typewriter features opaque letters on transparent background, so that it is useful to fill noninteractive forms.
+
+
+ Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the note, then drag to place the bottom-right one. Enter the text of the note then click on the OK to save the note, Cancel to cancel note entering or Clear to clear the note.
+
+
+ It is possible to define the Font and Text color for the text. Just right-click on the typewriter text created and select the Properties menu item.
@@ -578,7 +686,7 @@ Context menu actions like Rename Bookmarks etc.)
-
+
@@ -605,7 +713,34 @@ Context menu actions like Rename Bookmarks etc.)
-
+
+
+
+
+
+
+
+ Pop-up Note
+
+
+
+
+ To draw multiline note. The note will can be viewed by double clicking on an icon in the document.
+
+
+ Click on the tool button, then click on the place in the document where the pop-up note should be added. Enter the text of pop-up note then click on the Close this note button in the top right corner of the pop-up window.
+
+
+ It is possible to define the Color, Opacity, and Icon for the note. Just right-click on the note icon created and select the Properties menu item.
+
+
+
+
+
+
+
+
+
@@ -632,25 +767,25 @@ Context menu actions like Rename Bookmarks etc.)
-
+
- Highlighter
+ Arrow (drop-down list)
- To highlight text in the document with some given background color.
+ To mark with an arrow.
- Click on the tool button, then click with the &LMB; and hold to place the beginning of the highlighted text snippet, then drag to highlight it.
+ Click on the tool button, then click with the &LMB; to place the starting point of the line, then drag to place of the ending point of the line should be and click once more.
- It is possible to define the Type (Highlight, Squiggle, Underline or Strike out), Color, and Opacity for the highlighter. Just right-click on the highlighted text and select the Properties menu item.
+ It is possible to define the Color, Opacity, Width, Line start, Line end, Leader line length, and Leader line extension length for the line. Just right-click on the line created and select the Properties menu item.
@@ -659,14 +794,14 @@ Context menu actions like Rename Bookmarks etc.)
-
+
- Straight Line
+ Straight line (drop-down list)
@@ -686,14 +821,68 @@ Context menu actions like Rename Bookmarks etc.)
-
+
+
+
+
+
+
+
+ Rectangle (drop-down list)
+
+
+
+
+ To draw a rectangle around some chosen area.
+
+
+ Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the rectangle, then drag to place the bottom-right one.
+
+
+ It is possible to define the Type (Rectangle or Ellipse), Color, Opacity, Shape fill (and its color), and Width for the border. Just right-click on the border created and select the Properties menu item.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ellipse (drop-down list)
+
+
+
+
+ To draw an ellipse or rectangle around some chosen area.
+
+
+ Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the circumscribed rectangular for the ellipse, then drag to place the bottom-right one.
+
+
+ It is possible to define the Type (Rectangle or Ellipse), Color, Opacity, Shape fill (and its color), and Width for the border. Just right-click on the border created and select the Properties menu item.
+
+
+
+
+
+
+
+
+
- Polygon
+ Polygon (drop-down list)
@@ -713,7 +902,7 @@ Context menu actions like Rename Bookmarks etc.)
-
+
@@ -728,7 +917,7 @@ Context menu actions like Rename Bookmarks etc.)
To mark the text or image with some predefined shape.
- Click on the tool button then click with the &LMB; to place the stamp.
+ Click on the tool button to choose the stamp from the drop-down list then click with the &LMB; to place the stamp.
A single click just places a square stamp (useful for icons).
@@ -744,30 +933,81 @@ Context menu actions like Rename Bookmarks etc.)
+
+
+
+ These are the default annotations provided by &okular;. Using the Annotations page of the configuration dialog
+ you can add your own annotations like custom stamps, text markup or a geometrical shape with inner color to highlight regions &etc;
+
+
+
+ It is possible to add &latex; code into the text of annotations. Please add $$code$$ to the text of annotation, where code is any valid &latex; equation, and follow instructions on the screen to make it render by a &latex; distribution installed in your system.
+
+
+
+ It is possible to configure the current tool options using the annotating toolbar itself. The table below describes exactly what the default set of annotating toolbar configuring buttons does.
+
+
+
+
+
+
+ Button
+
+
+ Option Name
+
+
+ Description
+
+
+
+
-
+
- Underline
+ Line width
- To underline some text.
+ Click on the tool button to choose the width from the drop-down list.
+
+
+
+
- Click on the tool button, then click with the &LMB; and hold to place the beginning of the underlined text snippet, then drag to underline it.
+
+
+
+
+
+ /
+
+
+
+
+
+
+
- It is possible to define the Type (Highlight, Squiggle, Underline or Strike out), Color, and Opacity for the underline. Just right-click on the underlined text and select the Properties menu item.
+ Annotation color
+
+
+
+
+ Click on the tool button to choose color of text or border of your annotation. You can chose one of the predefined colors or click on the Custom Color... item to open the color selection dialog.
@@ -776,82 +1016,169 @@ Context menu actions like Rename Bookmarks etc.)
-
+
- Ellipse
+ Annotation fill color
- To draw an ellipse or rectangle around some chosen area.
+ Click on the tool button to choose a fill color of your annotation. You can chose one of the predefined colors or click on the Custom Color... item to open the color selection dialog.
+
+
+
+
- Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the circumscribed rectangular for the ellipse, then drag to place the bottom-right one.
+
+
+
+
+
+
+
- It is possible to define the Type (Rectangle or Ellipse), Color, Opacity, Shape fill (and its color), and Width for the border. Just right-click on the border created and select the Properties menu item.
+ Annotation opacity
+
+
+
+
+ Click on the tool button to choose annotation level of opacity from the drop-down list (100% is for the opaque annotations).
-
+
-
+
- Typewriter
+ Annotation font
- Typewriter features opaque letters on transparent background, so that it is useful to fill noninteractive forms.
+ Click on the tool button to open the font selection dialog.
+
+
+
+
+
+
+
+
+
+
+
+
+
- Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the note, then drag to place the bottom-right one. Enter the text of the note then click on the OK to save the note, Cancel to cancel note entering or Clear to clear the note.
+ Advanced settings for the current annotation tool
+
+
- It is possible to define the Font and Text color for the text. Just right-click on the typewriter text created and select the Properties menu item.
+ Click on the tool button to open the general configuration dialog for your annotation.
-
+
+
+
+
+ There are three additional utility buttons on the default annotating toolbar.
+
+
+
+
+
+
+ Button
+
+
+ Description
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add the current annotation to the Quick Annotations menu on the main toolbar.
+
+
+
+ You can use the default shortcuts from &Alt;9 to &Alt;0 to select the quick annotation actions any time you like even with the annotating toolbar hidden.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ When checked keep the current annotation tool active after use.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Hide the annotating toolbar.
+
+
+
+
- These are the default annotations provided by &okular;. Using the Annotations page of the configuration dialog
- you can add your own annotations like custom stamps, text markup with Squiggle or Strike out, a geometrical shape
- like a Rectangle with inner color to highlight regions &etc;
-
-
-
- It is possible to add &latex; code into the text of annotations. Please add $$code$$ to the text of annotation, where code is any valid &latex; equation, and follow instructions on the screen to make it render by a &latex; distribution installed in your system.
-
-
The contents of the annotating toolbar can be configured using the Annotations page of &okular; configuration dialog. This page can be opened with &RMB; clicking on the annotating toolbar then choosing Configure Annotations... from the context menu.
- With a single &LMB; click on an annotation tool button you can use a tool once.
- If you ⪚ want to highlight all important parts of a text, activate that tool
- permanently by double clicking on the tool button.
+ With a single &LMB; click on an annotation tool button you can use a tool once.
+ If you ⪚ want to highlight all important parts of a text, activate that tool
+ permanently by double clicking on the tool button.
Press the Esc key or click the tool button again to leave the permanent mode.
-
-
- The annotating toolbar can be docked in any side of the viewing area: just drag it to
- move it to another place.
-
-
Activating the annotating toolbar will make you switch to the Browse Mode.
@@ -1856,11 +2183,11 @@ Context menu actions like Rename Bookmarks etc.)
F6Tools
- Review
+ Annotations
- Open the review toolbar. The review toolbar allows you to add
+ Open the annotating toolbar. The annotating toolbar allows you to add
annotations on the document you are reading. For more information, please see the
section about Annotations.
@@ -2395,7 +2722,7 @@ Context menu actions like Rename Bookmarks etc.)
Rendering
- Using this group of options you can improve text and image rendering in &okular;. The result depends on the device to display the document.
+ Using this group of options you can improve text and image rendering in &okular;. The result depends on the device to display the document.
Enable Text Antialias and Enable Graphics Antialias items can be used to switch on and off spatial anti-aliasing of text and images in document, correspondingly.
Enable Text Hinting item is meant to be a switcher for font hinting.
Antialiasing and hinting change how the documents are displayed, you may want to tweak them to your preference.
diff --git a/doc/mainwindow.png b/doc/mainwindow.png
index 16e1eba7f..f091bbdbf 100644
Binary files a/doc/mainwindow.png and b/doc/mainwindow.png differ
diff --git a/doc/tool-draw-arrow.png b/doc/tool-draw-arrow.png
new file mode 100644
index 000000000..cb79a5889
Binary files /dev/null and b/doc/tool-draw-arrow.png differ
diff --git a/doc/tool-draw-ellipse.png b/doc/tool-draw-ellipse.png
new file mode 100644
index 000000000..d4aa579ba
Binary files /dev/null and b/doc/tool-draw-ellipse.png differ
diff --git a/doc/tool-draw-freehand.png b/doc/tool-draw-freehand.png
new file mode 100644
index 000000000..00b8c1513
Binary files /dev/null and b/doc/tool-draw-freehand.png differ
diff --git a/doc/tool-draw-highlight.png b/doc/tool-draw-highlight.png
new file mode 100644
index 000000000..7ee1b3221
Binary files /dev/null and b/doc/tool-draw-highlight.png differ
diff --git a/doc/tool-draw-line.png b/doc/tool-draw-line.png
new file mode 100644
index 000000000..1b9b8e8da
Binary files /dev/null and b/doc/tool-draw-line.png differ
diff --git a/doc/tool-draw-polyline.png b/doc/tool-draw-polyline.png
new file mode 100644
index 000000000..1125eaca5
Binary files /dev/null and b/doc/tool-draw-polyline.png differ
diff --git a/doc/tool-draw-rectangle.png b/doc/tool-draw-rectangle.png
new file mode 100644
index 000000000..3d05f65b8
Binary files /dev/null and b/doc/tool-draw-rectangle.png differ
diff --git a/doc/tool-edit-comment.png b/doc/tool-edit-comment.png
new file mode 100644
index 000000000..d720a153c
Binary files /dev/null and b/doc/tool-edit-comment.png differ
diff --git a/doc/tool-edit-line-width.png b/doc/tool-edit-line-width.png
new file mode 100644
index 000000000..63e0ee59f
Binary files /dev/null and b/doc/tool-edit-line-width.png differ
diff --git a/doc/tool-edit-opacity.png b/doc/tool-edit-opacity.png
new file mode 100644
index 000000000..a91957a1e
Binary files /dev/null and b/doc/tool-edit-opacity.png differ
diff --git a/doc/tool-ellipse-okular.png b/doc/tool-ellipse-okular.png
deleted file mode 100644
index 82d1d18a8..000000000
Binary files a/doc/tool-ellipse-okular.png and /dev/null differ
diff --git a/doc/tool-favorite.png b/doc/tool-favorite.png
new file mode 100644
index 000000000..b4c2b61f1
Binary files /dev/null and b/doc/tool-favorite.png differ
diff --git a/doc/tool-fill-color.png b/doc/tool-fill-color.png
new file mode 100644
index 000000000..48e12fd87
Binary files /dev/null and b/doc/tool-fill-color.png differ
diff --git a/doc/tool-font-face.png b/doc/tool-font-face.png
new file mode 100644
index 000000000..620c37e6f
Binary files /dev/null and b/doc/tool-font-face.png differ
diff --git a/doc/tool-format-text-color.png b/doc/tool-format-text-color.png
new file mode 100644
index 000000000..e7c2059e0
Binary files /dev/null and b/doc/tool-format-text-color.png differ
diff --git a/doc/tool-format-text-strikethrough.png b/doc/tool-format-text-strikethrough.png
new file mode 100644
index 000000000..1a37b8465
Binary files /dev/null and b/doc/tool-format-text-strikethrough.png differ
diff --git a/doc/tool-format-text-underline-squiggle.png b/doc/tool-format-text-underline-squiggle.png
new file mode 100644
index 000000000..23061d0a4
Binary files /dev/null and b/doc/tool-format-text-underline-squiggle.png differ
diff --git a/doc/tool-format-text-underline.png b/doc/tool-format-text-underline.png
new file mode 100644
index 000000000..26f9dc406
Binary files /dev/null and b/doc/tool-format-text-underline.png differ
diff --git a/doc/tool-highlighter-okular.png b/doc/tool-highlighter-okular.png
deleted file mode 100644
index 4a46158fc..000000000
Binary files a/doc/tool-highlighter-okular.png and /dev/null differ
diff --git a/doc/tool-ink-okular.png b/doc/tool-ink-okular.png
deleted file mode 100644
index 16f2b886a..000000000
Binary files a/doc/tool-ink-okular.png and /dev/null differ
diff --git a/doc/tool-line-okular.png b/doc/tool-line-okular.png
deleted file mode 100644
index e4f2d8251..000000000
Binary files a/doc/tool-line-okular.png and /dev/null differ
diff --git a/doc/tool-note-inline-okular.png b/doc/tool-note-inline-okular.png
deleted file mode 100644
index 235d0a446..000000000
Binary files a/doc/tool-note-inline-okular.png and /dev/null differ
diff --git a/doc/tool-note-okular.png b/doc/tool-note-okular.png
deleted file mode 100644
index b0dd4635c..000000000
Binary files a/doc/tool-note-okular.png and /dev/null differ
diff --git a/doc/tool-note.png b/doc/tool-note.png
new file mode 100644
index 000000000..d7d5849b4
Binary files /dev/null and b/doc/tool-note.png differ
diff --git a/doc/tool-pin.png b/doc/tool-pin.png
new file mode 100644
index 000000000..8156e2161
Binary files /dev/null and b/doc/tool-pin.png differ
diff --git a/doc/tool-polygon-okular.png b/doc/tool-polygon-okular.png
deleted file mode 100644
index 9df96ca12..000000000
Binary files a/doc/tool-polygon-okular.png and /dev/null differ
diff --git a/doc/tool-settings-configure.png b/doc/tool-settings-configure.png
new file mode 100644
index 000000000..c19a5a591
Binary files /dev/null and b/doc/tool-settings-configure.png differ
diff --git a/doc/tool-stamp-okular.png b/doc/tool-stamp-okular.png
deleted file mode 100644
index cb0b2de59..000000000
Binary files a/doc/tool-stamp-okular.png and /dev/null differ
diff --git a/doc/tool-tag.png b/doc/tool-tag.png
new file mode 100644
index 000000000..61df27df1
Binary files /dev/null and b/doc/tool-tag.png differ
diff --git a/doc/tool-tool-text.png b/doc/tool-tool-text.png
new file mode 100644
index 000000000..bd15b20a0
Binary files /dev/null and b/doc/tool-tool-text.png differ
diff --git a/doc/tool-typewriter-okular.png b/doc/tool-typewriter-okular.png
deleted file mode 100644
index 4f4465a1c..000000000
Binary files a/doc/tool-typewriter-okular.png and /dev/null differ
diff --git a/doc/tool-underline-okular.png b/doc/tool-underline-okular.png
deleted file mode 100644
index a14282d1f..000000000
Binary files a/doc/tool-underline-okular.png and /dev/null differ
diff --git a/doc/tool-window-pin.png b/doc/tool-window-pin.png
new file mode 100644
index 000000000..a26376e9b
Binary files /dev/null and b/doc/tool-window-pin.png differ