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

Daily Tab Calendar hide button and navigation enhancement

Browse Source
This commit is contained in:
Mark Watkins 2011-10-30 12:46:17 +10:00
parent 49ae2f0b83
commit 799cc0a224
3 changed files with 317 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daily.cpp
View File

@ -355,6 +355,7 @@ void Daily::on_calendar_selectionChanged()
Unload(previous_date); Unload(previous_date);
Load(ui->calendar->selectedDate()); Load(ui->calendar->selectedDate());
ui->calButton->setText(ui->calendar->selectedDate().toString("ddd, dd MMM yyyy"));
} }
void Daily::ResetGraphLayout() void Daily::ResetGraphLayout()
{ {
@ -849,3 +850,21 @@ void Daily::on_JournalNotesUnderline_clicked()
cursor.mergeCharFormat(format); cursor.mergeCharFormat(format);
//ui->JournalNotes->mergeCurrentCharFormat(format); //ui->JournalNotes->mergeCurrentCharFormat(format);
} }
void Daily::on_prevDayButton_clicked()
{
LoadDate(previous_date.addDays(-1));
}
void Daily::on_nextDayButton_clicked()
{
LoadDate(previous_date.addDays(1));
}
void Daily::on_calButton_toggled(bool checked)
{
ui->calendar->setVisible(checked);
if (!checked)
ui->calButton->setArrowType(Qt::DownArrow);
else ui->calButton->setArrowType(Qt::UpArrow);
}

7
daily.h
View File

@ -42,7 +42,6 @@ public:
gGraphView *SharedWidget() { return GraphView; } gGraphView *SharedWidget() { return GraphView; }
void RedrawGraphs(); void RedrawGraphs();
void LoadDate(QDate date); void LoadDate(QDate date);
private slots: private slots:
void on_calendar_currentPageChanged(int year, int month); void on_calendar_currentPageChanged(int year, int month);
@ -57,6 +56,12 @@ private slots:
void on_JournalNotesUnderline_clicked(); void on_JournalNotesUnderline_clicked();
void ShowHideGraphs(); void ShowHideGraphs();
void on_prevDayButton_clicked();
void on_nextDayButton_clicked();
void on_calButton_toggled(bool checked);
protected: protected:
private: private:

553
daily.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>840</width> <width>331</width>
<height>622</height> <height>530</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -20,33 +20,64 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QSplitter" name="splitter_2"> <widget class="QSplitter" name="splitter_2">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<widget class="QWidget" name="">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QToolButton" name="prevDayButton">
<property name="text">
<string>&lt; Prev</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="calButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>...</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
<property name="arrowType">
<enum>Qt::UpArrow</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="nextDayButton">
<property name="text">
<string>Next &gt;</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QCalendarWidget" name="calendar"> <widget class="QCalendarWidget" name="calendar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -99,7 +130,7 @@
<attribute name="title"> <attribute name="title">
<string>Details</string> <string>Details</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@ -109,7 +140,7 @@
<item> <item>
<widget class="QWebView" name="webView"> <widget class="QWebView" name="webView">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -130,10 +161,7 @@
<attribute name="title"> <attribute name="title">
<string>Events</string> <string>Events</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
@ -167,7 +195,7 @@
<attribute name="title"> <attribute name="title">
<string>Notes</string> <string>Notes</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@ -175,274 +203,277 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing"> <property name="spacing">
<number>2</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_8"> <widget class="QLabel" name="label_5">
<property name="spacing"> <property name="sizePolicy">
<number>0</number> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Journal</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="JournalNotesFontsize">
<property name="maximumSize">
<size>
<width>85</width>
<height>16777215</height>
</size>
</property>
<property name="maxVisibleItems">
<number>3</number>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <property name="text">
<property name="spacing"> <string>Small</string>
<number>0</number> </property>
</property>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Journal</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="JournalNotesFontsize">
<property name="maximumSize">
<size>
<width>85</width>
<height>16777215</height>
</size>
</property>
<property name="maxVisibleItems">
<number>3</number>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string>Small</string>
</property>
</item>
<item>
<property name="text">
<string>Medium</string>
</property>
</item>
<item>
<property name="text">
<string>Big</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesColour">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesItalic">
<property name="text">
<string> i </string>
</property>
<property name="shortcut">
<string>Ctrl+I</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesUnderline">
<property name="text">
<string>u</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesBold">
<property name="text">
<string>B</string>
</property>
<property name="shortcut">
<string>Ctrl+B</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="JournalNotes"/> <property name="text">
<string>Medium</string>
</property>
</item> </item>
</layout> <item>
<property name="text">
<string>Big</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesColour">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesItalic">
<property name="text">
<string> i </string>
</property>
<property name="shortcut">
<string>Ctrl+I</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesUnderline">
<property name="text">
<string>u</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="JournalNotesBold">
<property name="text">
<string>B</string>
</property>
<property name="shortcut">
<string>Ctrl+B</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QTextEdit" name="JournalNotes">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="extras"> <widget class="QWidget" name="extras">
<attribute name="title"> <attribute name="title">
<string>Extras</string> <string>Extras</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_11"> <widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="text">
<string>This tab is fake.. What to put here?</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item> <item>
<widget class="QLabel" name="label_6"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="text">
<string>This tab is fake.. What to put here?</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <widget class="QLabel" name="label">
<item> <property name="sizePolicy">
<widget class="QLabel" name="label"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<property name="text"> <horstretch>0</horstretch>
<string>Energy Level</string> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> <property name="text">
<item> <string>Energy Level</string>
<widget class="QSlider" name="EnergySlider"> </property>
<property name="orientation"> </widget>
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_5"> <widget class="QSlider" name="EnergySlider">
<item> <property name="orientation">
<widget class="QLabel" name="label_2"> <enum>Qt::Horizontal</enum>
<property name="text"> </property>
<string>Mood</string> <property name="tickPosition">
</property> <enum>QSlider::TicksAbove</enum>
</widget> </property>
</item> </widget>
<item>
<widget class="QSlider" name="MoodSlider">
<property name="value">
<number>99</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>2</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QLabel" name="label_2">
<item> <property name="sizePolicy">
<layout class="QVBoxLayout" name="verticalLayout_6"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<property name="sizeConstraint"> <horstretch>0</horstretch>
<enum>QLayout::SetMinimumSize</enum> <verstretch>0</verstretch>
</property> </sizepolicy>
<item> </property>
<widget class="QLabel" name="label_3"> <property name="text">
<property name="text"> <string>Mood</string>
<string>Weight</string> </property>
</property> </widget>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="WeightBox">
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>999.990000000000009</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QSlider" name="MoodSlider">
<item> <property name="value">
<layout class="QVBoxLayout" name="verticalLayout_7"> <number>99</number>
<property name="sizeConstraint"> </property>
<enum>QLayout::SetMinimumSize</enum> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="QLabel" name="label_4"> <property name="tickPosition">
<property name="text"> <enum>QSlider::TicksAbove</enum>
<string>Glucose</string> </property>
</property> </widget>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="GlucoseBox"/>
</item>
</layout>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QTableWidget" name="tableWidget">
<property name="editTriggers">
<set>QAbstractItemView::AllEditTriggers</set>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="rowCount">
<number>1</number>
</property>
<row/>
<column>
<property name="text">
<string>Medication</string>
</property>
</column>
<column>
<property name="text">
<string>Time</string>
</property>
</column>
<column>
<property name="text">
<string>Dose</string>
</property>
</column>
</widget>
</item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>2</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Weight</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="WeightBox">
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>999.990000000000009</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Glucose</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="GlucoseBox"/>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>68</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>