#846 Moved recent file management to RiaApplication

ApplicationCode/Application/RiaApplication.cpp

@@ -73,6 +73,7 @@
 #include "RiuMainPlotWindow.h"
 #include "RiuMainWindow.h"
 #include "RiuProcessMonitor.h"
+#include "RiuRecentFileActionProvider.h"
 #include "RiuSelectionManager.h"
 #include "RiuSummaryQwtPlot.h"
 #include "RiuViewer.h"
@@ -95,6 +96,7 @@
 #include "cvfProgramOptions.h"
 #include "cvfqtUtils.h"
 
+#include <QAction>
 #include <QClipboard>
 #include <QDebug>
 #include <QDesktopServices>
@@ -202,6 +204,8 @@ RiaApplication::RiaApplication(int& argc, char** argv)
     m_runningRegressionTests = false;
 
     m_mainPlotWindow = NULL;
+
+    m_recentFileActionProvider = std::unique_ptr<RiuRecentFileActionProvider>(new RiuRecentFileActionProvider);
 }
 
 
@@ -687,8 +691,7 @@ bool RiaApplication::saveProjectAs(const QString& fileName)
     m_preferences->lastUsedProjectFileName = fileName;
     caf::PdmSettings::writeFieldsToApplicationStore(m_preferences);
 
-    RiuMainWindow* mainWnd = RiuMainWindow::instance();
-    mainWnd->addRecentFiles(fileName);
+    m_recentFileActionProvider->addFileName(fileName);
 
     return true;
 }
@@ -1471,6 +1474,22 @@ bool RiaApplication::tryClosePlotWindow()
     return false;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaApplication::addToRecentFiles(const QString& fileName)
+{
+    m_recentFileActionProvider->addFileName(fileName);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<QAction*> RiaApplication::recentFileActions() const
+{
+    return m_recentFileActionProvider->actions();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -1500,7 +1519,6 @@ std::vector<QString> RiaApplication::readFileListFromTextFile(QString listFileNa
     return fileList;
 }
 
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaApplication.h

@@ -31,6 +31,9 @@
 #include "cvfFont.h"
 
 #include <iostream>
+#include <memory>
+
+class QAction;
 
 class Drawable;
 
@@ -52,6 +55,7 @@ class RimViewWindow;
 class RimWellLogPlot;
 
 class RiuMainPlotWindow;
+class RiuRecentFileActionProvider;
 
 namespace caf
 {
@@ -185,6 +189,9 @@ public:
     bool                tryCloseMainWindow();
     bool                tryClosePlotWindow();
 
+    void                  addToRecentFiles(const QString& fileName);
+    std::vector<QAction*> recentFileActions() const;
+
 private:
     enum ProjectLoadAction
     {
@@ -244,4 +251,6 @@ private:
     bool                                m_runningRegressionTests;
 
     RiuMainPlotWindow*                  m_mainPlotWindow;
+    
+    std::unique_ptr<RiuRecentFileActionProvider> m_recentFileActionProvider;
 };

ApplicationCode/CMakeLists.txt

@@ -118,6 +118,8 @@ set( USER_INTERFACE_FILES
 	UserInterface/RiuMainWindowBase.cpp
 	UserInterface/RiuPropertyViewTabWidget.h
 	UserInterface/RiuPropertyViewTabWidget.cpp
+	UserInterface/RiuRecentFileActionProvider.h
+	UserInterface/RiuRecentFileActionProvider.cpp
 )
 
 set( SOCKET_INTERFACE_FILES
@@ -229,6 +231,7 @@ set ( QT_MOC_HEADERS
 	UserInterface/RiuTreeViewEventFilter.h
 	UserInterface/RiuWellLogPlot.h
 	UserInterface/RiuWellLogTrack.h
+	UserInterface/RiuRecentFileActionProvider.h
 )
 
 qt4_wrap_cpp( MOC_FILES_CPP ${QT_MOC_HEADERS} )

ApplicationCode/Commands/RicImportEclipseCaseFeature.cpp

@@ -59,7 +59,7 @@ void RicImportEclipseCaseFeature::onActionTriggered(bool isChecked)
         {
             if (app->openEclipseCaseFromFile(fileName))
             {
-                RiuMainWindow::instance()->addRecentFiles(fileName);
+                app->addToRecentFiles(fileName);
             }
         }
     }

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -256,13 +256,6 @@ void RiuMainWindow::createActions()
 
     m_closeProjectAction               = new QAction("&Close Project", this);
 
-    for (int i = 0; i < MaxRecentFiles; ++i)
-    {
-        m_recentFileActions[i] = new QAction(this);
-        m_recentFileActions[i]->setVisible(false);
-        connect(m_recentFileActions[i], SIGNAL(triggered()), this, SLOT(slotOpenRecentFile()));
-    }
-
     m_exitAction = new QAction("E&xit", this);
 
     connect(m_openProjectAction,                SIGNAL(triggered()), SLOT(slotOpenProject()));
@@ -415,12 +408,12 @@ void RiuMainWindow::createMenus()
     fileMenu->addAction(m_saveProjectAction);
     fileMenu->addAction(m_saveProjectAsAction);
 
-    m_recentFilesSeparatorAction = fileMenu->addSeparator();
-    for (int i = 0; i < MaxRecentFiles; ++i)
-        fileMenu->addAction(m_recentFileActions[i]);
+    std::vector<QAction*> recentFileActions = RiaApplication::instance()->recentFileActions();
+    for (auto act : recentFileActions)
+    {
+        fileMenu->addAction(act);
+    }
     
-    updateRecentFileActions();
-
     fileMenu->addSeparator();
     QMenu* testMenu = fileMenu->addMenu("&Testing");
 
@@ -850,7 +843,7 @@ void RiuMainWindow::slotImportGeoMechModel()
         {
             if (app->openOdbCaseFromFile(fileName))
             {
-                addRecentFiles(fileName);
+                app->addToRecentFiles(fileName);
             }
         }
     }
@@ -873,7 +866,7 @@ void RiuMainWindow::slotOpenProject()
 
     if (app->loadProject(fileName))
     {
-        addRecentFiles(fileName);
+        app->addToRecentFiles(fileName);
     }
 }
 
@@ -887,7 +880,7 @@ void RiuMainWindow::slotOpenLastUsedProject()
     
     if (app->loadProject(fileName))
     {
-        addRecentFiles(fileName);
+        app->addToRecentFiles(fileName);
     }
 }
 
@@ -951,97 +944,6 @@ void RiuMainWindow::slotCloseProject()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuMainWindow::slotOpenRecentFile()
-{
-    QAction *action = qobject_cast<QAction *>(sender());
-    if (action)
-    {
-        QString filename = action->data().toString();
-        bool loadingSucceded = false;
-
-        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)
-        {
-            addRecentFiles(filename);
-        }
-        else
-        {
-            removeRecentFiles(filename);
-        }
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainWindow::updateRecentFileActions()
-{
-    QSettings settings;
-    QStringList files = settings.value("recentFileList").toStringList();
-
-    int numRecentFiles = qMin(files.size(), (int)MaxRecentFiles);
-
-    for (int i = 0; i < numRecentFiles; ++i) {
-        QString text = tr("&%1 %2").arg(i + 1).arg(QFileInfo(files[i]).fileName());
-        m_recentFileActions[i]->setText(text);
-        m_recentFileActions[i]->setData(files[i]);
-        m_recentFileActions[i]->setToolTip(files[i]);
-        m_recentFileActions[i]->setVisible(true);
-    }
-    for (int j = numRecentFiles; j < MaxRecentFiles; ++j)
-        m_recentFileActions[j]->setVisible(false);
-
-    m_recentFilesSeparatorAction->setVisible(numRecentFiles > 0);
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainWindow::addRecentFiles(const QString& file)
-{
-    QSettings settings;
-    QStringList files = settings.value("recentFileList").toStringList();
-    files.removeAll(file);
-    files.prepend(file);
-    while (files.size() > MaxRecentFiles)
-        files.removeLast();
-
-    settings.setValue("recentFileList", files);
-
-    updateRecentFileActions();
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiuMainWindow::removeRecentFiles(const QString& file)
-{
-    QSettings settings;
-    QStringList files = settings.value("recentFileList").toStringList();
-    files.removeAll(file);
-
-    settings.setValue("recentFileList", files);
-
-    updateRecentFileActions();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-
 QMdiSubWindow* RiuMainWindow::findMdiSubWindow(QWidget* viewer)
 {
     QList<QMdiSubWindow*> subws = m_mdiArea->subWindowList();

ApplicationCode/UserInterface/RiuMainWindow.h

@@ -110,9 +110,6 @@ public:
     
     void            setExpanded(const caf::PdmUiItem* uiItem, bool expanded);
 
-    void            addRecentFiles(const QString& file);
-    void            removeRecentFiles(const QString& file);
-
     RimMdiWindowGeometry    windowGeometryForViewer(QWidget* viewer);
     RimMdiWindowGeometry    windowGeometryForWidget(QWidget* widget);
 
@@ -132,8 +129,6 @@ private:
     void            createToolBars();
     void            createDockPanels();
 
-    void            updateRecentFileActions();
-
     void            storeTreeViewState();
     void            restoreTreeViewState();
 
@@ -152,13 +147,6 @@ private:
     QAction*            m_closeProjectAction;
     QAction*            m_exitAction;
 
-    // Recent files
-    enum { MaxRecentFiles = 9 };
-    QAction*            m_recentFilesSeparatorAction;
-    QMenu*              m_recentFilesMenu;
-    QAction*            m_recentFileActions[MaxRecentFiles];
-
-
     // Edit actions
     QAction*            m_editPreferences;
     QAction*            m_newPropertyView;
@@ -224,8 +212,6 @@ private slots:
     void    slotSaveProjectAs();
     void    slotCloseProject();
 
-    void    slotOpenRecentFile();
-
     void    slotRefreshFileActions();
 
     // Edit slots

ApplicationCode/UserInterface/RiuRecentFileActionProvider.cpp

@@ -0,0 +1,167 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA 2016
+// 
+//  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 "RiuRecentFileActionProvider.h"
+
+#include "RiaApplication.h"
+
+#include <QAction>
+#include <QSettings>
+#include <QFileInfo>
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiuRecentFileActionProvider::RiuRecentFileActionProvider(int maxActionCount)
+    : m_maxActionCount(maxActionCount)
+{
+    createActions();
+    updateActions();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiuRecentFileActionProvider::~RiuRecentFileActionProvider()
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuRecentFileActionProvider::addFileName(const QString& fileName)
+{
+    QSettings settings;
+    QStringList files = settings.value("recentFileList").toStringList();
+    files.removeAll(fileName);
+    files.prepend(fileName);
+    while (files.size() > m_maxActionCount)
+        files.removeLast();
+
+    settings.setValue("recentFileList", files);
+
+    updateActions();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuRecentFileActionProvider::removeFileName(const QString& fileName)
+{
+    QSettings settings;
+    QStringList files = settings.value("recentFileList").toStringList();
+    files.removeAll(fileName);
+
+    settings.setValue("recentFileList", files);
+
+    updateActions();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuRecentFileActionProvider::updateActions()
+{
+    QSettings settings;
+    QStringList files = settings.value("recentFileList").toStringList();
+
+    int numRecentFiles = qMin(files.size(), m_maxActionCount);
+
+    for (int i = 0; i < numRecentFiles; ++i) {
+        QString text = tr("&%1 %2").arg(i + 1).arg(QFileInfo(files[i]).fileName());
+        m_recentFileActions[i]->setText(text);
+        m_recentFileActions[i]->setData(files[i]);
+        m_recentFileActions[i]->setToolTip(files[i]);
+        m_recentFileActions[i]->setVisible(true);
+    }
+
+    for (int j = numRecentFiles; j < m_maxActionCount; ++j)
+        m_recentFileActions[j]->setVisible(false);
+
+    m_separatorAction->setVisible(numRecentFiles > 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<QAction*> RiuRecentFileActionProvider::actions() const
+{
+    std::vector<QAction*> actionItems;
+    actionItems.push_back(m_separatorAction);
+
+    for (auto act : m_recentFileActions)
+    {
+        actionItems.push_back(act);
+    }
+
+    return actionItems;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuRecentFileActionProvider::slotOpenRecentFile()
+{
+    QAction* action = qobject_cast<QAction *>(sender());
+    if (action)
+    {
+        QString filename = action->data().toString();
+        bool loadingSucceded = false;
+
+        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)
+        {
+            addFileName(filename);
+        }
+        else
+        {
+            removeFileName(filename);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuRecentFileActionProvider::createActions()
+{
+    for (int i = 0; i < m_maxActionCount; ++i)
+    {
+        QAction* act = new QAction(this);
+        act->setVisible(false);
+        connect(act, SIGNAL(triggered()), this, SLOT(slotOpenRecentFile()));
+        
+        m_recentFileActions.push_back(act);
+    }
+
+    m_separatorAction = new QAction(this);
+    m_separatorAction->setSeparator(true);
+}

ApplicationCode/UserInterface/RiuRecentFileActionProvider.h

@@ -0,0 +1,59 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA 2016
+// 
+//  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 <QObject>
+#include <QString>
+
+#include <vector>
+
+class QAction;
+
+//==================================================================================================
+//
+// 
+//
+//==================================================================================================
+class RiuRecentFileActionProvider : public QObject
+{
+    Q_OBJECT
+
+public:
+    RiuRecentFileActionProvider(int maxActionCount = 9);
+    ~RiuRecentFileActionProvider();
+
+    void addFileName(const QString& fileName);
+    std::vector<QAction*> actions() const;
+
+private slots:
+    void slotOpenRecentFile();
+
+private:
+    void createActions();
+    void updateActions();
+    void removeFileName(const QString& fileName);
+
+private:
+    int m_maxActionCount;
+
+    std::vector<QAction*> m_recentFileActions;
+    QAction* m_separatorAction;
+};
+
+