In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Changed util.printd to use the default locale on case 2. Also made kjsfunctionstest to be in a consistent locale

Adriaan de Groot authored Aug 15, 2019 and Albert Astals Cid committed Aug 15, 2019

Summary:
 - swap out manual management for a PrintDHelper class that allocates
   an action and MessageBoxHelper, runs the script, and checks the
   result.
 - use _data() to run the helper with different data; this improves
   observability as well.

Test Plan:  - Run tests, see same results as before

Subscribers: okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D23164

Joao Oliveira authored Aug 13, 2019 and Joao Oliveira committed Aug 14, 2019

Changed util.printd to work with the default locale set on QLocale::setDefault to allow consistent results in tests

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Andre Heinecke authored Jun 25, 2019 and Albert Astals Cid committed Aug 11, 2019

Summary:
With formatting there is an internal value, which represents
the true value of a field additionaly to the normal,
visible, text.

For fields which have formatting rules these might differ
and for calculations the internal value is used. The behavior
to format on focus in / focus out events is similar to
that of Acrobat reader.

Test Plan: Needs unit test

Reviewers: aacid

Subscribers: okular-devel

Tags: #okular

Maniphest Tasks: T8886

Differential Revision: https://phabricator.kde.org/D13171

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary:
- Correct QQC2 import
- Apply search field changes from Thumbnails here as well

Test Plan:
- Open https://openboard.ch/download/Tutoriel_OpenBoard_1.5EN.pdf with okularkirigami
- open the context drawer
- switch to the "Table of Contents" tab
- the ToC should load successfully

Reviewers: #okular, bshah

Reviewed By: bshah

Subscribers: bshah, okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D23066

Natsumi Higa authored Aug 10, 2019 and Albert Astals Cid committed Aug 10, 2019

Test Plan: Open a cb7 file (e.g. [[ https://bugs.kde.org/attachment.cgi?id=122002 | Attachment 122002 ]] from [[ https://bugs.kde.org/show_bug.cgi?id=410696 | Bug 410696 ]]) using Okular and see if it works.

Reviewers: #okular, aacid

Subscribers: broulik, pino, okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D23037

Jan Grulich authored Aug 10, 2019 and Albert Astals Cid committed Aug 10, 2019

Reviewers: aacid

Subscribers: pino, ngraham, okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D23027

Andrey Yashkin authored Aug 08, 2019 and Albert Astals Cid committed Aug 08, 2019

Summary:
Now //fontBoundaries// always has smaller width than //boundingRect// from
```
void QPainter::drawText(const QRect &rectangle, int flags, const QString &text, QRect *boundingRect = nullptr)
```
which is required to enclose the whole text. The difference is only several pixels, but sometimes it can cause visual problems. You can see the sidebar without and with this patch in Russian language with Noto Sans 10pt font on a picture below.
{F7177644}
Now the first and the last symbols are fully visible.

Reviewers: #okular

Subscribers: okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D23012