Start cleaning up the UI code

* Move out the settings account stuff to it's own manager
SneWs · Jul 11, 2024 · 03cdef3 · 03cdef3
1 parent aa754b6
commit 03cdef3
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 28 deletions.
diff --git a/AccountsTabUiManager.cpp b/AccountsTabUiManager.cpp
@@ -0,0 +1,49 @@
+//
+// Created by marcus on 2024-07-11.
+//
+
+#include "AccountsTabUiManager.h"
+
+#include <QDesktopServices>
+#include <QPushButton>
+#include <QUrl>
+
+#include "./ui_MainWindow.h"
+#include "models.h"
+
+AccountsTabUiManager::AccountsTabUiManager(Ui::MainWindow* u, QObject* parent)
+    : QObject(parent)
+    , ui(u)
+{
+
+    connect(ui->btnAdminConsole, &QPushButton::clicked,
+        this, [this]() {
+            QDesktopServices::openUrl(QUrl("https://login.tailscale.com/admin"));
+        }
+    );
+}
+
+AccountsTabUiManager::~AccountsTabUiManager() {
+ }
+
+void AccountsTabUiManager::onTailStatusChanged(TailStatus* pTailStatus) {
+    if (pTailStatus->user->id <= 0)
+        return; // Not logged in
+
+    ui->lstAccounts->clear();
+    auto* pCurrent = new QListWidgetItem(pTailStatus->user->displayName + "\n" +
+                                         pTailStatus->user->loginName);
+    ui->lstAccounts->addItem(pCurrent);
+
+    pCurrent->setSelected(true);
+    pCurrent->setTextAlignment(Qt::AlignmentFlag::AlignLeft | Qt::AlignmentFlag::AlignVCenter);
+
+    ui->lblUsername->setText(pTailStatus->user->displayName);
+    ui->lblTailnetName->setText(pTailStatus->user->loginName);
+    ui->lblEmail->setText(pTailStatus->user->loginName);
+    ui->lblStatus->setText(pTailStatus->backendState);
+    ui->lblKeyExpiry->setText(pTailStatus->self->keyExpiry.toString(Qt::DateFormat::ISODate));
+    if (!pTailStatus->user->profilePicUrl.isEmpty()) {
+        // ui->lblUsername->setPixmap(QPixmap(pTailStatus->user->profilePicUrl));
+    }
+}
diff --git a/AccountsTabUiManager.h b/AccountsTabUiManager.h
@@ -0,0 +1,33 @@
+//
+// Created by marcus on 2024-07-11.
+//
+
+#ifndef ACCOUNTSTABUIMANAGER_H
+#define ACCOUNTSTABUIMANAGER_H
+
+#include <QObject>
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class MainWindow;
+}
+QT_END_NAMESPACE
+
+class TailStatus;
+
+class AccountsTabUiManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit AccountsTabUiManager(Ui::MainWindow* ui, QObject* parent = nullptr);
+    virtual ~AccountsTabUiManager();
+
+    void onTailStatusChanged(TailStatus* pTailStatus);
+
+private:
+    Ui::MainWindow* ui;
+};
+
+
+
+#endif //ACCOUNTSTABUIMANAGER_H
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,8 @@ set(PROJECT_SOURCES
         TrayMenuManager.h
         TailSettings.cpp
         TailSettings.h
+        AccountsTabUiManager.cpp
+        AccountsTabUiManager.h
 )
 
 qt_add_executable(tail-tray

diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -1,20 +1,22 @@
-#include "MainWindow.h"
-#include "./ui_MainWindow.h"
-
 #include <QDir>
 #include <QFile>
-#include <QDesktopServices>
+
+#include "MainWindow.h"
+#include "AccountsTabUiManager.h"
+#include "./ui_MainWindow.h"
 
 MainWindow::MainWindow(QWidget* parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
+    , accountsTabUi(nullptr)
     , pTrayManager(nullptr)
     , eCurrentState(TailState::NoAccount)
     , pCurrentExecution(nullptr)
     , pTailStatus(nullptr)
     , pStatusCheckTimer(nullptr)
 {
     ui->setupUi(this);
+    accountsTabUi = new AccountsTabUiManager(ui, this);
 
     pStatusCheckTimer = new QTimer(this);
     connect(pStatusCheckTimer, &QTimer::timeout, this, [this]() {
@@ -50,12 +52,6 @@ MainWindow::MainWindow(QWidget* parent)
     connect(ui->btnSettingsClose, &QPushButton::clicked,
 this, &MainWindow::settingsClosed);
 
-    connect(ui->btnAdminConsole, &QPushButton::clicked,
-        this, [this]() {
-            QDesktopServices::openUrl(QUrl("https://login.tailscale.com/admin"));
-        }
-    );
-
     syncSettingsToUi();
 }
 
@@ -103,6 +99,7 @@ void MainWindow::onTailStatusChanged(TailStatus* pNewStatus)
     delete pTailStatus;
 
     pTailStatus = pNewStatus;
+
     if (pTailStatus->user->id > 0)
     {
         // Logged in
@@ -113,25 +110,9 @@ void MainWindow::onTailStatusChanged(TailStatus* pNewStatus)
 
         auto formattedVersion = pTailStatus->version.mid(0, pTailStatus->version.indexOf("-"));
         ui->lblVersionNumber->setText("Version " + formattedVersion);
-
-        // User account stuff
-        ui->lstAccounts->clear();
-        auto* pCurrent = new QListWidgetItem(pTailStatus->user->displayName + "\n" +
-            pTailStatus->user->loginName);
-        ui->lstAccounts->addItem(pCurrent);
-
-        pCurrent->setSelected(true);
-        pCurrent->setTextAlignment(Qt::AlignmentFlag::AlignLeft | Qt::AlignmentFlag::AlignVCenter);
-
-        ui->lblUsername->setText(pTailStatus->user->displayName);
-        ui->lblTailnetName->setText(pTailStatus->user->loginName);
-        ui->lblEmail->setText(pTailStatus->user->loginName);
-        ui->lblStatus->setText(pTailStatus->backendState);
-        ui->lblKeyExpiry->setText(pTailStatus->self->keyExpiry.toString(Qt::DateFormat::ISODate));
-        if (!pTailStatus->user->profilePicUrl.isEmpty()) {
-            // ui->lblUsername->setPixmap(QPixmap(pTailStatus->user->profilePicUrl));
-        }
     }
+
+    accountsTabUi->onTailStatusChanged(pTailStatus);
 }
 
 void MainWindow::syncSettingsToUi() {

diff --git a/MainWindow.h b/MainWindow.h
@@ -14,6 +14,8 @@ class MainWindow;
 }
 QT_END_NAMESPACE
 
+class AccountsTabUiManager;
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -28,6 +30,7 @@ class MainWindow : public QMainWindow
 
 private:
     Ui::MainWindow* ui;
+    AccountsTabUiManager* accountsTabUi;
     TrayMenuManager* pTrayManager;
 
     TailState eCurrentState;