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

Moved debug underneath main tab widget

Browse Source
This commit is contained in:
Mark Watkins 2011-07-18 02:05:16 +10:00
parent 766f09e0e8
commit 189acc3c53
3 changed files with 480 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mainwindow.cpp
View File

@ -271,12 +271,9 @@ void MainWindow::on_action_Noon_Date_Split_toggled(bool checked)
void MainWindow::on_actionDebug_toggled(bool checked) void MainWindow::on_actionDebug_toggled(bool checked)
{ {
pref["ShowDebug"]=checked; pref["ShowDebug"]=checked;
int idx=ui->tabWidget->indexOf(ui->debugTab);
if (checked) { if (checked) {
//ui->debugTab->show(); ui->logText->show();
//ui->tabWidget->setTabEnabled(idx,true);
} else { } else {
//ui->debugTab->hide(); ui->logText->hide();
// ui->tabWidget->setTabEnabled(idx,false);
} }
} }

965
mainwindow.ui
View File

@ -48,517 +48,504 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QSplitter" name="logSplitter">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <enum>Qt::Vertical</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="maximumSize"> <widget class="QTabWidget" name="tabWidget">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="tabPosition">
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<property name="documentMode">
<bool>false</bool>
</property>
<property name="tabsClosable">
<bool>false</bool>
</property>
<property name="movable">
<bool>false</bool>
</property>
<widget class="QWidget" name="welcome">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<attribute name="title"> <property name="maximumSize">
<string>&amp;Welcome</string> <size>
</attribute> <width>16777215</width>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <height>16777215</height>
<property name="spacing"> </size>
<number>0</number> </property>
<property name="tabPosition">
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<property name="documentMode">
<bool>false</bool>
</property>
<property name="tabsClosable">
<bool>false</bool>
</property>
<property name="movable">
<bool>false</bool>
</property>
<widget class="QWidget" name="welcome">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="margin"> <attribute name="title">
<number>0</number> <string>&amp;Welcome</string>
</property> </attribute>
<item> <layout class="QHBoxLayout" name="horizontalLayout_2">
<widget class="QSplitter" name="splitter"> <property name="spacing">
<property name="sizePolicy"> <number>0</number>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> </property>
<horstretch>0</horstretch> <property name="margin">
<verstretch>0</verstretch> <number>0</number>
</sizepolicy> </property>
</property> <item>
<property name="orientation"> <widget class="QSplitter" name="splitter">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<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::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</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">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/back.png</normaloff>:/icons/back.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="forwardButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="homeButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="urlBar">
<property name="editable">
<bool>true</bool>
</property>
</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>
</url>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QFrame" name="frame_2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="orientation">
<size> <enum>Qt::Horizontal</enum>
<width>115</width>
<height>0</height>
</size>
</property> </property>
<property name="maximumSize"> <widget class="QWidget" name="layoutWidget">
<size> <layout class="QVBoxLayout" name="verticalLayout">
<width>115</width> <property name="spacing">
<height>16777215</height> <number>0</number>
</size> </property>
</property> <item>
<property name="palette"> <widget class="QFrame" name="frame">
<palette> <property name="sizePolicy">
<active> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<colorrole role="Base"> <horstretch>0</horstretch>
<brush brushstyle="SolidPattern"> <verstretch>0</verstretch>
<color alpha="255"> </sizepolicy>
<red>255</red> </property>
<green>255</green> <property name="minimumSize">
<blue>255</blue> <size>
</color> <width>0</width>
</brush> <height>40</height>
</colorrole> </size>
<colorrole role="Window"> </property>
<brush brushstyle="SolidPattern"> <property name="maximumSize">
<color alpha="255"> <size>
<red>225</red> <width>16777215</width>
<green>233</green> <height>40</height>
<blue>255</blue> </size>
</color> </property>
</brush> <property name="frameShape">
</colorrole> <enum>QFrame::NoFrame</enum>
</active> </property>
<inactive> <property name="frameShadow">
<colorrole role="Base"> <enum>QFrame::Plain</enum>
<brush brushstyle="SolidPattern"> </property>
<color alpha="255"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<red>255</red> <property name="spacing">
<green>255</green> <number>0</number>
<blue>255</blue> </property>
</color> <property name="leftMargin">
</brush> <number>6</number>
</colorrole> </property>
<colorrole role="Window"> <property name="topMargin">
<brush brushstyle="SolidPattern"> <number>0</number>
<color alpha="255"> </property>
<red>225</red> <property name="rightMargin">
<green>233</green> <number>6</number>
<blue>255</blue> </property>
</color> <property name="bottomMargin">
</brush> <number>0</number>
</colorrole> </property>
</inactive> <item>
<disabled> <widget class="QToolButton" name="backButton">
<colorrole role="Base"> <property name="text">
<brush brushstyle="SolidPattern"> <string>...</string>
<color alpha="255"> </property>
<red>225</red> <property name="icon">
<green>233</green> <iconset resource="Resources.qrc">
<blue>255</blue> <normaloff>:/icons/back.png</normaloff>:/icons/back.png</iconset>
</color> </property>
</brush> <property name="iconSize">
</colorrole> <size>
<colorrole role="Window"> <width>24</width>
<brush brushstyle="SolidPattern"> <height>24</height>
<color alpha="255"> </size>
<red>225</red> </property>
<green>233</green> <property name="autoRaise">
<blue>255</blue> <bool>true</bool>
</color> </property>
</brush> </widget>
</colorrole> </item>
</disabled> <item>
</palette> <widget class="QToolButton" name="forwardButton">
</property> <property name="text">
<property name="autoFillBackground"> <string>...</string>
<bool>true</bool> </property>
</property> <property name="icon">
<property name="frameShape"> <iconset resource="Resources.qrc">
<enum>QFrame::StyledPanel</enum> <normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
</property> </property>
<property name="frameShadow"> <property name="iconSize">
<enum>QFrame::Raised</enum> <size>
</property> <width>24</width>
<layout class="QVBoxLayout" name="verticalLayout_2"> <height>24</height>
<property name="spacing"> </size>
<number>0</number> </property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="homeButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="urlBar">
<property name="editable">
<bool>true</bool>
</property>
</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>
</url>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QFrame" name="frame_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="leftMargin"> <property name="minimumSize">
<number>0</number> <size>
<width>115</width>
<height>0</height>
</size>
</property> </property>
<property name="topMargin"> <property name="maximumSize">
<number>0</number> <size>
<width>115</width>
<height>16777215</height>
</size>
</property> </property>
<property name="rightMargin"> <property name="palette">
<number>0</number> <palette>
<active>
<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>225</red>
<green>233</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<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>225</red>
<green>233</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>225</red>
<green>233</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>225</red>
<green>233</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property> </property>
<property name="bottomMargin"> <property name="autoFillBackground">
<number>4</number> <bool>true</bool>
</property> </property>
<item> <property name="frameShape">
<widget class="QToolButton" name="importButton"> <enum>QFrame::StyledPanel</enum>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <property name="frameShadow">
<horstretch>0</horstretch> <enum>QFrame::Raised</enum>
<verstretch>0</verstretch> </property>
</sizepolicy> <layout class="QVBoxLayout" name="verticalLayout_2">
</property> <property name="spacing">
<property name="minimumSize"> <number>0</number>
<size> </property>
<width>0</width> <property name="leftMargin">
<height>0</height> <number>0</number>
</size> </property>
</property> <property name="topMargin">
<property name="maximumSize"> <number>0</number>
<size> </property>
<width>16777215</width> <property name="rightMargin">
<height>90</height> <number>0</number>
</size> </property>
</property> <property name="bottomMargin">
<property name="text"> <number>4</number>
<string>Import</string> </property>
</property> <item>
<property name="icon"> <widget class="QToolButton" name="importButton">
<iconset resource="Resources.qrc"> <property name="sizePolicy">
<normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
</property> <horstretch>0</horstretch>
<property name="iconSize"> <verstretch>0</verstretch>
<size> </sizepolicy>
<width>64</width> </property>
<height>64</height> <property name="minimumSize">
</size> <size>
</property> <width>0</width>
<property name="checkable"> <height>0</height>
<bool>false</bool> </size>
</property> </property>
<property name="toolButtonStyle"> <property name="maximumSize">
<enum>Qt::ToolButtonTextUnderIcon</enum> <size>
</property> <width>16777215</width>
<property name="autoRaise"> <height>90</height>
<bool>true</bool> </size>
</property> </property>
<property name="arrowType"> <property name="text">
<enum>Qt::NoArrow</enum> <string>Import</string>
</property> </property>
</widget> <property name="icon">
</item> <iconset resource="Resources.qrc">
<item> <normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset>
<widget class="QToolButton" name="dailyButton"> </property>
<property name="sizePolicy"> <property name="iconSize">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <size>
<horstretch>0</horstretch> <width>64</width>
<verstretch>0</verstretch> <height>64</height>
</sizepolicy> </size>
</property> </property>
<property name="minimumSize"> <property name="checkable">
<size> <bool>false</bool>
<width>0</width> </property>
<height>0</height> <property name="toolButtonStyle">
</size> <enum>Qt::ToolButtonTextUnderIcon</enum>
</property> </property>
<property name="maximumSize"> <property name="autoRaise">
<size> <bool>true</bool>
<width>16777215</width> </property>
<height>90</height> <property name="arrowType">
</size> <enum>Qt::NoArrow</enum>
</property> </property>
<property name="text"> </widget>
<string>Daily</string> </item>
</property> <item>
<property name="icon"> <widget class="QToolButton" name="dailyButton">
<iconset resource="Resources.qrc"> <property name="sizePolicy">
<normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
</property> <horstretch>0</horstretch>
<property name="iconSize"> <verstretch>0</verstretch>
<size> </sizepolicy>
<width>64</width> </property>
<height>64</height> <property name="minimumSize">
</size> <size>
</property> <width>0</width>
<property name="toolButtonStyle"> <height>0</height>
<enum>Qt::ToolButtonTextUnderIcon</enum> </size>
</property> </property>
<property name="autoRaise"> <property name="maximumSize">
<bool>true</bool> <size>
</property> <width>16777215</width>
</widget> <height>90</height>
</item> </size>
<item> </property>
<widget class="QToolButton" name="overviewButton"> <property name="text">
<property name="sizePolicy"> <string>Daily</string>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> </property>
<horstretch>0</horstretch> <property name="icon">
<verstretch>0</verstretch> <iconset resource="Resources.qrc">
</sizepolicy> <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
</property> </property>
<property name="maximumSize"> <property name="iconSize">
<size> <size>
<width>16777215</width> <width>64</width>
<height>90</height> <height>64</height>
</size> </size>
</property> </property>
<property name="text"> <property name="toolButtonStyle">
<string>Overview</string> <enum>Qt::ToolButtonTextUnderIcon</enum>
</property> </property>
<property name="icon"> <property name="autoRaise">
<iconset resource="Resources.qrc"> <bool>true</bool>
<normaloff>:/icons/overview.png</normaloff>:/icons/overview.png</iconset> </property>
</property> </widget>
<property name="iconSize"> </item>
<size> <item>
<width>64</width> <widget class="QToolButton" name="overviewButton">
<height>64</height> <property name="sizePolicy">
</size> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
</property> <horstretch>0</horstretch>
<property name="toolButtonStyle"> <verstretch>0</verstretch>
<enum>Qt::ToolButtonTextUnderIcon</enum> </sizepolicy>
</property> </property>
<property name="autoRaise"> <property name="maximumSize">
<bool>true</bool> <size>
</property> <width>16777215</width>
</widget> <height>90</height>
</item> </size>
<item> </property>
<widget class="QToolButton" name="preferencesButton"> <property name="text">
<property name="sizePolicy"> <string>Overview</string>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> </property>
<horstretch>0</horstretch> <property name="icon">
<verstretch>0</verstretch> <iconset resource="Resources.qrc">
</sizepolicy> <normaloff>:/icons/overview.png</normaloff>:/icons/overview.png</iconset>
</property> </property>
<property name="maximumSize"> <property name="iconSize">
<size> <size>
<width>16777215</width> <width>64</width>
<height>90</height> <height>64</height>
</size> </size>
</property> </property>
<property name="text"> <property name="toolButtonStyle">
<string>Preferences</string> <enum>Qt::ToolButtonTextUnderIcon</enum>
</property> </property>
<property name="icon"> <property name="autoRaise">
<iconset resource="Resources.qrc"> <bool>true</bool>
<normaloff>:/icons/preferences.png</normaloff>:/icons/preferences.png</iconset> </property>
</property> </widget>
<property name="iconSize"> </item>
<size> <item>
<width>64</width> <widget class="QToolButton" name="preferencesButton">
<height>64</height> <property name="sizePolicy">
</size> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
</property> <horstretch>0</horstretch>
<property name="toolButtonStyle"> <verstretch>0</verstretch>
<enum>Qt::ToolButtonTextUnderIcon</enum> </sizepolicy>
</property> </property>
<property name="autoRaise"> <property name="maximumSize">
<bool>true</bool> <size>
</property> <width>16777215</width>
</widget> <height>90</height>
</item> </size>
<item> </property>
<spacer name="verticalSpacer"> <property name="text">
<property name="orientation"> <string>Preferences</string>
<enum>Qt::Vertical</enum> </property>
</property> <property name="icon">
<property name="sizeHint" stdset="0"> <iconset resource="Resources.qrc">
<size> <normaloff>:/icons/preferences.png</normaloff>:/icons/preferences.png</iconset>
<width>20</width> </property>
<height>40</height> <property name="iconSize">
</size> <size>
</property> <width>64</width>
</spacer> <height>64</height>
</item> </size>
</layout> </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>
</widget>
</widget> </widget>
</widget> </item>
</item> </layout>
</layout> </widget>
</widget> </widget>
<widget class="QWidget" name="debugTab"> <widget class="QPlainTextEdit" name="logText">
<attribute name="title"> <property name="readOnly">
<string>Debug</string> <bool>true</bool>
</attribute> </property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QPlainTextEdit" name="logText">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>

4
oximetry.cpp
View File

@ -340,11 +340,11 @@ void Oximetry::onReadyRead()
} else { } else {
//qDebug() << "Got " << bytes.size() << " bytes"; //qDebug() << "Got " << bytes.size() << " bytes";
}*/ }*/
QString aa=QString::number(bytes.size(),16)+"bytes: "; /*QString aa=QString::number(bytes.size(),16)+"bytes: ";
for (int i=0;i<bytes.size();i++) { for (int i=0;i<bytes.size();i++) {
aa+=" "+QString::number((unsigned char)bytes[i],16); aa+=" "+QString::number((unsigned char)bytes[i],16);
} }
qDebug() << aa; qDebug() << aa; */
lastsize=bytes.size(); lastsize=bytes.size();
} }