From ad5e40826c33b99e31c378f775c72491b6d0378a Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Mon, 31 Aug 2020 20:35:27 +0200 Subject: [PATCH 1/3] GIT_SILENT Upgrade release service version to 20.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55baf7205..d075f306b 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 "0") +set (RELEASE_SERVICE_VERSION_MICRO "1") 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 4b9e50a1ed9469a2c29d96fa44a0090f5527787e Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Mon, 31 Aug 2020 21:02:06 +0200 Subject: [PATCH 2/3] 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 1fda52396..dbd31fd07 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 ca5c39310..ce8abfc78 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 cdff01497..c87ca0f28 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 adefc9380..633edd728 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 639e636d8..3a5144c88 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 79ba38eda..bd2c596e2 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 4113adf20..3cf8d13c0 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 9e01591ce..87ac6d7a7 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 64dab1d1c..5070fa283 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 e8f4491cb..babe81b20 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 41f818403..33bb7dd7e 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 3839b9975..7c5481e90 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 78ff96fff..e2a6396f0 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 78a57ef1e..c8784c2c0 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 526f28328..afaa49b06 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 fcacd90c6..cba4378e2 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 8d63e7ef8..f8bfd02b7 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 8d2c1b53d..4d305435e 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 17565eb0e..a6cd96d2a 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 cd96735ae236499e0597317c8967a2a2ac551af1 Mon Sep 17 00:00:00 2001 From: Simone Gaiarin Date: Sun, 6 Sep 2020 10:08:19 +0000 Subject: [PATCH 3/3] Maintain quick annotation shortcut compatibility with Okular < 1.11.0 During the upgrade to Okular 1.11.0 the shortcuts for the quick annotations have been changed from the keys 1, 2, 3,... to Alt + 1, 2, 3,... making some users unhappy. CCBUG: 426009 --- autotests/annotationtoolbartest.cpp | 8 ++++---- ui/annotationactionhandler.cpp | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/autotests/annotationtoolbartest.cpp b/autotests/annotationtoolbartest.cpp index cc54f90dd..7b31bf5cf 100644 --- a/autotests/annotationtoolbartest.cpp +++ b/autotests/annotationtoolbartest.cpp @@ -179,11 +179,11 @@ void AnnotationToolBarTest::testAnnotationToolBar() toggleAnnotationToolBar->setChecked(false); QTRY_VERIFY(!annToolBar->isVisible()); - QTest::keyClick(part->widget(), Qt::Key_1); + QTest::keyClick(part->widget(), Qt::Key_1, Qt::AltModifier); QTRY_VERIFY2(annToolBar->isVisible(), "ToolBar not shown when triggering annotation using shortcut."); toggleAnnotationToolBar->setChecked(false); QTRY_VERIFY(!annToolBar->isVisible()); - QTest::keyClick(part->widget(), Qt::Key_3, Qt::AltModifier); + QTest::keyClick(part->widget(), Qt::Key_3); QTRY_VERIFY2(annToolBar->isVisible(), "ToolBar not shown when triggering quick annotation using shortcut."); // Click an annotation action to enable it @@ -202,7 +202,7 @@ void AnnotationToolBarTest::testAnnotationToolBar() QCOMPARE(simulateAddPopupAnnotation(part, mouseX, mouseY), false); // Trigger the action using a shortcut - QTest::keyClick(part->widget(), Qt::Key_7); + QTest::keyClick(part->widget(), Qt::Key_7, Qt::AltModifier); mouseY = 200; QTRY_COMPARE(Okular::Settings::mouseMode(), static_cast(Okular::Settings::EnumMouseMode::Browse)); QCOMPARE(simulateAddPopupAnnotation(part, mouseX, mouseY), true); @@ -214,7 +214,7 @@ void AnnotationToolBarTest::testAnnotationToolBar() QCOMPARE(simulateAddPopupAnnotation(part, mouseX, mouseY), false); // Trigger the action using a quick annotation shortcut - QTest::keyClick(part->widget(), Qt::Key_6, Qt::AltModifier); + QTest::keyClick(part->widget(), Qt::Key_6); QTRY_COMPARE(Okular::Settings::mouseMode(), static_cast(Okular::Settings::EnumMouseMode::Browse)); QCOMPARE(simulateAddPopupAnnotation(part, mouseX, mouseY), true); diff --git a/ui/annotationactionhandler.cpp b/ui/annotationactionhandler.cpp index 8d5cb3f41..7def6d28c 100644 --- a/ui/annotationactionhandler.cpp +++ b/ui/annotationactionhandler.cpp @@ -359,7 +359,7 @@ void AnnotationActionHandlerPrivate::populateQuickAnnotations() QAction *annFav = new QAction(toolIcon, itemText, q); aQuickTools->addAction(annFav); if (shortcutNumber != numberKeys.end()) - annFav->setShortcut(QKeySequence(Qt::ALT + *(shortcutNumber++))); + annFav->setShortcut(QKeySequence(*(shortcutNumber++))); QObject::connect(annFav, &QAction::triggered, q, [this, favToolId]() { slotQuickToolSelected(favToolId); }); QDomElement engineElement = favToolElement.firstChildElement(QStringLiteral("engine")); @@ -738,16 +738,16 @@ AnnotationActionHandler::AnnotationActionHandler(PageViewAnnotator *parent, KAct ac->addAction(QStringLiteral("annotation_settings_advanced"), d->aAdvancedSettings); ac->setDefaultShortcut(d->aShowToolBar, Qt::Key_F6); - ac->setDefaultShortcut(aHighlighter, Qt::Key_1); - ac->setDefaultShortcut(aUnderline, Qt::Key_2); - ac->setDefaultShortcut(aSquiggle, Qt::Key_3); - ac->setDefaultShortcut(aStrikeout, Qt::Key_4); - ac->setDefaultShortcut(aTypewriter, Qt::Key_5); - ac->setDefaultShortcut(aInlineNote, Qt::Key_6); - ac->setDefaultShortcut(aPopupNote, Qt::Key_7); - ac->setDefaultShortcut(aFreehandLine, Qt::Key_8); - ac->setDefaultShortcut(aArrow, Qt::Key_9); - ac->setDefaultShortcut(aRectangle, Qt::Key_0); + ac->setDefaultShortcut(aHighlighter, Qt::ALT + Qt::Key_1); + ac->setDefaultShortcut(aUnderline, Qt::ALT + Qt::Key_2); + ac->setDefaultShortcut(aSquiggle, Qt::ALT + Qt::Key_3); + ac->setDefaultShortcut(aStrikeout, Qt::ALT + Qt::Key_4); + ac->setDefaultShortcut(aTypewriter, Qt::ALT + Qt::Key_5); + ac->setDefaultShortcut(aInlineNote, Qt::ALT + Qt::Key_6); + ac->setDefaultShortcut(aPopupNote, Qt::ALT + Qt::Key_7); + ac->setDefaultShortcut(aFreehandLine, Qt::ALT + Qt::Key_8); + ac->setDefaultShortcut(aArrow, Qt::ALT + Qt::Key_9); + ac->setDefaultShortcut(aRectangle, Qt::ALT + Qt::Key_0); ac->setDefaultShortcut(d->aAddToQuickTools, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B)); d->updateConfigActions(); }