Commit ce66cf05 authored by Andi Sardina's avatar Andi Sardina

Merging the latest changes from master

parents 0b8c1f4e 51b90ecd
Pipeline #10581 passed with stage
in 10 minutes and 27 seconds
......@@ -175,6 +175,7 @@
<li>Annotations support</li>
<li xml:lang="ca">Admet anotacions</li>
<li xml:lang="ca-valencia">Admet anotacions</li>
<li xml:lang="cs">Podpora poznámek</li>
<li xml:lang="de">Unterstützung für Anmerkungen</li>
<li xml:lang="el">Υποστήριξη σημειώσεων</li>
<li xml:lang="en-GB">Annotations support</li>
......
......@@ -2330,28 +2330,28 @@ void Part::slotGoToPage()
{
GotoPageDialog pageDialog( m_pageView, m_document->currentPage() + 1, m_document->pages() );
if ( pageDialog.exec() == QDialog::Accepted )
m_document->setViewportPage( pageDialog.getPage() - 1 );
m_document->setViewportPage( pageDialog.getPage() - 1, nullptr, true );
}
void Part::slotPreviousPage()
{
if ( m_document->isOpened() && !(m_document->currentPage() < 1) )
m_document->setViewportPage( m_document->currentPage() - 1 );
m_document->setViewportPage( m_document->currentPage() - 1, nullptr, true );
}
void Part::slotNextPage()
{
if ( m_document->isOpened() && m_document->currentPage() < (m_document->pages() - 1) )
m_document->setViewportPage( m_document->currentPage() + 1 );
m_document->setViewportPage( m_document->currentPage() + 1, nullptr, true );
}
void Part::slotGotoFirst()
{
if ( m_document->isOpened() ) {
m_document->setViewportPage( 0 );
m_document->setViewportPage( 0, nullptr, true);
m_beginningOfDocument->setEnabled( false );
}
}
......@@ -2366,7 +2366,7 @@ void Part::slotGotoLast()
endPage.rePos.normalizedX = 0;
endPage.rePos.normalizedY = 1;
endPage.rePos.pos = Okular::DocumentViewport::TopLeft;
m_document->setViewport(endPage);
m_document->setViewport(endPage, nullptr, true);
m_endOfDocument->setEnabled(false);
}
}
......@@ -2471,7 +2471,7 @@ void Part::slotPreviousBookmark()
if ( !bookmark.isNull() )
{
DocumentViewport vp( bookmark.url().fragment(QUrl::FullyDecoded) );
m_document->setViewport( vp );
m_document->setViewport( vp, nullptr, true );
}
}
......@@ -2483,7 +2483,7 @@ void Part::slotNextBookmark()
if ( !bookmark.isNull() )
{
DocumentViewport vp( bookmark.url().fragment(QUrl::FullyDecoded) );
m_document->setViewport( vp );
m_document->setViewport( vp, nullptr, true );
}
}
......
......@@ -214,6 +214,7 @@
<li>Annotations support</li>
<li xml:lang="ca">Admet anotacions</li>
<li xml:lang="ca-valencia">Admet anotacions</li>
<li xml:lang="cs">Podpora poznámek</li>
<li xml:lang="de">Unterstützung für Anmerkungen</li>
<li xml:lang="el">Υποστήριξη σημειώσεων</li>
<li xml:lang="en-GB">Annotations support</li>
......
......@@ -390,7 +390,7 @@ void BookmarkList::goTo( BookmarkItem * item )
{
if ( item->url() == m_document->currentDocument() )
{
m_document->setViewport( item->viewport() );
m_document->setViewport( item->viewport(), nullptr, true );
}
else
{
......
This diff is collapsed.
......@@ -191,8 +191,8 @@ Q_OBJECT
int viewColumns() const;
void center(int cx, int cy);
void scrollTo( int x, int y );
void center(int cx, int cy, bool smoothMove = false);
void scrollTo( int x, int y, bool smoothMove = false);
void toggleFormWidgets( bool on );
......@@ -226,8 +226,6 @@ Q_OBJECT
void delayedResizeEvent();
// activated either directly or via the contentsMoving(int,int) signal
void slotRequestVisiblePixmaps( int newValue = -1 );
// activated by the viewport move timer
void slotMoveViewport();
// activated by the autoscroll timer (Shift+Up/Down keys)
void slotAutoScroll();
// activated by the dragScroll timer
......@@ -259,8 +257,8 @@ Q_OBJECT
void slotToggleAnnotator( bool );
void slotAutoScrollUp();
void slotAutoScrollDown();
void slotScrollUp( bool singleStep = false );
void slotScrollDown( bool singleStep = false );
void slotScrollUp( int nSteps = 0 );
void slotScrollDown(int nSteps = 0 );
void slotRotateClockwise();
void slotRotateCounterClockwise();
void slotRotateOriginal();
......
......@@ -743,7 +743,7 @@ void ThumbnailListPrivate::mouseReleaseEvent( QMouseEvent * e )
vp.rePos.normalizedY = double(p.y()) / double(item->rect().height());
vp.rePos.pos = Okular::DocumentViewport::Center;
vp.rePos.enabled = true;
m_document->setViewport( vp );
m_document->setViewport( vp, nullptr, true);
}
setCursor( Qt::OpenHandCursor );
m_mouseGrabPos.setX( 0 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment