Changeset 65 for trunk/src/MainPter.cxx

Timestamp:

04/14/06 16:24:42 (3 years ago)

Author:

jordi

Message:

The Main presenter now can reload encrypted files without bothering the user about password, unless the document's password has been changed. In this case, it will behaviour like opening the file as new.

Files:

• trunk/src/MainPter.cxx (modified) (6 diffs)

trunk/src/MainPter.cxx

@@ -245 +245 @@
     IMainView &view = getView ();
     gchar *fileName = view.openFileDialog ();
-    openDocument (fileName, TRUE);
+    openDocument (fileName, NULL, TRUE);
     g_free (fileName);
 }
@@ -263 +263 @@
     gdouble currentZoom = m_Document->getZoom ();
     // Reopen the document.
-    openDocument (m_Document->getFileName (), FALSE);    
+    openDocument (m_Document->getFileName (), m_Document->getPassword (), 
+                  FALSE); 
     // And restore the state
     m_Document->setZoom (currentZoom);
@@ -359 +360 @@
 ///                 NULL then that means the user didn't wanted to
 ///                 open a file, so this function won't do anything.
+/// @param oldPassword This is only used when reloading. It is the last
+///                    password that was used to open a file, and will be
+///                    used to open the file the first try before asking
+///                    to the user. For opening a new file, just set to NULL.
 /// @param canShowPage Set to TRUE if the application should show the page 
 ///                    after the loading or not. This is useful when reloading
@@ -365 +370 @@
 ///
 void
-MainPter::openDocument (const gchar *fileName, gboolean canShowPage)
+MainPter::openDocument (const gchar *fileName, const gchar *oldPassword,
+                        gboolean canShowPage)
 {
     // if fileName is NULL, then the user cancelled the operation.
@@ -372 +378 @@
     if ( NULL != fileName )
     {
-        GError *error = NULL;
-        if ( m_Document->loadFile (fileName, NULL, &error) )
+        GError *error = NULL;        
+        if ( m_Document->loadFile (fileName, oldPassword, &error) )
         {
             // Now that the document has been loaded, just reset the initial
@@ -380 +386 @@
         }
         else
-        {            
+        {
             // We got an error, but also can be that the file is encrypted.
             if ( DocumentErrorEncrypted == error->code )