Window size fix and icon PNG updates

Graphs/gXAxis.cpp

@@ -91,7 +91,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
         //if (min_tick<1.0) min_tick=1.0;
         //if (min_tick>10) min_tick=10;
     }
+    if (min_tick<=0) {
         assert(min_tick>0);
+    }
 
     double st3=st;
     while (st3>minx) {

Graphs/graphdata_custom.cpp

@@ -377,8 +377,8 @@ void HistoryData::Reload(Day *day)
     double y,lasty=0;
     min_y=max_y=0;
     min_x=max_x=0;
-    for (qint64 x=floor(real_min_x);x<=ceil(real_max_x);x++) {
+    for (double x=floor(real_min_x);x<=ceil(real_max_x);x++) {
-        date=QDateTime::fromMSecsSinceEpoch(x*86400000L);
+        date=QDateTime::fromMSecsSinceEpoch(x*86400000.0L);
         date.setTime(QTime(0,0,0));
         if (profile->daylist.find(date.date())==profile->daylist.end()) continue;
 

Resources.qrc

@@ -1,22 +1,14 @@
 <RCC>
     <qresource prefix="/">
-        <file>Docs/index.html</file>
+        <file>docs/sheep.png</file>
-        <file>Icons/toggle-on-us.svg</file>
+        <file>docs/index.html</file>
-        <file>Icons/toggle-off-us.svg</file>
+        <file>icons/sdcard.png</file>
-        <file>Icons/preferences.svg</file>
+        <file>icons/preferences.png</file>
-        <file>Icons/moon.svg</file>
+        <file>icons/overview.png</file>
-        <file>Icons/media.svg</file>
+        <file>icons/moon.png</file>
-        <file>Icons/go-home.png</file>
+        <file>icons/go-home.png</file>
-        <file>Icons/gnome-dev-media-sdmmc.svg</file>
+        <file>icons/forward.png</file>
-        <file>Icons/forward.svg</file>
+        <file>icons/edit-find.png</file>
-        <file>Icons/emblem-marketing.svg</file>
+        <file>icons/back.png</file>
-        <file>Icons/edit-find.svg</file>
-        <file>Icons/close-window.svg</file>
-        <file>Icons/calendar.svg</file>
-        <file>Icons/back.svg</file>
-        <file>Icons/applications-viewers.svg</file>
-        <file>Fonts/FreeSans.ttf</file>
-        <file>Docs/sheep.svg</file>
-        <file>Docs/sheep.png</file>
     </qresource>
 </RCC>

SleepyHeadQT.pro

@@ -6,6 +6,16 @@
 
 QT += core gui webkit opengl
 
+#CONFIG += static
+
+#static {
+#    CONFIG += static
+#    QTPLUGIN += qsvg qgif
+
+#    DEFINES += STATIC // Equivalent to "#define STATIC" in source code
+#    message("Static build.")
+#}
+
 #CONFIG += link_pkgconfig
 #PKGCONFIG += freetype2
 
@@ -91,4 +101,4 @@ RESOURCES += \
     Resources.qrc
 
 OTHER_FILES += \
-    Docs/index.html
+    docs/index.html

daily.cpp

@@ -86,7 +86,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
     SF->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR",0,sfc));
     SF->AddLayer(new gFooBar(10,QColor("lime green"),QColor("dark grey"),true));
     SF->setMinimumHeight(150+(extras ? 20 : 0));
-    SF->setMaximumHeight(350);
+   // SF->setMaximumHeight(350);
 
     AddCPAPData(pressure_iap=new EventData(CPAP_IAP));
     AddCPAPData(pressure_eap=new EventData(CPAP_EAP));

daily.ui

@@ -10,6 +10,12 @@
     <height>622</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -22,6 +28,12 @@
    </property>
    <item>
     <widget class="QSplitter" name="splitter_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -66,7 +78,7 @@
       </widget>
       <widget class="QTabWidget" name="tabWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>2</number>
        </property>
        <property name="movable">
         <bool>true</bool>

docs/index.html

@@ -14,7 +14,7 @@
 <p><b>About Sleep Apnea:</b> <a href='http://en.wikipedia.org/wiki/Sleep_apnea'>http://en.wikipedia.org/wiki/Sleep_apnea</a></p>
 <p><b>CPAPTalk Forum:</b> <a href='http://www.cpaptalk.com'>http://www.cpaptalk.com</a></p>
 </td>
-<td><image src='qrc:/Docs/sheep.png' width=220 height=220><br/>
+<td><image src='qrc:/docs/sheep.png' width=220 height=220><br/>
 <div align=center>This is a temporary logo<br/>
 (from OpenClipart.org)
 </div>

main.cpp

@@ -4,6 +4,7 @@
  License: GPL
 *********************************************************************/
 
+//#include <QtPlugin>
 #include <QtGui/QApplication>
 #include "mainwindow.h"
 #include "SleepLib/profiles.h"

mainwindow.cpp

@@ -47,7 +47,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->statusbar->addPermanentWidget(qstatus);
     ui->statusbar->addPermanentWidget(qprogress);
     qprogress->hide();
-    on_homeButton_clicked();
+    //on_homeButton_clicked();
 
 }
 
@@ -123,7 +123,7 @@ void MainWindow::on_actionUse_AntiAliasing_triggered()
 
 void MainWindow::on_homeButton_clicked()
 {
-    QString file="qrc:/Docs/index.html";
+    QString file="qrc:/docs/index.html";
     QUrl url(file);
     //QResource res(file);
     //QByteArray html((const char*)res.data(), res.size());

mainwindow.ui

@@ -6,20 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1029</width>
+    <width>1094</width>
-    <height>512</height>
+    <height>514</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
     <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
+    <verstretch>1</verstretch>
    </sizepolicy>
   </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
-    <height>787</height>
+    <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -27,12 +27,12 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources.qrc">
-    <normaloff>:/Icons/moon.svg</normaloff>:/Icons/moon.svg</iconset>
+    <normaloff>:/icons/moon.png</normaloff>:/icons/moon.png</iconset>
   </property>
   <property name="iconSize">
    <size>
-    <width>128</width>
+    <width>64</width>
-    <height>128</height>
+    <height>64</height>
    </size>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -42,7 +42,16 @@
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="sizeConstraint">
+     <enum>QLayout::SetNoConstraint</enum>
+    </property>
+    <property name="margin">
+     <number>0</number>
+    </property>
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="sizePolicy">
@@ -82,12 +91,21 @@
        <attribute name="title">
         <string>&amp;Welcome</string>
        </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QSplitter" name="splitter">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
+          <widget class="QWidget" name="">
+           <layout class="QVBoxLayout" name="verticalLayout">
+            <item>
              <widget class="QFrame" name="frame">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -95,40 +113,48 @@
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>40</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>40</height>
+               </size>
+              </property>
               <property name="frameShape">
                <enum>QFrame::StyledPanel</enum>
               </property>
               <property name="frameShadow">
                <enum>QFrame::Raised</enum>
               </property>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
                <property name="spacing">
-             <number>0</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <layout class="QVBoxLayout" name="verticalLayout_2">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_2">
-                <property name="spacing">
-                 <number>4</number>
-                </property>
-                <property name="margin">
                 <number>6</number>
                </property>
+               <property name="leftMargin">
+                <number>6</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>6</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
                <item>
-                 <widget class="QToolButton" name="backButton">
+                <widget class="QToolButton" name="homeButton">
                  <property name="text">
                   <string>...</string>
                  </property>
                  <property name="icon">
                   <iconset resource="Resources.qrc">
-                    <normaloff>:/Icons/back.svg</normaloff>:/Icons/back.svg</iconset>
+                   <normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset>
                  </property>
                 </widget>
                </item>
@@ -139,18 +165,18 @@
                  </property>
                  <property name="icon">
                   <iconset resource="Resources.qrc">
-                    <normaloff>:/Icons/forward.svg</normaloff>:/Icons/forward.svg</iconset>
+                   <normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
                  </property>
                 </widget>
                </item>
                <item>
-                 <widget class="QToolButton" name="homeButton">
+                <widget class="QToolButton" name="backButton">
                  <property name="text">
                   <string>...</string>
                  </property>
                  <property name="icon">
                   <iconset resource="Resources.qrc">
-                    <normaloff>:/Icons/go-home.png</normaloff>:/Icons/go-home.png</iconset>
+                   <normaloff>:/icons/back.png</normaloff>:/icons/back.png</iconset>
                  </property>
                 </widget>
                </item>
@@ -162,9 +188,28 @@
                 </widget>
                </item>
               </layout>
+             </widget>
             </item>
             <item>
              <widget class="QWebView" name="webView">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>200</height>
+               </size>
+              </property>
+              <property name="baseSize">
+               <size>
+                <width>0</width>
+                <height>200</height>
+               </size>
+              </property>
               <property name="url">
                <url>
                 <string>qrc:/docs/index.html</string>
@@ -173,8 +218,6 @@
              </widget>
             </item>
            </layout>
-            </item>
-           </layout>
           </widget>
           <widget class="QFrame" name="frame_2">
            <property name="sizePolicy">
@@ -268,17 +311,144 @@
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout_6">
+           <widget class="QToolButton" name="overviewButton">
-            <property name="spacing">
+            <property name="geometry">
-             <number>0</number>
+             <rect>
+              <x>2</x>
+              <y>194</y>
+              <width>92</width>
+              <height>90</height>
+             </rect>
             </property>
-            <property name="margin">
+            <property name="sizePolicy">
-             <number>0</number>
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <item>
+            <property name="maximumSize">
-             <layout class="QVBoxLayout" name="verticalLayout_5">
+             <size>
-              <item>
+              <width>16777215</width>
+              <height>90</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Overview</string>
+            </property>
+            <property name="icon">
+             <iconset resource="Resources.qrc">
+              <normaloff>:/icons/overview.png</normaloff>:/icons/overview.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextUnderIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+           <widget class="QToolButton" name="dailyButton">
+            <property name="geometry">
+             <rect>
+              <x>2</x>
+              <y>98</y>
+              <width>92</width>
+              <height>90</height>
+             </rect>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>90</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Daily</string>
+            </property>
+            <property name="icon">
+             <iconset resource="Resources.qrc">
+              <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextUnderIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+           <widget class="QToolButton" name="preferencesButton">
+            <property name="geometry">
+             <rect>
+              <x>2</x>
+              <y>290</y>
+              <width>92</width>
+              <height>90</height>
+             </rect>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>90</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Preferences</string>
+            </property>
+            <property name="icon">
+             <iconset resource="Resources.qrc">
+              <normaloff>:/icons/preferences.png</normaloff>:/icons/preferences.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextUnderIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
            <widget class="QToolButton" name="importButton">
+            <property name="geometry">
+             <rect>
+              <x>2</x>
+              <y>2</y>
+              <width>92</width>
+              <height>90</height>
+             </rect>
+            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
               <horstretch>0</horstretch>
@@ -302,7 +472,7 @@
             </property>
             <property name="icon">
              <iconset resource="Resources.qrc">
-                  <normaloff>:/Icons/gnome-dev-media-sdmmc.svg</normaloff>:/Icons/gnome-dev-media-sdmmc.svg</iconset>
+              <normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -323,134 +493,6 @@
              <enum>Qt::NoArrow</enum>
             </property>
            </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="dailyButton">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>90</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>90</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Daily</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="Resources.qrc">
-                  <normaloff>:/Icons/edit-find.svg</normaloff>:/Icons/edit-find.svg</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>64</width>
-                  <height>64</height>
-                 </size>
-                </property>
-                <property name="toolButtonStyle">
-                 <enum>Qt::ToolButtonTextUnderIcon</enum>
-                </property>
-                <property name="autoRaise">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="overviewButton">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>90</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Overview</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="Resources.qrc">
-                  <normaloff>:/Icons/applications-viewers.svg</normaloff>:/Icons/applications-viewers.svg</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>64</width>
-                  <height>64</height>
-                 </size>
-                </property>
-                <property name="toolButtonStyle">
-                 <enum>Qt::ToolButtonTextUnderIcon</enum>
-                </property>
-                <property name="autoRaise">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="preferencesButton">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>90</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Preferences</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="Resources.qrc">
-                  <normaloff>:/Icons/preferences.svg</normaloff>:/Icons/preferences.svg</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>64</width>
-                  <height>64</height>
-                 </size>
-                </property>
-                <property name="toolButtonStyle">
-                 <enum>Qt::ToolButtonTextUnderIcon</enum>
-                </property>
-                <property name="autoRaise">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="verticalSpacer">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
-           </layout>
           </widget>
          </widget>
         </item>
@@ -465,7 +507,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1029</width>
+     <width>1094</width>
      <height>25</height>
     </rect>
    </property>