smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6749 from symless/issue-6748-copyright-year

Browse source 
Updated copyright in about to the current build year
This commit is contained in:
Jnewbon 2020-08-18 15:59:37 +01:00 committed by GitHub
commit 8b4026adcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
v1.12.0-rc3
===========
Bug fixes:
- #6748 Copyright year in about dialog isn't updated
v1.12.0-rc2 v1.12.0-rc2
=========== ===========

13
src/gui/src/AboutDialog.cpp
View file

@ -27,6 +27,16 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
{ {
setupUi(this); setupUi(this);
QString aboutText(R"(<p>
Keyboard and mouse sharing application. Cross platform and open source.<br /><br />
Copyright © 2012-%%YEAR%% 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>)");
m_versionChecker.setApp(synergyApp); m_versionChecker.setApp(synergyApp);
QString version = m_versionChecker.getVersion(); QString version = m_versionChecker.getVersion();
#ifdef SYNERGY_REVISION #ifdef SYNERGY_REVISION
@ -39,6 +49,9 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
QDate buildDate = QLocale("en_US").toDate(buildDateString, "MMM d yyyy"); QDate buildDate = QLocale("en_US").toDate(buildDateString, "MMM d yyyy");
m_pLabelBuildDate->setText(buildDate.toString(Qt::SystemLocaleLongDate)); 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 // change default size based on os
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
QSize size(600, 380); QSize size(600, 380);

10
src/gui/src/AboutDialogBase.ui
View file

@ -50,15 +50,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;p&gt; <string></string>
Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
Copyright © 2012-2019 Symless Ltd.&lt;br /&gt;
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
The Synergy GUI is based on QSynergy by Volker Lanz.&lt;br /&gt;&lt;br /&gt;
Visit our website for help and info (symless.com).
&lt;/p&gt;</string>
</property> </property>
<property name="margin"> <property name="margin">
<number>1</number> <number>1</number>