First patch for Bug 209199: Update Win32 Save As dialog to include a Title edit box (and label). This edit box is sync'ed with the RDF and doc-level title and allows a user to edit the title prior to save. This patch does not update the GTK dialogs (that will be submitted in a subsequent patch).

(bzr r6791)

1 files changed, 12 insertions, 6 deletions

diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index 08a3230a9..b1ea5dfee 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -88,7 +88,7 @@ FileOpenDialog *FileOpenDialog::create(Gtk::Window &parentWindow,
 #else
     FileOpenDialog *dialog = new FileOpenDialogImplGtk(parentWindow, path, fileTypes, title);
 #endif
-	
+
 	return dialog;
 }
 
@@ -104,16 +104,17 @@ Glib::ustring FileOpenDialog::getFilename()
 /**
  * Public factory method.  Used in file.cpp
  */
-FileSaveDialog *FileSaveDialog::create(Gtk::Window& parentWindow, 
+FileSaveDialog *FileSaveDialog::create(Gtk::Window& parentWindow,
 									   const Glib::ustring &path,
                                        FileDialogType fileTypes,
                                        const char *title,
-                                       const Glib::ustring &default_key)
+                                       const Glib::ustring &default_key,
+                                       const gchar *docTitle)
 {
 #ifdef WIN32
-    FileSaveDialog *dialog = new FileSaveDialogImplWin32(parentWindow, path, fileTypes, title, default_key);
+    FileSaveDialog *dialog = new FileSaveDialogImplWin32(parentWindow, path, fileTypes, title, default_key, docTitle);
 #else
-    FileSaveDialog *dialog = new FileSaveDialogImplGtk(parentWindow, path, fileTypes, title, default_key);
+    FileSaveDialog *dialog = new FileSaveDialogImplGtk(parentWindow, path, fileTypes, title, default_key, docTitle);
 #endif
     return dialog;
 }
@@ -123,6 +124,11 @@ Glib::ustring FileSaveDialog::getFilename()
     return myFilename;
 }
 
+Glib::ustring FileSaveDialog::getDocTitle()
+{
+	return myDocTitle;
+}
+
 //void FileSaveDialog::change_path(const Glib::ustring& path)
 //{
 //	myFilename = path;
@@ -162,7 +168,7 @@ void FileSaveDialog::appendExtension(Glib::ustring& path, Inkscape::Extension::O
 /**
  * Public factory method.  Used in file.cpp
  */
- FileExportDialog *FileExportDialog::create(Gtk::Window& parentWindow, 
+ FileExportDialog *FileExportDialog::create(Gtk::Window& parentWindow,
 										   const Glib::ustring &path,
                                            FileDialogType fileTypes,
                                            const char *title,