Changeset 26

Timestamp:

04/11/06 11:40:45 (3 years ago)

Author:

jordi

Message:

When an error loading the document happens, the view shows to the user an error message.

Also, updated POTFILES.in with the correct document sources and the MainPter? sources.

Location:

trunk

Files:

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

trunk/src/IMainView.h

@@ -41 +41 @@
             virtual void sensitiveZoomWidth (gboolean sensitive) = 0;
             virtual void show (void) = 0;
+            virtual void showErrorMessage (const gchar *title, 
+                                           const gchar *body) = 0;
             virtual void showPage (DocumentPage *page) = 0;
             virtual void setTitle (const gchar *title) = 0;

trunk/src/MainPter.cxx

@@ -147 +147 @@
     if ( NULL != fileName )
     {
-        GError *error;
+        GError *error = NULL;
         if ( m_Document->loadFile (fileName, NULL, &error) )
         {
@@ -154 +154 @@
             setInitialState ();
             g_free (fileName);
+        }
+        else
+        {
+            // We got an error, but also can be that the file is encrypted.
+            if ( DocumentErrorEncrypted == error->code )
+            {
+                // TODO
+            }
+            else
+            {
+                // It was an error. Show the error message.
+                getView ().showErrorMessage (_("Error Loading File"), 
+                                             error->message);                
+
+            }
+            g_free (error);
         }
     }

trunk/tests/DumbDocument.cxx

@@ -29 +29 @@
 {
     m_Loaded = FALSE;
+    m_OpenError = DocumentErrorNone;
 }
 
@@ -45 +46 @@
                         GError **error)
 {
-    setFileName (filename);
-    m_Loaded = TRUE;
+    if ( DocumentErrorNone == m_OpenError )
+    {
+        setFileName (filename);
+        m_Loaded = TRUE;
+    }
+    else
+    {
+        g_set_error (error, EPDFVIEW_DOCUMENT_ERROR, m_OpenError, 
+                     "%s", IDocument::getErrorMessage (m_OpenError));
+    }
     return m_Loaded;
 }
@@ -62 +71 @@
     return new DocumentPage ();
 }
+
+////////////////////////////////////////////////////////////////
+// Tests Methods
+////////////////////////////////////////////////////////////////
+void
+DumbDocument::setOpenError (DocumentError error)
+{
+    m_OpenError = error;
+}

trunk/tests/DumbDocument.h

@@ -34 +34 @@
             DocumentPage *renderPage (void);
 
+            // Test functions.
+            void setOpenError (DocumentError error);
+
         private:
             gboolean m_Loaded;
+            DocumentError m_OpenError;
     };
 }

trunk/tests/DumbMainView.cxx

@@ -40 +40 @@
     m_SensitiveZoomWidth = TRUE;
     m_Shown = FALSE;
+    m_ShownError = FALSE;
     m_Title = g_strdup ("");
 }
@@ -116 +117 @@
 
 void
+DumbMainView::showErrorMessage (const gchar *title, const gchar *body)
+{
+    m_ShownError = TRUE;
+}
+
+void
 DumbMainView::showPage (DocumentPage *page)
 {
@@ -136 +143 @@
 DumbMainView::hasImagePageView ()
 {
-    return NULL != m_DocumentPage;
+    gboolean shown = (NULL != m_DocumentPage);
+    // The next time, it will be FALSE unless it's shown again.
+    m_DocumentPage = NULL;
+
+    return shown;
 }
 
@@ -215 +226 @@
     }
 }
+
+gboolean
+DumbMainView::shownError ()
+{
+    gboolean shown = m_ShownError;
+    // It's like the user clicked the "OK" button. No shown anymore, until
+    // the next error.
+    m_ShownError = FALSE;
+
+    return shown;
+}

trunk/tests/DumbMainView.h

@@ -39 +39 @@
             void sensitiveZoomWidth (gboolean sensitive);
             void show (void);
+            void showErrorMessage (const gchar *title, const gchar *body);
             void showPage (DocumentPage *page);
             void setTitle (const gchar *title);
@@ -56 +57 @@
             gboolean isSensitiveZoomWidth (void);
             void setOpenFileName (const gchar *fileName);
+            gboolean shownError (void);
 
         protected:
@@ -70 +72 @@
             gboolean m_SensitiveZoomWidth;
             gboolean m_Shown;
+            gboolean m_ShownError;
             gchar *m_Title;
     };

trunk/tests/MainPterTest.cxx

@@ -141 +141 @@
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomWidth ());
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->shownError ());
 }
+
+///
+/// @brief Test a failed load.
+///
+/// A failed load (anything but a DocumentErrorNone and DocumentErrorEncrypted)
+/// is very similar to the load cancelled, but an error message is shown 
+/// to the user.
+///
+void
+MainPterTest::loadFailed ()
+{    
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_Document->setOpenError (DocumentErrorDamaged);
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("PDF Viewer", 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 ());
+    CPPUNIT_ASSERT (m_View->shownError ());
+
+}

trunk/tests/MainPterTest.h

@@ -29 +29 @@
         CPPUNIT_TEST (loadDocument);
         CPPUNIT_TEST (loadCancelled);
+        CPPUNIT_TEST (loadFailed);
         CPPUNIT_TEST_SUITE_END();
 
@@ -38 +39 @@
             void loadDocument (void);
             void loadCancelled (void);
+            void loadFailed (void);
 
         private: