From 1842a68a0ed58e207ef3ddeed0e5ce0e2ff1e157 Mon Sep 17 00:00:00 2001
From: Andrew Nelless
Date: Thu, 20 Oct 2016 14:55:21 +0100
Subject: [PATCH] #5657 Always show trial counter, fix plurality
---
src/gui/src/MainWindow.cpp | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 1178edd9..77a9a841 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1072,21 +1072,26 @@ void MainWindow::setEdition(Edition edition)
void MainWindow::beginTrial(bool isExpiring)
{
- if (isExpiring) {
+ //Hack
+ //if (isExpiring) {
+ time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
QString expiringNotice ("%1 days of "
+ "font-weight:600;\">%1 day%3 of "
"your %2 trial remain. "
+ "\"https://symless.com/synergy/trial/thanks?id=%4\">"
"Buy now!"
"
");
expiringNotice = expiringNotice
- .arg (m_LicenseManager->serialKey().daysLeft(::time(0)))
+ .arg (daysLeft)
.arg (LicenseManager::getEditionName
- (m_LicenseManager->activeEdition()));
+ (m_LicenseManager->activeEdition()))
+ .arg ((daysLeft == 1) ? "" : "s")
+ .arg(QString::fromStdString
+ (m_LicenseManager->serialKey().toString()));
this->m_trialLabel->setText(expiringNotice);
this->m_trialWidget->show();
- }
+ //}
setWindowTitle (m_LicenseManager->activeEditionName());
}