Changeset 115

Timestamp:

04/25/06 07:04:09 (2 years ago)

Author:

jordi

Message:

Loading or reloading a document is now a background process, so the GUI remains "alive" while the presenter loading the file. There are known "bugs", though, that will be fixed on the next commits: The window doesn't unsensitives the open action, the reload action and doesn't show the "opening file" and a progress bar to the status bar.

Also I had to change the check on the configure.ac from glib-2.0 to gthread-2.0, because it's needed in order to use threads on glib. While I was there I changed the current release version to the next 0.1.4 also.

Files:

• trunk/configure.ac (modified) (2 diffs)
• trunk/src/JobLoad.cxx (added)
• trunk/src/JobLoad.h (added)
• trunk/src/MainPter.cxx (modified) (5 diffs)
• trunk/src/MainPter.h (modified) (2 diffs)
• trunk/src/Makefile.am (modified) (1 diff)
• trunk/src/epdfview.h (modified) (1 diff)
• trunk/src/main.cxx (modified) (3 diffs)
• trunk/tests/MainPterTest.cxx (modified) (23 diffs)

trunk/configure.ac

@@ -1 +1 @@
-dnl Process this file with autoconf to produce a configure script.
-3
+4
-AC_PREREQ([2.13])
-AC_CONFIG_HEADER([config.h])
@@ -31 +31 @@
-GTK2_REQUIRED=2.6.0
-
-lib
+thread
-AC_SUBST([GLIB_CFLAGS])
-AC_SUBST([GLIB_LIBS])

trunk/src/MainPter.cxx

@@ -276 +276 @@
-MainPter::openFileActivated ()
-{
-
-
-
+
-    gchar *lastFolder = config.getOpenFileFolder ();
-
-
-
-
+
+
-    if ( NULL != fileName )
-    {
-
-
-
+
-        config.setOpenFileFolder (dirName);
-        g_free (dirName);
-    }
-
+
+
+
+
+
+
+
+
-}
-
@@ -356 +357 @@
-MainPter::reloadActivated ()
-{    
+    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.
-gint currentPage = m_Document->getCurrentPageNum (
-gint currentRotation = m_Document->getRotation (
-gdouble currentZoom = m_Document->getZoom (
+job->setPage (m_Document->getCurrentPageNum ()
+job->setRotation (m_Document->getRotation ()
+job->setZoom ( m_Document->getZoom ()
-    // Reopen the document.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // Draw the document.
-    showPage (PAGE_SCROLL_NONE);
-}
-
-///
-/// @brief The "Rotate Left" was activated.
-///
-void
-MainPter::rotateLeftActivated ()
-{
-    g_assert ( NULL != m_Document && "Tried to rotate a NULL document.");
-
-    m_Document->rotateLeft ();
-
-    Config &config = Config::getConfig ();
-    if ( config.zoomToWidth () )
-    {
-        zoomWidth ();
-    }
-    else if ( config.zoomToFit () )
-    {
-        zoomFit ();
-    }
-    showPage (PAGE_SCROLL_START);
-}
-
-///
-/// @brief The "Rotate Right" was activated.
-///
-void
-MainPter::rotateRightActivated ()
-{
-    g_assert ( NULL != m_Document && "Tried to rotate a NULL document.");
-
-    m_Document->rotateRight ();
-
-    Config &config = Config::getConfig ();
-    if ( config.zoomToWidth () )
-    {
-        zoomWidth ();
-    }
-    else if ( config.zoomToFit () )
-    {
-        zoomFit ();
-    }
-    showPage (PAGE_SCROLL_START);
-}
-
-///
@@ -582 +604 @@
-///                    page, rotation and zoom again and then show the page.
-///
-
+
-MainPter::openDocument (const gchar *fileName, const gchar *oldPassword,
-gboolean canShowPage
+GError **error
-{
-    // if fileName is NULL, then the user cancelled the operation.
@@ -591 +613 @@
-    if ( NULL != fileName )
-    {
-
-
+
+
+
+
+
-        {
-            // Now that the document has been loaded, just reset the initial
@@ -645 +670 @@
-        }
-    }
-
-
+
+
+
-
-///

trunk/src/MainPter.h

@@ -50 +50 @@
-            void goToPageActivated (void);
-            void goToPreviousPageActivated (void);
-void
-gboolean canShowPage
+bool
+ GError **error
-            void openFileActivated (void);
-            void outlineActivated (DocumentOutline *outline);
@@ -61 +61 @@
-            void showStatusbarActivated (gboolean show);
-            void showToolbarActivated (gboolean show);
+            void setContext (gint pageNum, gint rotation, gdouble zoom);
-            void zoomFitActivated (gboolean active);
-            void zoomInActivated (void);

trunk/src/Makefile.am

@@ -15 +15 @@
-    IDocument.cxx       \
-    IDocument.h         \
+    JobLoad.cxx         \
+    JobLoad.h           \
-    MainPter.cxx        \
-    MainPter.h          \

trunk/src/epdfview.h

@@ -32 +32 @@
-#include <MainPter.h>
-
+#include <JobLoad.h>
+
-#endif //!__E_PDF_VIEW_H__

trunk/src/main.cxx

@@ -25 +25 @@
-#include "MainPter.h"
-#include "Config.h"
+#include "JobLoad.h"
-
-
-using namespace ePDFView;
-
-///
-/// @brief The data passed to open_command_line_file() function.
-///
-typedef struct
-{
-    /// The presenter to make open the file.
-    MainPter *presenter;
-    /// The file name to open.
-    gchar *fileName;
-} OpenFileData;
-
-// Forward declarations.
-static gboolean open_command_line_file (gpointer data);
-
-int
@@ -71 +58 @@
-    if ( argc > 1 )
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    }
-    // Create the main view.
@@ -100 +80 @@
-    return EXIT_SUCCESS;
-}
-
-gboolean
-open_command_line_file (gpointer data)
-{
-    g_assert (NULL != data && "The data parameter is NULL.");
-
-    OpenFileData *openFile = (OpenFileData *)data;
-    g_assert (NULL != openFile->presenter && "The presenter is NULL.");
-    g_assert (NULL != openFile->fileName && "The file name is NULL.");
-    openFile->presenter->openDocument (openFile->fileName, NULL, TRUE);
-    delete openFile;
-
-    // Returning FALSE means that the function won't be called again.
-    return FALSE;
-}

trunk/tests/MainPterTest.cxx

@@ -99 +99 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -119 +121 @@
-    m_Document->setTitle (g_strdup ("Test PDF"));
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("Test PDF", m_View->getTitle ()));
@@ -148 +152 @@
-    m_View->setOpenFileName (NULL);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -179 +185 @@
-    m_Document->setOpenError (DocumentErrorDamaged);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -212 +220 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -245 +255 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -278 +290 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -309 +323 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (NULL == m_View->getLastOpenFileFolder ());
-
@@ -314 +330 @@
-    m_View->setOpenFileName ("/usr/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/tmp", 
-                                             m_View->getLastOpenFileFolder ()));
-    
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/usr", 
-                                             m_View->getLastOpenFileFolder ()));
@@ -334 +354 @@
-    m_Document->setNumPages (4);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    // Check that sets the correct number of pages and the current page.
-    CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
@@ -414 +436 @@
-    m_Document->setNumPages (4);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    // Check that sets the correct number of pages and the current page.
-    CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
@@ -493 +517 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
@@ -521 +547 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
@@ -560 +588 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
@@ -624 +654 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
@@ -687 +719 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
@@ -730 +764 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-
@@ -742 +778 @@
-    // Reload the document.
-    m_MainPter->reloadActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -764 +802 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_EQUAL (0, 
@@ -781 +821 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->reloadActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0, 
-            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -804 +846 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_EQUAL (0, 
@@ -823 +867 @@
-    m_Document->setOpenError (DocumentErrorEncrypted);
-    m_MainPter->reloadActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT_EQUAL (0,
-            g_ascii_strcasecmp("newpassword", m_Document->getPassword ()));
@@ -860 +906 @@
-    m_View->setOpenFileName ("/tmp/test.pdf");
-    m_MainPter->openFileActivated ();
+    // Sleep to let the thread open the file.
+    sleep (1);
-    CPPUNIT_ASSERT (m_View->isShownSidebar ());
-    CPPUNIT_ASSERT (outline == m_View->getOutline ());