From 799cc0a224e1be6e461b5d9bc5c240bb10659031 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 30 Oct 2011 12:46:17 +1000 Subject: [PATCH] Daily Tab Calendar hide button and navigation enhancement --- daily.cpp | 19 ++ daily.h | 7 +- daily.ui | 553 ++++++++++++++++++++++++++++-------------------------- 3 files changed, 317 insertions(+), 262 deletions(-) diff --git a/daily.cpp b/daily.cpp index 9c84d80d..1d11d4ea 100644 --- a/daily.cpp +++ b/daily.cpp @@ -355,6 +355,7 @@ void Daily::on_calendar_selectionChanged() Unload(previous_date); Load(ui->calendar->selectedDate()); + ui->calButton->setText(ui->calendar->selectedDate().toString("ddd, dd MMM yyyy")); } void Daily::ResetGraphLayout() { @@ -849,3 +850,21 @@ void Daily::on_JournalNotesUnderline_clicked() cursor.mergeCharFormat(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); +} diff --git a/daily.h b/daily.h index 1f4d83f3..17ebb9e9 100644 --- a/daily.h +++ b/daily.h @@ -42,7 +42,6 @@ public: gGraphView *SharedWidget() { return GraphView; } void RedrawGraphs(); void LoadDate(QDate date); - private slots: void on_calendar_currentPageChanged(int year, int month); @@ -57,6 +56,12 @@ private slots: void on_JournalNotesUnderline_clicked(); void ShowHideGraphs(); + void on_prevDayButton_clicked(); + + void on_nextDayButton_clicked(); + + void on_calButton_toggled(bool checked); + protected: private: diff --git a/daily.ui b/daily.ui index 4989c3c5..d0379d72 100644 --- a/daily.ui +++ b/daily.ui @@ -6,8 +6,8 @@ 0 0 - 840 - 622 + 331 + 530 @@ -20,33 +20,64 @@ Form - - 0 - - - 0 - - - - 0 - 0 - - Qt::Horizontal - - - 16777215 - 16777215 - - Qt::Vertical + + + + + + < Prev + + + + + + + + 0 + 0 + + + + Qt::LeftToRight + + + ... + + + true + + + true + + + Qt::ToolButtonTextBesideIcon + + + true + + + Qt::UpArrow + + + + + + + Next > + + + + + @@ -99,7 +130,7 @@ Details - + 0 @@ -109,7 +140,7 @@ - + 0 0 @@ -130,10 +161,7 @@ Events - - - 0 - + 0 @@ -167,7 +195,7 @@ Notes - + 0 @@ -175,274 +203,277 @@ 0 - + - 2 + 0 - - - 0 + + + + 0 + 0 + + + + Journal + + + + + + + + 85 + 16777215 + + + + 3 + + + QComboBox::AdjustToContents - - - 0 - - - - - Journal - - - - - - - - 85 - 16777215 - - - - 3 - - - QComboBox::AdjustToContents - - - - Small - - - - - Medium - - - - - Big - - - - - - - - Color - - - - - - - i - - - Ctrl+I - - - - - - - u - - - - - - - B - - - Ctrl+B - - - - + + Small + - + + Medium + - + + + Big + + + + + + + + Color + + + + + + + i + + + Ctrl+I + + + + + + + u + + + + + + + B + + + Ctrl+B + + + + + + + 0 + 0 + + + + Extras - - - 0 - - - 0 - + - + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + This tab is fake.. What to put here? + + + false + + + Qt::AlignCenter + + + + + + + 2 + - - - QFrame::StyledPanel - - - QFrame::Sunken - - - This tab is fake.. What to put here? - - - false - - - Qt::AlignCenter - - - - - - - 2 - + - - - - - Energy Level - - - - - - - Qt::Horizontal - - - QSlider::TicksAbove - - - - + + + + 0 + 0 + + + + Energy Level + + - - - - - Mood - - - - - - - 99 - - - Qt::Horizontal - - - QSlider::TicksAbove - - - - + + + Qt::Horizontal + + + QSlider::TicksAbove + + - - - 2 - + - - - - - QLayout::SetMinimumSize - - - - - Weight - - - - - - - - - - 999.990000000000009 - - - - - - + + + + 0 + 0 + + + + Mood + + - - - - - QLayout::SetMinimumSize - - - - - Glucose - - - - - - - - - + + + 99 + + + Qt::Horizontal + + + QSlider::TicksAbove + + - - - - QAbstractItemView::AllEditTriggers - - - true - - - 1 - - - - - Medication - - - - - Time - - - - - Dose - - - - + + + + 2 + + + + + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + Weight + + + + + + + + + + 999.990000000000009 + + + + + + + + + + + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + Glucose + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 68 + + + +