OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#846 Moved recent file management to RiaApplication

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-05 08:23:07 +02:00
parent 1654ab3c91
commit c8b73dad68
8 changed files with 268 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

9
ApplicationCode/Application/RiaApplication.h
View File

@@ -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;
};