Merge remote-tracking branch 'origin/rc173' into rc173

viewer/JFJochViewerWindow.cpp

@@ -26,6 +26,9 @@
 #include <QLabel>
 #include <QPainter>
 #include <QPushButton>
+#include <QToolButton>
+#include <QDesktopServices>
+#include <QUrl>
 
 #include <utility>
 
@@ -37,6 +40,7 @@
 #include "widgets/JFJochViewerSettingsDock.h"
 #include "widgets/JFJochViewerFileBrowser.h"
 #include "JFJochViewerStatusBar.h"
+#include "ViewerTheme.h"
 #include "../common/CUDAWrapper.h"
 #include "../rugnux/RugnuxDefaults.h"
 #include "windows/JFJochViewerImageListWindow.h"
@@ -71,14 +75,31 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     menuBar = new JFJochViewerMenu(this);
     setMenuBar(menuBar);
 
-    // PSI logo in the menu-bar corner. There are four interchangeable dot designs; pick one at
+    // PSI logo in the menu-bar corner, linking to the PSI website. There are four interchangeable dot
-    // random each launch, for fun.
+    // designs; pick one at random each launch, for fun. The logo is black only, so the negative for the
+    // dark theme is the same image with its colours inverted.
     {
         const int n = QRandomGenerator::global()->bounded(1, 5);   // 1..4
-        QPixmap logoPixmap(QStringLiteral(":/psi_%1.png").arg(n, 2, 10, QLatin1Char('0')));
+        // As tall as the menu entries make the bar, so the logo does not stretch it.
-        auto *logo = new QLabel(this);
+        const QImage logoImage = QImage(QStringLiteral(":/psi_%1.png").arg(n, 2, 10, QLatin1Char('0')))
-        logo->setPixmap(logoPixmap.scaledToHeight(22, Qt::SmoothTransformation));
+                .convertToFormat(QImage::Format_ARGB32)
-        logo->setContentsMargins(6, 0, 8, 0);
+                .scaledToHeight(menuBar->sizeHint().height(), Qt::SmoothTransformation);
+        auto *logo = new QToolButton(this);
+        logo->setAutoRaise(true);
+        // No button padding or frame, which would make the bar taller all the same.
+        logo->setStyleSheet("QToolButton { padding: 0px 8px 0px 6px; border: none; }");
+        logo->setCursor(Qt::PointingHandCursor);
+        logo->setToolTip("Paul Scherrer Institute - www.psi.ch");
+        logo->setIconSize(logoImage.size());
+        auto setLogoIcon = [logo, logoImage] {
+            QImage image = logoImage;
+            if (DarkTheme())
+                image.invertPixels(QImage::InvertRgb);
+            logo->setIcon(QPixmap::fromImage(image));
+        };
+        setLogoIcon();
+        connect(ThemeNotifier::Instance(), &ThemeNotifier::changed, logo, setLogoIcon);
+        connect(logo, &QToolButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.psi.ch")); });
         menuBar->setCornerWidget(logo, Qt::TopRightCorner);
     }