From 5c0e72d779c1267887a262a13a393ccf35953b81 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Sep 2020 08:18:59 +0200 Subject: [PATCH 1/5] GIT_SILENT made messages (after extraction) --- shell/org.kde.okular.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index a6cd96d2a..97d23fd07 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -190,7 +190,7 @@
  • Sidebar with contents, thumbnails, reviews and bookmarks
  • Barra lateral amb el contingut, miniatures, revisions i punts
  • Barra lateral amb el contingut, miniatures, revisions i punts
    • -
  • Seitenleiste mit Inhalten, Vorschauen und Lesezeichen
    • +
  • Seitenleiste mit Inhalten, Vorschau, Anmerkungen und Lesezeichen
  • Πλευρική γραμμή με περιεχόμενα, εικόνες προεπισκόπησης, αναλύσεις και σελιδοδείκτες
  • Sidebar with contents, thumbnails, reviews and bookmarks
  • Barra lateral con contenido, miniaturas, revisiones y marcadores
    • From bef0ae2d82cb09eda39da82e71fabee1fea5eedf Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sat, 3 Oct 2020 12:49:57 +0200 Subject: [PATCH 2/5] GIT_SILENT Upgrade release service version to 20.08.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d075f306b..edbdb7ae7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "20") set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "1") +set (RELEASE_SERVICE_VERSION_MICRO "2") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(okular VERSION 1.11.${RELEASE_SERVICE_VERSION_MICRO}) From 0abdab924de92776ee8b6c34f91a26f5876e675a Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sat, 3 Oct 2020 14:20:23 +0200 Subject: [PATCH 3/5] GIT_SILENT Update Appstream for new release --- generators/chm/org.kde.okular-chm.metainfo.xml | 2 +- generators/comicbook/org.kde.okular-comicbook.metainfo.xml | 2 +- generators/djvu/org.kde.okular-djvu.metainfo.xml | 2 +- generators/dvi/org.kde.okular-dvi.metainfo.xml | 2 +- generators/epub/org.kde.okular-epub.metainfo.xml | 2 +- generators/fax/org.kde.okular-fax.metainfo.xml | 2 +- generators/fictionbook/org.kde.okular-fb.metainfo.xml | 2 +- generators/kimgio/org.kde.okular-kimgio.metainfo.xml | 2 +- generators/markdown/org.kde.okular-md.metainfo.xml | 2 +- generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml | 2 +- generators/ooo/org.kde.okular-ooo.metainfo.xml | 2 +- generators/plucker/org.kde.okular-plucker.metainfo.xml | 2 +- generators/poppler/org.kde.okular-poppler.metainfo.xml | 2 +- generators/spectre/org.kde.okular-spectre.metainfo.xml | 2 +- generators/tiff/org.kde.okular-tiff.metainfo.xml | 2 +- generators/txt/org.kde.okular-txt.metainfo.xml | 2 +- generators/xps/org.kde.okular-xps.metainfo.xml | 2 +- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/generators/chm/org.kde.okular-chm.metainfo.xml b/generators/chm/org.kde.okular-chm.metainfo.xml index dbd31fd07..447365989 100644 --- a/generators/chm/org.kde.okular-chm.metainfo.xml +++ b/generators/chm/org.kde.okular-chm.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index ce8abfc78..0b45624f4 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -84,9 +84,9 @@ https://okular.kde.org + - diff --git a/generators/djvu/org.kde.okular-djvu.metainfo.xml b/generators/djvu/org.kde.okular-djvu.metainfo.xml index c87ca0f28..bc77bd04f 100644 --- a/generators/djvu/org.kde.okular-djvu.metainfo.xml +++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/generators/dvi/org.kde.okular-dvi.metainfo.xml b/generators/dvi/org.kde.okular-dvi.metainfo.xml index 633edd728..cde97d514 100644 --- a/generators/dvi/org.kde.okular-dvi.metainfo.xml +++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml @@ -83,9 +83,9 @@ https://okular.kde.org + - diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index 3a5144c88..7ae16c952 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/generators/fax/org.kde.okular-fax.metainfo.xml b/generators/fax/org.kde.okular-fax.metainfo.xml index bd2c596e2..51d1c8fa0 100644 --- a/generators/fax/org.kde.okular-fax.metainfo.xml +++ b/generators/fax/org.kde.okular-fax.metainfo.xml @@ -82,9 +82,9 @@ https://okular.kde.org + - diff --git a/generators/fictionbook/org.kde.okular-fb.metainfo.xml b/generators/fictionbook/org.kde.okular-fb.metainfo.xml index 3cf8d13c0..de1180f7a 100644 --- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml +++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 87ac6d7a7..2fb05909f 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -104,9 +104,9 @@ https://okular.kde.org + - diff --git a/generators/markdown/org.kde.okular-md.metainfo.xml b/generators/markdown/org.kde.okular-md.metainfo.xml index 5070fa283..e21561336 100644 --- a/generators/markdown/org.kde.okular-md.metainfo.xml +++ b/generators/markdown/org.kde.okular-md.metainfo.xml @@ -79,9 +79,9 @@ https://okular.kde.org + - diff --git a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml index babe81b20..76bb46090 100644 --- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml +++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml @@ -104,9 +104,9 @@ https://okular.kde.org + - diff --git a/generators/ooo/org.kde.okular-ooo.metainfo.xml b/generators/ooo/org.kde.okular-ooo.metainfo.xml index 33bb7dd7e..a2d46996a 100644 --- a/generators/ooo/org.kde.okular-ooo.metainfo.xml +++ b/generators/ooo/org.kde.okular-ooo.metainfo.xml @@ -79,9 +79,9 @@ https://okular.kde.org + - diff --git a/generators/plucker/org.kde.okular-plucker.metainfo.xml b/generators/plucker/org.kde.okular-plucker.metainfo.xml index 7c5481e90..1b95246d3 100644 --- a/generators/plucker/org.kde.okular-plucker.metainfo.xml +++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/generators/poppler/org.kde.okular-poppler.metainfo.xml b/generators/poppler/org.kde.okular-poppler.metainfo.xml index e2a6396f0..fed6d2409 100644 --- a/generators/poppler/org.kde.okular-poppler.metainfo.xml +++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml @@ -84,9 +84,9 @@ https://okular.kde.org + - diff --git a/generators/spectre/org.kde.okular-spectre.metainfo.xml b/generators/spectre/org.kde.okular-spectre.metainfo.xml index c8784c2c0..8a3145de8 100644 --- a/generators/spectre/org.kde.okular-spectre.metainfo.xml +++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml @@ -88,9 +88,9 @@ https://okular.kde.org + - diff --git a/generators/tiff/org.kde.okular-tiff.metainfo.xml b/generators/tiff/org.kde.okular-tiff.metainfo.xml index afaa49b06..581cf02f2 100644 --- a/generators/tiff/org.kde.okular-tiff.metainfo.xml +++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/generators/txt/org.kde.okular-txt.metainfo.xml b/generators/txt/org.kde.okular-txt.metainfo.xml index cba4378e2..0029ec2a1 100644 --- a/generators/txt/org.kde.okular-txt.metainfo.xml +++ b/generators/txt/org.kde.okular-txt.metainfo.xml @@ -80,9 +80,9 @@ https://okular.kde.org + - diff --git a/generators/xps/org.kde.okular-xps.metainfo.xml b/generators/xps/org.kde.okular-xps.metainfo.xml index f8bfd02b7..39ffed470 100644 --- a/generators/xps/org.kde.okular-xps.metainfo.xml +++ b/generators/xps/org.kde.okular-xps.metainfo.xml @@ -81,9 +81,9 @@ https://okular.kde.org + - diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 4d305435e..349c7df7a 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -266,9 +266,9 @@ okularkirigami + - diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 97d23fd07..31d87a48f 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -307,9 +307,9 @@ https://www.microsoft.com/store/apps/9n41msq1wnm8 + - From 844363aa0e323d75f08197e44e9565e01f15a61a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 5 Oct 2020 08:26:20 +0200 Subject: [PATCH 4/5] GIT_SILENT made messages (after extraction) --- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 349c7df7a..2a3ac4d2f 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -176,7 +176,7 @@
  • Barra lateral con contentos, miniaturas, revisiones e marcatores de libro
  • Bilah sisi dengan konten, gambar-mini, ulasan, dan markah
  • Barra laterale con contenuti, miniature, revisioni e segnalibri
    • -
  • 목차, 미리 보기 그림, 검토 및 책갈피 도구가 있는 사이드바
    • +
  • 목차, 축소판, 검토 및 책갈피 도구가 있는 사이드바
  • Šoninė juosta su turiniu, miniatiūromis, atsiliepimais ir žymelėmis
  • Zijbalk met inhoud, miniaturen, reviews en bladwijzers
  • Sidestolpe med innhaldsliste, miniatyrbilete, omtalar og bokmerke
    • diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 31d87a48f..a4bbf20ce 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -202,7 +202,7 @@
  • Barra lateral con contentos, miniaturas, revisiones e marcatores de libro
  • Bilah sisi dengan konten, gambar-mini, ulasan, dan markah
  • Barra laterale con contenuti, miniature, revisioni e segnalibri
    • -
  • 목차, 책갈피, 미리 보기, 주석이 있는 사이드바
    • +
  • 목차, 책갈피, 축소판, 주석이 있는 사이드바
  • Šoninė juosta su turiniu, miniatiūromis, atsiliepimais ir žymelėmis
  • Zijbalk met inhoud, miniaturen, reviews en bladwijzers
  • Sidestolpe med innhaldsliste, miniatyrbilete, omtalar og bokmerke
    • From c8cf651335732170aa803c1af538c716c9b17e10 Mon Sep 17 00:00:00 2001 From: Tobias Deiminger Date: Tue, 6 Oct 2020 00:41:17 +0200 Subject: [PATCH 5/5] Complete TextSelectorEngine if nothing selected Selecting highlight tool, pressing left mouse button while over text, and immediately releasing without dragging a selection caused inconsistent state. It left TextSelectorEnigne in the state m_creationCompleted == false and m_lockedItem == something. Then in continuous mode all events kept on being propagated to TextSelectorEngine::event, even if the user started unrelated interactions in the meantime. This caused various side effects. It notably happened when you double clicked a finished highlight annotation, as described in bug 426658. We can go to m_creationComplete after release even without a selection, because TextSelectorEngine::end and PageViewAnnotator::performRouteMouseOrTabletEvent handle the case just fine, i.e. don't create an annotation but reset the state machine. Fixes bug 426658 at least partially. I couldn't reproduce the described crash, so no idea if that's also fixed. BUG: 446658 --- ui/pageviewannotator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp index 27ad4ff6d..7a909b0af 100644 --- a/ui/pageviewannotator.cpp +++ b/ui/pageviewannotator.cpp @@ -527,7 +527,7 @@ public: selection = std::move(newselection); } } - } else if (type == Release && selection) { + } else if (type == Release) { m_creationCompleted = true; } return rect;