chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remember last used CPAP import path

Browse Source
This commit is contained in:
Mark Watkins 2014-07-13 20:03:00 +10:00
parent 40764c1783
commit 3024b8247f
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sleepyhead/SleepLib/common.h
View File

@ -86,6 +86,7 @@ const QString STR_GEN_Off = QObject::tr("Off");
const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates"; const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates";
const QString STR_PREF_ReimportBackup = "ReimportBackup"; const QString STR_PREF_ReimportBackup = "ReimportBackup";
const QString STR_PREF_LastCPAPPath = "LastCPAPPath";
const QString STR_PROP_Brand = "Brand"; const QString STR_PROP_Brand = "Brand";
const QString STR_PROP_Model = "Model"; const QString STR_PROP_Model = "Model";

5
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -316,9 +316,8 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
//CHECKME: Should I be taking noon day split time into account here? //CHECKME: Should I be taking noon day split time into account here?
strdate[date].push_back(&strsess.insert(ontime, R).value()); strdate[date].push_back(&strsess.insert(ontime, R).value());
QDateTime dofftime = QDateTime::fromTime_t(offtime); //QDateTime dofftime = QDateTime::fromTime_t(offtime);
qDebug() << "Mask on" << dontime << "Mask off" << dofftime; //qDebug() << "Mask on" << dontime << "Mask off" << dofftime;
} }
dt = dt.addDays(1); dt = dt.addDays(1);
} }

29
sleepyhead/mainwindow.cpp
View File

@ -680,10 +680,9 @@ void MainWindow::on_action_Import_Data_triggered()
if (datapaths.size() > 0) { if (datapaths.size() > 0) {
int res = QMessageBox::question(this, int res = QMessageBox::question(this,
tr("CPAP Data Located"), tr("CPAP Data Located"),
QString((tr("CPAP Datacard structures were detected at the following locations:")+ tr("CPAP Datacard structures were detected at the following locations:")+
"\n\n%1\n\n"+ QString("\n\n%1\n\n").arg(QDir::toNativeSeparators(datapaths.join("\n")))+
tr("Would you like to import from the path(s) shown above?"))). tr("Would you like to import from the path(s) shown above?"),
arg(QDir::toNativeSeparators(datapaths.join("\n"))),
STR_MessageBox_Yes, STR_MessageBox_Yes,
tr("Select another folder"), tr("Select another folder"),
STR_MessageBox_Cancel, STR_MessageBox_Cancel,
@ -707,18 +706,23 @@ void MainWindow::on_action_Import_Data_triggered()
if (asknew) { if (asknew) {
popup.show(); 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); 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) #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
const QString documentsFolder = QDesktopServices::storageLocation( folder = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
QDesktopServices::DocumentsLocation);
#else #else
const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); folder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
#endif #endif
}
w.setDirectory(folder);
w.setDirectory(documentsFolder);
w.setFileMode(QFileDialog::Directory); w.setFileMode(QFileDialog::Directory);
w.setOption(QFileDialog::ShowDirsOnly, true); w.setOption(QFileDialog::ShowDirsOnly, true);
@ -759,6 +763,7 @@ void MainWindow::on_action_Import_Data_triggered()
return; return;
} }
popup.hide(); popup.hide();
for (int i = 0; i < w.selectedFiles().size(); i++) { for (int i = 0; i < w.selectedFiles().size(); i++) {
@ -787,6 +792,9 @@ void MainWindow::on_action_Import_Data_triggered()
if (c) { if (c) {
goodlocations.push_back(dir); goodlocations.push_back(dir);
QDir d(dir.section("/",0,-2));
(*p_profile)[STR_PREF_LastCPAPPath] = d.absolutePath();
successful = true; successful = true;
} }
@ -811,6 +819,7 @@ void MainWindow::on_action_Import_Data_triggered()
} }
PopulatePurgeMenu(); PopulatePurgeMenu();
} }
QMenu *MainWindow::CreateMenu(QString title) QMenu *MainWindow::CreateMenu(QString title)
{ {
QMenu *menu = new QMenu(title, ui->menubar); QMenu *menu = new QMenu(title, ui->menubar);