smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: MainWindow, no more auto connection for the host and client ip lines

Browse source
This commit is contained in:
sithlord48 2024-12-18 19:05:51 -05:00 committed by Nick Bolton
parent d0dadf2112
commit 5032a5d275
3 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gui/src/MainWindow.cpp
View file

@ -285,6 +285,12 @@ void MainWindow::connectSlots()
connect(ui->btnApplySettings, &QPushButton::clicked, this, &MainWindow::resetCore); connect(ui->btnApplySettings, &QPushButton::clicked, this, &MainWindow::resetCore);
connect(ui->btnConnect, &QPushButton::clicked, this, &MainWindow::resetCore); connect(ui->btnConnect, &QPushButton::clicked, this, &MainWindow::resetCore);
connect(ui->btnConnectToClient, &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() void MainWindow::onAppAboutToQuit()
@ -459,26 +465,6 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
showConfigureServer(); 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() void MainWindow::resetCore()
{ {
m_ClientConnection.setShowMessage(); m_ClientConnection.setShowMessage();
@ -641,8 +627,8 @@ void MainWindow::applyConfig()
enableServer(m_AppConfig.serverGroupChecked()); enableServer(m_AppConfig.serverGroupChecked());
enableClient(m_AppConfig.clientGroupChecked()); enableClient(m_AppConfig.clientGroupChecked());
ui->m_pLineEditHostname->setText(m_AppConfig.serverHostname()); ui->lineHostname->setText(m_AppConfig.serverHostname());
ui->m_pLineEditClientIp->setText(m_ServerConfig.getClientAddress()); ui->lineClientIp->setText(m_ServerConfig.getClientAddress());
} }
void MainWindow::applyCloseToTray() const void MainWindow::applyCloseToTray() const
@ -654,8 +640,8 @@ void MainWindow::saveSettings()
{ {
m_AppConfig.setServerGroupChecked(ui->m_pRadioGroupServer->isChecked()); m_AppConfig.setServerGroupChecked(ui->m_pRadioGroupServer->isChecked());
m_AppConfig.setClientGroupChecked(ui->m_pRadioGroupClient->isChecked()); m_AppConfig.setClientGroupChecked(ui->m_pRadioGroupClient->isChecked());
m_AppConfig.setServerHostname(ui->m_pLineEditHostname->text()); m_AppConfig.setServerHostname(ui->lineHostname->text());
m_ServerConfig.setClientAddress(ui->m_pLineEditClientIp->text()); m_ServerConfig.setClientAddress(ui->lineClientIp->text());
m_ConfigScopes.save(); m_ConfigScopes.save();
} }

5
src/gui/src/MainWindow.h
View file

@ -130,6 +130,7 @@ private slots:
void testFatalError() const; void testFatalError() const;
void testCriticalError() const; void testCriticalError() const;
void resetCore(); void resetCore();
// //
// Auto-connect slots // Auto-connect slots
// //
@ -138,10 +139,6 @@ private slots:
void on_m_pRadioGroupServer_clicked(bool); void on_m_pRadioGroupServer_clicked(bool);
void on_m_pRadioGroupClient_clicked(bool); void on_m_pRadioGroupClient_clicked(bool);
void on_m_pButtonConfigureServer_clicked(); 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: private:
std::unique_ptr<Ui::MainWindow> ui; std::unique_ptr<Ui::MainWindow> ui;

8
src/gui/src/MainWindow.ui
View file

@ -206,7 +206,7 @@
<number>20</number> <number>20</number>
</property> </property>
<item> <item>
<widget class="QLineEdit" name="m_pLineEditClientIp"/> <widget class="QLineEdit" name="lineClientIp"/>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnConnectToClient"> <widget class="QPushButton" name="btnConnectToClient">
@ -376,7 +376,7 @@
<number>20</number> <number>20</number>
</property> </property>
<item> <item>
<widget class="QLineEdit" name="m_pLineEditHostname"> <widget class="QLineEdit" name="lineHostname">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -615,10 +615,10 @@
<tabstops> <tabstops>
<tabstop>m_pRadioGroupServer</tabstop> <tabstop>m_pRadioGroupServer</tabstop>
<tabstop>m_pRadioGroupClient</tabstop> <tabstop>m_pRadioGroupClient</tabstop>
<tabstop>m_pLineEditClientIp</tabstop> <tabstop>lineClientIp</tabstop>
<tabstop>btnConnectToClient</tabstop> <tabstop>btnConnectToClient</tabstop>
<tabstop>m_pButtonConfigureServer</tabstop> <tabstop>m_pButtonConfigureServer</tabstop>
<tabstop>m_pLineEditHostname</tabstop> <tabstop>lineHostname</tabstop>
<tabstop>btnConnect</tabstop> <tabstop>btnConnect</tabstop>
<tabstop>m_pLogOutput</tabstop> <tabstop>m_pLogOutput</tabstop>
<tabstop>btnApplySettings</tabstop> <tabstop>btnApplySettings</tabstop>