Fixed disabling of screen blanking, implemented prev/next page scrolling and fixed search OWait useage

11 files changed, 50 insertions, 34 deletions

diff --git a/noncore/apps/dagger/ChangeLog b/noncore/apps/dagger/ChangeLog
index feb9a19..108419e 100644
--- a/noncore/apps/dagger/ChangeLog
+++ b/noncore/apps/dagger/ChangeLog
@@ -1 +1,8 @@
+2004-04-22 Dan Williams <drw@handhelds.org>
+
+    * Released version 0.9.1
+    * Fixed the disabling of screen blanking
+    * Implement previous/next page scrolling
+    * Animate search OWait
+
 2004-04-06 Dan Williams <drw@handhelds.org>
diff --git a/noncore/apps/dagger/README b/noncore/apps/dagger/README
index 4a4bb61..00e9eed 100644
--- a/noncore/apps/dagger/README
+++ b/noncore/apps/dagger/README
@@ -4,3 +4,3 @@
 /*                          ===============
-/*                           Version 0.9.0
+/*                           Version 0.9.1
 /*
diff --git a/noncore/apps/dagger/TODO b/noncore/apps/dagger/TODO
index 2548dd3..1530bd6 100644
--- a/noncore/apps/dagger/TODO
+++ b/noncore/apps/dagger/TODO
@@ -4,3 +4,3 @@
 /*                          ===============
-/*                           Version 0.9.0
+/*                           Version 0.9.1
 /*
@@ -18,5 +18,3 @@ To-do for Opie-Dagger - April, 2004
 
-1. Implement search function callback to animate OWait dialog
-2. Implement previous/next page scrolling
-3. Fix disablement of screen blanking
+1. Implement module installation
 
diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp
index ace8f36..b2e00e8 100644
--- a/noncore/apps/dagger/mainwindow.cpp
+++ b/noncore/apps/dagger/mainwindow.cpp
@@ -75,2 +75,5 @@ MainWindow::~MainWindow()
 {
+    // Re-enable screen blanking if it was disabled
+    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+
     // Save Sword options
@@ -171,3 +174,3 @@ void MainWindow::initUI()
     m_navToolbar->navBtnsEnable( false );
-    connect( m_navToolbar, SIGNAL(prevChapter()), this, SLOT(slotNavPrevChapter()) );
+    connect( m_navToolbar, SIGNAL(prevPage()), this, SLOT(slotNavPrevPage()) );
     connect( m_navToolbar, SIGNAL(prevVerse()), this, SLOT(slotNavPrevVerse()) );
@@ -175,3 +178,3 @@ void MainWindow::initUI()
     connect( m_navToolbar, SIGNAL(nextVerse()), this, SLOT(slotNavNextVerse()) );
-    connect( m_navToolbar, SIGNAL(nextChapter()), this, SLOT(slotNavNextChapter()) );
+    connect( m_navToolbar, SIGNAL(nextPage()), this, SLOT(slotNavNextPage()) );
     connect( m_navToolbar, SIGNAL(autoScroll(bool)), this, SLOT(slotNavAutoScroll(bool)) );
@@ -334,3 +337,3 @@ void MainWindow::enableScreenBlanking( bool enable )
     enable ? QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable
-           : QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable;
+           : QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 }
@@ -599,3 +602,3 @@ void MainWindow::slotViewSearchToolbar( bool enabled )
 
-void MainWindow::slotNavPrevChapter()
+void MainWindow::slotNavPrevPage()
 {
@@ -604,3 +607,3 @@ void MainWindow::slotNavPrevChapter()
     {
-        text->prevChapter();
+        text->prevPage();
         setCaption( QString( "%1 - Dagger" ).arg( text->getFullKey() ) );
@@ -645,3 +648,3 @@ void MainWindow::slotNavNextVerse()
 
-void MainWindow::slotNavNextChapter()
+void MainWindow::slotNavNextPage()
 {
@@ -650,3 +653,3 @@ void MainWindow::slotNavNextChapter()
     {
-        text->nextChapter();
+        text->nextPage();
         setCaption( QString( "%1 - Dagger" ).arg( text->getFullKey() ) );
diff --git a/noncore/apps/dagger/mainwindow.h b/noncore/apps/dagger/mainwindow.h
index 0c7f3c8..b114e33 100644
--- a/noncore/apps/dagger/mainwindow.h
+++ b/noncore/apps/dagger/mainwindow.h
@@ -113,3 +113,3 @@ private slots:
     // Navigation toolbar slots
-    void slotNavPrevChapter();
+    void slotNavPrevPage();
     void slotNavPrevVerse();
@@ -117,3 +117,3 @@ private slots:
     void slotNavNextVerse();
-    void slotNavNextChapter();
+    void slotNavNextPage();
     void slotNavAutoScroll( bool enabled );
diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp
index 4781af0..212dc36 100644
--- a/noncore/apps/dagger/navbar.cpp
+++ b/noncore/apps/dagger/navbar.cpp
@@ -29,6 +29,6 @@ NavBar::NavBar( QMainWindow *parent )
     // Initialize UI
-    m_actionPrevChapter = new QAction( tr( "Previous chapter" ), Resource::loadPixmap( "fastback" ),
+    m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ),
                                        QString::null, 0, this, 0 );
-    m_actionPrevChapter->addTo( this );
-    connect( m_actionPrevChapter, SIGNAL(activated()), this, SIGNAL(prevChapter()) );
+    m_actionPrevPage->addTo( this );
+    connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) );
 
@@ -48,6 +48,6 @@ NavBar::NavBar( QMainWindow *parent )
 
-    m_actionNextChapter = new QAction( tr( "Next chapter" ), Resource::loadPixmap( "fastforward" ),
+    m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ),
                                        QString::null, 0, this, 0 );
-    m_actionNextChapter->addTo( this );
-    connect( m_actionNextChapter, SIGNAL(activated()), this, SIGNAL(nextChapter()) );
+    m_actionNextPage->addTo( this );
+    connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) );
 
@@ -74,6 +74,6 @@ void NavBar::navBtnsEnable( bool enabled )
 {
-    m_actionPrevChapter->setEnabled( enabled );
+    m_actionPrevPage->setEnabled( enabled );
     m_actionPrevVerse->setEnabled( enabled );
     m_actionNextVerse->setEnabled( enabled );
-    m_actionNextChapter->setEnabled( enabled );
+    m_actionNextPage->setEnabled( enabled );
     m_scrollRate->setEnabled( enabled );
diff --git a/noncore/apps/dagger/navbar.h b/noncore/apps/dagger/navbar.h
index a37d6ff..0df2bf0 100644
--- a/noncore/apps/dagger/navbar.h
+++ b/noncore/apps/dagger/navbar.h
@@ -39,3 +39,3 @@ public:
 private:
-    QAction   *m_actionPrevChapter; // Action for going back 1 chapter
+    QAction   *m_actionPrevPage;    // Action for going back 1 page
     QAction   *m_actionPrevVerse;   // Action for going back 1 verse
@@ -43,3 +43,3 @@ private:
     QAction   *m_actionNextVerse;   // Action for going forward 1 verse
-    QAction   *m_actionNextChapter; // Action for going forward 1 chapter
+    QAction   *m_actionNextPage;    // Action for going forward 1 page
     QSpinBox  *m_scrollRate;        // Spin box to adjust rate of auto-scrolling
@@ -48,3 +48,3 @@ private:
 signals:
-    void prevChapter();
+    void prevPage();
     void prevVerse();
@@ -52,3 +52,3 @@ signals:
     void nextVerse();
-    void nextChapter();
+    void nextPage();
     void autoScroll( bool enabled );
diff --git a/noncore/apps/dagger/opie-dagger.control b/noncore/apps/dagger/opie-dagger.control
index c401f03..4ded1f2 100644
--- a/noncore/apps/dagger/opie-dagger.control
+++ b/noncore/apps/dagger/opie-dagger.control
@@ -5,7 +5,5 @@ Section: opie/applications
 Depends: task-opie-minimal, libopiecore2, libopieui2
-Replaces: dagger
 Architecture: arm
-Source: http://draknor.net/dagger/
 Maintainer: Dan Williams (drw@handhelds.org)
 Description: A Bible study program utilizing the Sword library.
-Version: 0.9.0
+Version: 0.9.1$EXTRAVERSION
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp
index 747d696..ff434dd 100644
--- a/noncore/apps/dagger/searchbar.cpp
+++ b/noncore/apps/dagger/searchbar.cpp
@@ -33,2 +33,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
 
+void searchCallback( char /*percent*/, void */*userData*/ )
+{
+    qApp->processEvents();
+}
+
 SearchBar::SearchBar( QMainWindow *parent )
@@ -110,3 +115,4 @@ void SearchBar::slotFind()
     // TODO - implement search callback function to animate wait cursor
-    sword::ListKey results = m_currText->getModule()->Search( m_searchText->text().latin1(), REG_ICASE, 0 );
+    sword::ListKey results = m_currText->getModule()->Search( m_searchText->text().latin1(), 0, REG_ICASE, 0, 0,
+                                                              &searchCallback );
 
diff --git a/noncore/apps/dagger/textwidget.cpp b/noncore/apps/dagger/textwidget.cpp
index 8ff620d..9f7de66 100644
--- a/noncore/apps/dagger/textwidget.cpp
+++ b/noncore/apps/dagger/textwidget.cpp
@@ -80,4 +80,6 @@ QString TextWidget::getCurrVerse()
 
-void TextWidget::prevChapter()
+void TextWidget::prevPage()
 {
+    (*m_key) -= m_numVerses;
+    setText();
 }
@@ -102,4 +104,6 @@ void TextWidget::nextVerse()
 
-void TextWidget::nextChapter()
+void TextWidget::nextPage()
 {
+    (*m_key) += m_numVerses;
+    setText();
 }
diff --git a/noncore/apps/dagger/textwidget.h b/noncore/apps/dagger/textwidget.h
index 647eae9..f78ef69 100644
--- a/noncore/apps/dagger/textwidget.h
+++ b/noncore/apps/dagger/textwidget.h
@@ -44,3 +44,3 @@ public:
 
-    void prevChapter();
+    void prevPage();
     void prevVerse();
@@ -48,3 +48,3 @@ public:
     void nextVerse();
-    void nextChapter();
+    void nextPage();