Changeset 29

Timestamp:

04/11/06 13:58:09 (3 years ago)

Author:

jordi

Message:

The page navigation toolbar works as expected, setting the sensitiveness of its controls correctly.

Location:

trunk

Files:

• src/IMainView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (4 diffs)
• src/MainPter.h (modified) (1 diff)
• tests/DumbDocument.cxx (modified) (1 diff)
• tests/DumbMainView.cxx (modified) (5 diffs)
• tests/DumbMainView.h (modified) (3 diffs)
• tests/MainPterTest.cxx (modified) (1 diff)
• tests/MainPterTest.h (modified) (2 diffs)

trunk/src/IMainView.h

@@ -45 +45 @@
                                            const gchar *body) = 0;
             virtual void showPage (DocumentPage *page) = 0;
+            virtual void setTotalPages (gint pages) = 0;
+            virtual void setGoToPageText (const gchar *text) = 0;
+            virtual const gchar *getGoToPageText (void) = 0;
             virtual void setTitle (const gchar *title) = 0;
 

trunk/src/MainPter.cxx

@@ -63 +63 @@
     if ( m_Document->isLoaded () )
     {
+        m_Document->goToFirstPage ();
         if ( 0 == g_ascii_strcasecmp ("", m_Document->getTitle ()) )
         {
@@ -71 +72 @@
             view.setTitle (m_Document->getTitle ());
         }
-        view.sensitiveGoToFirstPage (FALSE);
-        view.sensitiveGoToLastPage (TRUE);
-        view.sensitiveGoToNextPage (TRUE);
         view.sensitiveGoToPage (TRUE);
-        view.sensitiveGoToPreviousPage (FALSE);
         view.sensitiveZoomIn (TRUE);
         view.sensitiveZoomOut (TRUE);
         view.sensitiveZoomFit (TRUE);
         view.sensitiveZoomWidth (TRUE);
+        view.setTotalPages (m_Document->getNumPages ());
         showPage ();
     }
@@ -126 +124 @@
     // state.
     setInitialState ();
+}
+
+///
+/// @brief The "Go To First Page" action was activated.
+///
+void
+MainPter::goToFirstPageActivated (void)
+{
+    g_assert (NULL != m_Document && 
+              "Tried to go to the first page of a NULL document.");
+    
+    m_Document->goToFirstPage ();
+    showPage ();
+}
+
+void
+MainPter::goToLastPageActivated (void)
+{
+    g_assert (NULL != m_Document && 
+              "Tried to go to the last page of a NULL document.");
+    
+    m_Document->goToLastPage ();
+    showPage ();
+}
+
+void
+MainPter::goToNextPageActivated (void)
+{
+    g_assert (NULL != m_Document && 
+              "Tried to go to the next page of a NULL document.");
+    
+    m_Document->goToNextPage ();
+    showPage ();
+}
+
+void
+MainPter::goToPageActivated (void)
+{
+    g_assert (NULL != m_Document && 
+              "Tried to go to the a page of a NULL document.");
+    
+    // First try to get the page number from the view.
+    const gchar *goToPageText = getView ().getGoToPageText ();
+    if ( NULL != goToPageText )
+    {
+        // Try to read as much as possible.
+        int pageNum = atoi (goToPageText);
+        // If the page number is too high, the Document class will
+        // go to the last page. The same if it's too low.
+        m_Document->goToPage (pageNum);
+        showPage ();
+    }
+}
+
+void
+MainPter::goToPreviousPageActivated (void)
+{
+    g_assert (NULL != m_Document && 
+              "Tried to go to the previous page of a NULL document.");
+    
+    m_Document->goToPreviousPage ();
+    showPage ();
 }
 
@@ -218 +278 @@
     g_assert (m_Document->isLoaded () && 
               "Tried to show a page from a not loaded document.");
-            
+
+    IMainView &view = getView ();
+    // Set the text for the current page.
+    gint currentPage = m_Document->getCurrentPageNum ();
+    gchar *goToPageText = g_strdup_printf ("%d", currentPage);
+    view.setGoToPageText (goToPageText);
+    g_free (goToPageText);
+    
+    // Set the page navigation sensitivity.
+    view.sensitiveGoToFirstPage (1 < currentPage );
+    view.sensitiveGoToPreviousPage (1 < currentPage );
+    view.sensitiveGoToLastPage (m_Document->getNumPages() > currentPage);
+    view.sensitiveGoToNextPage (m_Document->getNumPages() > currentPage);
+    
     DocumentPage *page = m_Document->renderPage ();
     if ( NULL != page )

trunk/src/MainPter.h

@@ -31 +31 @@
             IMainView &getView (void);
             void setView (IMainView *view);
-
+            
+            void goToFirstPageActivated (void);
+            void goToLastPageActivated (void);
+            void goToNextPageActivated (void);
+            void goToPageActivated (void);
+            void goToPreviousPageActivated (void);
             void openFileActivated (void);
 

trunk/tests/DumbDocument.cxx

@@ -31 +31 @@
     m_OpenError = DocumentErrorNone;
     m_Password = NULL;
+    setNumPages (2);
 }
 

trunk/tests/DumbMainView.cxx

@@ -27 +27 @@
     IMainView (pter)
 {
+    m_CurrentPage = 0;
     // This won't be deleted because it's presenter responsability.
     m_DocumentPage = NULL;
+    m_GoToPageText = g_strdup ("");
     m_OpenFileName = g_strdup ("");
     m_Password = NULL;
@@ -44 +46 @@
     m_Title = g_strdup ("");
     m_TimesShownPassword = 0;
+    m_TotalPages = 0;
 }
 
 DumbMainView::~DumbMainView ()
 {
+    g_free (m_GoToPageText);
     g_free (m_OpenFileName);
     g_free (m_Password);
@@ -120 +124 @@
 }
 
-void
-DumbMainView::show (void)
-{
-    m_Shown = TRUE;
-}
-
-void
-DumbMainView::showErrorMessage (const gchar *title, const gchar *body)
-{
-    m_ShownError = TRUE;
-}
-
-void
-DumbMainView::showPage (DocumentPage *page)
-{
-    m_DocumentPage = page;
+const gchar *
+DumbMainView::getGoToPageText ()
+{
+    return (const gchar *)m_GoToPageText;
+}
+
+void
+DumbMainView::setTotalPages (gint pages)
+{
+    m_TotalPages = pages;
+}
+
+void
+DumbMainView::setGoToPageText (const char *text)
+{
+    g_free (m_GoToPageText);
+    m_GoToPageText = g_strdup (text);
+    m_CurrentPage = atoi(text);
 }
 
@@ -145 +151 @@
 }
 
+void
+DumbMainView::show (void)
+{
+    m_Shown = TRUE;
+}
+
+void
+DumbMainView::showErrorMessage (const gchar *title, const gchar *body)
+{
+    m_ShownError = TRUE;
+}
+
+void
+DumbMainView::showPage (DocumentPage *page)
+{
+    m_DocumentPage = page;
+}
 
 ////////////////////////////////////////////////////////////////
@@ -154 +177 @@
 {
     return m_TimesShownPassword;
+}
+
+gint
+DumbMainView::getCurrentPage ()
+{
+    return m_CurrentPage;
+}
+
+gint
+DumbMainView::getTotalPages ()
+{
+    return m_TotalPages;
 }
 

trunk/tests/DumbMainView.h

@@ -39 +39 @@
             void sensitiveZoomFit (gboolean sensitive);
             void sensitiveZoomWidth (gboolean sensitive);
+            const gchar *getGoToPageText (void);
+            void setTotalPages (gint pages);
+            void setGoToPageText (const char *text);
+            void setTitle (const gchar *title);
             void show (void);
             void showErrorMessage (const gchar *title, const gchar *body);
             void showPage (DocumentPage *page);
-            void setTitle (const gchar *title);
 
             // Methods for test purposes.
-            gint countTimesShownPasswordPrompt ();
+            gint countTimesShownPasswordPrompt (void);
+            gint getCurrentPage (void);            
             const gchar *getTitle (void);
+            gint getTotalPages (void);
             gboolean hasImagePageView (void);
             gboolean isShown (void);
@@ -63 +68 @@
 
         protected:
+            gint m_CurrentPage;
             DocumentPage *m_DocumentPage;
+            gchar *m_GoToPageText;
             gchar *m_OpenFileName;
             gchar *m_Password;
@@ -79 +86 @@
             gint m_TimesShownPassword;
             gchar *m_Title;
+            gint m_TotalPages;
     };
 }

trunk/tests/MainPterTest.cxx

@@ -262 +262 @@
     CPPUNIT_ASSERT_EQUAL (1, m_View->countTimesShownPasswordPrompt ());
 }
+
+///
+/// @brief Test page navigation.
+///
+/// I'll load a 4-pages document and will try to go to the first, last, next, 
+/// previous and also on a page using the entry on the toolbar.
+///
+void
+MainPterTest::pageNavigation ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_Document->setNumPages (4);
+    m_MainPter->openFileActivated ();
+    // Check that sets the correct number of pages and the current page.
+    CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
+    CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // Going to the next page should make all actions sensitive.
+    m_MainPter->goToNextPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // Going to the last will make some unsensitive.
+    m_MainPter->goToLastPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (4, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // Again to the last won't harm (just in case...) nor going next.
+    m_MainPter->goToLastPageActivated ();
+    m_MainPter->goToNextPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (4, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // But going to the previous will change something.
+    m_MainPter->goToPreviousPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (3, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // Now, to the first again.
+    m_MainPter->goToFirstPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // Check sane behaviour.
+    m_MainPter->goToFirstPageActivated ();
+    m_MainPter->goToPreviousPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+
+    // Now try again using the page entry on toolbar.
+    m_View->setGoToPageText ("2");
+    m_MainPter->goToPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+
+    m_View->setGoToPageText ("4");
+    m_MainPter->goToPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (4, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());    
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+
+    m_View->setGoToPageText ("1");
+    m_MainPter->goToPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+
+    // Invalid values.
+    m_View->setGoToPageText ("123123");
+    m_MainPter->goToPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (4, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());    
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+
+    m_View->setGoToPageText ("0");
+    m_MainPter->goToPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());    
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+
+    m_MainPter->goToNextPageActivated ();
+    m_View->setGoToPageText ("Jejej");
+    m_MainPter->goToPageActivated ();
+    CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+}

trunk/tests/MainPterTest.h

@@ -33 +33 @@
         CPPUNIT_TEST (badPassword);
         CPPUNIT_TEST (goodPassword);
+        CPPUNIT_TEST (pageNavigation);
         CPPUNIT_TEST_SUITE_END();
 
@@ -46 +47 @@
             void badPassword (void);
             void goodPassword (void);
+            void pageNavigation (void);
 
         private: