diff --git a/ChangeLog b/ChangeLog index ddf3d2029..51e9600e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +v1.12.0-rc3 +=========== + +Bug fixes: +- #6748 Copyright year in about dialog isn't updated + v1.12.0-rc2 =========== diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp index da6c6ba21..8e92f44ff 100644 --- a/src/gui/src/AboutDialog.cpp +++ b/src/gui/src/AboutDialog.cpp @@ -27,6 +27,16 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) : { setupUi(this); + QString aboutText(R"(

+Keyboard and mouse sharing application. Cross platform and open source.

+Copyright © 2012-%%YEAR%% Symless Ltd.
+Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.

+Synergy is released under the GNU General Public License (GPLv2).

+Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.
+The Synergy GUI is based on QSynergy by Volker Lanz.

+Visit our website for help and info (symless.com). +

)"); + m_versionChecker.setApp(synergyApp); QString version = m_versionChecker.getVersion(); #ifdef SYNERGY_REVISION @@ -39,6 +49,9 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) : QDate buildDate = QLocale("en_US").toDate(buildDateString, "MMM d yyyy"); m_pLabelBuildDate->setText(buildDate.toString(Qt::SystemLocaleLongDate)); + //Sets the current build year into the copyright text + label_3->setText(aboutText.replace(QString("%%YEAR%%"), QString::number(buildDate.year()))); + // change default size based on os #if defined(Q_OS_MAC) QSize size(600, 380); diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui index b2cbe5e14..8cf6f63fc 100644 --- a/src/gui/src/AboutDialogBase.ui +++ b/src/gui/src/AboutDialogBase.ui @@ -50,15 +50,7 @@ - <p> -Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> -Copyright © 2012-2019 Symless Ltd.<br /> -Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> -Visit our website for help and info (symless.com). -</p> + 1