From 204653e2c3cf7c2368ce8d74f546485350972519 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Jan 2020 09:37:27 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- generators/comicbook/okularApplication_comicbook.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 798330db8..3ecef675d 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -174,6 +174,7 @@ X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic X-KDE-Keywords[et]=cbr, cbz, cbt, cb7, Comic Book, koomiks X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua +X-KDE-Keywords[fi]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book From d7e9be4f8ce090446776ceac5d36a44006bd8c94 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 11 Jan 2020 19:48:47 +0100 Subject: [PATCH 2/2] Fix PartTest::testAnnotWindow By waiting for the delayResizeEventTimer to trigger --- autotests/parttest.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp index b3698159b..16740457f 100644 --- a/autotests/parttest.cpp +++ b/autotests/parttest.cpp @@ -1589,14 +1589,6 @@ void PartTest::testAnnotWindow() part.m_document->setViewportPage(0); - // wait for pixmap - QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); - - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseNormal"); QCOMPARE(part.m_document->currentPage(), 0u); @@ -1612,11 +1604,22 @@ void PartTest::testAnnotWindow() // Add annot1 and annot2 to document part.m_document->addPageAnnotation( 0, annot1 ); - QTest::qWait(100); part.m_document->addPageAnnotation( 0, annot2 ); - QTest::qWait(100); QVERIFY( part.m_document->page( 0 )->annotations().size() == 2 ); + QTimer *delayResizeEventTimer = part.m_pageView->findChildren("delayResizeEventTimer").at(0); + QVERIFY(delayResizeEventTimer->isActive()); + QTest::qWait(delayResizeEventTimer->interval() * 2); + + // wait for pixmap + QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + + // Double click the first annotation to open its window (move mouse for visual feedback) const NormalizedPoint annot1pt = annot1->boundingRectangle().center(); QTest::mouseMove(part.m_pageView->viewport(), QPoint(width * annot1pt.x, height * annot1pt.y));