From be6c04e61982ea2372ca05e6a4ddf51f636ee520 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 17 May 2014 21:33:33 +1000 Subject: [PATCH] GUI appearance tweaks --- sleepyhead/Graphs/gGraphView.cpp | 6 + sleepyhead/daily.cpp | 20 +- sleepyhead/daily.ui | 566 +++++++++++++++++++-- sleepyhead/mainwindow.ui | 843 ++++++++++++++++++++++++++++++- sleepyhead/overview.cpp | 15 +- sleepyhead/oximetry.cpp | 14 +- 6 files changed, 1392 insertions(+), 72 deletions(-) diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 013bdca0..4712ba2f 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -1041,8 +1041,14 @@ void gGraphView::paintGL() AddTextQue(ss, width(), w / 2, 90, QColor(Qt::black), defaultfont); DrawTextQue(painter); } +// painter.setPen(Qt::lightGray); +// painter.drawLine(0, 0, 0, height()); +// painter.drawLine(0, 0, width(), 0); +// painter.setPen(Qt::darkGray); + //painter.drawLine(width(), 0, width(), height()); #endif + painter.end(); #ifndef BROKEN_OPENGL_BUILD diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 2ebc4818..3214c677 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -91,6 +91,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared) // sessbar->setMinimumHeight(sessbar->height()); // } + + ui->calNavWidget->setMaximumHeight(ui->calNavWidget->height()); + ui->calNavWidget->setMinimumHeight(ui->calNavWidget->height()); sessbar=nullptr; webView=new MyWebView(this); @@ -99,12 +102,12 @@ Daily::Daily(QWidget *parent,gGraphView * shared) ui->tabWidget->insertTab(0,webView,QIcon(),"Details"); - ui->graphMainArea->setLayout(layout); + ui->graphFrame->setLayout(layout); //ui->graphMainArea->setLayout(layout); ui->graphMainArea->setAutoFillBackground(false); - GraphView=new gGraphView(ui->graphMainArea,shared); + GraphView=new gGraphView(ui->graphFrame,shared); GraphView->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); snapGV=new gGraphView(GraphView); //ui->graphMainArea); @@ -112,7 +115,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) snapGV->hideSplitter(); snapGV->hide(); - scrollbar=new MyScrollBar(ui->graphMainArea); + scrollbar=new MyScrollBar(ui->graphFrame); scrollbar->setOrientation(Qt::Vertical); scrollbar->setSizePolicy(QSizePolicy::Maximum,QSizePolicy::Expanding); scrollbar->setMaximumWidth(20); @@ -1876,11 +1879,14 @@ void Daily::on_nextDayButton_clicked() void Daily::on_calButton_toggled(bool checked) { - //bool b=!ui->calendar->isVisible(); bool b=checked; - ui->calendar->setVisible(b); - if (!b) ui->calButton->setArrowType(Qt::DownArrow); - else ui->calButton->setArrowType(Qt::UpArrow); + ui->calendarFrame->setVisible(b); + + if (!b) { + ui->calButton->setArrowType(Qt::DownArrow); + } else { + ui->calButton->setArrowType(Qt::UpArrow); + } } diff --git a/sleepyhead/daily.ui b/sleepyhead/daily.ui index 40d33a82..5e777179 100644 --- a/sleepyhead/daily.ui +++ b/sleepyhead/daily.ui @@ -16,10 +16,425 @@ 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + Form - + 0 @@ -51,27 +466,21 @@ 0 - - - 16777215 - 27 - - - + - 0 + 1 0 - 0 + 4 0 - 0 + 4 @@ -138,18 +547,6 @@ QToolButton:pressed { 0 - - - 0 - 25 - - - - - 16777215 - 25 - - Show or hide the calender @@ -306,27 +703,57 @@ QToolButton:pressed { - + - + 0 0 - - - 0 - 200 - + + QFrame::StyledPanel - - - 0 - 0 - + + QFrame::Raised - - #qt_calendar_nextmonth { + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 200 + + + + + 0 + 0 + + + + #qt_calendar_nextmonth { background: transparent; border-radius: 8px; } @@ -383,24 +810,26 @@ QToolButton:pressed { border: 2px solid #456789; background: #89abcd; } - - - - Qt::Monday - - - false - - - QCalendarWidget::ShortDayNames - - - QCalendarWidget::NoVerticalHeader - - - true - + + + Qt::Monday + + + false + + + QCalendarWidget::ShortDayNames + + + QCalendarWidget::NoVerticalHeader + + + true + + + + @@ -410,7 +839,7 @@ QToolButton:pressed { - 1 + 0 true @@ -965,6 +1394,33 @@ QSlider::handle:horizontal { 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index 033791e6..e677988d 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -22,6 +22,421 @@ 16777215 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + SleepyHead @@ -80,14 +495,432 @@ 16777215 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 170 + 170 + 170 + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 127 + 127 + 127 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + true QTabWidget::North + + QTabWidget::Triangular + - 0 + 1 false @@ -988,8 +1821,8 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 - 180 - 596 + 100 + 30 @@ -2136,8 +2969,8 @@ border-radius: 10px; 0 0 - 180 - 596 + 100 + 30 diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index 3707b52b..36374425 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -69,13 +69,22 @@ Overview::Overview(QWidget *parent, gGraphView *shared) : connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), SLOT(dateEnd_currentPageChanged(int, int))); + QVBoxLayout *framelayout = new QVBoxLayout(ui->graphArea); + ui->graphArea->setLayout(framelayout); + + QFrame *border = new QFrame(ui->graphArea); + + framelayout->setMargin(1); + border->setFrameShape(QFrame::StyledPanel); + framelayout->addWidget(border,1); + // Create the horizontal layout to hold the GraphView object and it's scrollbar - layout = new QHBoxLayout(ui->graphArea); + layout = new QHBoxLayout(border); layout->setSpacing(0); // remove the ugly margins/spacing layout->setMargin(0); layout->setContentsMargins(0, 0, 0, 0); - ui->graphArea->setLayout(layout); - ui->graphArea->setAutoFillBackground(false); + border->setLayout(layout); + border->setAutoFillBackground(false); // Create the GraphView Object GraphView = new gGraphView(ui->graphArea, m_shared); diff --git a/sleepyhead/oximetry.cpp b/sleepyhead/oximetry.cpp index 43af922d..e6717806 100644 --- a/sleepyhead/oximetry.cpp +++ b/sleepyhead/oximetry.cpp @@ -1155,12 +1155,22 @@ Oximetry::Oximetry(QWidget *parent, gGraphView *shared) : day = new Day(oximeter->getMachine()); + QVBoxLayout *framelayout = new QVBoxLayout(ui->graphArea); + ui->graphArea->setLayout(framelayout); + + QFrame *border = new QFrame(ui->graphArea); + + framelayout->setMargin(1); + border->setFrameShape(QFrame::StyledPanel); + framelayout->addWidget(border,1); + + layout = new QHBoxLayout(ui->graphArea); layout->setSpacing(0); layout->setMargin(0); layout->setContentsMargins(0, 0, 0, 0); - ui->graphArea->setLayout(layout); - ui->graphArea->setAutoFillBackground(false); + border->setLayout(layout); + border->setAutoFillBackground(false); GraphView = new gGraphView(ui->graphArea, m_shared); GraphView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);