From 076e657ec1165ac71d4980222ff4ac79cfc5952e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 14 Jun 2018 17:25:54 +1000 Subject: [PATCH] Clean up tr() strings a bit and hunt for untranslateables --- sleepyhead/Graphs/MinutesAtPressure.cpp | 4 +- sleepyhead/Graphs/gGraph.cpp | 4 +- sleepyhead/Graphs/glcommon.cpp | 7 +- sleepyhead/Graphs/glcommon.h | 4 +- sleepyhead/SleepLib/common.cpp | 6 +- .../SleepLib/loader_plugins/edfparser.h | 4 +- sleepyhead/aboutdialog.cpp | 10 +- sleepyhead/build_number.h | 2 +- sleepyhead/daily.cpp | 17 ++- sleepyhead/help.cpp | 6 +- sleepyhead/main.cpp | 7 +- sleepyhead/profileselect.cpp | 4 +- sleepyhead/profileselector.cpp | 17 +-- sleepyhead/profileselector.h | 5 +- sleepyhead/sessionbar.cpp | 5 +- sleepyhead/sleepyhead.pro | 75 +++++-------- sleepyhead/statistics.cpp | 100 +++++++++--------- sleepyhead/statistics.h | 3 + 18 files changed, 130 insertions(+), 150 deletions(-) diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp index 3a475397..47a39563 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.cpp +++ b/sleepyhead/Graphs/MinutesAtPressure.cpp @@ -1,4 +1,4 @@ -/* MinutesAtPressure Graph Implementation +/* MinutesAtPressure Graph Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -309,7 +309,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r graph.renderText(label, left-8-w, bot+h/2-2 ); bot -= peakmult; } - label = QString("Peak %1").arg(qMax(ipap.peaktime, epap.peaktime)/60.0); + label = QObject::tr("Peak %1").arg(qMax(ipap.peaktime, epap.peaktime)/60.0); graph.renderText(label, left, top+5 ); xstep /= 5.0; diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp index ecf84efa..ebae6f6a 100644 --- a/sleepyhead/Graphs/gGraph.cpp +++ b/sleepyhead/Graphs/gGraph.cpp @@ -1,4 +1,4 @@ -/* gGraph Implemntation +/* gGraph Implemntation * * Copyright (c) 2011-2018 Mark Watkins * @@ -790,7 +790,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) int ms(a % 1000); if (d > 1) { - m_selDurString.sprintf("%1.0f days", d); + m_selDurString = tr("%1 days").arg(floor(d)); } else { m_selDurString.sprintf("%02i:%02i:%02i:%03i", h, m, s, ms); diff --git a/sleepyhead/Graphs/glcommon.cpp b/sleepyhead/Graphs/glcommon.cpp index ff1dab53..dd6738f6 100644 --- a/sleepyhead/Graphs/glcommon.cpp +++ b/sleepyhead/Graphs/glcommon.cpp @@ -1,4 +1,4 @@ -/* glcommon GL code & font stuff +/* glcommon GL code & font stuff * * Copyright (c) 2011-2018 Mark Watkins * @@ -42,14 +42,11 @@ QColor brighten(QColor color, float mult) } -#ifdef BUILD_WITH_MSVC - -#if (_MSC_VER < 1800) +#if defined(_MSC_VER) && (_MSC_VER < 1800) double round(double number) { return number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5); } #endif -#endif diff --git a/sleepyhead/Graphs/glcommon.h b/sleepyhead/Graphs/glcommon.h index 49211207..bb28127f 100644 --- a/sleepyhead/Graphs/glcommon.h +++ b/sleepyhead/Graphs/glcommon.h @@ -62,11 +62,9 @@ const int max_history = 50; const double M_PI = 3.141592653589793; #endif -#ifdef BUILD_WITH_MSVC // Visual C++ earlier than 2013 doesn't have round in it's maths header.. -#if (_MSC_VER < 1800) +#if defined(_MSC_VER) && (_MSC_VER < 1800) double round(double number); #endif -#endif #endif // GLCOMMON_H diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index 0cd9540a..7f112797 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -18,13 +18,10 @@ #include "SleepLib/common.h" -#ifndef BUILD_WITH_MSVC -# include -#endif - #ifdef _MSC_VER #include #else +#include #include #endif @@ -70,6 +67,7 @@ const QString getDefaultAppRoot() bool gfxEgnineIsSupported(GFXEngine e) { #if defined(Q_OS_WIN32) + Q_UNUSED(e) return true; #else switch(e) { diff --git a/sleepyhead/SleepLib/loader_plugins/edfparser.h b/sleepyhead/SleepLib/loader_plugins/edfparser.h index 334a0c2a..c19278fd 100644 --- a/sleepyhead/SleepLib/loader_plugins/edfparser.h +++ b/sleepyhead/SleepLib/loader_plugins/edfparser.h @@ -1,4 +1,4 @@ -/* EDF Parser Header +/* EDF Parser Header * * Copyright (c) 2011-2018 Mark Watkins * @@ -35,7 +35,7 @@ struct EDFHeader { char dur_data_records[8]; char num_signals[4]; } -#ifndef BUILD_WITH_MSVC +#ifndef _MSC_VER __attribute__((packed)) #endif ; diff --git a/sleepyhead/aboutdialog.cpp b/sleepyhead/aboutdialog.cpp index c9a30736..3dded47e 100644 --- a/sleepyhead/aboutdialog.cpp +++ b/sleepyhead/aboutdialog.cpp @@ -1,4 +1,4 @@ -/* SleepyHead AboutDialog Implementation +/* SleepyHead AboutDialog Implementation * * Date created: 7/5/2018 * @@ -63,7 +63,7 @@ void AboutDialog::on_donateButton_clicked() QString AboutDialog::getRelnotes() { QFile clfile(":/docs/release_notes.html"); - QString changeLog = QObject::tr("Sorry, could not locate changelog."); + QString changeLog = tr("Sorry, could not locate changelog."); if (clfile.open(QIODevice::ReadOnly)) { //Todo, write XML parser and only show the latest.. //QTextStream ts(&clfile); @@ -76,8 +76,8 @@ QString AboutDialog::getRelnotes() ""+tr("SleepyHead v%1").arg(VersionString)+"" "
"; if (ReleaseStatus != "r") { - text += "

"+QObject::tr("Important:")+" " - ""+QObject::tr("As this is a pre-release version, it is recommended that you back up your data folder manually before proceding, because attempting to roll back later may break things.")+"

"; + text += "

"+tr("Important:")+" " + ""+tr("As this is a pre-release version, it is recommended that you back up your data folder manually before proceding, because attempting to roll back later may break things.")+"

"; } text += changeLog; text += ""; @@ -89,7 +89,7 @@ QString AboutDialog::getLicense() QString text; QString licenseFile = ":/docs/GPLv3-"+AppSetting->language(); if (!QFile::exists(licenseFile)) { - ui->licenceLabel->setText(QObject::tr("To see if the license text is available in your language, see %1.").arg("https://www.gnu.org/licenses/translations.en.html\"")); + ui->licenceLabel->setText(tr("To see if the license text is available in your language, see %1.").arg("https://www.gnu.org/licenses/translations.en.html")); ui->licenceLabel->setVisible(true); licenseFile = ":/docs/GPLv3-en_US"; } else { diff --git a/sleepyhead/build_number.h b/sleepyhead/build_number.h index aaaf5891..6025edac 100644 --- a/sleepyhead/build_number.h +++ b/sleepyhead/build_number.h @@ -1 +1 @@ -const int build_number = 0; +const int build_number = 2; diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 460876f2..2169df9d 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -1,4 +1,4 @@ -/* Daily Panel +/* Daily Panel * * Copyright (c) 2011-2018 Mark Watkins * @@ -123,7 +123,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) layout2->insertWidget(1,sessionbar,0); // add the sessionbar after it. - ui->tabWidget->insertTab(0,widget,QIcon(),"Details"); + ui->tabWidget->insertTab(0, widget, QIcon(), tr("Details")); ui->graphFrame->setLayout(layout); //ui->graphMainArea->setLayout(layout); @@ -163,7 +163,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) const QString STR_GRAPH_TAP = "TimeAtPressure"; // gGraph * SG; -// graphlist[STR_GRAPH_DailySummary] = SG = new gGraph(STR_GRAPH_DailySummary, GraphView, QObject::tr("Summary"), QObject::tr("Summary of this daily information"), default_height); +// graphlist[STR_GRAPH_DailySummary] = SG = new gGraph(STR_GRAPH_DailySummary, GraphView, tr("Summary"), tr("Summary of this daily information"), default_height); // SG->AddLayer(new gLabelArea(nullptr),LayerLeft,gYAxis::Margin); // SG->AddLayer(new gDailySummary()); @@ -274,7 +274,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) pc->addPlot(CPAP_IPAPHi, square); gGraph * TAP2; - graphlist[STR_GRAPH_TAP] = TAP2 = new gGraph(STR_GRAPH_TAP, GraphView, QObject::tr("Time at Pressure"), QObject::tr("Time at Pressure"), default_height); + graphlist[STR_GRAPH_TAP] = TAP2 = new gGraph(STR_GRAPH_TAP, GraphView, tr("Time at Pressure"), tr("Time at Pressure"), default_height); MinutesAtPressure * map; TAP2->AddLayer(map = new MinutesAtPressure()); TAP2->AddLayer(new gLabelArea(map),LayerLeft,gYAxis::Margin); @@ -872,7 +872,7 @@ QString Daily::getSessionInformation(Day * day) Session *sess=*s; - QString tooltip = QObject::tr("Click to %1 this session.").arg(sess->enabled() ? QObject::tr("disable") : QObject::tr("enable")); + QString tooltip = tr("Click to %1 this session.").arg(sess->enabled() ? tr("disable") : tr("enable")); html+=QString("%2" "" "" @@ -888,8 +888,8 @@ QString Daily::getSessionInformation(Day * day) "%3" ) .arg((*s)->session()) - .arg(QObject::tr("%1 Session #%2").arg((*s)->machine()->loaderName()).arg((*s)->session(),8,10,QChar('0'))) - .arg(QString("%1h %2m %3s").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s1,2,10,QChar('0'))) + .arg(tr("%1 Session #%2").arg((*s)->machine()->loaderName()).arg((*s)->session(),8,10,QChar('0'))) + .arg(tr("%1h %2m %3s").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s1,2,10,QChar('0'))) .arg((sess->enabled() ? "on" : "off")) .arg(fd.date().toString(Qt::SystemLocaleShortDate)) .arg(fd.toString("HH:mm:ss")) @@ -1457,7 +1457,7 @@ void Daily::Load(QDate date) pixmap.save(&buffer, "PNG"); html += "\n"; } else { - html += "Unable to display Pie Chart on this system\n"; + html += ""+tr("Unable to display Pie Chart on this system")+"\n"; } } else if (day->channelHasData(CPAP_Obstructive) || day->channelHasData(CPAP_Hypopnea) @@ -1532,7 +1532,6 @@ void Daily::Load(QDate date) const int maxcolors=sizeof(cols)/sizeof(QColor); QList::iterator i; - // WebView trashes it without asking.. :( if (cpap) { int c=0; diff --git a/sleepyhead/help.cpp b/sleepyhead/help.cpp index 47dc8a4b..8bfe4f3c 100644 --- a/sleepyhead/help.cpp +++ b/sleepyhead/help.cpp @@ -1,4 +1,4 @@ -/* SleepyHead Help Implementation +/* SleepyHead Help Implementation * * Copyright (c) 2018 Mark Watkins * @@ -97,7 +97,7 @@ Help::Help(QWidget *parent) : if (!helpLoaded) { - QString html = "

No documentation available

"; + QString html = "

"+tr("No documentation available")+"

"; helpBrowser->setHtml(html); return; } else { @@ -185,7 +185,7 @@ void Help::on_homeButton_clicked() void Help::on_searchComplete(int count) { if (!searchReady) { - QString html = "

Please wait a bit.. Indexing still in progress

"; + QString html = "

"+tr("Please wait a bit.. Indexing still in progress")+"

"; helpBrowser->setText(html); return; } diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp index d839c51e..405c8c36 100644 --- a/sleepyhead/main.cpp +++ b/sleepyhead/main.cpp @@ -1,4 +1,4 @@ -/* SleepyHead Main +/* SleepyHead Main * * Copyright (c) 2011-2018 Mark Watkins * @@ -128,8 +128,9 @@ int main(int argc, char *argv[]) initializeStrings(); // This must be called AFTER translator is installed, but before mainwindow is setup - QFontDatabase::addApplicationFont("://fonts/FreeSans.ttf"); - a.setFont(QFont("FreeSans", 11, QFont::Normal, false)); +// QFontDatabase::addApplicationFont("://fonts/FreeSans.ttf"); +// a.setFont(QFont("FreeSans", 11, QFont::Normal, false)); + mainwin = new MainWindow; #ifdef BROKEN_OPENGL_BUILD diff --git a/sleepyhead/profileselect.cpp b/sleepyhead/profileselect.cpp index 834f010b..591060e0 100644 --- a/sleepyhead/profileselect.cpp +++ b/sleepyhead/profileselect.cpp @@ -1,4 +1,4 @@ -/* Profile Select Implementation (Login Screen) +/* Profile Select Implementation (Login Screen) * * Copyright (c) 2011-2018 Mark Watkins * @@ -256,7 +256,7 @@ void ProfileSelect::deleteProfile() QMessageBox::Ok); } qDebug() << "Delete" << path; - QMessageBox::information(this, STR_MessageBox_Information, QString(tr("Profile '%1' was succesfully deleted").arg(name)),QMessageBox::Ok); + QMessageBox::information(this, STR_MessageBox_Information, tr("Profile '%1' was succesfully deleted").arg(name),QMessageBox::Ok); } int row = ui->listView->currentIndex().row(); diff --git a/sleepyhead/profileselector.cpp b/sleepyhead/profileselector.cpp index e9279940..ff596bc5 100644 --- a/sleepyhead/profileselector.cpp +++ b/sleepyhead/profileselector.cpp @@ -1,4 +1,4 @@ -/* Profile Selector Implementation +/* Profile Selector Implementation * * Copyright (c) 2018 Mark Watkins * @@ -423,7 +423,7 @@ void ProfileSelector::on_buttonDestroyProfile_clicked() QMessageBox::Ok); } qDebug() << "Delete" << path; - QMessageBox::information(this, STR_MessageBox_Information, QString(tr("Profile '%1' was succesfully deleted").arg(name)),QMessageBox::Ok); + QMessageBox::information(this, STR_MessageBox_Information, tr("Profile '%1' was succesfully deleted").arg(name),QMessageBox::Ok); } updateProfileList(); @@ -431,8 +431,9 @@ void ProfileSelector::on_buttonDestroyProfile_clicked() } } -QString formatSize(qint64 size) { - QStringList units = { "Bytes", "KB", "MB", "GB", "TB", "PB" }; +QString ProfileSelector::formatSize(qint64 size) +{ + QStringList units = { tr("Bytes"), tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB") }; int i; double outputSize = size; for (i=0; idiskSpaceBackups(); html += "" - "" - "" - "" + "" + "" + "" "
"+QObject::tr("Summaries:")+""+formatSize(sizeSummaries)+"
"+QObject::tr("Events:")+""+formatSize(sizeEvents)+"
"+QObject::tr("Backups:")+""+formatSize(sizeBackups)+"
"+tr("Summaries:")+""+formatSize(sizeSummaries)+"
"+tr("Events:")+""+formatSize(sizeEvents)+"
"+tr("Backups:")+""+formatSize(sizeBackups)+"
"; } return html; diff --git a/sleepyhead/profileselector.h b/sleepyhead/profileselector.h index cb57b0f5..3d6d8ecc 100644 --- a/sleepyhead/profileselector.h +++ b/sleepyhead/profileselector.h @@ -1,4 +1,4 @@ -/* Profile Selector Header +/* Profile Selector Header * * Copyright (c) 2018 Mark Watkins * @@ -58,6 +58,9 @@ private slots: void on_selectionChanged(const QModelIndex ¤t, const QModelIndex &previous); private: + QString getProfileDiskInfo(Profile *profile); + QString formatSize(qint64 size); + Ui::ProfileSelector *ui; QStandardItemModel *model; MySortFilterProxyModel2 *proxy; diff --git a/sleepyhead/sessionbar.cpp b/sleepyhead/sessionbar.cpp index d8380f02..8067dd6f 100644 --- a/sleepyhead/sessionbar.cpp +++ b/sleepyhead/sessionbar.cpp @@ -1,4 +1,4 @@ -/* SessionBar Graph Implementation +/* SessionBar Graph Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -243,8 +243,7 @@ void SessionBar::paintEvent(QPaintEvent *) int m = (len / 60) % 60; //int s=len % 60; - QString msg = QString("%1h %2m").arg((short)h, 1, 10, QChar('0')).arg((short)m, 1, 10, - QChar('0')); //.arg((short)s,2,10,QChar('0')); + QString msg = tr("%1h %2m").arg((short)h, 1, 10, QChar('0')).arg((short)m, 1, 10, QChar('0')); //painter.setBrush(QBrush((*i).color); QRect segrect(3 + sx, 3, ex, height() - 6); diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index 02e33dff..b9ac567e 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -14,38 +14,33 @@ DEFINES += QT_DEPRECATED_WARNINGS #SleepyHead requires OpenGL 2.0 support to run smoothly #On platforms where it's not available, it can still be built to work -#provided the BrokenGL DEFINES flag is passed to qmake (eg, qmake [specs] /path/to/SleepyHeadQT.pro DEFINES+=BrokenGL) -contains(DEFINES, BrokenGL) { - message("BrokgenGL has been disabled to test the Dynamic GFX Engine selection") +#provided the BrokenGL DEFINES flag is passed to qmake (eg, qmake [specs] /path/to/SleepyHeadQT.pro DEFINES+=BrokenGL) (hint, Projects button on the left) +contains(DEFINES, NoGL) { + message("Building with QWidget gGraphView to support systems without ANY OpenGL") + DEFINES += BROKEN_OPENGL_BUILD + DEFINES += NO_OPENGL_BUILD +} else:contains(DEFINES, BrokenGL) { + DEFINES += BROKEN_OPENGL_BUILD + message("Building with QWidget gGraphView to support systems with legacy graphics") DEFINES-=BrokenGL +} else { + QT += opengl + message("Building with regular OpenGL gGraphView") } -# message("Building with QWidget gGraphView") -# DEFINES += BROKEN_OPENGL_BUILD -#} else:contains(DEFINES, NoGL) { -# message("Building with QWidget gGraphView (No GL at all)") -# DEFINES += BROKEN_OPENGL_BUILD -# DEFINES += NO_OPENGL_BUILD -#} else { -# message("Building with QGLWidget gGraphView") -#} - -QT += opengl DEFINES += LOCK_RESMED_SESSIONS CONFIG += c++11 CONFIG += rtti - -# Remove this crap because it sucks -CONFIG-=debug_and_release +CONFIG -= debug_and_release contains(DEFINES, STATIC) { -static { - CONFIG += static - QTPLUGIN += qsvg qgif qpng + static { + CONFIG += static + QTPLUGIN += qgif qpng - message("Static build.") -} + message("Static build.") + } } TARGET = SleepyHead @@ -69,9 +64,6 @@ win32 { PRE_TARGETDEPS += git_info.h QMAKE_EXTRA_TARGETS += gitinfotarget -#Comment out for official builds -DEFINES += BETA_BUILD - #Build the help documentation message("Generating help files"); qtPrepareTool(QCOLGENERATOR, qcollectiongenerator) @@ -80,30 +72,17 @@ command=$$QCOLGENERATOR $$PWD/help/index.qhcp -o $$PWD/help/index.qhc system($$command)|error("Failed to run: $$command") message("Finished generating help files"); -unix:!macx:!haiku { - LIBS += -lX11 -lz -lGLU - DEFINES += _TTY_POSIX_ -} - macx { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 - LIBS += -lz ICON = icons/iconfile.icns -} - -haiku { +} else:haiku { LIBS += -lz -lGLU DEFINES += _TTY_POSIX_ -} - -CONFIG(release, debug|release) { - contains(DEFINES, UPX_PACK_EXE) { - DEFINES-=UPX_PACK_EXE - win32:QMAKE_POST_LINK += upx -k --best --overlay=strip --strip-relocs=0 $(DESTDIR_TARGET) - } -} -win32 { +} else:unix { + LIBS += -lX11 -lz -lGLU + DEFINES += _TTY_POSIX_ +} else:win32 { DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this LIBS += -lsetupapi @@ -112,28 +91,30 @@ win32 { QMAKE_TARGET_COPYRIGHT = Copyright (c)2011-2018 Mark Watkins QMAKE_TARGET_DESCRIPTION = "OpenSource CPAP Research & Review" VERSION = 1.1.0.0 - RC_ICONS = ./icons/bob-v3.0.ico - INCLUDEPATH += $$PWD INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib if (*-msvc*):!equals(TEMPLATE_PREFIX, "vc") { LIBS += -ladvapi32 - DEFINES += "BUILD_WITH_MSVC=1" } else { # MingW needs this LIBS += -lz } - if (*-msvc*) { CONFIG += precompile_header PRECOMPILED_HEADER = pch.h HEADERS += pch.h + } + CONFIG(release, debug|release) { + contains(DEFINES, OfficialBuild) { + QMAKE_POST_LINK += "$$PWD/../../scripts/release_tool.sh --testing --source \"$$PWD/..\" --binary \"$${OUT_PWD}/$${TARGET}.exe\"" + } + } } TRANSLATIONS = $$files($$PWD/../Translations/*.ts) diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index e3337cef..cf72b758 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -1,4 +1,4 @@ -/* Statistics Report Generator Implementation +/* Statistics Report Generator Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -575,7 +575,7 @@ Statistics::Statistics(QObject *parent) : } const QString table_width = "width=99%"; -QString htmlHeader(bool showheader) +QString Statistics::htmlHeader(bool showheader) { QString address = p_profile->user->address(); @@ -584,18 +584,18 @@ QString htmlHeader(bool showheader) QString userinfo; if (!p_profile->user->firstName().isEmpty()) { - userinfo = QString(QObject::tr("Name: %1, %2")).arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "
"; + userinfo = tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "
"; if (!p_profile->user->DOB().isNull()) { - userinfo += QString(QObject::tr("DOB: %1")).arg(p_profile->user->DOB().toString()) + "
"; + userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString()) + "
"; } if (!p_profile->user->phone().isEmpty()) { - userinfo += QString(QObject::tr("Phone: %1")).arg(p_profile->user->phone()) + "
"; + userinfo += tr("Phone: %1").arg(p_profile->user->phone()) + "
"; } if (!p_profile->user->email().isEmpty()) { - userinfo += QString(QObject::tr("Email: %1")).arg(p_profile->user->email()) + "

"; + userinfo += tr("Email: %1").arg(p_profile->user->email()) + "

"; } if (!p_profile->user->address().isEmpty()) { - userinfo += QObject::tr("Address:")+"
"+address; + userinfo += tr("Address:")+"
"+address; } } @@ -638,22 +638,22 @@ QString htmlHeader(bool showheader) html += "
" +resizeHTMLPixmap(bobPixmap,64,64)+"
" "" + STR_TR_SleepyHead + "
" - "" + QObject::tr("Usage Statistics") + "
" - "" + QObject::tr("(NOT approved for compliance or medical reporting purposes)")+"
"; + "" + tr("Usage Statistics") + "
" + "" + tr("(NOT approved for compliance or medical reporting purposes)")+"
"; if (!userinfo.isEmpty()) html += "
"+userinfo+"
"; html += "

"; } return html; } -QString htmlFooter(bool showinfo=true) +QString Statistics::htmlFooter(bool showinfo) { QString html; if (showinfo) { html += "
"; - html += QString(QObject::tr("This report was generated by SleepyHead v%1")).arg(ShortVersionString) + "
" - +QObject::tr("SleepyHead is free open-source CPAP research software available from http://sleepyhead.jedimark.net"); + html += tr("This report was generated by SleepyHead v%1").arg(ShortVersionString) + "
" + +tr("SleepyHead is free open-source CPAP research software available from http://sleepyhead.jedimark.net"); html += "
"; } @@ -1019,7 +1019,7 @@ QString Statistics::GenerateHTML() // int decimals = 2; html += "
"; - html += QString(""); + html += "
"; int number_periods = 0; if (p_profile->general->statReportMode() == 1) { @@ -1119,16 +1119,16 @@ QString Statistics::GenerateHTML() if (value == 0) { html+=QString("\n").arg(periods.size()+1). - arg(QString(tr("No %1 data available.")).arg(machine)); + arg(tr("No %1 data available.").arg(machine)); } else if (value == 1) { html+=QString("\n").arg(periods.size()+1). - arg(QString(tr("%1 day of %2 Data on %3")) + arg(tr("%1 day of %2 Data on %3") .arg(value) .arg(machine) .arg(last.toString())); } else { html+=QString("\n").arg(periods.size()+1). - arg(QString(tr("%1 days of %2 Data, between %3 and %4")) + arg(tr("%1 days of %2 Data, between %3 and %4") .arg(value) .arg(machine) .arg(first.toString()) @@ -1210,10 +1210,10 @@ void Statistics::UpdateRecordsBox() float comperc = (100.0 / float(totaldays)) * float(compliant); - html += ""+QObject::tr("CPAP Usage")+"
"; - html += QObject::tr("Days Used: %1").arg(totaldays) + "
"; - html += QObject::tr("Low Use Days: %1").arg(totaldays - compliant) + "
"; - html += QObject::tr("Compliance: %1%").arg(comperc, 0, 'f', 1) + "
"; + html += ""+tr("CPAP Usage")+"
"; + html += tr("Days Used: %1").arg(totaldays) + "
"; + html += tr("Low Use Days: %1").arg(totaldays - compliant) + "
"; + html += tr("Compliance: %1%").arg(comperc, 0, 'f', 1) + "
"; ///////////////////////////////////////////////////////////////////////////////////// /// AHI Records @@ -1237,30 +1237,30 @@ void Statistics::UpdateRecordsBox() } ahilist.insert(ahi, date); } - html += QObject::tr("Days AHI of 5 or greater: %1").arg(baddays) + "

"; + html += tr("Days AHI of 5 or greater: %1").arg(baddays) + "

"; if (ahilist.size() > (show_records * 2)) { it = ahilist.begin(); it_end = ahilist.end(); - html += ""+QObject::tr("Best AHI")+"
"; + html += ""+tr("Best AHI")+"
"; for (int i=0; (i").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; } html += "
"; - html += ""+QObject::tr("Worst AHI")+"
"; + html += ""+tr("Worst AHI")+"
"; it = ahilist.end() - 1; it_end = ahilist.begin(); for (int i=0; (i").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; } @@ -1291,29 +1291,29 @@ void Statistics::UpdateRecordsBox() it = ahilist.begin(); it_end = ahilist.end(); - html += ""+QObject::tr("Best Flow Limitation")+"
"; + html += ""+tr("Best Flow Limitation")+"
"; for (int i=0; (i").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; } html += "
"; - html += ""+QObject::tr("Worst Flow Limtation")+"
"; + html += ""+tr("Worst Flow Limtation")+"
"; it = ahilist.end() - 1; it_end = ahilist.begin(); for (int i=0; (i 0) { html += QString("").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; cnt++; } } if (cnt == 0) { - html+= ""+QObject::tr("No Flow Limitation on record")+"
"; + html+= ""+tr("No Flow Limitation on record")+"
"; } html += "
"; @@ -1334,7 +1334,7 @@ void Statistics::UpdateRecordsBox() cnt = 0; if (ahilist.size() > (show_records * 2)) { - html += ""+QObject::tr("Worst Large Leaks")+"
"; + html += ""+tr("Worst Large Leaks")+"
"; it = ahilist.end() - 1; it_end = ahilist.begin(); @@ -1342,13 +1342,13 @@ void Statistics::UpdateRecordsBox() for (int i=0; (i 0) { html += QString("").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 Leak: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 Leak: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; cnt++; } } if (cnt == 0) { - html+= ""+QObject::tr("No Large Leaks on record")+"
"; + html+= ""+tr("No Large Leaks on record")+"
"; } html += "
"; @@ -1371,7 +1371,7 @@ void Statistics::UpdateRecordsBox() } if (ahilist.size() > (show_records * 2)) { - html += ""+QObject::tr("Worst CSR")+"
"; + html += ""+tr("Worst CSR")+"
"; it = ahilist.end() - 1; it_end = ahilist.begin(); @@ -1379,12 +1379,12 @@ void Statistics::UpdateRecordsBox() if (it.key() > 0) { html += QString("").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 CSR: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 CSR: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; cnt++; } } if (cnt == 0) { - html+= ""+QObject::tr("No CSR on record")+"
"; + html+= ""+tr("No CSR on record")+"
"; } html += "
"; @@ -1401,7 +1401,7 @@ void Statistics::UpdateRecordsBox() } if (ahilist.size() > (show_records * 2)) { - html += ""+QObject::tr("Worst PB")+"
"; + html += ""+tr("Worst PB")+"
"; it = ahilist.end() - 1; it_end = ahilist.begin(); @@ -1409,12 +1409,12 @@ void Statistics::UpdateRecordsBox() if (it.key() > 0) { html += QString("").arg(it.value().toString(Qt::ISODate)) - +QObject::tr("Date: %1 PB: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; + +tr("Date: %1 PB: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
"; cnt++; } } if (cnt == 0) { - html+= ""+QObject::tr("No PB on record")+"
"; + html+= ""+tr("No PB on record")+"
"; } html += "
"; @@ -1422,9 +1422,9 @@ void Statistics::UpdateRecordsBox() } } else { - html += "
"+QObject::tr("Want more information?")+"
"; - html += ""+QObject::tr("SleepyHead needs all summary data loaded to calculate best/worst data for individual days.")+"

"; - html += ""+QObject::tr("Please enable Pre-Load Summaries checkbox in preferences to make sure this data is available.")+"

"; + html += "
"+tr("Want more information?")+"
"; + html += ""+tr("SleepyHead needs all summary data loaded to calculate best/worst data for individual days.")+"

"; + html += ""+tr("Please enable Pre-Load Summaries checkbox in preferences to make sure this data is available.")+"

"; } @@ -1444,26 +1444,26 @@ void Statistics::UpdateRecordsBox() if (list.size() >= 2) { - html += ""+QObject::tr("Best RX Setting")+"
"; + html += ""+tr("Best RX Setting")+"
"; const RXItem & rxbest = *list.at(0); html += QString("").arg(rxbest.start.toString(Qt::ISODate)).arg(rxbest.end.toString(Qt::ISODate)) + - QObject::tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "
"; + tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "
"; html += QString("%1").arg(rxbest.machine->model()) + "
"; html += QString("Serial: %1").arg(rxbest.machine->serial()) + "
"; - html += QObject::tr("Culminative AHI: %1").arg(double(rxbest.ahi) / rxbest.hours, 0, 'f', 2) + "
"; - html += QObject::tr("Culminative Hours: %1").arg(rxbest.hours, 0, 'f', 2) + "
"; + html += tr("Culminative AHI: %1").arg(double(rxbest.ahi) / rxbest.hours, 0, 'f', 2) + "
"; + html += tr("Culminative Hours: %1").arg(rxbest.hours, 0, 'f', 2) + "
"; html += QString("%1").arg(rxbest.pressure) + "
"; html += QString("%1").arg(rxbest.relief) + "
"; html += "
"; - html += ""+QObject::tr("Worst RX Setting")+"
"; + html += ""+tr("Worst RX Setting")+"
"; const RXItem & rxworst = *list.at(list.size() -1); html += QString("").arg(rxworst.start.toString(Qt::ISODate)).arg(rxworst.end.toString(Qt::ISODate)) + - QObject::tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "
"; + tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "
"; html += QString("%1").arg(rxworst.machine->model()) + "
"; html += QString("Serial: %1").arg(rxworst.machine->serial()) + "
"; - html += QObject::tr("Culminative AHI: %1").arg(double(rxworst.ahi) / rxworst.hours, 0, 'f', 2) + "
"; - html += QObject::tr("Culminative Hours: %1").arg(rxworst.hours, 0, 'f', 2) + "
"; + html += tr("Culminative AHI: %1").arg(double(rxworst.ahi) / rxworst.hours, 0, 'f', 2) + "
"; + html += tr("Culminative Hours: %1").arg(rxworst.hours, 0, 'f', 2) + "
"; html += QString("%1").arg(rxworst.pressure) + "
"; html += QString("%1").arg(rxworst.relief) + "
"; diff --git a/sleepyhead/statistics.h b/sleepyhead/statistics.h index d13df9fa..1a9c86c2 100644 --- a/sleepyhead/statistics.h +++ b/sleepyhead/statistics.h @@ -164,6 +164,9 @@ class Statistics : public QObject protected: + QString htmlHeader(bool showheader); + QString htmlFooter(bool showinfo=true); + // Using a map to maintain order QList rows; QMap calcnames;
%2
%2
%2