Suggest sensible defaults in file dialogs

Went through first the diff of the referenced commit, then all instances of "Create(Open|Save)FileDialog"; added SuggestFilename() calls where a default exists This has been previously removed in 6b5db58 Closes #538
solvespace · May 4, 2020 · ef26dc6 · ef26dc6
1 parent a7eeef1
commit ef26dc6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 1 deletion.
diff --git a/src/file.cpp b/src/file.cpp
@@ -893,11 +893,13 @@ bool SolveSpaceUI::ReloadAllLinked(const Platform::Path &saveFile, bool canCance
             }
         } else if(linkMap.count(g.linkFile) == 0) {
             // The file was moved; prompt the user for its new location.
-            switch(LocateImportedFile(g.linkFile.RelativeTo(saveFile), canCancel)) {
+            const auto linkFileRelative = g.linkFile.RelativeTo(saveFile);
+            switch(LocateImportedFile(linkFileRelative, canCancel)) {
                 case Platform::MessageDialog::Response::YES: {
                     Platform::FileDialogRef dialog = Platform::CreateOpenFileDialog(SS.GW.window);
                     dialog->AddFilters(Platform::SolveSpaceModelFileFilters);
                     dialog->ThawChoices(settings, "LinkSketch");
+                    dialog->SuggestFilename(linkFileRelative);
                     if(dialog->RunModal()) {
                         dialog->FreezeChoices(settings, "LinkSketch");
                         linkMap[g.linkFile] = dialog->GetFilename();
@@ -974,6 +976,7 @@ bool SolveSpaceUI::ReloadLinkedImage(const Platform::Path &saveFile,
         Platform::FileDialogRef dialog = Platform::CreateOpenFileDialog(SS.GW.window);
         dialog->AddFilters(Platform::RasterFileFilters);
         dialog->ThawChoices(settings, "LinkImage");
+        dialog->SuggestFilename(filename->RelativeTo(saveFile));
         if(dialog->RunModal()) {
             dialog->FreezeChoices(settings, "LinkImage");
             *filename = dialog->GetFilename();

diff --git a/src/platform/gui.h b/src/platform/gui.h
@@ -354,6 +354,7 @@ class FileDialog {
 
     virtual Platform::Path GetFilename() = 0;
     virtual void SetFilename(Platform::Path path) = 0;
+    virtual void SuggestFilename(Platform::Path path) = 0;
 
     virtual void AddFilter(std::string name, std::vector<std::string> extensions) = 0;
     void AddFilter(const FileFilter &filter);

diff --git a/src/platform/guigtk.cpp b/src/platform/guigtk.cpp
@@ -1245,6 +1245,10 @@ class FileDialogImplGtk : public FileDialog {
         gtkChooser->set_filename(path.raw);
     }
 
+    void SuggestFilename(Platform::Path path) override {
+        SetFilename(path.WithExtension(""));  // TODO
+    }
+
     void AddFilter(std::string name, std::vector<std::string> extensions) override {
         Glib::RefPtr<Gtk::FileFilter> gtkFilter = Gtk::FileFilter::create();
         Glib::ustring desc;

diff --git a/src/platform/guimac.mm b/src/platform/guimac.mm
@@ -1261,6 +1261,10 @@ void SetFilename(Platform::Path path) override {
         nsPanel.nameFieldStringValue = Wrap(path.FileStem());
     }
 
+    void SuggestFilename(Platform::Path path) override {
+        SetFilename(path.WithExtension(""));
+    }
+
     void FreezeChoices(SettingsRef settings, const std::string &key) override {
         settings->FreezeString("Dialog_" + key + "_Folder",
                                [nsPanel.directoryURL.absoluteString UTF8String]);

diff --git a/src/platform/guiwin.cpp b/src/platform/guiwin.cpp
@@ -1575,6 +1575,10 @@ class FileDialogImplWin32 final : public FileDialog {
         wcsncpy(filenameWC, Widen(path.raw).c_str(), sizeof(filenameWC) / sizeof(wchar_t) - 1);
     }
 
+    void SuggestFilename(Platform::Path path) override {
+        SetFilename(path.WithExtension(""));
+    }
+
     void AddFilter(std::string name, std::vector<std::string> extensions) override {
         std::string desc, patterns;
         for(auto extension : extensions) {

diff --git a/src/solvespace.cpp b/src/solvespace.cpp
@@ -599,6 +599,7 @@ void SolveSpaceUI::MenuFile(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::RasterFileFilters);
             dialog->ThawChoices(settings, "ExportImage");
+            dialog->SuggestFilename(SS.saveFile);
             if(dialog->RunModal()) {
                 dialog->FreezeChoices(settings, "ExportImage");
                 SS.ExportAsPngTo(dialog->GetFilename());
@@ -610,6 +611,7 @@ void SolveSpaceUI::MenuFile(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::VectorFileFilters);
             dialog->ThawChoices(settings, "ExportView");
+            dialog->SuggestFilename(SS.saveFile);
             if(!dialog->RunModal()) break;
             dialog->FreezeChoices(settings, "ExportView");
 
@@ -633,6 +635,7 @@ void SolveSpaceUI::MenuFile(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::Vector3dFileFilters);
             dialog->ThawChoices(settings, "ExportWireframe");
+            dialog->SuggestFilename(SS.saveFile);
             if(!dialog->RunModal()) break;
             dialog->FreezeChoices(settings, "ExportWireframe");
 
@@ -644,6 +647,7 @@ void SolveSpaceUI::MenuFile(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::VectorFileFilters);
             dialog->ThawChoices(settings, "ExportSection");
+            dialog->SuggestFilename(SS.saveFile);
             if(!dialog->RunModal()) break;
             dialog->FreezeChoices(settings, "ExportSection");
 
@@ -655,6 +659,7 @@ void SolveSpaceUI::MenuFile(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::MeshFileFilters);
             dialog->ThawChoices(settings, "ExportMesh");
+            dialog->SuggestFilename(SS.saveFile);
             if(!dialog->RunModal()) break;
             dialog->FreezeChoices(settings, "ExportMesh");
 
@@ -666,6 +671,7 @@ void SolveSpaceUI::MenuFile(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::SurfaceFileFilters);
             dialog->ThawChoices(settings, "ExportSurfaces");
+            dialog->SuggestFilename(SS.saveFile);
             if(!dialog->RunModal()) break;
             dialog->FreezeChoices(settings, "ExportSurfaces");
 
@@ -879,6 +885,7 @@ void SolveSpaceUI::MenuAnalyze(Command id) {
             Platform::FileDialogRef dialog = Platform::CreateSaveFileDialog(SS.GW.window);
             dialog->AddFilters(Platform::CsvFileFilters);
             dialog->ThawChoices(settings, "Trace");
+            dialog->SetFilename(SS.saveFile);
             if(dialog->RunModal()) {
                 dialog->FreezeChoices(settings, "Trace");