Merge branch '2.7' into master

1 files changed, 8 insertions, 24 deletions

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 76768ea97..1d8663abe 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -27,6 +27,7 @@
 #include "accountstate.h"
 #include "openfilemanager.h"
 #include "accountmanager.h"
+#include "aboutdialog.h"
 #include "common/syncjournalfilerecord.h"
 #include "creds/abstractcredentials.h"
 
@@ -49,7 +50,6 @@ ownCloudGui::ownCloudGui(Application *parent)
     : QObject(parent)
     , _tray(new Systray(this))
     , _settingsDialog(new SettingsDialog(this))
-    , _logBrowser(nullptr)
     , _recentActionsMenu(nullptr)
     , _app(parent)
 {
@@ -1018,18 +1018,14 @@ void ownCloudGui::slotShutdown()
 
     // those do delete on close
     _settingsDialog->close();
-    if (!_logBrowser.isNull())
-        _logBrowser->deleteLater();
 }
 
 void ownCloudGui::slotToggleLogBrowser()
 {
-    if (_logBrowser.isNull()) {
-        // init the log browser.
-        _logBrowser = new LogBrowser(settingsDialog());
-    }
-    _logBrowser->open();
-    raiseDialog(_logBrowser);
+    auto logBrowser = new LogBrowser(settingsDialog());
+    logBrowser->setAttribute(Qt::WA_DeleteOnClose);
+    logBrowser->open();
+    raiseDialog(logBrowser);
 }
 
 void ownCloudGui::slotOpenOwnCloud()
@@ -1141,21 +1137,9 @@ void ownCloudGui::slotRemoveDestroyedShareDialogs()
 
 void ownCloudGui::slotAbout()
 {
-    const QString title = tr("About %1").arg(Theme::instance()->appNameGUI());
-    QMessageBox *msgBox = new QMessageBox(this->_settingsDialog);
-#ifdef Q_OS_MAC
-    // From Qt doc: "On macOS, the window title is ignored (as required by the macOS Guidelines)."
-    msgBox->setText(title);
-#else
-    msgBox->setWindowTitle(title);
-#endif
-    msgBox->setAttribute(Qt::WA_DeleteOnClose, true);
-    msgBox->setTextFormat(Qt::RichText);
-    msgBox->setTextInteractionFlags(Qt::TextBrowserInteraction);
-    msgBox->setInformativeText(QStringLiteral("<qt>%1</qt>").arg(Theme::instance()->about()));
-    msgBox->setStandardButtons(QMessageBox::Ok);
-    msgBox->setIconPixmap(Theme::instance()->applicationIcon().pixmap(qApp->primaryScreen()->availableSize().width() / 4));
-    msgBox->show();
+    auto about = new AboutDialog(_settingsDialog);
+    about->setAttribute(Qt::WA_DeleteOnClose);
+    about->open();
 }