new global gDirs for default directories and filters; rm warnings from file loaders

standardize file save dialogs

disentangle ProjectManager from new src pair Dirs

rm all handling of warnings; just throw a runtime_error if something fails. This saves us lots of compilcations.

GUI/Support/Data/Dirs.cpp

@@ -13,9 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Support/Data/Dirs.h"
-#include "Base/Util/Assert.h"
 #include <QDir>
-#include <QFileInfo>
 #include <QSettings>
 
 namespace {
@@ -23,7 +21,8 @@ namespace {
 const QString S_DIRS = "Dirs";
 const QString S_DEFAULTPROJECTPATH = "DefaultProjectPath";
 const QString S_ARTIFACTEXPORTDIR = "ArtifactExportDir";
-const QString S_LASTUSEDIMPORTDIR = "LastUsedImportDir";
+const QString S_DATAIMPORTDIR = "DataImportDir";
+const QString S_SCRIPTIMPORTDIR = "ScriptImportDir";
 const QString S_LASTUSEDIMPORFILTER1D = "LastUsedImportFilter1D";
 const QString S_LASTUSEDIMPORFILTER2D = "LastUsedImportFilter2D";
 
@@ -34,6 +33,8 @@ BA_GUI_API_ std::unique_ptr<Dirs> gDirs;
 Dirs::Dirs()
 {
     artifact_export_dir = QDir::homePath();
+    data_import_dir = QDir::homePath();
+    script_import_dir = QDir::homePath();
     readSettings();
 }
 
@@ -50,10 +51,9 @@ void Dirs::readSettings()
     if (settings.childGroups().contains(S_DIRS)) {
         settings.beginGroup(S_DIRS);
 
-        artifact_export_dir =
-            settings.value(S_LASTUSEDIMPORFILTER1D, artifact_export_dir).toString();
-        if (settings.contains(S_LASTUSEDIMPORTDIR))
-            m_import_directory = settings.value(S_LASTUSEDIMPORTDIR, "").toString();
+        artifact_export_dir = settings.value(S_ARTIFACTEXPORTDIR, artifact_export_dir).toString();
+        data_import_dir = settings.value(S_DATAIMPORTDIR, data_import_dir).toString();
+        script_import_dir = settings.value(S_SCRIPTIMPORTDIR, script_import_dir).toString();
 
         import_filter_1D = settings.value(S_LASTUSEDIMPORFILTER1D, "").toString();
         import_filter_2D = settings.value(S_LASTUSEDIMPORFILTER2D, "").toString();
@@ -70,36 +70,10 @@ void Dirs::writeSettings()
     settings.beginGroup(S_DIRS);
 
     settings.setValue(S_ARTIFACTEXPORTDIR, artifact_export_dir);
-    settings.setValue(S_LASTUSEDIMPORTDIR, m_import_directory);
+    settings.setValue(S_DATAIMPORTDIR, data_import_dir);
+    settings.setValue(S_SCRIPTIMPORTDIR, script_import_dir);
     settings.setValue(S_LASTUSEDIMPORFILTER1D, import_filter_1D);
     settings.setValue(S_LASTUSEDIMPORFILTER2D, import_filter_2D);
 
     settings.endGroup();
 }
-
-//! Returns directory name which was used by the user to import files.
-
-QString Dirs::userImportDir() const
-{
-    /*
-    if (m_import_directory.isEmpty()) {
-        if (gDoc)
-            return gDoc->userExportDir();
-        return "";
-    }
-    */
-    return m_import_directory;
-} //! Sets user import directory in system settings.
-
-
-void Dirs::setImportDir(const QString& dirname)
-{
-    m_import_directory = dirname;
-}
-
-//! Sets user import directory in system settings.
-
-void Dirs::setImportDirFromFilePath(const QString& filePath)
-{
-    m_import_directory = QFileInfo(filePath).absolutePath();
-}