Changeset 97

Timestamp:

04/20/06 10:08:49 (2 years ago)

Author:

jordi

Message:

The Main presenter now pass the last folder used to open a file to the view, so it can change the shown folder on the open dialog. Also, the main presenter saves the last folder to the configuration class.

Location:

trunk

Files:

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

trunk/src/IMainView.h

@@ -49 +49 @@
             /// the toolkit's specific open dialog.
             ///
+            /// @param folder The last folder used to open a file. This is
+            ///               used to show this folder when the open dialog
+            ///               appears.
+            ///
             /// @return A copy of the file name that the user will try to open
             ///         or NULL if the user cancelled the operation.
             ///         This string will be freed by the presenter.
             ///
-            virtual gchar *openFileDialog (void) = 0;
+            virtual gchar *openFileDialog (const gchar *lastFolder) = 0;
 
             ///

trunk/src/MainPter.cxx

@@ -253 +253 @@
 {
     IMainView &view = getView ();
-    gchar *fileName = view.openFileDialog ();
+    Config &config = Config::getConfig ();
+    
+    gchar *lastFolder = config.getOpenFileFolder ();
+    gchar *fileName = view.openFileDialog (lastFolder);
+    g_free (lastFolder);
+    
     openDocument (fileName, NULL, TRUE);
-    g_free (fileName);
+    if ( NULL != fileName )
+    {
+        gchar *dirName = g_path_get_dirname (fileName);
+        g_free (fileName);
+        
+        config.setOpenFileFolder (dirName);
+        g_free (dirName);
+    }
+    
 }
 

trunk/src/gtk/MainView.cxx

@@ -192 +192 @@
 
 gchar *
-MainView::openFileDialog ()
+MainView::openFileDialog (const gchar *lastFolder)
 {
     GtkWidget *openDialog = gtk_file_chooser_dialog_new (_("Open PDF File"),
@@ -200 +200 @@
             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
             NULL);
+    
+    if ( NULL != lastFolder )
+    {
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (openDialog),
+                                             lastFolder);
+    }
+    
     if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (openDialog)) )
     {

trunk/src/gtk/MainView.h

@@ -32 +32 @@
             ~MainView ();
             
-            gchar *openFileDialog ();
-            gchar *promptPasswordDialog ();
+            gchar *openFileDialog (const gchar *lastFolder);
+            gchar *promptPasswordDialog (void);
             void sensitiveGoToFirstPage (gboolean sensitive);
             void sensitiveGoToLastPage (gboolean sensitive);

trunk/tests/DumbMainView.cxx

@@ -32 +32 @@
     m_GoToPageText = g_strdup ("");
     m_OpenFileName = g_strdup ("");
+    m_LastOpenFileFolder = NULL;
     m_Outline = NULL;
     m_Password = NULL;
@@ -57 +58 @@
 {
     g_free (m_GoToPageText);
+    g_free (m_LastOpenFileFolder);
     g_free (m_OpenFileName);
     g_free (m_Password);
@@ -63 +65 @@
             
 gchar *
-DumbMainView::openFileDialog (void)
-{
+DumbMainView::openFileDialog (const gchar *lastFolder)
+{
+    g_free (m_LastOpenFileFolder);
+    m_LastOpenFileFolder = g_strdup (lastFolder);
     return g_strdup (m_OpenFileName);
 }
@@ -226 +230 @@
     return m_CurrentPage;
 }
+
+const gchar *
+DumbMainView::getLastOpenFileFolder ()
+{
+    return m_LastOpenFileFolder;
+}
+
 
 DocumentOutline *

trunk/tests/DumbMainView.h

@@ -28 +28 @@
             ~DumbMainView ();
 
-            gchar *openFileDialog (void);
+            gchar *openFileDialog (const gchar *lastFolder);
             gchar *promptPasswordDialog (void);
             void sensitiveGoToFirstPage (gboolean sensitive);
@@ -56 +56 @@
             gint countTimesShownPasswordPrompt (void);
             gint getCurrentPage (void);
+            const gchar *getLastOpenFileFolder (void);
             DocumentOutline *getOutline (void);
             const gchar *getTitle (void);
@@ -82 +83 @@
             DocumentPage *m_DocumentPage;
             gchar *m_GoToPageText;
+            gchar *m_LastOpenFileFolder;
             gchar *m_OpenFileName;
             DocumentOutline *m_Outline;

trunk/tests/MainPterTest.cxx

@@ -36 +36 @@
     m_View = new DumbMainView (m_MainPter);
     m_MainPter->setView (m_View);
+    Config::loadFile (FALSE);
 }
 
@@ -47 +48 @@
     // classes are deleted by it.
     delete m_MainPter;
+    // Drop the current configuration.
+    Config::destroy ();
 }
 
@@ -292 +295 @@
 }
 
+///
+/// @brief Test the last folder used to open a file.
+///
+/// When the presenter wants to open a file, it should pass to the
+/// view the last folder that was used to open a file, so the
+/// view can show it up when opening the dialog.
+///
+void
+MainPterTest::lastFolder ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (NULL == m_View->getLastOpenFileFolder ());
+
+
+    m_View->setOpenFileName ("/usr/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/tmp", 
+                                             m_View->getLastOpenFileFolder ()));
+    
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/usr", 
+                                             m_View->getLastOpenFileFolder ()));
+}
 
 ///

trunk/tests/MainPterTest.h

@@ -33 +33 @@
         CPPUNIT_TEST (badPassword);
         CPPUNIT_TEST (goodPassword);
+        CPPUNIT_TEST (lastFolder);
         CPPUNIT_TEST (pageNavigation);
         CPPUNIT_TEST (pageNavigationEntry);
@@ -54 +55 @@
             void badPassword (void);
             void goodPassword (void);
+            void lastFolder (void);
             void pageNavigation (void);
             void pageNavigationEntry (void);