From d93b39a7d43d4882b9664b31d31ae41857e8789e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 28 Nov 2011 22:03:43 +1000 Subject: [PATCH] First use/profile editor screen improvements --- Graphs/gGraphView.cpp | 3 +- Resources.qrc | 2 + SleepyHeadQT.pro | 6 +- docs/countries.txt | 195 +++++++++++++++ docs/tz.txt | 91 +++++++ mainwindow.cpp | 5 +- newprofile.cpp | 111 ++++++++- newprofile.h | 3 + newprofile.ui | 565 +++++++++++++++++++++++++++++++----------- 9 files changed, 823 insertions(+), 158 deletions(-) create mode 100644 docs/countries.txt create mode 100644 docs/tz.txt diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 7f21dcdf..a1b00030 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1865,7 +1865,7 @@ void gGraphView::ResetBounds(bool refresh) //short group) { Q_UNUSED(refresh) qint64 m1=0,m2=0; - gGraph *g; + gGraph *g=NULL; for (int i=0;iResetBounds(); if (!m_graphs[i]->min_x) continue; @@ -1881,7 +1881,6 @@ void gGraphView::ResetBounds(bool refresh) //short group) } } if (!g) g=m_graphs[0]; - if (!g) return; qint64 xx=g->max_x - g->min_x; double d=xx/86400000L; diff --git a/Resources.qrc b/Resources.qrc index 233fab31..b87680c1 100644 --- a/Resources.qrc +++ b/Resources.qrc @@ -23,5 +23,7 @@ icons/toggle-on-us.svg docs/release_notes.html icons/save.png + docs/countries.txt + docs/tz.txt diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 3b450dd5..5e0d9830 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -151,7 +151,11 @@ OTHER_FILES += \ docs/graphs.xml \ docs/channels.xml \ docs/release_notes.html \ - docs/startup_tips.txt + docs/startup_tips.txt \ + docs/countries.txt \ + docs/tz.txt + + diff --git a/docs/countries.txt b/docs/countries.txt new file mode 100644 index 00000000..3fd93c58 --- /dev/null +++ b/docs/countries.txt @@ -0,0 +1,195 @@ +Afghanistan +Albania +Algeria +Andorra +Angola +Antigua & Deps +Argentina +Armenia +Australia +Austria +Azerbaijan +Bahamas +Bahrain +Bangladesh +Barbados +Belarus +Belgium +Belize +Benin +Bhutan +Bolivia +Bosnia Herzegovina +Botswana +Brazil +Brunei +Bulgaria +Burkina +Burundi +Cambodia +Cameroon +Canada +Cape Verde +Central African Rep +Chad +Chile +China +Colombia +Comoros +Congo +Congo {Democratic Rep} +Costa Rica +Croatia +Cuba +Cyprus +Czech Republic +Denmark +Djibouti +Dominica +Dominican Republic +East Timor +Ecuador +Egypt +El Salvador +Equatorial Guinea +Eritrea +Estonia +Ethiopia +Fiji +Finland +France +Gabon +Gambia +Georgia +Germany +Ghana +Greece +Grenada +Guatemala +Guinea +Guinea-Bissau +Guyana +Haiti +Honduras +Hungary +Iceland +India +Indonesia +Iran +Iraq +Ireland {Republic} +Israel +Italy +Ivory Coast +Jamaica +Japan +Jordan +Kazakhstan +Kenya +Kiribati +Korea North +Korea South +Kosovo +Kuwait +Kyrgyzstan +Laos +Latvia +Lebanon +Lesotho +Liberia +Libya +Liechtenstein +Lithuania +Luxembourg +Macedonia +Madagascar +Malawi +Malaysia +Maldives +Mali +Malta +Marshall Islands +Mauritania +Mauritius +Mexico +Micronesia +Moldova +Monaco +Mongolia +Montenegro +Morocco +Mozambique +Myanmar, {Burma} +Namibia +Nauru +Nepal +Netherlands +New Zealand +Nicaragua +Niger +Nigeria +Norway +Oman +Pakistan +Palau +Panama +Papua New Guinea +Paraguay +Peru +Philippines +Poland +Portugal +Qatar +Romania +Russian Federation +Rwanda +St Kitts & Nevis +St Lucia +Saint Vincent & the Grenadines +Samoa +San Marino +Sao Tome & Principe +Saudi Arabia +Senegal +Serbia +Seychelles +Sierra Leone +Singapore +Slovakia +Slovenia +Solomon Islands +Somalia +South Africa +Spain +Sri Lanka +Sudan +Suriname +Swaziland +Sweden +Switzerland +Syria +Taiwan +Tajikistan +Tanzania +Thailand +Togo +Tonga +Trinidad & Tobago +Tunisia +Turkey +Turkmenistan +Tuvalu +Uganda +Ukraine +United Arab Emirates +United Kingdom +United States +Uruguay +Uzbekistan +Vanuatu +Vatican City +Venezuela +Vietnam +Yemen +Zambia +Zimbabwe diff --git a/docs/tz.txt b/docs/tz.txt new file mode 100644 index 00000000..0474ba85 --- /dev/null +++ b/docs/tz.txt @@ -0,0 +1,91 @@ +Pacific/Midway=(GMT-11:00) Midway Island, Samoa +America/Adak=(GMT-10:00) Hawaii-Aleutian +Etc/GMT+10=(GMT-10:00) Hawaii +Pacific/Marquesas=(GMT-09:30) Marquesas Islands +Pacific/Gambier=(GMT-09:00) Gambier Islands +America/Anchorage=(GMT-09:00) Alaska +America/Ensenada=(GMT-08:00) Tijuana, Baja California +Etc/GMT+8=(GMT-08:00) Pitcairn Islands +America/Los_Angeles=(GMT-08:00) Pacific Time (US & Canada) +America/Denver=(GMT-07:00) Mountain Time (US & Canada) +America/Chihuahua=(GMT-07:00) Chihuahua, La Paz, Mazatlan +America/Dawson_Creek=(GMT-07:00) Arizona +America/Belize=(GMT-06:00) Saskatchewan, Central America +America/Cancun=(GMT-06:00) Guadalajara, Mexico City, Monterrey +Chile/EasterIsland=(GMT-06:00) Easter Island +America/Chicago=(GMT-06:00) Central Time (US & Canada) +America/New_York=(GMT-05:00) Eastern Time (US & Canada) +America/Havana=(GMT-05:00) Cuba +America/Bogota=(GMT-05:00) Bogota, Lima, Quito, Rio Branco +America/Caracas=(GMT-04:30) Caracas +America/Santiago=(GMT-04:00) Santiago +America/La_Paz=(GMT-04:00) La Paz +Atlantic/Stanley=(GMT-04:00) Faukland Islands +America/Campo_Grande=(GMT-04:00) Brazil +America/Goose_Bay=(GMT-04:00) Atlantic Time (Goose Bay) +America/Glace_Bay=(GMT-04:00) Atlantic Time (Canada) +America/St_Johns=(GMT-03:30) Newfoundland +America/Araguaina=(GMT-03:00) UTC-3, +America/Montevideo=(GMT-03:00) Montevideo +America/Miquelon=(GMT-03:00) Miquelon, St. Pierre +America/Godthab=(GMT-03:00) Greenland +America/Argentina/Buenos_Aires=(GMT-03:00) Buenos Aires +America/Sao_Paulo=(GMT-03:00) Brasilia +America/Noronha=(GMT-02:00) Mid-Atlantic +Atlantic/Cape_Verde=(GMT-01:00) Cape Verde Is. +Atlantic/Azores=(GMT-01:00) Azores +Europe/Belfast=(GMT) Greenwich Mean Time : Belfast +Europe/Dublin=(GMT) Greenwich Mean Time : Dublin +Europe/Lisbon=(GMT) Greenwich Mean Time : Lisbon +Europe/London=(GMT) Greenwich Mean Time : London +Africa/Abidjan=(GMT) Monrovia, Reykjavik +Europe/Amsterdam=(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna +Europe/Belgrade=(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague +Europe/Brussels=(GMT+01:00) Brussels, Copenhagen, Madrid, Paris +Africa/Algiers=(GMT+01:00) West Central Africa +Africa/Windhoek=(GMT+01:00) Windhoek +Asia/Beirut=(GMT+02:00) Beirut +Africa/Cairo=(GMT+02:00) Cairo +Asia/Gaza=(GMT+02:00) Gaza +Africa/Blantyre=(GMT+02:00) Harare, Pretoria +Asia/Jerusalem=(GMT+02:00) Jerusalem +Europe/Minsk=(GMT+02:00) Minsk +Asia/Damascus=(GMT+02:00) Syria +Europe/Moscow=(GMT+03:00) Moscow, St. Petersburg, Volgograd +Africa/Addis_Ababa=(GMT+03:00) Nairobi +Asia/Tehran=(GMT+03:30) Tehran +Asia/Dubai=(GMT+04:00) Abu Dhabi, Muscat +Asia/Yerevan=(GMT+04:00) Yerevan +Asia/Kabul=(GMT+04:30) Kabul +Asia/Yekaterinburg=(GMT+05:00) Ekaterinburg +Asia/Tashkent=(GMT+05:00) Tashkent +Asia/Kolkata=(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi +Asia/Katmandu=(GMT+05:45) Kathmandu +Asia/Dhaka=(GMT+06:00) Astana, Dhaka +Asia/Novosibirsk=(GMT+06:00) Novosibirsk +Asia/Rangoon=(GMT+06:30) Yangon (Rangoon) +Asia/Bangkok=(GMT+07:00) Bangkok, Hanoi, Jakarta +Asia/Krasnoyarsk=(GMT+07:00) Krasnoyarsk +Asia/Hong_Kong=(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi +Asia/Irkutsk=(GMT+08:00) Irkutsk, Ulaan Bataar +Australia/Perth=(GMT+08:00) Perth +Australia/Eucla=(GMT+08:45) Eucla +Asia/Tokyo=(GMT+09:00) Osaka, Sapporo, Tokyo +Asia/Seoul=(GMT+09:00) Seoul +Asia/Yakutsk=(GMT+09:00) Yakutsk +Australia/Adelaide=(GMT+09:30) Adelaide +Australia/Darwin=(GMT+09:30) Darwin +Australia/Brisbane=(GMT+10:00) Brisbane +Australia/Hobart=(GMT+10:00) Hobart +Asia/Vladivostok=(GMT+10:00) Vladivostok +Australia/Lord_Howe=(GMT+10:30) Lord Howe Island +Etc/GMT-11=(GMT+11:00) Solomon Is., New Caledonia +Asia/Magadan=(GMT+11:00) Magadan +Pacific/Norfolk=(GMT+11:30) Norfolk Island +Asia/Anadyr=(GMT+12:00) Anadyr, Kamchatka +Pacific/Auckland=(GMT+12:00) Auckland, Wellington +Etc/GMT-12=(GMT+12:00) Fiji, Kamchatka, Marshall Is. +Pacific/Chatham=(GMT+12:45) Chatham Islands +Pacific/Tongatapu=(GMT+13:00) Nuku Alofa +Pacific/Kiritimati=(GMT+14:00) Kiritimati + diff --git a/mainwindow.cpp b/mainwindow.cpp index e953533e..c7b2a9e4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -489,14 +489,13 @@ void MainWindow::CheckForUpdates() void MainWindow::on_actionCheck_for_Updates_triggered() { if (PREF.Exists("Updates_LastChecked")) { - if (PREF["Updates_LastChecked"].toDateTime().secsTo(QDateTime::currentDateTime())<3600) { + if (PREF["Updates_LastChecked"].toDateTime().secsTo(QDateTime::currentDateTime())<7200) { // Instead of doing this, just use the cached crud if (prefdialog) prefdialog->RefreshLastChecked(); - mainwin->Notify("No New Updates - You already checked in the last hour..."); + mainwin->Notify("No New Updates - You already checked recently..."); return; } } - return; netmanager->get(QNetworkRequest(QUrl("http://sleepyhead.sourceforge.net/current_version.txt"))); } void MainWindow::replyFinished(QNetworkReply * reply) diff --git a/newprofile.cpp b/newprofile.cpp index 6f07bc69..f5d203ac 100644 --- a/newprofile.cpp +++ b/newprofile.cpp @@ -5,6 +5,8 @@ */ #include +#include +#include #include #include "SleepLib/profiles.h" @@ -31,6 +33,42 @@ NewProfile::NewProfile(QWidget *parent) : ui->stackedWidget->setCurrentIndex(0); on_cpapModeCombo_activated(0); m_passwordHashed=false; + ui->heightEdit2->setVisible(false); + ui->heightEdit->setDecimals(2); + ui->heightEdit->setSuffix("cm"); + + { // process countries list + QFile f(":/docs/countries.txt"); + f.open(QFile::ReadOnly); + QTextStream cnt(&f); + QString a; + ui->countryCombo->clear(); + ui->countryCombo->addItem("Select Country"); + do { + a=cnt.readLine(); + if (a.isEmpty()) break; + ui->countryCombo->addItem(a); + } while(1); + f.close(); + } + { // timezone list + QFile f(":/docs/tz.txt"); + f.open(QFile::ReadOnly); + QTextStream cnt(&f); + QString a; + ui->timezoneCombo->clear(); + //ui->countryCombo->addItem("Select TimeZone"); + do { + a=cnt.readLine(); + if (a.isEmpty()) break; + QStringList l; + l=a.split("="); + ui->timezoneCombo->addItem(l[1],l[0]); + } while(1); + f.close(); + } + + } NewProfile::~NewProfile() @@ -86,7 +124,6 @@ void NewProfile::on_nextButton_clicked() prof["FirstName"]=ui->firstNameEdit->text(); prof["LastName"]=ui->lastNameEdit->text(); prof["DOB"]=ui->dobEdit->date(); - prof["Height"]=ui->heightEdit->value(); prof["EmailAddress"]=ui->emailEdit->text(); prof["Phone"]=ui->phoneEdit->text(); prof["Address"]=ui->addressEdit->toPlainText(); @@ -116,7 +153,20 @@ void NewProfile::on_nextButton_clicked() prof["DoctorPhone"]=ui->doctorPhoneEdit->text(); prof["DoctorEmail"]=ui->doctorEmailEdit->text(); prof["DoctorPatientID"]=ui->doctorPatientIDEdit->text(); - + prof["Language"]=ui->languageCombo->currentText(); + prof["TimeZone"]=ui->timezoneCombo->itemData(ui->timezoneCombo->currentIndex()).toString(); + prof["Country"]=ui->countryCombo->currentText(); + prof["DST"]=ui->DSTcheckbox->isChecked(); + prof["Units"]=ui->heightCombo->currentText(); + double v=0; + if (ui->heightCombo->currentIndex()==1) { + // convert to metric + v=(ui->heightEdit->value()*30.48); + v+=ui->heightEdit2->value()*2.54; + } else { + v=ui->heightEdit->value(); + } + prof["Height"]=v; PREF["Profile"]=ui->userNameEdit->text(); @@ -213,6 +263,38 @@ void NewProfile::edit(const QString name) ui->doctorEmailEdit->setText(profile->Get("DoctorEmail")); ui->doctorAddressEdit->setText(profile->Get("DoctorAddress")); ui->doctorPatientIDEdit->setText(profile->Get("DoctorPatientID")); + + ui->DSTcheckbox->setChecked((*profile)["DST"].toBool()); + int i=ui->timezoneCombo->findData(profile->Get("TimeZone")); + ui->timezoneCombo->setCurrentIndex(i); + i=ui->countryCombo->findText(profile->Get("Country")); + ui->countryCombo->setCurrentIndex(i); + + i=ui->heightCombo->findText(profile->Get("Units")); + if (i<0) i=0; + ui->heightCombo->setCurrentIndex(i); + + bool ok; + double v=(*profile)["Height"].toDouble(&ok); + if (!ok) v=0; + + if (i==1) { // evil non-metric + int ti=v/2.54; + int feet=ti / 12; + int inches=ti % 12; + ui->heightEdit->setValue(feet); + ui->heightEdit2->setValue(inches); + ui->heightEdit2->setVisible(true); + ui->heightEdit->setDecimals(0); + ui->heightEdit2->setDecimals(0); + ui->heightEdit->setSuffix("ft"); + ui->heightEdit2->setSuffix("\""); + } else { // good wholesome metric + ui->heightEdit->setValue(v); + ui->heightEdit2->setVisible(false); + ui->heightEdit->setDecimals(2); + ui->heightEdit->setSuffix("cm"); + } } void NewProfile::on_passwordEdit1_editingFinished() @@ -224,3 +306,28 @@ void NewProfile::on_passwordEdit2_editingFinished() { m_passwordHashed=false; } + + +void NewProfile::on_heightCombo_currentIndexChanged(int index) +{ + if (index==0) { + //metric + ui->heightEdit2->setVisible(false); + ui->heightEdit->setDecimals(2); + ui->heightEdit->setSuffix("cm"); + double v=ui->heightEdit->value()*30.48; + v+=ui->heightEdit2->value()*2.54; + ui->heightEdit->setValue(v); + } else { //evil + ui->heightEdit->setDecimals(0); + ui->heightEdit2->setDecimals(0); + ui->heightEdit->setSuffix("ft"); + ui->heightEdit2->setVisible(true); + ui->heightEdit2->setSuffix("\""); + int v=ui->heightEdit->value()/2.54; + int feet=v / 12; + int inches=v % 12; + ui->heightEdit->setValue(feet); + ui->heightEdit2->setValue(inches); + } +} diff --git a/newprofile.h b/newprofile.h index 87223cbb..22ee5889 100644 --- a/newprofile.h +++ b/newprofile.h @@ -35,6 +35,9 @@ private slots: void on_passwordEdit2_editingFinished(); + + void on_heightCombo_currentIndexChanged(int index); + private: Ui::NewProfile *ui; bool m_editMode; diff --git a/newprofile.ui b/newprofile.ui index 0b63cddd..a8984d06 100644 --- a/newprofile.ui +++ b/newprofile.ui @@ -6,7 +6,7 @@ 0 0 - 605 + 607 392 @@ -24,10 +24,47 @@ - 1 + 2 - + + + 5 + + + + + + + + 0 + 0 + + + + Language + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + English + + + + + Klingon + + + + + + @@ -66,31 +103,57 @@ p, li { white-space: pre-wrap; } - - + + + + 0 + + + 4 + - Personal && User Information + User Information false - - - QFormLayout::AllNonFixedFieldsGrow + + + 0 - - - - User Name + + 4 + + + 4 + + + 4 + + + + + + + User Name + + + + + + + + + + + + Qt::Horizontal - - - - + Keep the kids out.. Nothing more.. This isn't meant to be uber security. @@ -107,21 +170,7 @@ p, li { white-space: pre-wrap; } false - - - - - QLineEdit::PasswordEchoOnEdit - - - - - - - QLineEdit::PasswordEchoOnEdit - - - + @@ -129,6 +178,13 @@ p, li { white-space: pre-wrap; } + + + + QLineEdit::PasswordEchoOnEdit + + + @@ -136,37 +192,177 @@ p, li { white-space: pre-wrap; } + + + + QLineEdit::PasswordEchoOnEdit + + + - + + + + Qt::Horizontal + + + + + + + + + + Locale Settings + + + + 0 + + + 4 + + + 0 + + + + + + 0 + 0 + + + + Country + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + TimeZone + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + DST Zone + + + + + + + + + + + + 0 + + + 4 + + + + + Personal Information (for reports) + + + + 4 + + + 4 + + + 0 + + + 4 + + + 4 + + + 4 + + First Name - + - + Last Name - + - + D.O.B. - + @@ -199,7 +395,7 @@ p, li { white-space: pre-wrap; } - + @@ -215,40 +411,83 @@ p, li { white-space: pre-wrap; } - - - - 350.000000000000000 + + + + 0 - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - + + + + 2 + + + 350.000000000000000 + + + + + + + 0 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + metric + + + + + archiac + + + + + - - - - Contact Information + + QFormLayout::AllNonFixedFieldsGrow + + + 4 + + + 4 + + + 0 + + + 4 + + + 4 + + + 4 + @@ -276,52 +515,42 @@ p, li { white-space: pre-wrap; } - + Phone - + - + Qt::Vertical - 250 - 2 + 20 + 40 - - - - - true - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(This information is just used in reports.)</p></body></html> - - - - + + + 0 + + + 4 + @@ -331,6 +560,24 @@ p, li { white-space: pre-wrap; } QFormLayout::AllNonFixedFieldsGrow + + 4 + + + 4 + + + 0 + + + 4 + + + 4 + + + 0 + @@ -416,32 +663,43 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + 0 + + + 4 + - Doctors Information + Doctors / Clinic Information QFormLayout::AllNonFixedFieldsGrow + + 4 + + + 4 + + + 0 + + + 4 + + + 4 + + + 0 + @@ -452,61 +710,82 @@ p, li { white-space: pre-wrap; } - + + + + Qt::Horizontal + + + + Practice - + - - - Address - - - - - - - true - - - - - - - Phone - - - - - - - - - - Email - - - - - - - Patient ID - + + + + + Qt::Horizontal + + + + + + + Address + + + + + + + true + + + + + + + Qt::Horizontal + + + + + + + Phone + + + + + + + + + + Email + + + + + + Qt::Vertical @@ -519,20 +798,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - -