Merge remote-tracking branch 'origin/2.5'

 Conflicts:
	VERSION.cmake
	src/gui/generalsettings.ui
	src/libsync/propagateuploadng.cpp

1 files changed, 11 insertions, 2 deletions

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index dc2335ddd..6d7922d63 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -16,6 +16,7 @@
 #include "ui_generalsettings.h"
 
 #include "theme.h"
+#include "version.h"
 #include "configfile.h"
 #include "application.h"
 #include "configfile.h"
@@ -103,12 +104,20 @@ GeneralSettings::GeneralSettings(QWidget *parent)
     if (theme->appName() != QLatin1String("ownCloud") && theme->appName() != QLatin1String("testpilotcloud") ) {
 #ifdef Q_OS_MAC
         // Because we don't have any statusString from the SparkleUpdater anyway we can hide the whole thing
-        _ui->updatesGroupBox->hide();
+        _ui->updaterWidget->hide();
 #else
         _ui->updateChannelLabel->hide();
         _ui->updateChannel->hide();
 #endif
     }
+
+    _ui->versionLabel->setText("<a href='about'>" MIRALL_VERSION_STRING "</a>");
+    QObject::connect(_ui->versionLabel, &QLabel::linkActivated, this, &GeneralSettings::showAbout);
+
+    if (!theme->aboutShowCopyright()) {
+        _ui->copyrightLabelDotBefore->hide();
+        _ui->copyrightLabel->hide();
+    }
 }
 
 GeneralSettings::~GeneralSettings()
@@ -143,7 +152,7 @@ void GeneralSettings::slotUpdateInfo()
 {
     if (ConfigFile().skipUpdateCheck() || !Updater::instance()) {
         // updater disabled on compile
-        _ui->updatesGroupBox->setVisible(false);
+        _ui->updaterWidget->setVisible(false);
         return;
     }