okular

9139 Commits

9 Branches

332 Tags

50 MiB

Tag: Branch: Tree: 847b423e2a

Commit Graph

Author	SHA1	Message	Date
David Hurka	19d5dd8ec7	New part/ directory for okularpart sources from /, ui/, conf/ Source files are no longer separated by UI and non-UI and similar, but only by their build target. * ui/ -> part/ * Move all source files from conf/ to part/ * Keep config skeleton definitions in conf/, needed for the mobile target too * Move editdrawingtooldialogtest.h from conf/autotests/ to autotests/ * ui/data/icons/ -> icons/ * Move /part.cpp, /part.rc and similar files to part/ * Adapt include paths in source files * Adapt CMakeLists.txt files (in / and in subdirectories) * Adapt /Messages.sh	5 years ago
Simone Gaiarin	72f5a2db08	Find built-in tool corresponding to quick tool at runtime In this way it is possible to drop the `sourceId` attribute from the quick tools definition. This simplifies the code logic and makes it easier to update user settings from the previous version of Okular (because there is no need to add the attribute `sourceId` This also fixes the crash due to the fact that `sourceId` was not correctly created when a quick annotation is created from the Annotation page of Okualr Settings. BUG: 424810 FIXED-IN: 1.11.0	6 years ago
Simone Gaiarin	0b05d7ce99	Overhaul annotations UX Create a new new annotation toolbar to replace the current one as discussed in the task T8076. Fixes: BUG: 386578 BUG: 374728 BUG: 352310 BUG: 330518 BUG: 341914 BUG: 157289 BUG: 358057 BUG: 412767 BUG: 413595 BUG: 420462 FIXED-IN: 1.11.0 Test Plan Before testing this revision Delete or Temporary move aside the following files: ~/.config/okularpartrc ~/.config/okularrc ~/.local/share/kxmlgui5/okular/part.rc ~/.local/share/kxmlgui5/okular/shell.rc Nomenclature Actions in the main toolbar: Quick annotations Actions in the annotation toolbar: Annotation actions Highlighter, Underline, Squiggle, Strike out, Typewriter, Inline note, Popup note, Freehand line, Arrow, Straight line, Rectangle, Ellipse, Polygon, Stamp Annotation config actions Line width, Color, Inner color, Opacity, Font, Annotation settings Other actions Add to Quick Annotations, Pin Autotests First run: annotation toolbar is not visible Selecting Tools > Annotations shows the annotation toolbar (below the main toolbar by default) Select an annotation > toolbar is shown Select a quick annotation > toolbar is shown Hide action (red cross) on the toolbar hides the toolbar Keys 1-9,0 select the (builtin) Annotation actions (one case tested) Keys Alt+1-9,0 select the quick annotation actions (one case tested) No annotation action selected: Quick Annotations is enabled, Add to quick annotations is disabled, Annotation config actions are disabled, Pin is enabled The current document is an image: Highlighter, Underline, Squiggle, Strike out are disabled (also in Quick annotations) The current document is protected: All actions are disabled Select annotation: the Annotation config actions are enabled and their values set to the ones for the current annotation (taken from okularpartrc) Click an annotation action when none selected: browse mode is selected Click the currently selected annotation action: the action is unchecked and the tool disabled (back to browse mode) Click ESC: the currently selected annotation action is unchecked If Pin unchecked the selected annotation is unchecked after it has be used once and we are back to Browse mode The annotation systems works when multiple Okular tabs are open (the selected annotation is per-tab) Manual tests (TODO) Check that kconf_update updates the key AnnotationTools to QuickAnnotationTools in ~/.config/okularpartrc Color icon is a format-text-color (if inline note or typewriter) or format-stroke-color for all other annotations All actions have tooltips (some change based on the fact that the icon is enabled or not) If a custom Line Width or Opacity is set through the Annotation Settings dialog, its value appears as a new checked action in the Line width or Opacity menu If a custom stamp is selected through the Annotation Settings dialog, its name or filename (without path) appears as a new checked action in the Stamp menu In Configure Okular > Annotations it is only possible to configure the quick annotations. Modifying them here updates the Quick annotations list after clicking Apply The current document is an image: Highlighter, Underline, Squiggle, Strike out are disabled in Quick annotations The state of Pin action is remembered across Okular launches Selecting a quick action selects the corresponding action and loads its config values (color, line width, ...) Setting the color and fill color works for all annotations (to be tested carefully, can be problematic for typewriter and inline note given the different internal mechanism to store the color in the settings) Test stamp annotation (handled differently from the rest of the annotations) Merge Request: https://invent.kde.org/graphics/okular/-/merge_requests/105	6 years ago

Author

SHA1

Message

Date

David Hurka

19d5dd8ec7

New part/ directory for okularpart sources from /, ui/, conf/

Source files are no longer separated by UI and non-UI and similar,
but only by their build target.

* ui/ -> part/
* Move all source files from conf/ to part/
* Keep config skeleton definitions in conf/, needed for the mobile target too
* Move editdrawingtooldialogtest.h from conf/autotests/ to autotests/
* ui/data/icons/ -> icons/
* Move /part.cpp, /part.rc and similar files to part/
* Adapt include paths in source files
* Adapt CMakeLists.txt files (in / and in subdirectories)
* Adapt /Messages.sh

5 years ago

Simone Gaiarin

72f5a2db08

Find built-in tool corresponding to quick tool at runtime

In this way it is possible to drop the `sourceId` attribute from the quick tools definition. This simplifies the code logic and makes it easier to update user settings from the previous version of Okular (because there is no need to add the attribute `sourceId`

This also fixes the crash due to the fact that `sourceId` was not correctly created when a quick annotation is created from the Annotation page of Okualr Settings.

BUG: 424810
FIXED-IN: 1.11.0

6 years ago

Simone Gaiarin

0b05d7ce99

Overhaul annotations UX

Create a new new annotation toolbar to replace the current one as discussed in the task T8076.
Fixes:
BUG: 386578
BUG: 374728
BUG: 352310
BUG: 330518
BUG: 341914
BUG: 157289
BUG: 358057
BUG: 412767
BUG: 413595
BUG: 420462
FIXED-IN: 1.11.0

Test Plan
Before testing this revision
Delete or Temporary move aside the following files:

~/.config/okularpartrc
~/.config/okularrc
~/.local/share/kxmlgui5/okular/part.rc
~/.local/share/kxmlgui5/okular/shell.rc

Nomenclature
Actions in the main toolbar:

Quick annotations
Actions in the annotation toolbar:

Annotation actions Highlighter, Underline, Squiggle, Strike out, Typewriter,
Inline note, Popup note, Freehand line, Arrow, Straight line, Rectangle, Ellipse,
Polygon, Stamp

Annotation config actions Line width, Color, Inner color, Opacity, Font, Annotation settings

Other actions Add to Quick Annotations, Pin

Autotests

 First run: annotation toolbar is not visible

 Selecting Tools > Annotations shows the annotation toolbar (below the main toolbar by default)

 Select an annotation > toolbar is shown

 Select a quick annotation > toolbar is shown

 Hide action (red cross) on the toolbar hides the toolbar

 Keys 1-9,0 select the (builtin) Annotation actions (one case tested)

 Keys Alt+1-9,0 select the quick annotation actions (one case tested)

 No annotation action selected: Quick Annotations is enabled, Add to quick annotations is disabled, Annotation config actions are disabled, Pin is enabled

 The current document is an image: Highlighter, Underline, Squiggle, Strike out are disabled (also in Quick annotations)

 The current document is protected: All actions are disabled

 Select annotation: the  Annotation config actions are enabled and their values set to the ones for the current annotation (taken from okularpartrc)

 Click an annotation action when none selected: browse mode is selected

 Click the currently selected annotation action: the action is unchecked and the tool disabled (back to browse mode)

 Click ESC: the currently selected annotation action is unchecked

 If Pin unchecked the selected annotation is unchecked after it has be used once and we are back to Browse mode

 The annotation systems works when multiple Okular tabs are open (the selected annotation is per-tab)

Manual tests

(TODO) Check that kconf_update updates the key AnnotationTools to QuickAnnotationTools in ~/.config/okularpartrc

Color icon is a format-text-color (if inline note or typewriter) or format-stroke-color for all other annotations
All actions have tooltips (some change based on the fact that the icon is enabled or not)
If a custom Line Width or Opacity is set through the Annotation Settings dialog, its value appears as a new checked action in the Line width or Opacity menu
If a custom stamp is selected through the Annotation Settings dialog, its name or filename (without path) appears as a new checked action in the Stamp menu
In Configure Okular > Annotations it is only possible to configure the quick annotations. Modifying them here updates the Quick annotations list after clicking Apply

The current document is an image: Highlighter, Underline, Squiggle, Strike out are disabled in Quick annotations
The state of Pin action is remembered across Okular launches
Selecting a quick action selects the corresponding action and loads its config values (color, line width, ...)
Setting the color and fill color works for all annotations (to be tested carefully, can be problematic for typewriter and inline note given the different internal mechanism to store the color in the settings)
Test stamp annotation (handled differently from the rest of the annotations)

Merge Request: https://invent.kde.org/graphics/okular/-/merge_requests/105

6 years ago

1 Commits (847b423e2abb3bea67b95ce235aba7dbf3e363c4)