#846 Added Open Last Used Project feature

ApplicationCode/Application/RiaApplication.cpp

@@ -1845,6 +1845,29 @@ void RiaApplication::setLastUsedDialogDirectory(const QString& dialogName, const
 }
 
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaApplication::openFile(const QString& fileName)
+{
+    bool loadingSucceded = false;
+
+    if (fileName.contains(".rsp", Qt::CaseInsensitive) || fileName.contains(".rip", Qt::CaseInsensitive))
+    {
+        loadingSucceded = loadProject(fileName);
+    }
+    else if (fileName.contains(".egrid", Qt::CaseInsensitive) || fileName.contains(".grid", Qt::CaseInsensitive))
+    {
+        loadingSucceded = openEclipseCaseFromFile(fileName);
+    }
+    else if (fileName.contains(".odb", Qt::CaseInsensitive))
+    {
+        loadingSucceded = openOdbCaseFromFile(fileName);
+    }
+
+    return loadingSucceded;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaApplication.h

@@ -114,6 +114,7 @@ public:
     QString             lastUsedDialogDirectoryWithFallback(const QString& dialogName, const QString& fallbackDirectory);
     void                setLastUsedDialogDirectory(const QString& dialogName, const QString& directory);
 
+    bool                openFile(const QString& fileName);
     bool                openEclipseCaseFromFile(const QString& fileName);
     bool                openEclipseCase(const QString& caseName, const QString& caseFileName);
     bool                addEclipseCases(const QStringList& fileNames);

ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake

@@ -11,6 +11,7 @@ ${CEE_CURRENT_LIST_DIR}RicShowMainWindowFeature.h
 ${CEE_CURRENT_LIST_DIR}RicTileWindowsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicTilePlotWindowsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicOpenProjectFeature.h
+${CEE_CURRENT_LIST_DIR}RicOpenLastUsedFileFeature.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -20,6 +21,7 @@ ${CEE_CURRENT_LIST_DIR}RicShowMainWindowFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicTileWindowsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicTilePlotWindowsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicOpenProjectFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicOpenLastUsedFileFeature.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/Commands/ApplicationCommands/RicOpenLastUsedFileFeature.cpp

@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016 Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicOpenLastUsedFileFeature.h"
+
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
+
+#include "RiuMainWindow.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicOpenLastUsedFileFeature, "RicOpenLastUsedFileFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicOpenLastUsedFileFeature::isCommandEnabled()
+{
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicOpenLastUsedFileFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString fileName = app->preferences()->lastUsedProjectFileName;
+
+    if (app->loadProject(fileName))
+    {
+        app->addToRecentFiles(fileName);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicOpenLastUsedFileFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Open &Last Used Project");
+}

ApplicationCode/Commands/ApplicationCommands/RicOpenLastUsedFileFeature.h

@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016 Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicOpenLastUsedFileFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled() override;
+    virtual void onActionTriggered( bool isChecked ) override;
+    virtual void setupActionLook( QAction* actionToSetup ) override;
+};
+
+

ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.h

@@ -30,9 +30,9 @@ class RicOpenProjectFeature : public caf::CmdFeature
 
 protected:
     // Overrides
-    virtual bool isCommandEnabled();
+    virtual bool isCommandEnabled() override;
-    virtual void onActionTriggered( bool isChecked );
+    virtual void onActionTriggered( bool isChecked ) override;
-    virtual void setupActionLook( QAction* actionToSetup );
+    virtual void setupActionLook( QAction* actionToSetup ) override;
 };
 
 

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -232,8 +232,6 @@ void RiuMainWindow::closeEvent(QCloseEvent* event)
 void RiuMainWindow::createActions()
 {
     // File actions
-    m_openLastUsedProjectAction = new QAction("Open &Last Used Project", this);
-
     m_importGeoMechCaseAction     = new QAction(QIcon(":/GeoMechCase48x48.png"), "Import &Geo Mechanical Model", this);
 
     m_mockModelAction           = new QAction("&Mock Model", this);
@@ -257,8 +255,6 @@ void RiuMainWindow::createActions()
 
     m_exitAction = new QAction("E&xit", this);
 
-    connect(m_openLastUsedProjectAction,        SIGNAL(triggered()), SLOT(slotOpenLastUsedProject()));
-
     connect(m_importGeoMechCaseAction,          SIGNAL(triggered()), SLOT(slotImportGeoMechModel()));
     
     connect(m_mockModelAction,            SIGNAL(triggered()), SLOT(slotMockModel()));
@@ -379,7 +375,7 @@ void RiuMainWindow::createMenus()
     menuBar()->addMenu(fileMenu);
   
     fileMenu->addAction(cmdFeatureMgr->action("RicOpenProjectFeature"));
-    fileMenu->addAction(m_openLastUsedProjectAction);
+    fileMenu->addAction(cmdFeatureMgr->action("RicOpenLastUsedFileFeature"));
     fileMenu->addSeparator();
 
     QMenu* importMenu = fileMenu->addMenu("&Import");

ApplicationCode/UserInterface/RiuMainWindow.h

@@ -140,7 +140,6 @@ private:
 private:
     // File actions
     QAction*            m_importGeoMechCaseAction;
-    QAction*            m_openLastUsedProjectAction;
     QAction*            m_saveProjectAction;
     QAction*            m_saveProjectAsAction;
     QAction*            m_closeProjectAction;

ApplicationCode/UserInterface/RiuRecentFileActionProvider.cpp

@@ -122,20 +122,7 @@ void RiuRecentFileActionProvider::slotOpenRecentFile()
     if (action)
     {
         QString filename = action->data().toString();
-        bool loadingSucceded = false;
+        bool loadingSucceded = RiaApplication::instance()->openFile(filename);
-
-        if (filename.contains(".rsp", Qt::CaseInsensitive) || filename.contains(".rip", Qt::CaseInsensitive))
-        {
-            loadingSucceded = RiaApplication::instance()->loadProject(action->data().toString());
-        }
-        else if (filename.contains(".egrid", Qt::CaseInsensitive) || filename.contains(".grid", Qt::CaseInsensitive))
-        {
-            loadingSucceded = RiaApplication::instance()->openEclipseCaseFromFile(filename);
-        }
-        else if (filename.contains(".odb", Qt::CaseInsensitive))
-        {
-            loadingSucceded = RiaApplication::instance()->openOdbCaseFromFile(filename);
-        }
 
         if (loadingSucceded)
         {