#3632 webapp: show connected status in status bar

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -1,5 +1,12 @@
 # QOwnNotes Changelog
 
+## 26.6.3
+
+- Added a compact web application connection status indicator to the main window
+  status bar when web application support is enabled; right-clicking it now shows
+  a context menu with a **Connected systems** submenu
+  (for [#3632](https://github.com/pbek/QOwnNotes/issues/3632))
+
 ## 26.6.2
 
 - Fixed custom shortcuts for actions that appear in multiple menus, such as

src/mainwindow.cpp

@@ -74,6 +74,7 @@
 #include <QKeyEvent>
 #include <QKeySequence>
 #include <QListWidgetItem>
+#include <QMenu>
 #include <QMessageBox>
 #include <QMimeData>
 #include <QPageSetupDialog>
@@ -287,8 +288,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
     _noteSubFolderDockWidgetVisible = true;
     _noteExternallyRemovedCheckEnabled = true;
     _readOnlyButton = new QPushButton(this);
+    _webAppStatusButton = new QPushButton(this);
     _lastNoteSelectionWasMultiple = false;
     _webSocketServerService = nullptr;
+    _webAppClientService = nullptr;
     _mcpService = nullptr;
     _closeEventWasFired = false;
     _useNoteFolderButtons = settings.value("useNoteFolderButtons").toBool();
@@ -911,6 +914,8 @@ void MainWindow::initWebSocketServerService() {
 void MainWindow::initWebAppClientService() {
     _webAppClientServiceSettingsKey = webAppClientServiceSettingsKey();
     _webAppClientService = new WebAppClientService();
+    connectWebAppClientServiceSignals();
+    updateWebAppStatusButton();
 }
 
 /**
@@ -928,6 +933,7 @@ void MainWindow::reinitWebAppClientService() {
 
     delete _webAppClientService;
     _webAppClientService = nullptr;
+    _webAppConnectedDevices.clear();
     initWebAppClientService();
 }
 
@@ -2971,6 +2977,9 @@ void MainWindow::setupStatusBarWidgets() {
 
     ui->statusBar->addPermanentWidget(_noteEditLineNumberLabel);
 
+    setupWebAppStatusButton();
+    ui->statusBar->addPermanentWidget(_webAppStatusButton);
+
     /*
      * setup of update available button
      */
@@ -2988,6 +2997,77 @@ void MainWindow::setupStatusBarWidgets() {
     ui->statusBar->addPermanentWidget(_updateAvailableButton);
 }
 
+void MainWindow::setupWebAppStatusButton() {
+    _webAppStatusButton->setFlat(true);
+    _webAppStatusButton->setText(tr("Web"));
+    _webAppStatusButton->setStyleSheet(QStringLiteral("QPushButton {padding: 0 5px}"));
+    _webAppStatusButton->setContextMenuPolicy(Qt::CustomContextMenu);
+
+    connect(_webAppStatusButton, &QWidget::customContextMenuRequested, this,
+            &MainWindow::showWebAppStatusContextMenu);
+
+    updateWebAppStatusButton();
+}
+
+void MainWindow::connectWebAppClientServiceSignals() {
+    if (_webAppClientService == nullptr) {
+        return;
+    }
+
+    connect(_webAppClientService, &WebAppClientService::connectionStateChanged, this,
+            [this](bool) { updateWebAppStatusButton(); });
+    connect(_webAppClientService, &WebAppClientService::connectedDevicesUpdated, this,
+            &MainWindow::updateWebAppConnectedDevices);
+}
+
+void MainWindow::updateWebAppStatusButton() {
+    if (_webAppStatusButton == nullptr) {
+        return;
+    }
+
+    const bool enabled = Utils::Misc::isWebAppSupportEnabled();
+    const bool connected =
+        _webAppClientService != nullptr && _webAppClientService->checkIsConnected();
+    _webAppStatusButton->setVisible(enabled);
+    _webAppStatusButton->setToolTip(connected ? tr("Web app is connected")
+                                              : tr("Web app is not connected"));
+    _webAppStatusButton->setStyleSheet(
+        connected ? QStringLiteral("QPushButton {padding: 0 5px; color: #2e7d32}")
+                  : QStringLiteral("QPushButton {padding: 0 5px; color: #b71c1c}"));
+}
+
+void MainWindow::updateWebAppConnectedDevices(const QStringList &deviceNames) {
+    _webAppConnectedDevices = deviceNames;
+    updateWebAppStatusButton();
+}
+
+void MainWindow::showWebAppStatusContextMenu(const QPoint &point) {
+    if (_webAppStatusButton == nullptr || !Utils::Misc::isWebAppSupportEnabled()) {
+        return;
+    }
+
+    const bool connected =
+        _webAppClientService != nullptr && _webAppClientService->checkIsConnected();
+    if (connected) {
+        _webAppClientService->sendRequestConnectedDevices();
+    }
+
+    QMenu menu(this);
+    menu.addAction(connected ? tr("Web app connected") : tr("Web app disconnected"))
+        ->setEnabled(false);
+
+    QMenu *connectedSystemsMenu = menu.addMenu(tr("Connected systems"));
+    if (_webAppConnectedDevices.isEmpty()) {
+        connectedSystemsMenu->addAction(tr("No connected systems"))->setEnabled(false);
+    } else {
+        for (const QString &deviceName : qAsConst(_webAppConnectedDevices)) {
+            connectedSystemsMenu->addAction(deviceName)->setEnabled(false);
+        }
+    }
+
+    menu.exec(_webAppStatusButton->mapToGlobal(point));
+}
+
 void MainWindow::initializeOpenAiActivitySpinner() {
     _aiToolbarManager->initializeOpenAiActivitySpinner();
 }

src/mainwindow.h

@@ -50,6 +50,7 @@ class QPlainTextEdit;
 class QTextEdit;
 class QTextDocument;
 class QLabel;
+class QMenu;
 class QPushButton;
 class QFile;
 class QToolBar;
@@ -958,6 +959,7 @@ class MainWindow : public QMainWindow {
     NoteHistory noteHistory;
     QHash<int, NoteHistoryItem> noteBookmarks;
     QPushButton *_updateAvailableButton;
+    QPushButton *_webAppStatusButton;
     NoteFilePathLabel *_noteFilePathLabel;
     QLabel *_noteEditLineNumberLabel;
     QPushButton *_readOnlyButton;
@@ -1027,6 +1029,7 @@ class MainWindow : public QMainWindow {
     WebSocketServerService *_webSocketServerService;
     WebAppClientService *_webAppClientService;
     QString _webAppClientServiceSettingsKey;
+    QStringList _webAppConnectedDevices;
     McpService *_mcpService;
     bool _brokenTagNoteLinksRemoved = false;
 
@@ -1123,6 +1126,12 @@ class MainWindow : public QMainWindow {
 
     void setupStatusBarWidgets();
 
+    void setupWebAppStatusButton();
+    void connectWebAppClientServiceSignals();
+    void updateWebAppStatusButton();
+    void updateWebAppConnectedDevices(const QStringList &deviceNames);
+    void showWebAppStatusContextMenu(const QPoint &point);
+
     void gotoNextNote();
 
     void activateContextMenu();

src/services/webappclientservice.cpp

@@ -291,6 +291,9 @@ void WebAppClientService::onConnected() {
 
     // Send registration with connection name to the server
     sendRegister();
+    sendRequestConnectedDevices();
+
+    emit connectionStateChanged(true);
 }
 
 void WebAppClientService::onDisconnected() {
@@ -300,6 +303,9 @@ void WebAppClientService::onDisconnected() {
 
     Utils::Misc::printInfo(
         tr("QOwnNotes is now disconnected from websocket to %1").arg(getServerUrl()));
+
+    emit connectionStateChanged(false);
+    emit connectedDevicesUpdated(QStringList());
 }
 
 void WebAppClientService::onTextMessageReceived(const QString &message) {

src/services/webappclientservice.h

@@ -47,6 +47,7 @@ class WebAppClientService : public QObject {
     bool sendClipboardAsText() const;
 
    signals:
+    void connectionStateChanged(bool connected);
     void connectedDevicesUpdated(const QStringList &deviceNames);
 
    private slots: