Changeset 136

Timestamp:

04/29/06 14:09:50 (2 years ago)

Author:

jordi

Message:

Now all tests passes and the ePDFView executable can be build.

Location:

trunk

Files:

• src/IDocument.cxx (modified) (5 diffs)
• src/IDocument.h (modified) (3 diffs)
• src/IDocumentObserver.h (modified) (1 diff)
• src/JobLoad.cxx (modified) (11 diffs)
• src/JobLoad.h (modified) (1 diff)
• src/MainPter.cxx (modified) (5 diffs)
• src/MainPter.h (modified) (1 diff)
• tests/DumbDocumentObserver.cxx (modified) (4 diffs)
• tests/DumbDocumentObserver.h (modified) (2 diffs)
• tests/MainPterTest.cxx (modified) (3 diffs)
• tests/MainPterTest.h (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/PDFDocumentTest.cxx (modified) (1 diff)

trunk/src/IDocument.cxx

@@ -211 +211 @@
 
 void
-IDocument::notifyLoadPassword (const gchar *fileName, const GError *error)
+IDocument::notifyLoadPassword (const gchar *fileName, gboolean reload,
+                               const GError *error)
 {
     for ( GList *item = g_list_first (m_Observers) ; NULL != item ;
@@ -217 +218 @@
     {
         IDocumentObserver *observer = (IDocumentObserver *)item->data;
-        observer->notifyLoadPassword (fileName, error);
+        observer->notifyLoadPassword (fileName, reload, error);
     }
 }
@@ -272 +273 @@
         IDocumentObserver *observer = (IDocumentObserver *)item->data;
         observer->notifyPageZoomed (zoom);
+    }
+}
+
+void
+IDocument::notifyReload ()
+{
+    // Refresh the cache.
+    G_LOCK (JobRender);
+    refreshCache ();
+    G_UNLOCK (JobRender);
+
+    for ( GList *item = g_list_first (m_Observers) ; NULL != item ;
+          item = g_list_next (item) )
+    {
+        IDocumentObserver *observer = (IDocumentObserver *)item->data;
+        observer->notifyReload ();
     }
 }
@@ -286 +303 @@
     job->setFileName (fileName);
     job->setPassword (password);
+    IJob::queue (job);
+}
+
+void
+IDocument::reload (void)
+{
+    JobLoad *job = new JobLoad ();
+    job->setDocument (this);
+    job->setFileName (getFileName ());
+    job->setPassword (getPassword ());
+    job->setReload (TRUE);
     IJob::queue (job);
 }
@@ -1123 +1151 @@
     {
         PageCache *tmpCached = (PageCache *)page->data;
-        if ( pageNum == tmpCached->pageNumber )
+        if ( NULL != tmpCached && pageNum == tmpCached->pageNumber )
         {
             cached = tmpCached;

trunk/src/IDocument.h

@@ -187 +187 @@
             void notifyLoad (void);
             void notifyLoadError (const GError *error);
-            void notifyLoadPassword (const gchar *fileName, 
+            void notifyLoadPassword (const gchar *fileName, gboolean reload,
                                      const GError *error);
             void notifyPageChanged (void);
@@ -194 +194 @@
             void notifyPageRotated (void);
             void notifyPageZoomed (void);
+            void notifyReload (void);
             
             const gchar *getTitle (void);
@@ -233 +234 @@
 
             void load (const gchar *fileName, const gchar *password);
+            void reload (void);
 
             void goToFirstPage (void);

trunk/src/IDocumentObserver.h

@@ -29 +29 @@
             virtual void notifyLoadError (const GError *error) { }
             virtual void notifyLoadPassword (const gchar *fileName,
+                                             gboolean reload,
                                              const GError *error) { }
             virtual void notifyPageChanged (gint pageNum) { }
             virtual void notifyPageRotated (gint rotation) { }
             virtual void notifyPageZoomed (gdouble zoom) { }
+            virtual void notifyReload (void) { }
 
         protected:

trunk/src/JobLoad.cxx

@@ -25 +25 @@
 static gboolean job_load_error (gpointer data);
 static gboolean job_load_password (gpointer data);
+static gboolean job_reload_done (gpointer data);
 
 ///
@@ -32 +33 @@
     IJob ()
 {
+    m_Document = NULL;
+    m_Error = NULL;
     m_FileName = NULL;
-    m_Error = NULL;
     m_Password = NULL;
-    m_Document = NULL;
+    m_Reload = FALSE;
 }
 
@@ -52 +54 @@
 
 ///
+/// @brief The document that's loading.
+///
+/// @return The document that is loading.
+///
+IDocument &
+JobLoad::getDocument ()
+{
+    g_assert (NULL != m_Document && "The document is NULL.");
+
+    return *m_Document;
+}
+
+///
+/// @brief Gets the last error.
+///
+/// @return The last load error.
+///
+GError *
+JobLoad::getError ()
+{
+    return m_Error;
+}
+
+///
 /// @brief Gets the file name to load or reload.
 ///
@@ -63 +89 @@
 
 ///
-/// @brief Gets the last error.
-///
-/// @return The last load error.
-///
-GError *
-JobLoad::getError ()
-{
-    return m_Error;
-}
-
-///
 /// @brief Gets the password.
 ///
@@ -85 +100 @@
 
 ///
-/// @brief The document that's loading.
-///
-/// @return The document that is loading.
-///
-IDocument &
-JobLoad::getDocument ()
-{
-    g_assert (NULL != m_Document && "The document is NULL.");
-
-    return *m_Document;
-}
-
+/// @brief Check if we are reloading.
+///
+/// @return TREU if are reloading, FALSE otherwise.
+///
+gboolean
+JobLoad::isReloading ()
+{
+    return m_Reload;
+}
 
 ///
@@ -108 +120 @@
     if ( getDocument ().loadFile (getFileName (), getPassword (), &error) )
     {
-        JOB_NOTIFIER (job_load_done, this);
+        if ( isReloading () )
+        {
+            JOB_NOTIFIER (job_reload_done, this);
+        }
+        else
+        {
+            JOB_NOTIFIER (job_load_done, this);
+        }
     }
     else
@@ -127 +146 @@
 
 ///
+/// @brief Sets the document to load.
+///
+/// @param document The document that will load.
+///
+void
+JobLoad::setDocument (IDocument *document)
+{
+    g_assert ( NULL != document && "Tried to set a NULL document.");
+    
+    m_Document = document;
+}
+
+///
+/// @brief Sets the last error.
+///
+/// @param error The last error opening a file.
+///
+void
+JobLoad::setError (GError *error)
+{
+    if ( NULL != m_Error )
+    {
+        g_error_free (m_Error);
+    }
+    m_Error = error;
+}
+
+///
 /// @brief Sets the file name to open.
 ///
@@ -139 +186 @@
 
 ///
-/// @brief Sets the last error.
-///
-/// @param error The last error opening a file.
-///
-void
-JobLoad::setError (GError *error)
-{
-    if ( NULL != m_Error )
-    {
-        g_error_free (m_Error);
-    }
-    m_Error = error;
-}
-
-///
 /// @brief Sets the password to open the document.
 ///
@@ -166 +198 @@
 
 ///
-/// @brief Sets the document to load.
-///
-/// @param document The document that will load.
-///
-void
-JobLoad::setDocument (IDocument *document)
-{
-    g_assert ( NULL != document && "Tried to set a NULL document.");
-    
-    m_Document = document;
-}
-
+/// @brief Sets if reload.
+///
+/// @param reload TRUE if must reload, FALSE otherwise.
+///
+void
+JobLoad::setReload (gboolean reload)
+{
+    m_Reload = reload;
+}
 
 ////////////////////////////////////////////////////////////////
@@ -238 +267 @@
     JobLoad *job = (JobLoad *)data;
     job->getDocument ().notifyLoadPassword (job->getFileName (),
+                                            job->isReloading (),
                                             job->getError ());
     JOB_NOTIFIER_END();
@@ -243 +273 @@
     return FALSE;
 }
+
+///
+/// @brief The reload is finished correctly.
+///
+/// @param data This parameter holds the JobLoad that finished.
+///
+gboolean
+job_reload_done (gpointer data)
+{
+    g_assert (NULL != data && "The data parameter is NULL.");
+
+    JobLoad *job = (JobLoad *)data;
+    job->getDocument ().notifyReload ();
+    JOB_NOTIFIER_END();
+    
+    return FALSE;
+}

trunk/src/JobLoad.h

@@ -40 +40 @@
             const gchar *getFileName (void);
             const gchar *getPassword (void);
+            gboolean isReloading (void);
             gboolean run (void);
+            void setDocument (IDocument *document);
+            void setError (GError *error);
             void setFileName (const gchar *fileName);
-            void setError (GError *error);
             void setPassword (const gchar *password);
-            void setDocument (IDocument *document);
+            void setReload (gboolean reload);
 
         protected:
+            IDocument *m_Document;
+            GError *m_Error;
             gchar *m_FileName;
-            GError *m_Error;
             gchar *m_Password;
-            IDocument *m_Document;
+            gboolean m_Reload;
     };
 }

trunk/src/MainPter.cxx

@@ -158 +158 @@
     // Remove the status bar text.
     view.setStatusBarText (NULL);
+    // Show the normal cursor.
+    view.setCursor (MAIN_VIEW_CURSOR_NORMAL);
     // Show the first page *AFTER* showing the sidebar because 
     // the view change the row to the first outline that doesn't need
     // to be the first page. If we don't do this, the first page pointed
     // by the first outline is selected and we don't want this.
-    m_Document->goToFirstPage ();
-    // Show the normal cursor.
-    view.setCursor (MAIN_VIEW_CURSOR_NORMAL);
-    // Show the window.
     if ( m_Document->isLoaded () && canShowPage )
     {
+        m_Document->goToFirstPage ();
         refreshPage (PAGE_SCROLL_START);
     }
@@ -398 +397 @@
 MainPter::reloadActivated ()
 {   
-    // Reopen the document.
-/*    JobLoad *job = new JobLoad ();
-    job->setPresenter (this);
-    job->setFileName (m_Document->getFileName ());
-    job->setPassword (m_Document->getPassword ());
-    job->setReload (TRUE);
-    // Save the current document's state.
-    job->setPage (m_Document->getCurrentPageNum ());
-    job->setRotation (m_Document->getRotation ());
-    job->setZoom ( m_Document->getZoom ());
-    job->run ();*/
+    g_assert ( m_Document->isLoaded () && 
+            "Tried to reload a yet to load document.");
+
+    // Insensitive the open and reload controls.
+    IMainView &view = getView ();
+    view.sensitiveOpen (FALSE);
+    view.sensitiveReload (FALSE);
+    // Show the text on the status bar.
+    gchar *statusText = g_strdup_printf (_("Reloading file %s..."),
+                                         m_Document->getFileName ());
+    view.setStatusBarText (statusText);
+    g_free (statusText);
+    // Set the wait cursor.
+    view.setCursor (MAIN_VIEW_CURSOR_WAIT);
+    // Set the number of times we can try the password.
+    m_PasswordTries = 3;
+    // Reload
+    m_Document->reload ();
 }
 
@@ -702 +708 @@
 
 void
-MainPter::notifyLoadPassword (const gchar *fileName, const GError *error)
+MainPter::notifyLoadPassword (const gchar *fileName, gboolean reload, const GError *error)
 {
     if ( 0 < m_PasswordTries )
@@ -710 +716 @@
         if ( password != NULL )
         {
-            m_Document->load (fileName, password);
+            if ( reload )
+            {
+                m_Document->setPassword (password);
+                m_Document->reload ();
+            }
+            else
+            {
+                m_Document->load (fileName, password);
+            }
         }
 #if defined (DEBUG)
@@ -778 +792 @@
 }
 
+void
+MainPter::notifyReload ()
+{
+    setInitialState (FALSE);
+    refreshPage (PAGE_SCROLL_NONE);
+#if defined (DEBUG)
+    G_LOCK (fileLoaded);
+    fileLoaded = TRUE;
+    G_UNLOCK (fileLoaded);
+#endif // DEBUG
+}
+
 #if defined (DEBUG)
 ///

trunk/src/MainPter.h

@@ -68 +68 @@
             void notifyLoad (void);
             void notifyLoadError (const GError *error);
-            void notifyLoadPassword (const gchar *fileName, 
+            void notifyLoadPassword (const gchar *fileName, gboolean reload,
                                      const GError *error);
             void notifyPageChanged (gint pageNum);
             void notifyPageRotated (gint rotation);
             void notifyPageZoomed (gdouble zoom);
+            void notifyReload (void);
 
             static gboolean pageNotAvailable (gpointer user);

trunk/tests/DumbDocumentObserver.cxx

@@ -31 +31 @@
     m_NotifiedPageRotated = FALSE;
     m_NotifiedPageZoomed = FALSE;
+    m_NotifiedReload = FALSE;
     m_Zoom = 0.0;
 }
@@ -55 +56 @@
 
 void
-DumbDocumentObserver::notifyLoadPassword (const gchar *fileName,
+DumbDocumentObserver::notifyLoadPassword (const gchar *fileName, 
+                                          gboolean reload,
                                           const GError *error)
 {
@@ -79 +81 @@
     m_NotifiedPageZoomed = TRUE;
     m_Zoom = zoom;
+}
+
+void
+DumbDocumentObserver::notifyReload (void)
+{
+    m_NotifiedReload;
 }
 
@@ -106 +114 @@
 DumbDocumentObserver::loadFinished (void)
 {
-    return m_NotifiedError || m_NotifiedPassword || m_NotifiedLoad;
+    return m_NotifiedError || m_NotifiedPassword || m_NotifiedLoad ||
+           m_NotifiedReload;
 }
 

trunk/tests/DumbDocumentObserver.h

@@ -29 +29 @@
             void notifyLoad (void);
             void notifyLoadError (const GError *error);
-            void notifyLoadPassword (const gchar *fileName, 
+            void notifyLoadPassword (const gchar *fileName, gboolean reload,
                                      const GError *error);
             void notifyPageChanged (gint pageNum);
             void notifyPageRotated (gint rotation);
             void notifyPageZoomed (gdouble zoom);
+            void notifyReload (void);
 
             gint getCurrentPage (void);
@@ -54 +55 @@
             gboolean m_NotifiedPageRotated;
             gboolean m_NotifiedPageZoomed;
+            gboolean m_NotifiedReload;
             gdouble m_Zoom;
     };

trunk/tests/MainPterTest.cxx

@@ -748 +748 @@
     CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
 }
-/*
+
 ///
 /// @brief Test to reload a normal document.
@@ -828 +828 @@
 /// @brief Tries to reload an encrypted file whose password changed.
 ///
-/// Reloading an encrypted file won't ask for the password unless it changed. 
+/// Reloading an encrypted file won't ask for the password unless it changed.
+/// If the password changed, then the document starts on the first page.
 ///
 void
@@ -870 +871 @@
     CPPUNIT_ASSERT_EQUAL (1, m_View->countTimesShownPasswordPrompt ());
 }
-*/
+
 ///
 /// @brief Checks that the index is shown when a document has outline.

trunk/tests/MainPterTest.h

@@ -41 +41 @@
         CPPUNIT_TEST (pageZoomFit);
         CPPUNIT_TEST (pageZoomAndRotate);
-/*        CPPUNIT_TEST (reloadNormal);
+        CPPUNIT_TEST (reloadNormal);
         CPPUNIT_TEST (reloadEncrypted);
-        CPPUNIT_TEST (reloadChangedPassword);*/
+        CPPUNIT_TEST (reloadChangedPassword);
         CPPUNIT_TEST (showIndex);
         CPPUNIT_TEST (showToolAndStatusBars);

trunk/tests/Makefile.am

@@ -21 +21 @@
     MainPterTest.cxx    \
     MainPterTest.h  \
+    PDFDocumentTest.cxx \
+    PDFDocumentTest.h   \
     Utils.cxx               \
     Utils.h
 
-#   PDFDocumentTest.cxx
-#   PDFDocumentTest.h
 
 test_epdfview_CXXFLAGS =                        \

trunk/tests/PDFDocumentTest.cxx

@@ -583 +583 @@
     m_Document->zoomToWidth (300); 
     CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3562f, m_Document->getZoom (), DELTA);
-    DocumentPage *page = m_Document->getCurrentPage ();
+    DocumentPage *page = NULL;
+    while ( NULL == page || (DocumentPage *)0xdeadbeef == page )
+    {
+        page = m_Document->getCurrentPage ();
+    }
     CPPUNIT_ASSERT (NULL != page);
+    CPPUNIT_ASSERT ((DocumentPage *)0xdeadbeef != page);
     CPPUNIT_ASSERT_EQUAL (300, page->getWidth ());
     CPPUNIT_ASSERT_EQUAL (212, page->getHeight ());