diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index b8f06fa4..aa879ca7 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -97,9 +97,7 @@ MainWindow::MainWindow(QWidget *parent) : logtime.start(); ui->setupUi(this); - QString version = FullVersionString; - - if (QString(GIT_BRANCH) != "master") { version += QString(" ") + QString(GIT_BRANCH); } + QString version = VersionString; #ifdef TEST_BUILD version += QString(STR_TestBuild); @@ -107,6 +105,9 @@ MainWindow::MainWindow(QWidget *parent) : ui->warningLabel->hide(); #endif + if (QString(GIT_BRANCH) != "master") { version += " (" + QString(GIT_BRANCH)+" branch)"; } + + this->setWindowTitle(STR_TR_SleepyHead + QString(" v%1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString())); //ui->tabWidget->setCurrentIndex(1); diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index 84f9926c..3aef0624 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -111,6 +111,26 @@ QString htmlHeader() address.replace("\n", "
"); // "a:link,a:visited { color: '#000020'; text-decoration: none; font-weight: bold;}" // "a:hover { background-color: inherit; color: red; text-decoration:none; font-weight: bold; }" + + QString userinfo; + + if (!PROFILE.user->firstName().isEmpty()) { + userinfo = QString(QObject::tr("Name: %1, %2")).arg(PROFILE.user->lastName()).arg(PROFILE.user->firstName()) + "
"; + if (!PROFILE.user->DOB().isNull()) { + userinfo += QString(QObject::tr("DOB: %1")).arg(PROFILE.user->DOB().toString()) + "
"; + } + } + if (!PROFILE.user->phone().isEmpty()) { + userinfo += QString(QObject::tr("Phone: %1")).arg(PROFILE.user->phone()) + "
"; + } + if (!PROFILE.user->email().isEmpty()) { + userinfo += QString(QObject::tr("Email: %1")).arg(PROFILE.user->email()) + "

"; + } + if (!PROFILE.user->address().isEmpty()) { + userinfo += QObject::tr("Address:")+"
"+address; + } + + return QString("" "" "