From 5032a5d275fca6b90870993a3f901d5e94948005 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Wed, 18 Dec 2024 19:05:51 -0500
Subject: [PATCH] refactor: MainWindow, no more auto connection for the host
 and client ip lines

---
 src/gui/src/MainWindow.cpp | 34 ++++++++++------------------------
 src/gui/src/MainWindow.h   |  5 +----
 src/gui/src/MainWindow.ui  |  8 ++++----
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 8b175e95c..df7754ec8 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -285,6 +285,12 @@ void MainWindow::connectSlots()
   connect(ui->btnApplySettings, &QPushButton::clicked, this, &MainWindow::resetCore);
   connect(ui->btnConnect, &QPushButton::clicked, this, &MainWindow::resetCore);
   connect(ui->btnConnectToClient, &QPushButton::clicked, this, &MainWindow::resetCore);
+
+  connect(ui->lineHostname, &QLineEdit::returnPressed, ui->btnConnect, &QPushButton::click);
+  connect(ui->lineHostname, &QLineEdit::textChanged, &m_CoreProcess, &deskflow::gui::CoreProcess::setAddress);
+
+  connect(ui->lineClientIp, &QLineEdit::returnPressed, ui->btnConnectToClient, &QPushButton::click);
+  connect(ui->lineClientIp, &QLineEdit::textChanged, &m_CoreProcess, &deskflow::gui::CoreProcess::setAddress);
 }
 
 void MainWindow::onAppAboutToQuit()
@@ -459,26 +465,6 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
   showConfigureServer();
 }
 
-void MainWindow::on_m_pLineEditHostname_returnPressed()
-{
-  ui->btnConnect->click();
-}
-
-void MainWindow::on_m_pLineEditClientIp_returnPressed()
-{
-  ui->btnConnectToClient->click();
-}
-
-void MainWindow::on_m_pLineEditHostname_textChanged(const QString &text)
-{
-  m_CoreProcess.setAddress(text);
-}
-
-void MainWindow::on_m_pLineEditClientIp_textChanged(const QString &text)
-{
-  m_CoreProcess.setAddress(text);
-}
-
 void MainWindow::resetCore()
 {
   m_ClientConnection.setShowMessage();
@@ -641,8 +627,8 @@ void MainWindow::applyConfig()
   enableServer(m_AppConfig.serverGroupChecked());
   enableClient(m_AppConfig.clientGroupChecked());
 
-  ui->m_pLineEditHostname->setText(m_AppConfig.serverHostname());
-  ui->m_pLineEditClientIp->setText(m_ServerConfig.getClientAddress());
+  ui->lineHostname->setText(m_AppConfig.serverHostname());
+  ui->lineClientIp->setText(m_ServerConfig.getClientAddress());
 }
 
 void MainWindow::applyCloseToTray() const
@@ -654,8 +640,8 @@ void MainWindow::saveSettings()
 {
   m_AppConfig.setServerGroupChecked(ui->m_pRadioGroupServer->isChecked());
   m_AppConfig.setClientGroupChecked(ui->m_pRadioGroupClient->isChecked());
-  m_AppConfig.setServerHostname(ui->m_pLineEditHostname->text());
-  m_ServerConfig.setClientAddress(ui->m_pLineEditClientIp->text());
+  m_AppConfig.setServerHostname(ui->lineHostname->text());
+  m_ServerConfig.setClientAddress(ui->lineClientIp->text());
 
   m_ConfigScopes.save();
 }
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 5a50b3d26..ed3de43f5 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -130,6 +130,7 @@ private slots:
   void testFatalError() const;
   void testCriticalError() const;
   void resetCore();
+
   //
   // Auto-connect slots
   //
@@ -138,10 +139,6 @@ private slots:
   void on_m_pRadioGroupServer_clicked(bool);
   void on_m_pRadioGroupClient_clicked(bool);
   void on_m_pButtonConfigureServer_clicked();
-  void on_m_pLineEditHostname_returnPressed();
-  void on_m_pLineEditClientIp_returnPressed();
-  void on_m_pLineEditHostname_textChanged(const QString &text);
-  void on_m_pLineEditClientIp_textChanged(const QString &text);
 
 private:
   std::unique_ptr<Ui::MainWindow> ui;
diff --git a/src/gui/src/MainWindow.ui b/src/gui/src/MainWindow.ui
index 309917657..196dc0323 100644
--- a/src/gui/src/MainWindow.ui
+++ b/src/gui/src/MainWindow.ui
@@ -206,7 +206,7 @@
                    <number>20</number>
                   </property>
                   <item>
-                   <widget class="QLineEdit" name="m_pLineEditClientIp"/>
+                   <widget class="QLineEdit" name="lineClientIp"/>
                   </item>
                   <item>
                    <widget class="QPushButton" name="btnConnectToClient">
@@ -376,7 +376,7 @@
                 <number>20</number>
                </property>
                <item>
-                <widget class="QLineEdit" name="m_pLineEditHostname">
+                <widget class="QLineEdit" name="lineHostname">
                  <property name="minimumSize">
                   <size>
                    <width>0</width>
@@ -615,10 +615,10 @@
  <tabstops>
   <tabstop>m_pRadioGroupServer</tabstop>
   <tabstop>m_pRadioGroupClient</tabstop>
-  <tabstop>m_pLineEditClientIp</tabstop>
+  <tabstop>lineClientIp</tabstop>
   <tabstop>btnConnectToClient</tabstop>
   <tabstop>m_pButtonConfigureServer</tabstop>
-  <tabstop>m_pLineEditHostname</tabstop>
+  <tabstop>lineHostname</tabstop>
   <tabstop>btnConnect</tabstop>
   <tabstop>m_pLogOutput</tabstop>
   <tabstop>btnApplySettings</tabstop>