From 4697f84ea98c9daa2f0161d786a1ef187014643d Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Wed, 22 May 2019 13:49:28 -0700 Subject: [PATCH] Revise Statistics page heading to use less space. Reformat and correct errors in HTML strings. --- oscar/statistics.cpp | 88 ++++++++++++++++++++++++-------------------- oscar/statistics.h | 1 + 2 files changed, 50 insertions(+), 39 deletions(-) diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 3e9dbe7e..bb383d2c 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -575,10 +575,7 @@ Statistics::Statistics(QObject *parent) : } -const QString table_width = "width=99%"; -QString Statistics::htmlHeader(bool showheader) -{ - +QString Statistics::getUserInfo () { QString address = p_profile->user->address(); address.replace("\n", "
"); @@ -600,53 +597,66 @@ QString Statistics::htmlHeader(bool showheader) } } + return userinfo; +} +const QString table_width = "width=99%"; +QString Statistics::htmlHeader(bool showheader) +{ QString html = QString("")+ - "" + "" + "" + "" + "" + ""; - QPixmap logoPixmap(":/icons/logo-md.png"); + QPixmap logoPixmap(":/icons/logo-lg.png"); + if (showheader) { - html += "
" - +resizeHTMLPixmap(logoPixmap,64,64)+"
" - "" + STR_TR_OSCAR + "
" - "" + tr("Usage Statistics") + "
"; -// "" + tr("(NOT approved for compliance or medical reporting purposes)")+"
"; - if (!userinfo.isEmpty()) - html += "
"+userinfo; - html += "

"; - } + html += "
" + "" + "" + "" + "" + "" + "
" + getUserInfo() + "" + "" + STR_TR_OSCAR + "   
" + "" + QObject::tr("Usage Statistics") + "   " + "		" + resizeHTMLPixmap(logoPixmap,120,120)+"   
" + "
" + "

"; + } return html; } QString Statistics::htmlFooter(bool showinfo) @@ -654,7 +664,7 @@ QString Statistics::htmlFooter(bool showinfo) QString html; if (showinfo) { - html += "
"; + html += "
"; html += tr("This report was generated by OSCAR v%1").arg(ShortVersionString) + "
" +tr("OSCAR is free open-source CPAP report software"); html += "
"; diff --git a/oscar/statistics.h b/oscar/statistics.h index 1a9c86c2..dff2f30e 100644 --- a/oscar/statistics.h +++ b/oscar/statistics.h @@ -156,6 +156,7 @@ class Statistics : public QObject void saveRXChanges(); void updateRXChanges(); + QString getUserInfo(); QString GenerateHTML(); QString GenerateMachineList(); QString GenerateRXChanges();