Smarted up GFXEngine selection stuff a bit underneath

sleepyhead/SleepLib/common.cpp

@@ -67,34 +67,33 @@ const QString getDefaultAppRoot()
     return approot;
 }
 
-
+bool gfxEgnineIsSupported(GFXEngine e)
-unsigned int currentGFXEngine()
 {
-    QSettings settings;
+#if Q_OS_WIN32
-
+    return true;
-    return qMin(settings.value(GFXEngineSetting, 2).toUInt(), (unsigned int) 2);
+#else
-}
+    switch(e) {
-void setCurrentGFXEngine(unsigned int r)
+    case GFX_OpenGL:
-{
+    case GFX_Software:
-    QSettings settings;
+       return true;
-
+    case GFX_ANGLE:
-    settings.setValue(GFXEngineSetting, qMin(r, (unsigned int)2));
-}
-
-QString GFXEngineName(unsigned int r)
-{
-    switch (r) {
-    case 0:
-        return STR_GFXEngine_Software;
-    case 1:
-        return STR_GFXEngine_ANGLE;
-    case 2:
     default:
-        return STR_GFXEngine_OpenGL;
+       return false;
     }
+#endif
 }
+GFXEngine currentGFXEngine()
+{
+    QSettings settings;
 
+    return (GFXEngine)qMin(settings.value(GFXEngineSetting, GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine);
+}
+void setCurrentGFXEngine(GFXEngine e)
+{
+    QSettings settings;
 
+    settings.setValue(GFXEngineSetting, qMin((unsigned int)e, (unsigned int)MaxGFXEngine));
+}
 
 QString getOpenGLVersionString()
 {
@@ -267,9 +266,7 @@ void copyPath(QString src, QString dst)
     }
 }
 
-QString STR_GFXEngine_Software;
+QString GFXEngineNames[MaxGFXEngine+1]; // Set by initializeStrings()
-QString STR_GFXEngine_ANGLE;
-QString STR_GFXEngine_OpenGL;
 
 QString STR_UNIT_M;
 QString STR_UNIT_CM;
@@ -473,9 +470,9 @@ QString STR_TR_WAvg;   // Short form of Weighted Average
 
 void initializeStrings()
 {
-    STR_GFXEngine_Software = QObject::tr("Software Engine");
+    GFXEngineNames[GFX_Software] = QObject::tr("Software Engine");
-    STR_GFXEngine_ANGLE = QObject::tr("ANGLE / OpenGLES");
+    GFXEngineNames[GFX_ANGLE] = QObject::tr("ANGLE / OpenGLES");
-    STR_GFXEngine_OpenGL = QObject::tr("Desktop OpenGL");
+    GFXEngineNames[GFX_OpenGL] = QObject::tr("Desktop OpenGL");
 
     STR_UNIT_M = QObject::tr(" m");
     STR_UNIT_CM = QObject::tr(" cm");

sleepyhead/SleepLib/common.h

@@ -19,24 +19,24 @@
 #include <QLocale>
 #include "Graphs/glcommon.h"
 
+enum GFXEngine { GFX_OpenGL=0, GFX_ANGLE, GFX_Software, MaxGFXEngine=GFX_Software};
 const QString GFXEngineSetting = "GFXEngine";
+extern QString GFXEngineNames[MaxGFXEngine+1]; // Set by initializeStrings()
 
 const QString CSTR_GFX_ANGLE = "ANGLE";
 const QString CSTR_GFX_OpenGL = "OpenGL";
 const QString CSTR_GFX_BrokenGL = "LegacyGFX";
 
 
-
 //! \brief Gets the first day of week from the system locale, to show in the calendars.
 Qt::DayOfWeek firstDayOfWeekFromLocale();
 
 QString getBranchVersion();
 QString getGFXEngine();
 
-unsigned int currentGFXEngine();
+bool gfxEgnineIsSupported(GFXEngine e);
-void setCurrentGFXEngine(unsigned int r);
+GFXEngine currentGFXEngine();
-QString GFXEngineName(unsigned int r);
+void setCurrentGFXEngine(GFXEngine e);
-
 
 QString appResourcePath();
 QString getGraphicsEngine();
@@ -172,11 +172,6 @@ const QString STR_AppRoot = "SleepyHeadData";
 // Commonly used translatable text strings
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-extern QString STR_GFXEngine_Software;
-extern QString STR_GFXEngine_ANGLE;
-extern QString STR_GFXEngine_OpenGL;
-
-
 extern QString STR_UNIT_M;
 extern QString STR_UNIT_CM;
 extern QString STR_UNIT_INCH;

sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp

@@ -668,8 +668,9 @@ void CMS50F37Loader::eraseSession(int user, int session)
 }
 
 
-void CMS50F37Loader::setDeviceID(QString str)
+void CMS50F37Loader::setDeviceID(const QString & newid)
 {
+    QString str = newid;
     str.truncate(7);
     if (str.length() < 7) {
         str = QString(" ").repeated(7-str.length()) + str;

sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h

@@ -61,7 +61,7 @@ Q_OBJECT
 
     virtual void syncClock();
     virtual QString getDeviceID();
-    virtual void setDeviceID(QString);
+    virtual void setDeviceID(const QString &);
 
 
     virtual void setDuration(int d) { duration=d; }

sleepyhead/main.cpp

@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName(getDeveloperName());
 
     QSettings settings;
-    unsigned int gfxEngine = qMin(settings.value(GFXEngineSetting, 0).toUInt(), (unsigned int)2);
+    GFXEngine gfxEngine = (GFXEngine)qMin((unsigned int)settings.value(GFXEngineSetting, (unsigned int)GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine);
 
     switch (gfxEngine) {
     case 0:
@@ -128,6 +128,8 @@ int main(int argc, char *argv[])
 
     initializeStrings(); // This must be called AFTER translator is installed, but before mainwindow is setup
 
+    QFontDatabase::addApplicationFont("://fonts/FreeSans.ttf");
+    a.setFont(QFont("FreeSans", 11, QFont::Normal, false));
     mainwin = new MainWindow;
 
 #ifdef BROKEN_OPENGL_BUILD

sleepyhead/preferencesdialog.cpp

@@ -87,7 +87,20 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     ui->resmedPrefCalcsNotice->setVisible(haveResMed);
 #endif
 
-    ui->gfxEngineCombo->setCurrentIndex(currentGFXEngine());
+    int gfxEngine=(int)currentGFXEngine();
+
+    int selIdx = 0;
+    for (int j=0, i=0; i<=(int)MaxGFXEngine; ++i) {
+        if (gfxEgnineIsSupported((GFXEngine) i)) {
+            ui->gfxEngineCombo->addItem(GFXEngineNames[i], i);
+            if (i==gfxEngine) {
+                 selIdx = j;
+            }
+            ++j;
+        }
+    }
+    ui->gfxEngineCombo->setCurrentIndex(selIdx);
+
 
     ui->culminativeIndices->setEnabled(false);
 
@@ -689,8 +702,8 @@ bool PreferencesDialog::Save()
         needs_reload = true;
     }
 
-    if ((unsigned int)ui->gfxEngineCombo->currentIndex() != currentGFXEngine()) {
+    if ((GFXEngine)ui->gfxEngineCombo->currentData().toUInt() != currentGFXEngine()) {
-        setCurrentGFXEngine(ui->gfxEngineCombo->currentIndex());
+        setCurrentGFXEngine((GFXEngine)ui->gfxEngineCombo->currentData().toUInt());
         needs_restart = true;
     }
 

sleepyhead/preferencesdialog.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>696</width>
+    <width>945</width>
-    <height>610</height>
+    <height>721</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -1749,7 +1749,7 @@ as this is the only value available on summary-only days.</string>
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt;
@@ -2737,23 +2737,7 @@ this application to be unstable with this feature enabled.</string>
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QComboBox" name="gfxEngineCombo">
+             <widget class="QComboBox" name="gfxEngineCombo"/>
-              <item>
-               <property name="text">
-                <string>Desktop OpenGL</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>ANGLE / OpenGLES</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>MESA (Software Renderer)</string>
-               </property>
-              </item>
-             </widget>
             </item>
            </layout>
           </widget>

sleepyhead/sessionbar.cpp

@@ -225,7 +225,7 @@ void SessionBar::paintEvent(QPaintEvent *)
 
     double sx, ex;
     QVector<SBSeg>::iterator i;
-    QRect selectRect;
+    //QRect selectRect;
 
     int cnt = 0;
     for (i = segments.begin(); i != segments.end(); ++i) {