From be5025b2258b6de44a4e8f3f972413d8e6352bc9 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 18 Dec 2024 19:33:05 -0500 Subject: [PATCH] refactor: MainWindow, Do not use auto connection for the computer name label --- src/gui/src/MainWindow.cpp | 12 ++++-------- src/gui/src/MainWindow.h | 1 - src/gui/src/MainWindow.ui | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index c9fcbc7a2..b270a5c41 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -293,6 +293,7 @@ void MainWindow::connectSlots() connect(ui->lineClientIp, &QLineEdit::textChanged, &m_CoreProcess, &deskflow::gui::CoreProcess::setAddress); connect(ui->btnConfigureServer, &QPushButton::clicked, this, [this] { showConfigureServer(""); }); + connect(ui->lblComputerName, &QLabel::linkActivated, this, &MainWindow::openSettings); } void MainWindow::onAppAboutToQuit() @@ -468,11 +469,6 @@ void MainWindow::resetCore() m_CoreProcess.restart(); } -void MainWindow::on_m_pLabelComputerName_linkActivated(const QString &) -{ - m_actionSettings->trigger(); -} - void MainWindow::on_m_pLabelFingerprint_linkActivated(const QString &) { QMessageBox::information(this, "TLS fingerprint", TlsFingerprint::local().readFirst()); @@ -1012,9 +1008,9 @@ void MainWindow::secureSocket(bool secureSocket) void MainWindow::updateScreenName() { - ui->m_pLabelComputerName->setText(QString("This computer's name: %1 " - R"((change))") - .arg(m_AppConfig.screenName(), kColorSecondary)); + ui->lblComputerName->setText(QString("This computer's name: %1 " + R"((change))") + .arg(m_AppConfig.screenName(), kColorSecondary)); m_ServerConfig.updateServerName(); } diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 57905dc54..2512d4413 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -134,7 +134,6 @@ private slots: // // Auto-connect slots // - void on_m_pLabelComputerName_linkActivated(const QString &link); void on_m_pLabelFingerprint_linkActivated(const QString &link); void on_m_pRadioGroupServer_clicked(bool); void on_m_pRadioGroupClient_clicked(bool); diff --git a/src/gui/src/MainWindow.ui b/src/gui/src/MainWindow.ui index f8ce2d9e0..e4be6a1a3 100644 --- a/src/gui/src/MainWindow.ui +++ b/src/gui/src/MainWindow.ui @@ -33,7 +33,7 @@ - + This computer's name: