Changeset 24

Timestamp:

04/11/06 11:10:26 (3 years ago)

Author:

jordi

Message:

The main presenter now can open files and changes the window's title to show the file name or the document's title, if it has title. Also changes the the control's sensitiveness.

Location:

trunk

Files:

• src/IMainView.h (modified) (2 diffs)
• src/MainPter.cxx (modified) (4 diffs)
• src/MainPter.h (modified) (1 diff)
• tests/DumbDocument.cxx (modified) (3 diffs)
• tests/DumbDocument.h (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

@@ -30 +30 @@
             virtual ~IMainView () {}
 
+            virtual gchar *openFileDialog () = 0;
             virtual void sensitiveGoToFirstPage (gboolean sensitive) = 0;
             virtual void sensitiveGoToLastPage (gboolean sensitive) = 0;
@@ -39 +40 @@
             virtual void sensitiveZoomFit (gboolean sensitive) = 0;
             virtual void sensitiveZoomWidth (gboolean sensitive) = 0;
-            virtual void show (void) = 0; 
+            virtual void show (void) = 0;
+            virtual void showPage (DocumentPage *page) = 0;
             virtual void setTitle (const gchar *title) = 0;
 

trunk/src/MainPter.cxx

@@ -25 +25 @@
 MainPter::MainPter ()
 {
+    m_Document = new PDFDocument ();
 }
 
@@ -36 +37 @@
 MainPter::MainPter (IDocument *document)
 {
+    g_assert (NULL != document && "Tried to set a NULL document");
+
+    m_Document = document;
 }
 
@@ -54 +58 @@
 MainPter::setInitialState ()
 {
+    g_assert ( NULL != m_Document && "The document is NULL.");
+    
     IMainView &view = getView ();
-    view.setTitle (_("PDF Viewer"));
-    view.sensitiveGoToFirstPage (FALSE);
-    view.sensitiveGoToLastPage (FALSE);
-    view.sensitiveGoToNextPage (FALSE);
-    view.sensitiveGoToPage (FALSE);
-    view.sensitiveGoToPreviousPage (FALSE);
-    view.sensitiveZoomIn (FALSE);
-    view.sensitiveZoomOut (FALSE);
-    view.sensitiveZoomFit (FALSE);
-    view.sensitiveZoomWidth (FALSE);
+    if ( m_Document->isLoaded () )
+    {
+        if ( 0 == g_ascii_strcasecmp ("", m_Document->getTitle ()) )
+        {
+            view.setTitle (m_Document->getFileName ());
+        }
+        else
+        {
+            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);
+        showPage ();
+    }
+    else
+    {
+        view.setTitle (_("PDF Viewer"));
+        view.sensitiveGoToFirstPage (FALSE);
+        view.sensitiveGoToLastPage (FALSE);
+        view.sensitiveGoToNextPage (FALSE);
+        view.sensitiveGoToPage (FALSE);
+        view.sensitiveGoToPreviousPage (FALSE);
+        view.sensitiveZoomIn (FALSE);
+        view.sensitiveZoomOut (FALSE);
+        view.sensitiveZoomFit (FALSE);
+        view.sensitiveZoomWidth (FALSE);
+    }
+    
     view.show (); 
 }
@@ -97 +128 @@
 }
 
+///
+/// @brief The Open File action was activated.
+///
+/// This means that the user wants to open a new file. The presenter
+/// asks the view to show the Open File dialog and return a filename.
+/// Then we'll try to open the file and if it's correct we'll show it, 
+/// otherwise it will request the view to show an error dialog or a 
+/// password dialog, if the document is encrypted.
+///
+void
+MainPter::openFileActivated ()
+{
+    IMainView &view = getView ();
+    gchar *fileName = view.openFileDialog ();
+    GError *error;
+    if ( m_Document->loadFile (fileName, NULL, &error) )
+    {
+        // Now that the document has been loaded, just reset the initial
+        // state.
+        setInitialState ();
+        g_free (fileName);
+    }
+}
 
+///
+/// @brief Shows the current page.
+///
+/// This function is called when the presenter needs to show a document's
+/// page. It only gets the rendered page from the document and then
+/// pass the resultant DocumentPage to the view.
+///
+void
+MainPter::showPage ()
+{
+    g_assert (NULL != m_Document && 
+              "Tried to show a page from a NULL document.");
+    g_assert (m_Document->isLoaded () && 
+              "Tried to show a page from a not loaded document.");
+            
+    DocumentPage *page = m_Document->renderPage ();
+    if ( NULL != page )
+    {
+        getView ().showPage (page);
+        delete page;
+    }
+}

trunk/src/MainPter.h

@@ -28 +28 @@
             ~MainPter ();
 
-            void setInitialState (void);
+            void setInitialState (void);            
             IMainView &getView (void);
             void setView (IMainView *view);
 
+            void openFileActivated (void);
+
         protected:
+            void showPage (void);
+
+            IDocument *m_Document;
             IMainView *m_View;
     };

trunk/tests/DumbDocument.cxx

@@ -28 +28 @@
     IDocument ()
 {
+    m_Loaded = FALSE;
 }
 
@@ -37 +38 @@
 DumbDocument::isLoaded ()
 {
-    return false;
+    return m_Loaded;
 }
 
@@ -44 +45 @@
                         GError **error)
 {
-    return false;
+    setFileName (filename);
+    m_Loaded = TRUE;
+    return m_Loaded;
 }
 

trunk/tests/DumbDocument.h

@@ -33 +33 @@
             void getPageSize (gdouble *width, gdouble *height);
             DocumentPage *renderPage (void);
+
+        private:
+            gboolean m_Loaded;
     };
 }

trunk/tests/DumbMainView.cxx

@@ -29 +29 @@
     // This won't be deleted because it's presenter responsability.
     m_DocumentPage = NULL;
+    m_OpenFileName = g_strdup ("");
     m_SensitiveGoToFirstPage = TRUE;
     m_SensitiveGoToLastPage = TRUE;
@@ -44 +45 @@
 DumbMainView::~DumbMainView ()
 {
+    g_free (m_OpenFileName);
     g_free (m_Title);
 }
+            
+gchar *
+DumbMainView::openFileDialog (void)
+{
+    return g_strdup (m_OpenFileName);
+}
 
 void
@@ -105 +113 @@
 {
     m_Shown = TRUE;
+}
+
+void
+DumbMainView::showPage (DocumentPage *page)
+{
+    m_DocumentPage = page;
 }
 
@@ -120 +134 @@
 
 gboolean
+DumbMainView::hasImagePageView ()
+{
+    return NULL != m_DocumentPage;
+}
+
+gboolean
 DumbMainView::isShown ()
 {
@@ -185 +205 @@
 }
 
-gboolean
-DumbMainView::hasImagePageView ()
-{
-    return NULL != m_DocumentPage;
-}
+void
+DumbMainView::setOpenFileName (const gchar *fileName)
+{
+    g_free (m_OpenFileName);
+    m_OpenFileName = g_strdup (fileName);
+}

trunk/tests/DumbMainView.h

@@ -28 +28 @@
             ~DumbMainView ();
 
+            gchar *openFileDialog (void);
             void sensitiveGoToFirstPage (gboolean sensitive);
             void sensitiveGoToLastPage (gboolean sensitive);
@@ -37 +38 @@
             void sensitiveZoomFit (gboolean sensitive);
             void sensitiveZoomWidth (gboolean sensitive);
-            void show (void); 
+            void show (void);
+            void showPage (DocumentPage *page);
             void setTitle (const gchar *title);
 
             // Methods for test purposes.
             const gchar *getTitle (void);
+            gboolean hasImagePageView (void);
             gboolean isShown (void);
             gboolean isSensitiveGoToFirstPage (void);
@@ -52 +55 @@
             gboolean isSensitiveZoomFit (void);
             gboolean isSensitiveZoomWidth (void);
-            gboolean hasImagePageView (void);
+            void setOpenFileName (const gchar *fileName);
 
         protected:
             DocumentPage *m_DocumentPage;
+            gchar *m_OpenFileName;
             gboolean m_SensitiveGoToFirstPage;
             gboolean m_SensitiveGoToLastPage;

trunk/tests/MainPterTest.cxx

@@ -74 +74 @@
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
 }
+
+///
+/// @brief Test loading a document.
+///
+/// Loading a document will set the title to the document's title or the
+/// document's file name, if it has no title. Also will sensitive the
+/// go to next page, go to last page and all zoom actions. Also will
+/// show the document's first page.
+///
+void
+MainPterTest::loadDocument ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
+    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->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomFit ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomWidth ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+
+    // Now try a document with a title.
+    m_Document->setTitle ("Test PDF");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("Test PDF", m_View->getTitle ()));
+    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->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomFit ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomWidth ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+}

trunk/tests/MainPterTest.h

@@ -27 +27 @@
         CPPUNIT_TEST_SUITE (MainPterTest);
         CPPUNIT_TEST (initialStatus);
+        CPPUNIT_TEST (loadDocument);
         CPPUNIT_TEST_SUITE_END();
 
@@ -34 +35 @@
 
             void initialStatus (void);
+            void loadDocument (void);
 
         private: