From d049c4f0fa84d8c2010899d41e79eceec2235142 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 27 May 2014 05:29:01 +1000 Subject: [PATCH] Appearance tweaks to Statistics page --- sleepyhead/SleepLib/profiles.cpp | 7 +- sleepyhead/newprofile.ui | 345 +++++++++++++++---------------- sleepyhead/profileselect.cpp | 4 +- sleepyhead/profileselect.ui | 23 ++- sleepyhead/statistics.cpp | 35 +++- 5 files changed, 219 insertions(+), 195 deletions(-) diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 82417dc7..fe6ab85d 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -512,11 +512,8 @@ void Done() PREF.Save(); LAYOUT.Save(); - Q_FOREACH(Profile * profile, profiles) { - // TODO: only save open profiles.. (maybe add an open bit?) - profile->Save(); - delete profile; - } + p_profile->Save(); + delete p_profile; profiles.clear(); delete p_pref; diff --git a/sleepyhead/newprofile.ui b/sleepyhead/newprofile.ui index 2f83de50..21f4d236 100644 --- a/sleepyhead/newprofile.ui +++ b/sleepyhead/newprofile.ui @@ -6,7 +6,7 @@ 0 0 - 607 + 614 395 @@ -40,7 +40,7 @@ - 0 + 3 @@ -91,19 +91,19 @@ - 0 + -1 - 4 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -114,17 +114,20 @@ false + + -1 + - 0 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -140,66 +143,64 @@ - - - - Qt::Horizontal + + + + + + + Keep the kids out.. Nothing more.. This isn't meant to be uber security. + + + Password Protect Profile + + + false + + + true + + + false + + + + 8 + + + 8 + + + 8 + + + 8 + + + + + Password - - - - Keep the kids out.. Nothing more.. This isn't meant to be uber security. + + + + QLineEdit::PasswordEchoOnEdit - - Password Protect Profile - - - false - - - true - - - false - - - - - - Password - - - - - - - QLineEdit::PasswordEchoOnEdit - - - - - - - ...twice... - - - - - - - QLineEdit::PasswordEchoOnEdit - - - - - - - - Qt::Horizontal + + + + ...twice... + + + + + + + QLineEdit::PasswordEchoOnEdit @@ -213,23 +214,65 @@ - 0 + 8 - 0 + 8 - 0 + 8 - 0 + 8 - - 0 - - - 4 + + -1 + + + + + 0 + 0 + + + + DST Zone + + + + + + + + 0 + 0 + + + + TimeZone + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + @@ -249,58 +292,6 @@ - - - - - 0 - 0 - - - - TimeZone - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - DST Zone - - - @@ -309,19 +300,19 @@ - 0 + -1 - 4 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -330,22 +321,22 @@ - 4 + -1 - 4 + -1 - 0 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -484,22 +475,22 @@ QFormLayout::AllNonFixedFieldsGrow - 4 + -1 - 4 + -1 - 0 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -559,19 +550,19 @@ - 0 + -1 - 4 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -583,22 +574,22 @@ QFormLayout::AllNonFixedFieldsGrow - 4 + -1 - 4 + -1 - 0 + 8 - 4 + 8 - 4 + 8 - 0 + 8 @@ -676,20 +667,13 @@ - + true - - - - Qt::Horizontal - - - @@ -698,19 +682,19 @@ - 0 + -1 - 4 + 8 - 4 + 8 - 4 + 8 - 4 + 8 @@ -722,22 +706,22 @@ QFormLayout::AllNonFixedFieldsGrow - 4 + -1 - 4 + -1 - 0 + 8 - 4 + 8 - 4 + 8 - 0 + 8 @@ -919,6 +903,21 @@ + + 16 + + + 8 + + + 8 + + + 8 + + + 8 + diff --git a/sleepyhead/profileselect.cpp b/sleepyhead/profileselect.cpp index de183eec..a1b2d5a3 100644 --- a/sleepyhead/profileselect.cpp +++ b/sleepyhead/profileselect.cpp @@ -73,7 +73,9 @@ ProfileSelect::ProfileSelect(QWidget *parent) : ui->listView->setModel(proxy); ui->listView->setSelectionBehavior(QAbstractItemView::SelectRows); ui->listView->setSelectionMode(QAbstractItemView::SingleSelection); - if (sel >= 0) { ui->listView->setCurrentIndex(model->item(sel)->index()); } + + + if (sel >= 0) { ui->listView->setCurrentIndex(proxy->index(sel,0)); } //model->item(sel)->index()); } m_tries = 0; diff --git a/sleepyhead/profileselect.ui b/sleepyhead/profileselect.ui index 4a0a2ca2..f3bf559a 100644 --- a/sleepyhead/profileselect.ui +++ b/sleepyhead/profileselect.ui @@ -6,8 +6,8 @@ 0 0 - 465 - 354 + 418 + 272 @@ -22,6 +22,20 @@ background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(220, 220, 220, 255)); } +QGroupBox { + background-color: white; + border: 1px solid gray; + border-radius: 5px; + margin-top: 3ex; /* leave space at the top for the title */ + } + + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; /* position at the top center */ + padding: 2px; + background-color: white; +} + QFrame { background: white; border: 1px solid gray; @@ -30,6 +44,7 @@ border-radius: 10px; QLabel { background: transparent; +border: 0px; } QPushButton { @@ -50,12 +65,10 @@ QPushButton:pressed { background: gray; } - - QLineEdit { border-radius: 5px; border: 1px solid gray; -background: #cccccc; +background: white; } diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index d36d6409..4bb4fc66 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -136,6 +136,19 @@ QString htmlHeader() "" "" "" "" "" - "
" + "
" // cellpadding=3 cellspacing=0 border=0 "" "
"+userinfo+"" "

" + STR_TR_SleepyHead + "


" @@ -154,7 +167,7 @@ QString htmlHeader() "
" "
" "
" - "
"); + "
"); } QString htmlFooter() { @@ -488,7 +501,7 @@ QString Statistics::GenerateHTML() { QString heading_color="#ffffff"; - QString subheading_color="#efefef"; + QString subheading_color="#e0e0e0"; QString html = htmlHeader(); @@ -515,7 +528,7 @@ QString Statistics::GenerateHTML() if (mach.size() == 0) { - html += ""; + html += "
"; //cellpadding=2 cellspacing=0 border=0 html += "

" + tr("Please Import Some Data") + "

" + tr("SleepyHead is pretty much useless without it.") + "

" + tr("It might be a good idea to check preferences first,
as there are some options that affect import.") @@ -547,7 +560,7 @@ QString Statistics::GenerateHTML() int decimals = 2; html += "

"; - html += QString(""); + html += QString("
"); //cellpadding=2 cellspacing=0 border=0 int number_periods = 0; if (p_profile->general->statReportMode() == 1) { @@ -655,7 +668,7 @@ QString Statistics::GenerateHTML() name = calcnames[row.calc].arg(schema::channel[id].fullname()); } QString line; - line += QString("").arg(name); + line += QString("").arg(name); for (int j=0; j < periods.size(); j++) { QString val=row.value(periods.at(j).start,periods.at(j).end); line += QString("") @@ -1024,7 +1037,7 @@ QString Statistics::GenerateHTML() RXorder=true; qSort(rxchange.begin(),rxchange.end());*/ html += "

"; - html += QString("
%1
%1%2
"); + html += QString("
"); //cellpadding=2 cellspacing=0 border=1 html += ""; QString extratxt; @@ -1078,7 +1091,7 @@ QString Statistics::GenerateHTML() } mode = rx.mode; - extratxt = "
" + tr("Changes to Prescription Settings") + "
"; + extratxt = "
"; //cellpadding=0 cellspacing=0 // tooltip=QString("%1 %2% ").arg(machstr).arg(percentile*100.0)+STR_TR_EPAP+ // QString("=%1
%2% ").arg(rx.per1,0,'f',decimals).arg(percentile*100.0)+ @@ -1148,7 +1161,7 @@ QString Statistics::GenerateHTML() tooltiphide = "tooltip.hide();"; } - html += QString("") + html += QString("") .arg(color) .arg(tooltipshow) .arg(tooltiphide) @@ -1182,7 +1195,7 @@ QString Statistics::GenerateHTML() if (mach.size() > 0) { html += "

"; - html += QString("
"); + html += QString("
"); // cellpadding=2 cellspacing=0 border=1 width=90%>"); html += ""; html += QString("") @@ -1200,7 +1213,7 @@ QString Statistics::GenerateHTML() QString mn = m->properties[STR_PROP_ModelNumber]; //if (mn.isEmpty()) - html += QString("") + html += QString("") .arg(m->properties[STR_PROP_Brand]) .arg(m->properties[STR_PROP_Model] + " " + m->properties[STR_PROP_SubModel] + (mn.isEmpty() ? "" : QString(" (") + mn + QString(")")))
" + tr("Machine Information") + "
%1%2%3%4%5
%1%2%3%4%5
%1%2%3%4%5