Changeset 25

Timestamp:

04/11/06 11:16:59 (2 years ago)

Author:

jordi

Message:

It's now possible to cancel the open file dialog :-)

Location:

trunk

Files:

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

trunk/src/MainPter.cxx

@@ -142 +142 @@
     IMainView &view = getView ();
     gchar *fileName = view.openFileDialog ();
-    GError *error;
-    if ( m_Document->loadFile (fileName, NULL, &error) )
+    // if openFileDialog returns NULL, then the user cancelled the operation.
+    // I don't need to do anything in this case. I'm only interested when
+    // the user tried to open a file.
+    if ( NULL != fileName )
     {
-        // Now that the document has been loaded, just reset the initial
-        // state.
-        setInitialState ();
-        g_free (fileName);
+        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);
+        }
     }
 }

trunk/tests/DumbMainView.cxx

@@ -209 +209 @@
 {
     g_free (m_OpenFileName);
-    m_OpenFileName = g_strdup (fileName);
-}
+    m_OpenFileName = NULL;
+    if ( NULL != fileName )
+    {
+        m_OpenFileName = g_strdup (fileName);
+    }
+}

trunk/tests/MainPterTest.cxx

@@ -117 +117 @@
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
 }
+
+///
+/// @brief Tests a cancelled open file.
+///
+/// When the user cancels the open dialog, then nothing should change.
+///
+void
+MainPterTest::loadCancelled ()
+{
+    // returning a NULL file name is what will happen when cancel.
+    m_View->setOpenFileName (NULL);
+    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 ());
+}

trunk/tests/MainPterTest.h

@@ -28 +28 @@
         CPPUNIT_TEST (initialStatus);
         CPPUNIT_TEST (loadDocument);
+        CPPUNIT_TEST (loadCancelled);
         CPPUNIT_TEST_SUITE_END();
 
@@ -36 +37 @@
             void initialStatus (void);
             void loadDocument (void);
+            void loadCancelled (void);
 
         private: