Merge branch 'devel'

Author: dridk

CHANGELOG

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 ## [0.2.3] - 2017-29-03
 ### Changed
 - Exporting file displays a progress dialog
+- Add recent menu
 
 >>>>>>> devel
 

ui/mainwindow.cpp

@@ -50,12 +50,14 @@ void MainWindow::addFiles()
     {
         for (QString file : fileNames)
         {
+            qDebug()<<"add file ";
             mView->addFile(file);
+            addRecent(file);
         }
     }
 
     statusBar()->showMessage(QString(tr("Running on %1 threads")).arg(QThreadPool::globalInstance()->activeThreadCount()));
-
+    updateRecentMenu();
 }
 
 void MainWindow::remFiles()
@@ -134,11 +136,15 @@ void MainWindow::setupActions()
     // File menu
     QMenu * fileMenu = menuBar()->addMenu(tr("&File"));
     QAction * openAction = fileMenu->addAction(QFontIcon::icon(0xf067), tr("&Add files"),this, SLOT(addFiles()), QKeySequence::Open);
+
+    mRecentMenu = fileMenu->addMenu(tr("Fichiers récents"));
+    updateRecentMenu();
+
+
     QAction * exportSelAction = fileMenu->addAction(QFontIcon::icon(0xf0c7),tr("&Export"),this, SLOT(exportSelection()), QKeySequence::Save);
     openAction->setToolTip(tr("Add Fastq(s) files for analysis"));
     exportSelAction->setToolTip(tr("Export selected analyses" ));
 
-    fileMenu->addSeparator();
     fileMenu->addAction(QFontIcon::icon(0xf00d),tr("&Close"),qApp, SLOT(closeAllWindows()), QKeySequence::Close);
 
 
@@ -172,7 +178,7 @@ void MainWindow::setupActions()
 
     QToolBar * bar = addToolBar(tr("Open"));
     bar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-   // bar->setIconSize(QSize(22,22));
+    // bar->setIconSize(QSize(22,22));
     bar->addAction(openAction);
     bar->addAction(remAction);
     bar->addSeparator();
@@ -187,5 +193,52 @@ void MainWindow::setupActions()
 
 }
 
+void MainWindow::addRecent(const QString &path)
+{
+    QStringList recents = loadRecent();
+    recents.prepend(path);
+    recents.removeDuplicates();
+
+    QSettings settings;
+    settings.beginWriteArray("recents");
+    settings.clear();
+    int max = recents.size() > MAX_RECENT ? MAX_RECENT : recents.size();
+
+    for (int i=0; i<max; ++i)
+    {
+        settings.setArrayIndex(i);
+        settings.setValue("path",recents.at(i));
+    }
+
+    settings.endArray();
+}
+
+QStringList MainWindow::loadRecent()
+{
+    QStringList recents;
+    QSettings settings;
+    int size  = settings.beginReadArray("recents");
+    int max   = size > MAX_RECENT ? MAX_RECENT : size;
+
+    for (int i=0; i<max; ++i)
+    {
+        settings.setArrayIndex(i);
+        recents.append(settings.value("path").toString());
+    }
+
+    settings.endArray();
+
+    return recents;
+}
+
+void MainWindow::updateRecentMenu()
+{
+    mRecentMenu->clear();
+    for (QString recent : loadRecent())
+    {
+        mRecentMenu->addAction(recent,this, [recent,this](){mView->addFile(recent);});
+    }
+}
+
 
 

ui/mainwindow.h

@@ -54,6 +54,9 @@ public Q_SLOTS:
 
 protected:
     void setupActions();
+    void addRecent(const QString& path);
+    QStringList loadRecent();
+    void updateRecentMenu();
 
 private:
     void printEasterEggs();
@@ -64,6 +67,8 @@ public Q_SLOTS:
     MainAnalyseView * mView;
     QFuture<void> mRunFuture;
     QStatusBar * mStatusBar;
+    QMenu * mRecentMenu;
+    static const int MAX_RECENT=10;
 };
 
 #endif // MAINWINDOW_H