Changeset 263

Timestamp:

02/23/07 03:05:25 (20 months ago)

Author:

jordi

Message:

"Save a copy" dialog now sets the original PDF file name as input file name for saving. This fixes bug #72.

Location:

trunk/src

Files:

• IMainView.h (modified) (2 diffs)
• MainPter.cxx (modified) (1 diff)
• gtk/MainView.cxx (modified) (2 diffs)
• gtk/MainView.h (modified) (1 diff)

trunk/src/IMainView.h

@@ -116 +116 @@
             ///                   used to show this folder when the save dialog
             ///                   appears.
+            /// @param fileName The file name to set as the initial name to
+            ///                 the save dialog.
             ///
             /// @return A copy of the file name that the user will try to use
@@ -121 +123 @@
             ///         This string will be freed by the presenter.
             ///
-            virtual gchar *saveFileDialog (const gchar *lastFolder) = 0;
+            virtual gchar *saveFileDialog (const gchar *lastFolder,
+                                           const gchar *fileName) = 0;
 
             ///

trunk/src/MainPter.cxx

@@ -578 +578 @@
     gchar *lastFolder = config.getSaveFileFolder ();
     IMainView &view = getView ();
-    gchar *fileName = view.saveFileDialog (lastFolder);
+    gchar *originalFileName = g_path_get_basename (m_Document->getFileName ());
+    gchar *fileName = view.saveFileDialog (lastFolder, originalFileName);
+    g_free (originalFileName);
     g_free (lastFolder);
     if ( NULL != fileName )

trunk/src/gtk/MainView.cxx

@@ -382 +382 @@
 
 gchar *
-MainView::saveFileDialog (const gchar *lastFolder)
+MainView::saveFileDialog (const gchar *lastFolder, const gchar *fileName)
 {
     GtkWidget *saveDialog = gtk_file_chooser_dialog_new (_("Save PDF File"),
@@ -398 +398 @@
         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (saveDialog),
                                              lastFolder);
+    }
+    // Set the original file name to use as initial save name, if any.
+    if ( NULL != fileName )
+    {
+        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (saveDialog),
+                                           fileName);
     }
 

trunk/src/gtk/MainView.h

@@ -38 +38 @@
             gchar *openFileDialog (const gchar *lastFolder);
             gchar *promptPasswordDialog (void);
-            gchar *saveFileDialog (const gchar *lastFolder);
+            gchar *saveFileDialog (const gchar *lastFolder,
+                                   const gchar *fileName);
             void sensitiveFind (gboolean sensitive);
             void sensitiveGoToFirstPage (gboolean sensitive);