Fix for bug #1752113; added set_preview_widget_active(false) to FileSaveDialogImplGtk...

diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index cb4dc67a75b801843bd3ac213ff5dc6aa0a002b9..61d37e918be3c1add85290124ff29f24f92023a2 100644 (file)
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -161,7 +161,7 @@ bool SVGPreview::setFileName(Glib::ustring &theFileName)
     /**\r
      * I don't know why passing false to keepalive is bad.  But it\r
      * prevents the display of an svg with a non-ascii filename\r
-     */              \r
+     */\r
     SPDocument *doc = sp_document_new (fileName.c_str(), true);\r
     if (!doc) {\r
         g_warning("SVGView: error loading document '%s'\n", fileName.c_str());\r
@@ -386,8 +386,8 @@ void SVGPreview::showNoPreview()
 \r
 /**\r
  * Inform the user that the svg file is too large to be displayed.\r
- * This does not check for sizes of embedded images (yet) \r
- */ \r
+ * This does not check for sizes of embedded images (yet)\r
+ */\r
 void SVGPreview::showTooLarge(long fileLength)\r
 {\r
 \r
@@ -491,7 +491,7 @@ void SVGPreview::showTooLarge(long fileLength)
 \r
 /**\r
  * Return true if the string ends with the given suffix\r
- */ \r
+ */\r
 static bool\r
 hasSuffix(Glib::ustring &str, Glib::ustring &ext)\r
 {\r
@@ -569,7 +569,7 @@ bool SVGPreview::set(Glib::ustring &fileName, int dialogType)
             return FALSE;\r
             }\r
         }\r
-        \r
+\r
     Glib::ustring svg = ".svg";\r
     Glib::ustring svgz = ".svgz";\r
 \r
@@ -612,7 +612,7 @@ SVGPreview::~SVGPreview()
 \r
 void FileDialogBaseGtk::internalSetup()\r
 {\r
-    bool enablePreview = \r
+    bool enablePreview =\r
         (bool)prefs_get_int_attribute( preferenceBase.c_str(),\r
              "enable_preview", 1 );\r
 \r
@@ -681,8 +681,8 @@ void FileDialogBaseGtk::_updatePreviewCallback()
 /**\r
  * Constructor.  Not called directly.  Use the factory.\r
  */\r
-FileOpenDialogImplGtk::FileOpenDialogImplGtk(Gtk::Window& parentWindow, \r
-                                              const Glib::ustring &dir,\r
+FileOpenDialogImplGtk::FileOpenDialogImplGtk(Gtk::Window& parentWindow,\r
+                                       const Glib::ustring &dir,\r
                                        FileDialogType fileTypes,\r
                                        const Glib::ustring &title) :\r
     FileDialogBaseGtk(parentWindow, title, fileTypes, "dialogs.open")\r
@@ -796,7 +796,7 @@ bool
 FileOpenDialogImplGtk::show()\r
 {\r
     Glib::ustring s = Glib::filename_to_utf8 (get_current_folder());\r
-    if (s.length() == 0) \r
+    if (s.length() == 0)\r
         s = getcwd (NULL, 0);\r
     set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing\r
     set_modal (TRUE);                      //Window\r
@@ -859,7 +859,7 @@ FileOpenDialogImplGtk::getFilename (void)
  * To Get Multiple filenames selected at-once.\r
  */\r
 std::vector<Glib::ustring>FileOpenDialogImplGtk::getFilenames()\r
-{    \r
+{\r
     std::vector<Glib::ustring> result = get_filenames();\r
 #ifdef WITH_GNOME_VFS\r
     if (result.empty() && gnome_vfs_initialized())\r
@@ -880,8 +880,8 @@ std::vector<Glib::ustring>FileOpenDialogImplGtk::getFilenames()
 /**\r
  * Constructor\r
  */\r
-FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow, \r
-                       const Glib::ustring &dir,\r
+FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow,\r
+            const Glib::ustring &dir,\r
             FileDialogType fileTypes,\r
             const Glib::ustring &title,\r
             const Glib::ustring &default_key) :\r
@@ -1089,6 +1089,7 @@ FileSaveDialogImplGtk::show()
     sp_transientize((GtkWidget *)gobj());  //Make transient\r
     gint b = run();                        //Dialog\r
     svgPreview.showNoPreview();\r
+    set_preview_widget_active(false);\r
     hide();\r
 \r
     if (b == Gtk::RESPONSE_OK)\r
@@ -1176,7 +1177,7 @@ FileSaveDialogImplGtk::getFilename()
 }\r
 \r
 \r
-void \r
+void\r
 FileSaveDialogImplGtk::change_title(const Glib::ustring& title)\r
 {\r
     this->set_title(title);\r
@@ -1185,7 +1186,7 @@ FileSaveDialogImplGtk::change_title(const Glib::ustring& title)
 /**\r
   * Change the default save path location.\r
   */\r
-void \r
+void\r
 FileSaveDialogImplGtk::change_path(const Glib::ustring& path)\r
 {\r
     myFilename = path;\r
@@ -1236,7 +1237,7 @@ void FileSaveDialogImplGtk::updateNameAndExtension()
             if ( pos != Glib::ustring::npos ) {\r
                 Glib::ustring trail = utf8Name.substr( pos );\r
                 Glib::ustring foldedTrail = trail.casefold();\r
-                if ( (trail == ".") \r
+                if ( (trail == ".")\r
                      | (foldedTrail != Glib::ustring( newOut->get_extension() ).casefold()\r
                         && ( knownExtensions.find(foldedTrail) != knownExtensions.end() ) ) ) {\r
                     utf8Name = utf8Name.erase( pos );\r
@@ -1356,7 +1357,7 @@ void FileExportDialogImpl::createFileTypeMenu()
  * Constructor\r
  */\r
 FileExportDialogImpl::FileExportDialogImpl(Gtk::Window& parentWindow,\r
-                       const Glib::ustring &dir,\r
+            const Glib::ustring &dir,\r
             FileDialogType fileTypes,\r
             const Glib::ustring &title,\r
             const Glib::ustring &default_key) :\r
@@ -1491,7 +1492,7 @@ FileExportDialogImpl::FileExportDialogImpl(Gtk::Window& parentWindow,
     destFrame.add(destBox);\r
     exportOptionsBox.pack_start(destFrame);\r
 \r
-    //##### Put the two boxes and their parent onto the dialog    \r
+    //##### Put the two boxes and their parent onto the dialog\r
     exportOptionsBox.pack_start(sourceFrame);\r
     exportOptionsBox.pack_start(destFrame);\r
 \r
@@ -1551,7 +1552,7 @@ bool
 FileExportDialogImpl::show()\r
 {\r
     Glib::ustring s = Glib::filename_to_utf8 (get_current_folder());\r
-    if (s.length() == 0) \r
+    if (s.length() == 0)\r
         s = getcwd (NULL, 0);\r
     set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing\r
     set_modal (TRUE);                      //Window\r
@@ -1722,7 +1723,7 @@ FileExportToOCALDialogImpl::FileExportToOCALDialogImpl(Gtk::Window &parentWindow
     //Gtk::HBox fileBox;\r
 \r
     Gtk::Label *fileLabel = new Gtk::Label(_("File"));\r
-    \r
+\r
     fileNameEntry = new Gtk::Entry();\r
     fileNameEntry->set_text(myFilename);\r
     fileNameEntry->set_max_length(252); // I am giving the extension approach.\r
@@ -1743,9 +1744,9 @@ FileExportToOCALDialogImpl::FileExportToOCALDialogImpl(Gtk::Window &parentWindow
 \r
     checksBox.pack_start( fileTypeCheckbox );\r
     vbox->pack_start( checksBox );\r
-    \r
+\r
     vbox->pack_end( fileTypeComboBox );\r
-    \r
+\r
     //Let's do some customization\r
     fileNameEntry = NULL;\r
     Gtk::Container *cont = get_toplevel();\r
@@ -1876,7 +1877,7 @@ FileExportToOCALDialogImpl::getFilename()
 }\r
 \r
 \r
-void \r
+void\r
 FileExportToOCALDialogImpl::change_title(const Glib::ustring& title)\r
 {\r
     this->set_title(title);\r
@@ -1886,7 +1887,7 @@ void FileExportToOCALDialogImpl::updateNameAndExtension()
 {\r
     // Pick up any changes the user has typed in.\r
     Glib::ustring tmp = myFilename;   // get_filename();\r
-    \r
+\r
     Inkscape::Extension::Output* newOut = extension ? dynamic_cast<Inkscape::Extension::Output*>(extension) : 0;\r
     if ( fileTypeCheckbox.get_active() && newOut ) {\r
         try {\r
@@ -1896,7 +1897,7 @@ void FileExportToOCALDialogImpl::updateNameAndExtension()
             if ( pos != Glib::ustring::npos ) {\r
                 Glib::ustring trail = utf8Name.substr( pos );\r
                 Glib::ustring foldedTrail = trail.casefold();\r
-                if ( (trail == ".") \r
+                if ( (trail == ".")\r
                      | (foldedTrail != Glib::ustring( newOut->get_extension() ).casefold()\r
                         && ( knownExtensions.find(foldedTrail) != knownExtensions.end() ) ) ) {\r
                     utf8Name = utf8Name.erase( pos );\r