From 89cdac0a044c0e7c4273a2fe075a86df7e908bbf Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 14 Sep 2003 21:53:40 +0000 Subject: [PATCH] Fix use wheelmouse and last page svn path=/trunk/kdegraphics/kpdf/; revision=251104 --- kpdf/kpdf_part.cpp | 27 +++++++++++++++++++-------- kpdf/kpdf_part.h | 2 ++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/kpdf/kpdf_part.cpp b/kpdf/kpdf_part.cpp index 106960ae3..3726c6beb 100644 --- a/kpdf/kpdf_part.cpp +++ b/kpdf/kpdf_part.cpp @@ -124,8 +124,8 @@ void Part::slotReadUp() return; if( !m_outputDev->readUp() ) { - slotPreviousPage(); - m_outputDev->scrollBottom(); + if ( previousPage() ) + m_outputDev->scrollBottom(); } } @@ -135,9 +135,8 @@ void Part::slotReadDown() return; if( !m_outputDev->readDown() ) { - //todo fix if we can "next page" as in kghostview - slotNextPage(); - m_outputDev->scrollTop(); + if ( nextPage() ) + m_outputDev->scrollTop(); } } @@ -192,24 +191,36 @@ void Part::slotGotoStart() } } -void Part::slotNextPage() +bool Part::nextPage() { m_currentPage = pdfpartview->pagesListBox->currentItem() + 1; if ( m_doc && m_currentPage >= m_doc->getNumPages()) - return; + return false; pdfpartview->pagesListBox->setCurrentItem(m_currentPage); m_outputDev->nextPage(); + return true; +} + +void Part::slotNextPage() +{ + nextPage(); } void Part::slotPreviousPage() +{ + previousPage(); +} + +bool Part::previousPage() { m_currentPage = pdfpartview->pagesListBox->currentItem() - 1; if ( m_currentPage < 0) - return; + return false; pdfpartview->pagesListBox->setCurrentItem(m_currentPage ); m_outputDev->previousPage(); + return true; } KAboutData* diff --git a/kpdf/kpdf_part.h b/kpdf/kpdf_part.h index 11e37eafc..5464ef2df 100644 --- a/kpdf/kpdf_part.h +++ b/kpdf/kpdf_part.h @@ -79,6 +79,8 @@ namespace KPDF void update(); void readSettings(); void writeSettings(); + bool nextPage(); + bool previousPage(); protected slots: void find() { /* stub */ }; void findNext() { /* stub */ };