Resinsight: Made Home path the default path for file dialog browsing, and added remembering of the last opened path.

Added -startdir command line argument to override the default file browse path
p4#: 19263

ApplicationCode/Application/RIApplication.cpp

@@ -111,6 +111,14 @@ RIApplication::RIApplication(int& argc, char** argv)
 
     m_socketServer = new RiaSocketServer( this);
     m_workerProcess = NULL;
+
+
+    m_startupDefaultDirectory = QDir::homePath();
+
+#ifdef WIN32
+    //m_startupDefaultDirectory += "/My Documents/";
+#endif
+
 }
 
 
@@ -282,6 +290,8 @@ bool RIApplication::saveProjectPromptForFileName()
 {
     //if (m_project.isNull()) return true;
 
+    RIApplication* app = RIApplication::instance();
+
     QString startPath;
     if (!m_project->fileName().isEmpty())
     {
@@ -290,7 +300,7 @@ bool RIApplication::saveProjectPromptForFileName()
     }
     else
     {
-        startPath = QDir::currentPath();
+        startPath = app->defaultFileDialogDirectory("BINARY_GRID");
     }
 
     startPath += "/ResInsightProject.rip";
@@ -301,6 +311,9 @@ bool RIApplication::saveProjectPromptForFileName()
         return false;
     }
 
+    // Remember the directory to next time
+    app->setDefaultFileDialogDirectory("BINARY_GRID", QFileInfo(fileName).absolutePath());
+
     bool bSaveOk = saveProjectAs(fileName);
 
     setWindowCaptionFromAppState();
@@ -591,38 +604,52 @@ bool RIApplication::parseArguments()
 
     bool isParsingProjectFile = false;
     bool isParsingCaseNames = false;
+    bool isParsingStartDir = false;
     bool showHelp = false;
     
     int i;
     for (i = 1; i < arguments.size(); i++)
     {
         QString arg = arguments[i];
-        bool argParsedAsFlag = false;
+        bool foundKnownOption = false;
 
         if (arg.toLower() == "-help" || arg.toLower() == "-?")
         {
             showHelp = true;
+            foundKnownOption = true;
         }
 
         if (arg.toLower() == "-last")
         {
             openLatestProject = true;
-            argParsedAsFlag = true;
+            foundKnownOption = true;
         }
         else if (arg.toLower() == "-project")
         {
             isParsingCaseNames = false;
             isParsingProjectFile = true;
-            argParsedAsFlag = true;
+            isParsingStartDir = false;
+
+            foundKnownOption = true;
         }
         else if (arg.toLower() == "-case")
         {
             isParsingCaseNames = true;
             isParsingProjectFile = false;
-            argParsedAsFlag = true;
+            isParsingStartDir = false;
+
+            foundKnownOption = true;
+        }
+        else if (arg.toLower() == "-startdir")
+        {
+            isParsingCaseNames = false;
+            isParsingProjectFile = false;
+            isParsingStartDir = true;
+
+            foundKnownOption = true;
         }
 
-        if (!argParsedAsFlag)
+        if (!foundKnownOption)
         {
             if (isParsingProjectFile && QFile::exists(arg))
             {
@@ -633,6 +660,11 @@ bool RIApplication::parseArguments()
             {
                 caseNames.append(arg);
             }
+
+            if (isParsingStartDir)
+            {
+                m_startupDefaultDirectory = arg;
+            }
         }
     }
 
@@ -648,6 +680,8 @@ bool RIApplication::parseArguments()
         "-project <filename>  Open project file <filename>\n"
         "-case <casename>     Open Eclipse case <casename>\n"
         "                     (do not include .GRID/.EGRID)\n"
+        "-startdir            The default directory for open/save commands\n"
+
         "-help                \n"
         "-?                   Displays help text\n"
         "-----------------------------------------------------------------";
@@ -883,3 +917,28 @@ void RIApplication::terminateProcess()
 
     m_workerProcess = NULL;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RIApplication::defaultFileDialogDirectory(const QString& dialogName)
+{
+    QString defaultDirectory = m_startupDefaultDirectory;
+    std::map<QString, QString>::iterator it;
+    it = m_fileDialogDefaultDirectories.find(dialogName);
+    
+    if ( it != m_fileDialogDefaultDirectories.end())
+    {
+        defaultDirectory = it->second;
+    }
+
+    return defaultDirectory;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RIApplication::setDefaultFileDialogDirectory(const QString& dialogName, const QString& defaultDirectory)
+{
+    m_fileDialogDefaultDirectories[dialogName] = defaultDirectory;
+}

ApplicationCode/Application/RIApplication.h

@@ -75,6 +75,9 @@ public:
     void                createLargeResultsMockModel();
     void                createInputMockModel();
 
+    QString             defaultFileDialogDirectory(const QString& dialogName);
+    void                setDefaultFileDialogDirectory(const QString& dialogName, const QString& defaultDirectory);
+
     bool                openEclipseCaseFromFile(const QString& fileName);
     bool                openEclipseCase(const QString& caseName, const QString& caseFileName);
     bool                openInputEclipseCase(const QString& caseName, const QStringList& caseFileNames);
@@ -129,4 +132,7 @@ private:
     caf::UiProcess*                 m_workerProcess;
 
     RIPreferences*                  m_preferences;
+
+    std::map<QString, QString>      m_fileDialogDefaultDirectories;
+    QString                         m_startupDefaultDirectory;
 };