diff --git a/sleepyhead/SleepLib/appsettings.h b/sleepyhead/SleepLib/appsettings.h
index f5176e1b..e6f14ea9 100644
--- a/sleepyhead/SleepLib/appsettings.h
+++ b/sleepyhead/SleepLib/appsettings.h
@@ -51,6 +51,7 @@ const QString STR_US_AutoLaunchImport = "AutoLaunchImport";
const QString STR_US_RemoveCardReminder = "RemoveCardReminder";
const QString STR_IS_CacheSessions = "MemoryHog";
+const QString STR_GEN_AutoOpenLastUsed = "AutoOpenLastUsed";
const QString STR_GEN_UpdatesLastChecked = "UpdatesLastChecked";
const QString STR_GEN_UpdatesAutoCheck = "Updates_AutoCheck";
const QString STR_GEN_UpdateCheckFrequency = "Updates_CheckFrequency";
@@ -94,6 +95,7 @@ public:
initPref(STR_IS_CacheSessions, false);
initPref(STR_US_RemoveCardReminder, true);
initPref(STR_GEN_Profile, "");
+ initPref(STR_GEN_AutoOpenLastUsed, true);
initPref(STR_GEN_UpdatesAutoCheck, true);
initPref(STR_GEN_UpdateCheckFrequency, 7);
@@ -157,6 +159,7 @@ public:
int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); }
int openTabAfterImport() const { return getPref(STR_US_OpenTabAfterImport).toInt(); }
bool removeCardReminder() const { return getPref(STR_US_RemoveCardReminder).toBool(); }
+ bool autoOpenLastUsed() const { return getPref(STR_GEN_AutoOpenLastUsed).toBool(); }
void setProfileName(QString name) { setPref(STR_GEN_Profile, name); }
void setAutoLaunchImport(bool b) { setPref(STR_US_AutoLaunchImport, b); }
@@ -211,6 +214,7 @@ public:
void setAllowEarlyUpdates(bool b) { setPref(STR_PREF_AllowEarlyUpdates, b); }
void setUpdatesLastChecked(QDateTime datetime) { setPref(STR_GEN_UpdatesLastChecked, datetime); }
void setUpdateCheckFrequency(int freq) { setPref(STR_GEN_UpdateCheckFrequency,freq); }
+ void setAutoOpenLastUsed(bool b) { setPref(STR_GEN_AutoOpenLastUsed , b); }
};
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 99e7cb8d..0d1e22b3 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -547,9 +547,10 @@ void MainWindow::CloseProfile()
void MainWindow::Startup()
{
+
QString lastProfile = AppSetting->profileName();
- if (Profiles::profiles.contains(lastProfile)) {
+ if (Profiles::profiles.contains(lastProfile) && AppSetting->autoOpenLastUsed()) {
OpenProfile(lastProfile);
ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart());
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index b9049393..b8d1be53 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -125,7 +125,10 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->oxiDiscardThreshold->setValue(profile->oxi->oxiDiscardThreshold());
ui->eventIndexCombo->setCurrentIndex(profile->general->calculateRDI() ? 1 : 0);
- ui->automaticImport->setChecked(profile->cpap->autoImport());
+
+ ui->automaticImport->setChecked(profile->cpap->autoImport()); // Skip extra dialogs, this needs to rename.
+
+ ui->autoLoadLastUsed->setChecked(AppSetting->autoOpenLastUsed());
ui->timeEdit->setTime(profile->session->daySplitTime());
int val = profile->session->combineCloseSessions();
@@ -823,7 +826,8 @@ bool PreferencesDialog::Save()
profile->cpap->setAHIWindow(ui->ahiGraphWindowSize->value());
profile->cpap->setAHIReset(ui->ahiGraphZeroReset->isChecked());
- profile->cpap->setAutoImport(ui->automaticImport->isChecked());
+ profile->cpap->setAutoImport(ui->automaticImport->isChecked()); // delete me???
+ AppSetting->setAutoOpenLastUsed(ui->autoLoadLastUsed->isChecked());
profile->cpap->setUserEventFlagging(ui->customEventGroupbox->isChecked());
diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui
index f91fbff8..23197c42 100644
--- a/sleepyhead/preferencesdialog.ui
+++ b/sleepyhead/preferencesdialog.ui
@@ -57,7 +57,7 @@
- 6
+ 0
@@ -567,16 +567,29 @@ SleepyHead can keep a copy of this data if you ever need to reinstall.
Memory and Startup Options
- -
-
+
-
+
- <html><head/><body><p>Cuts down on any unimportant confirmation dialogs during import.</p></body></html>
+ Bypass the login screen and load the most recent User Profile
- Import without asking for confirmation
+ Auto-Launch CPAP Importer after opening profile
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
@@ -598,27 +611,21 @@ SleepyHead can keep a copy of this data if you ever need to reinstall.
-
-
-
- Bypass the login screen and load the most recent User Profile
-
+
- Auto-Launch CPAP Importer after application start-up
+ Automatically load last used profile on start-up
- -
-
-
- Qt::Vertical
+
-
+
+
+ <html><head/><body><p>Cuts down on any unimportant confirmation dialogs during import.</p></body></html>
-
-
- 20
- 40
-
+
+ Import without asking for confirmation
-
+
@@ -2247,7 +2254,7 @@ p, li { white-space: pre-wrap; }
-
- <html><head/><body><p>Which tab to open on loading a profile. (Note: It will default to Profile if there is no open Profile)</p></body></html>
+ <html><head/><body><p>Which tab to open on loading a profile. (Note: It will default to Profile if SleepyHead is set to not open a profile on startup)</p></body></html>
Profile
diff --git a/sleepyhead/profileselector.cpp b/sleepyhead/profileselector.cpp
index 4c3d7e01..2e2b31cb 100644
--- a/sleepyhead/profileselector.cpp
+++ b/sleepyhead/profileselector.cpp
@@ -59,6 +59,7 @@ ProfileSelector::~ProfileSelector()
delete ui;
}
+const Qt::GlobalColor openProfileHighlightColor = Qt::darkGreen;
void ProfileSelector::updateProfileList()
{
@@ -114,11 +115,14 @@ void ProfileSelector::updateProfileList()
model->setData(model->index(row, 4, QModelIndex()), mach->lastImported().toString(Qt::SystemLocaleShortDate));
}
QBrush bg = QColor(Qt::black);
+ QFont font = QApplication::font();
if (prof == p_profile) {
- bg = QBrush(Qt::red);
+ bg = QBrush(openProfileHighlightColor);
+ font.setBold(true);
}
for (int i=0; isetData(model->index(row, i, QModelIndex()), bg, Qt::ForegroundRole);
+ //model->setData(model->index(row, i, QModelIndex()), font, Qt::FontRole);
}
QRect rect = fm.boundingRect(name);
@@ -156,21 +160,50 @@ void ProfileSelector::updateProfileList()
void ProfileSelector::updateProfileHighlight(QString name)
{
+ QFont font = QApplication::font();
+ font.setBold(false);
QBrush bg = QColor(Qt::black);
for (int row=0;row < model->rowCount(); row++) {
for (int i=0; icolumnCount(); i++) {
model->setData(model->index(row, i, QModelIndex()), bg, Qt::ForegroundRole);
+ //model->setData(model->index(row, i, QModelIndex()), font, Qt::FontRole);
}
}
- bg = QBrush(Qt::red);
+ bg = QBrush(openProfileHighlightColor);
+ font = QApplication::font();
+ font.setBold(true);
for (int row=0;row < proxy->rowCount(); row++) {
if (proxy->data(proxy->index(row, 0, QModelIndex())).toString().compare(name)==0) {
for (int i=0; icolumnCount(); i++) {
proxy->setData(proxy->index(row, i, QModelIndex()), bg, Qt::ForegroundRole);
+ // proxy->setData(model->index(row, i, QModelIndex()), font, Qt::FontRole);
}
break;
}
}
+ if (p_profile) {
+ QString html = QString();
+
+ if (!p_profile->user->lastName().isEmpty() && !p_profile->user->firstName().isEmpty()) {
+ html += tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName())+"
";
+ }
+ if (!p_profile->user->phone().isEmpty()) {
+ html += tr("Phone: %1").arg(p_profile->user->phone())+"
";
+ }
+ if (!p_profile->user->phone().isEmpty()) {
+ html += "
"+tr("Address:")+"
"+p_profile->user->address().trimmed().replace("\n","
")+"
";
+ }
+
+ if (html.isEmpty()) {
+ html += tr("No profile information given");
+ }
+
+ ui->profileInfoGroupBox->setTitle(tr("Current Profile: %1").arg(name));
+ ui->profileInfoLabel->setText(html);
+ } else {
+
+ }
+
}
void ProfileSelector::SelectProfile(QString profname)
@@ -232,6 +265,8 @@ void ProfileSelector::on_buttonEditProfile_clicked()
}
proxy->setData(proxy->index(ui->profileView->currentIndex().row(), 5, QModelIndex()), usersname);
+ //updateProfileList();
+ if (prof == p_profile) updateProfileHighlight(name);
}
delete newprof;
@@ -266,8 +301,9 @@ void ProfileSelector::on_buttonDestroyProfile_clicked()
{
if (ui->profileView->currentIndex().isValid()) {
QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString();
-
Profile * profile = Profiles::profiles[name];
+ QString path = profile->Get(PrefMacro(STR_GEN_DataFolder));
+
bool reallydelete = false;
if (profile->user->hasPassword()) {
QDialog dialog(this, Qt::Dialog);
@@ -301,11 +337,12 @@ void ProfileSelector::on_buttonDestroyProfile_clicked()
}
}
} while (tries < 3);
- } else { reallydelete = true; }
+ if (!reallydelete) return;
+ }
QDialog confirmdlg;
QVBoxLayout layout(&confirmdlg);
- QLabel message(QString(""+STR_MessageBox_Warning+": "+tr("You are about to destroy profile '%1'.")+"
"+tr("Enter the word DELETE below to confirm.")).arg(name), &confirmdlg);
+ QLabel message(QString(""+STR_MessageBox_Warning+": "+tr("You are about to destroy profile '%1'.")+"
"+tr("Think carefully, as this will irretrievably delete the profile along with all backup data stored under
%2.")+"
"+tr("Enter the word DELETE below to confirm.")).arg(name).arg(path), &confirmdlg);
layout.insertWidget(0,&message,1);
QLineEdit lineedit(&confirmdlg);
layout.insertWidget(1, &lineedit, 1);
@@ -330,7 +367,6 @@ void ProfileSelector::on_buttonDestroyProfile_clicked()
if (reallydelete) {
qDebug() << "Deleting Profile" << name;
- QString path = profile->Get(PrefMacro(STR_GEN_DataFolder));
if (profile == p_profile) {
// Shut down if active
mainwin->CloseProfile();
diff --git a/sleepyhead/profileselector.ui b/sleepyhead/profileselector.ui
index 5c454510..43966b78 100644
--- a/sleepyhead/profileselector.ui
+++ b/sleepyhead/profileselector.ui
@@ -81,6 +81,12 @@
-
+
+
+ 250
+ 0
+
+
QFrame::StyledPanel
@@ -89,29 +95,68 @@
-
-
-
-
- 0
- 0
-
-
-
-
- 128
- 128
-
-
-
-
-
-
- :/icons/bob-v3.0.png
-
-
- true
-
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Preferred
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ 128
+ 128
+
+
+
+
+
+
+ :/icons/bob-v3.0.png
+
+
+ true
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Preferred
+
+
+
+ 40
+ 20
+
+
+
+
+
-
@@ -157,6 +202,10 @@
&Open Profile
+
+
+ :/icons/forward.png:/icons/forward.png
+
-
@@ -180,11 +229,66 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Current Profile: None
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ false
+
+
+
+ Please open or create a profile...
+
+
+ Qt::AutoText
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ true
+
+
+
+
+
+
-
Qt::Vertical
+
+ QSizePolicy::Expanding
+
20