From 3024b8247f1fd944f4b649f7a48b213fb7c22eff Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sun, 13 Jul 2014 20:03:00 +1000
Subject: [PATCH] Remember last used CPAP import path

---
 sleepyhead/SleepLib/common.h                  |  1 +
 .../SleepLib/loader_plugins/resmed_loader.cpp |  5 ++--
 sleepyhead/mainwindow.cpp                     | 29 ++++++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h
index da45c347..07177461 100644
--- a/sleepyhead/SleepLib/common.h
+++ b/sleepyhead/SleepLib/common.h
@@ -86,6 +86,7 @@ const QString STR_GEN_Off = QObject::tr("Off");
 
 const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates";
 const QString STR_PREF_ReimportBackup = "ReimportBackup";
+const QString STR_PREF_LastCPAPPath = "LastCPAPPath";
 
 const QString STR_PROP_Brand = "Brand";
 const QString STR_PROP_Model = "Model";
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index e63f5343..2b51d774 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -316,9 +316,8 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
                 //CHECKME: Should I be taking noon day split time into account here?
                 strdate[date].push_back(&strsess.insert(ontime, R).value());
 
-                QDateTime dofftime = QDateTime::fromTime_t(offtime);
-                qDebug() << "Mask on" << dontime << "Mask off" << dofftime;
-
+                //QDateTime dofftime = QDateTime::fromTime_t(offtime);
+                //qDebug() << "Mask on" << dontime << "Mask off" << dofftime;
             }
             dt = dt.addDays(1);
         }
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 66285a37..1af90752 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -680,10 +680,9 @@ void MainWindow::on_action_Import_Data_triggered()
     if (datapaths.size() > 0) {
         int res = QMessageBox::question(this,
                                         tr("CPAP Data Located"),
-                                        QString((tr("CPAP Datacard structures were detected at the following locations:")+
-                                                   "\n\n%1\n\n"+
-                                                   tr("Would you like to import from the path(s) shown above?"))).
-                                            arg(QDir::toNativeSeparators(datapaths.join("\n"))),
+                                        tr("CPAP Datacard structures were detected at the following locations:")+
+                                        QString("\n\n%1\n\n").arg(QDir::toNativeSeparators(datapaths.join("\n")))+
+                                        tr("Would you like to import from the path(s) shown above?"),
                                         STR_MessageBox_Yes,
                                         tr("Select another folder"),
                                         STR_MessageBox_Cancel,
@@ -707,18 +706,23 @@ void MainWindow::on_action_Import_Data_triggered()
 
     if (asknew) {
         popup.show();
-        mainwin->Notify(tr("Please remember to point the importer at the root folder or drive letter of your data-card, and not a subfolder."),tr("Import Reminder"),8000);
+        mainwin->Notify(tr("Please remember to point the importer at the root folder or drive letter of your data-card, and not a subfolder."),
+                        tr("Import Reminder"),8000);
 
         QFileDialog w(this);
+
+        QString folder;
+        if (p_profile->contains(STR_PREF_LastCPAPPath)) {
+            folder = (*p_profile)[STR_PREF_LastCPAPPath].toString();
+        } else {
 #if QT_VERSION  < QT_VERSION_CHECK(5,0,0)
-        const QString documentsFolder = QDesktopServices::storageLocation(
-                                      QDesktopServices::DocumentsLocation);
+            folder = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
 #else
-        const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+            folder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
 #endif
+        }
 
-
-        w.setDirectory(documentsFolder);
+        w.setDirectory(folder);
         w.setFileMode(QFileDialog::Directory);
         w.setOption(QFileDialog::ShowDirsOnly, true);
 
@@ -759,6 +763,7 @@ void MainWindow::on_action_Import_Data_triggered()
 
             return;
         }
+
         popup.hide();
 
         for (int i = 0; i < w.selectedFiles().size(); i++) {
@@ -787,6 +792,9 @@ void MainWindow::on_action_Import_Data_triggered()
             if (c) {
                 goodlocations.push_back(dir);
 
+                QDir d(dir.section("/",0,-2));
+                (*p_profile)[STR_PREF_LastCPAPPath] = d.absolutePath();
+
                 successful = true;
             }
 
@@ -811,6 +819,7 @@ void MainWindow::on_action_Import_Data_triggered()
     }
     PopulatePurgeMenu();
 }
+
 QMenu *MainWindow::CreateMenu(QString title)
 {
     QMenu *menu = new QMenu(title, ui->menubar);