From dc66eb3167efe2508b55ea0145a72593a7283431 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Tue, 27 Apr 2021 15:40:21 +0300 Subject: [PATCH] SYNERGY-936 New message for expired licenses --- src/gui/src/LicenseManager.cpp | 41 +++++-------- src/gui/src/MainWindow.cpp | 6 +- src/gui/src/MainWindowBase.ui | 108 +++++++++++++++++---------------- 3 files changed, 74 insertions(+), 81 deletions(-) diff --git a/src/gui/src/LicenseManager.cpp b/src/gui/src/LicenseManager.cpp index 3b7a3aef6..63056f3fd 100644 --- a/src/gui/src/LicenseManager.cpp +++ b/src/gui/src/LicenseManager.cpp @@ -174,27 +174,19 @@ LicenseManager::getTrialNotice() const QString Notice; if (m_serialKey.isExpired(::time(0))){ - Notice = "

Your %1 trial has expired. " - "" - "Buy now!

"; - Notice = Notice.arg(LicenseManager::getEditionName(activeEdition())); + Notice = "

" + "Trial expired - " + "Buy now" + "

"; } else{ - Notice = "

%1 day%3 of " - "your %2 trial remain%5. " - "Buy now!" + Notice = "

" + "Trial expires in %1 day%2 - " + "Buy now" "

"; time_t daysLeft = m_serialKey.daysLeft(::time(0)); - Notice = Notice - .arg (daysLeft) - .arg (LicenseManager::getEditionName(activeEdition())) - .arg ((daysLeft == 1) ? "" : "s") - .arg ((daysLeft == 1) ? "s" : ""); + Notice = Notice.arg (daysLeft).arg ((daysLeft == 1) ? "" : "s"); } return Notice; @@ -206,18 +198,15 @@ LicenseManager::getTemporaryNotice() const QString Notice; if (m_serialKey.isExpired(::time(0))) { - Notice = "

Your license has expired. " - "" - "Renew now!

"; + Notice = "

" + "License expired - " + "Renew now" + "

"; } else if (m_serialKey.isExpiring(::time(0))) { - Notice = "

%1 day%2 " - "before your license expires." - "Renew now!" + Notice = "

" + "License expires in %1 day%2 - " + "Renew now" "

"; time_t daysLeft = m_serialKey.daysLeft(::time(0)); diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index f02ca2462..e6216549f 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -151,7 +151,7 @@ MainWindow::MainWindow (AppConfig& appConfig, setMinimumSize(size()); #endif - m_trialWidget->hide(); + m_trialLabel->hide(); // hide padlock icon secureSocket(false); @@ -1129,11 +1129,11 @@ void MainWindow::InvalidLicense() void MainWindow::showLicenseNotice(const QString& notice) { - this->m_trialWidget->hide(); + this->m_trialLabel->hide(); if (!notice.isEmpty()) { this->m_trialLabel->setText(notice); - this->m_trialWidget->show(); + this->m_trialLabel->show(); } setWindowTitle (m_LicenseManager->activeEditionName()); diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index 79d3604e1..5091ee27b 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/src/gui/src/MainWindowBase.ui @@ -27,57 +27,6 @@ - - - - - 2 - - - 0 - - - 0 - - - 8 - - - - - - - - :/res/icons/16x16/warning.png - - - - - - - <html><head/><body><p><span style=" font-weight:600;">%1</span> days of your Synergy Pro trial remain. <a href="http://symless.com/pricing?src=gui"><span style=" text-decoration: underline; color:#0000ff;">Buy now!</span></a></p></body></html> - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - @@ -252,7 +201,7 @@ - <html><head/><body><p style="margin-left: 5px;">(<a href="#"><span style=" text-decoration: none; font-size: 13px; color:#007af4;">Settings</span></a>)</p></body></html> + <html><head/><body><p style="margin-left: 5px;">(<a href="#"><span style=" text-decoration: none; font-size: 13px; color:#007af4;">Preferences</span></a>)</p></body></html> 0 @@ -818,6 +767,9 @@ + + 6 + QLayout::SetDefaultConstraint @@ -854,6 +806,58 @@ + + + + + Arial + -1 + 87 + true + + + + false + + + font-size: 13px; +font-weight: 700; +padding: 3px 5px; +border-radius: 3px; +background-color: #EC4C47; +color: #ffffff; +top: 3px; + + + <html><head/><body><p><span style=" font-weight:600;">%1</span> days of your Synergy Pro trial remain. <a href="http://symless.com/pricing?src=gui"><span style=" text-decoration: underline; color:#0000ff;">Buy now!</span></a></p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 0 + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + +