Show Open Profile information in profile selector, add AutoLoadLastUsed Preference

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

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());
 

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());
 

sleepyhead/preferencesdialog.ui

@@ -57,7 +57,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>6</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">
@@ -567,16 +567,29 @@ SleepyHead can keep a copy of this data if you ever need to reinstall.
           <string>Memory and Startup Options</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_14">
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="automaticImport">
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="autoLaunchImporter">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cuts down on any unimportant confirmation dialogs during import.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>Bypass the login screen and load the most recent User Profile</string>
             </property>
             <property name="text">
-             <string>Import without asking for confirmation</string>
+             <string>Auto-Launch CPAP Importer after opening profile</string>
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
           <item row="0" column="1">
            <widget class="QCheckBox" name="cacheSessionData">
             <property name="toolTip">
@@ -598,27 +611,21 @@ SleepyHead can keep a copy of this data if you ever need to reinstall.
            </widget>
           </item>
           <item row="1" column="0">
-           <widget class="QCheckBox" name="autoLaunchImporter">
-            <property name="toolTip">
-             <string>Bypass the login screen and load the most recent User Profile</string>
-            </property>
+           <widget class="QCheckBox" name="autoLoadLastUsed">
             <property name="text">
-             <string>Auto-Launch CPAP Importer after application start-up</string>
+             <string>Automatically load last used profile on start-up</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="automaticImport">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cuts down on any unimportant confirmation dialogs during import.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
+            <property name="text">
+             <string>Import without asking for confirmation</string>
             </property>
-           </spacer>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -2247,7 +2254,7 @@ p, li { white-space: pre-wrap; }
             <item row="2" column="1">
              <widget class="QComboBox" name="openingTabCombo">
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Which tab to open on loading a profile. (Note: It will default to Profile if there is no open Profile)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="currentText">
                <string>Profile</string>

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; i<columns; i++) {
             model->setData(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; i<model->columnCount(); 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; i<proxy->columnCount(); 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())+"<br/>";
+        }
+        if (!p_profile->user->phone().isEmpty()) {
+            html += tr("Phone: %1").arg(p_profile->user->phone())+"<br/>";
+        }
+        if (!p_profile->user->phone().isEmpty()) {
+            html += "<br/>"+tr("Address:")+"<br/>"+p_profile->user->address().trimmed().replace("\n","<br/>")+"<br/>";
+        }
+
+        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("<b>"+STR_MessageBox_Warning+":</b> "+tr("You are about to destroy profile '%1'.")+"<br/><br/>"+tr("Enter the word DELETE below to confirm.")).arg(name), &confirmdlg);
+        QLabel message(QString("<b>"+STR_MessageBox_Warning+":</b> "+tr("You are about to destroy profile '<b>%1</b>'.")+"<br/><br/>"+tr("Think carefully, as this will irretrievably delete the profile along with all <b>backup data</b> stored under<br/>%2.")+"<br/><br/>"+tr("Enter the word <b>DELETE</b> 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();

sleepyhead/profileselector.ui

@@ -81,6 +81,12 @@
      </item>
      <item>
       <widget class="QFrame" name="frame_2">
+       <property name="minimumSize">
+        <size>
+         <width>250</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>
@@ -88,11 +94,29 @@
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Preferred</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
           <item>
            <widget class="QLabel" name="SleepyHeadLogo">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
+              <horstretch>1</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
@@ -111,8 +135,29 @@
             <property name="scaledContents">
              <bool>true</bool>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Preferred</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QLabel" name="SleepyHeadLabel">
           <property name="font">
@@ -157,6 +202,10 @@
           <property name="text">
            <string>&amp;Open Profile</string>
           </property>
+          <property name="icon">
+           <iconset resource="Resources.qrc">
+            <normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
+          </property>
          </widget>
         </item>
         <item>
@@ -180,11 +229,66 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QGroupBox" name="profileInfoGroupBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="title">
+           <string>Current Profile: None</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <item>
+            <widget class="QLabel" name="profileInfoLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <weight>50</weight>
+               <bold>false</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Please open or create a profile...</string>
+             </property>
+             <property name="textFormat">
+              <enum>Qt::AutoText</enum>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>