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

Beginning of new (hideable) App-Wide Sidebar to replace Welcome screens navigator

Browse Source
This commit is contained in:
Mark Watkins 2011-12-25 21:27:10 +10:00
parent 6f3ea4d39a
commit 1146aa3692
6 changed files with 766 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources.qrc
View File

@ -34,5 +34,7 @@
<file>icons/sheep.png</file> <file>icons/sheep.png</file>
<file>icons/nodata.png</file> <file>icons/nodata.png</file>
<file>icons/cubeoximeter.png</file> <file>icons/cubeoximeter.png</file>
<file>icons/trophy.png</file>
<file>icons/bookmark.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
icons/bookmark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
icons/trophy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

11
mainwindow.cpp
View File

@ -1830,3 +1830,14 @@ void MainWindow::keyPressEvent(QKeyEvent * event)
{ {
qDebug() << "Keypress:" << event->key(); qDebug() << "Keypress:" << event->key();
} }
void MainWindow::on_summaryButton_2_clicked()
{
ui->tabWidget->setCurrentWidget(ui->welcome);
on_summaryButton_clicked();
}
void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible)
{
ui->toolBox->setVisible(visible);
}

4
mainwindow.h
View File

@ -244,6 +244,10 @@ private slots:
void on_summaryButton_2_clicked();
void on_action_Sidebar_Toggle_toggled(bool arg1);
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;

461
mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>668</width> <width>554</width>
<height>540</height> <height>443</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -44,13 +44,17 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>4</number>
</property> </property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSplitter" name="logSplitter"> <widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -93,27 +97,16 @@
</sizepolicy> </sizepolicy>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>&amp;Welcome</string> <string>&amp;Summary</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>3</number>
</property> </property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <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="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@ -265,29 +258,41 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<widget class="QFrame" name="frame_2"> </widget>
<property name="sizePolicy"> <widget class="QPlainTextEdit" name="logText">
<sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding"> <property name="readOnly">
<horstretch>0</horstretch> <bool>true</bool>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
</widget>
</widget>
<widget class="QToolBox" name="toolBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>115</width> <width>140</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>115</width> <width>140</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>129</red>
<green>142</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base"> <colorrole role="Base">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
@ -300,14 +305,23 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>225</red> <red>0</red>
<green>233</green> <green>31</green>
<blue>255</blue> <blue>237</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>129</red>
<green>142</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base"> <colorrole role="Base">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
@ -320,86 +334,187 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>225</red> <red>0</red>
<green>233</green> <green>31</green>
<blue>255</blue> <blue>237</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>129</red>
<green>142</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base"> <colorrole role="Base">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>225</red> <red>0</red>
<green>233</green> <green>31</green>
<blue>255</blue> <blue>237</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>225</red> <red>0</red>
<green>233</green> <green>31</green>
<blue>255</blue> <blue>237</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::Box</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<property name="lineWidth">
<number>1</number>
</property>
<property name="midLineWidth">
<number>1</number>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<property name="tabSpacing">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>123</width>
<height>513</height>
</rect>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>181</red>
<green>194</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>186</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>181</red>
<green>194</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>186</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>181</red>
<green>194</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>186</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>186</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<attribute name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/docs/sheep.png</normaloff>:/docs/sheep.png</iconset>
</attribute>
<attribute name="label">
<string>Navigation</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item> <item>
<widget class="QToolButton" name="importButton"> <widget class="QToolButton" name="summaryButton_2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </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"> <property name="text">
<string>Import</string> <string>Summary</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="Resources.qrc"> <iconset resource="Resources.qrc">
<normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset> <normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -407,18 +522,12 @@
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum> <enum>Qt::ToolButtonTextUnderIcon</enum>
</property> </property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -435,12 +544,6 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>90</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Daily</string> <string>Daily</string>
</property> </property>
@ -470,12 +573,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>90</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Overview</string> <string>Overview</string>
</property> </property>
@ -505,12 +602,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>90</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Oximetry</string> <string>Oximetry</string>
</property> </property>
@ -532,6 +623,47 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="importButton">
<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="text">
<string>Import</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@ -546,16 +678,129 @@
</spacer> </spacer>
</item> </item>
</layout> </layout>
<zorder>splitter</zorder>
<zorder>dailyButton</zorder>
<zorder>overviewButton</zorder>
<zorder>verticalSpacer</zorder>
<zorder>oximetryButton</zorder>
<zorder>summaryButton_2</zorder>
<zorder>importButton</zorder>
</widget> </widget>
<widget class="QWidget" name="page_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>138</width>
<height>319</height>
</rect>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<attribute name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/bookmark.png</normaloff>:/icons/bookmark.png</iconset>
</attribute>
<attribute name="label">
<string>Favourites</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QListWidget" name="listWidget">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>170</red>
<green>170</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>170</red>
<green>170</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>31</green>
<blue>237</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> <widget class="QWidget" name="page_3">
<widget class="QPlainTextEdit" name="logText"> <property name="mouseTracking">
<bool>true</bool>
</property>
<attribute name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/trophy.png</normaloff>:/icons/trophy.png</iconset>
</attribute>
<attribute name="label">
<string>Records</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="textEdit">
<property name="tabChangesFocus">
<bool>true</bool>
</property>
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="html">
<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:'Sans'; font-size:10pt; 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-weight:600;&quot;&gt;Highest AHI&lt;/span&gt;&lt;/p&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;a href=&quot;foo&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;somedate&lt;/span&gt;&lt;/a&gt;&lt;/p&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-weight:600;&quot;&gt;Lowest AHI&lt;/span&gt;&lt;/p&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;a href=&quot;foo&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;somedate&lt;/span&gt;&lt;/a&gt;&lt;/p&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-weight:600;&quot;&gt;Most PB/CSR&lt;/span&gt;&lt;/p&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;a href=&quot;foo&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;somedate&lt;/span&gt;&lt;/a&gt;&lt;/p&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;etc..&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -566,7 +811,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>668</width> <width>554</width>
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>
@ -605,6 +850,8 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_Link_Graph_Groups"/> <addaction name="action_Link_Graph_Groups"/>
<addaction name="action_Reset_Graph_Layout"/> <addaction name="action_Reset_Graph_Layout"/>
<addaction name="separator"/>
<addaction name="action_Sidebar_Toggle"/>
</widget> </widget>
<widget class="QMenu" name="menu_Help"> <widget class="QMenu" name="menu_Help">
<property name="title"> <property name="title">
@ -813,6 +1060,20 @@
<string>All data for current CPAP machine</string> <string>All data for current CPAP machine</string>
</property> </property>
</action> </action>
<action name="action_Sidebar_Toggle">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Right &amp;Sidebar</string>
</property>
<property name="shortcut">
<string>F8</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>