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

refactor: MainWindow, do not use autoconnections for the client / server radio butons

Browse source
This commit is contained in:
sithlord48 2024-12-18 19:47:50 -05:00 committed by Nick Bolton
parent 19c227b937
commit 94006f0bcd
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
* Copyright (C) 2012 Symless Ltd. * Copyright (C) 2012 Symless Ltd.
* Copyright (C) 2008 Volker Lanz (vl@fidra.de) * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
* *
@ -198,8 +199,8 @@ void MainWindow::setupControls()
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
ui->m_pRadioGroupServer->setAttribute(Qt::WA_MacShowFocusRect, 0); ui->rbModeServer->setAttribute(Qt::WA_MacShowFocusRect, 0);
ui->m_pRadioGroupClient->setAttribute(Qt::WA_MacShowFocusRect, 0); ui->rbModeClient->setAttribute(Qt::WA_MacShowFocusRect, 0);
#endif #endif
} }
@ -295,6 +296,9 @@ void MainWindow::connectSlots()
connect(ui->btnConfigureServer, &QPushButton::clicked, this, [this] { showConfigureServer(""); }); connect(ui->btnConfigureServer, &QPushButton::clicked, this, [this] { showConfigureServer(""); });
connect(ui->lblComputerName, &QLabel::linkActivated, this, &MainWindow::openSettings); connect(ui->lblComputerName, &QLabel::linkActivated, this, &MainWindow::openSettings);
connect(ui->lblMyFingerprint, &QLabel::linkActivated, this, &MainWindow::showMyFingerprint); connect(ui->lblMyFingerprint, &QLabel::linkActivated, this, &MainWindow::showMyFingerprint);
connect(ui->rbModeServer, &QRadioButton::clicked, this, &MainWindow::setModeServer);
connect(ui->rbModeClient, &QRadioButton::clicked, this, &MainWindow::setModeClient);
} }
void MainWindow::onAppAboutToQuit() void MainWindow::onAppAboutToQuit()
@ -475,14 +479,14 @@ void MainWindow::showMyFingerprint()
QMessageBox::information(this, "TLS fingerprint", TlsFingerprint::local().readFirst()); QMessageBox::information(this, "TLS fingerprint", TlsFingerprint::local().readFirst());
} }
void MainWindow::on_m_pRadioGroupServer_clicked(bool) void MainWindow::setModeServer()
{ {
enableServer(true); enableServer(true);
enableClient(false); enableClient(false);
m_ConfigScopes.save(); m_ConfigScopes.save();
} }
void MainWindow::on_m_pRadioGroupClient_clicked(bool) void MainWindow::setModeClient()
{ {
enableClient(true); enableClient(true);
enableServer(false); enableServer(false);
@ -632,8 +636,8 @@ void MainWindow::applyCloseToTray() const
void MainWindow::saveSettings() void MainWindow::saveSettings()
{ {
m_AppConfig.setServerGroupChecked(ui->m_pRadioGroupServer->isChecked()); m_AppConfig.setServerGroupChecked(ui->rbModeServer->isChecked());
m_AppConfig.setClientGroupChecked(ui->m_pRadioGroupClient->isChecked()); m_AppConfig.setClientGroupChecked(ui->rbModeClient->isChecked());
m_AppConfig.setServerHostname(ui->lineHostname->text()); m_AppConfig.setServerHostname(ui->lineHostname->text());
m_ServerConfig.setClientAddress(ui->lineClientIp->text()); m_ServerConfig.setClientAddress(ui->lineClientIp->text());
@ -693,7 +697,7 @@ void MainWindow::updateFromLogLine(const QString &line)
void MainWindow::checkConnected(const QString &line) void MainWindow::checkConnected(const QString &line)
{ {
if (ui->m_pRadioGroupServer->isChecked()) { if (ui->rbModeServer->isChecked()) {
m_ServerConnection.handleLogLine(line); m_ServerConnection.handleLogLine(line);
ui->m_pLabelServerState->updateServerState(line); ui->m_pLabelServerState->updateServerState(line);
} else { } else {
@ -962,7 +966,7 @@ void MainWindow::updateLocalFingerprint()
qFatal("failed to check if fingerprint exists"); qFatal("failed to check if fingerprint exists");
} }
if (m_AppConfig.tlsEnabled() && fingerprintExists && ui->m_pRadioGroupServer->isChecked()) { if (m_AppConfig.tlsEnabled() && fingerprintExists && ui->rbModeServer->isChecked()) {
ui->lblMyFingerprint->setVisible(true); ui->lblMyFingerprint->setVisible(true);
} else { } else {
ui->lblMyFingerprint->setVisible(false); ui->lblMyFingerprint->setVisible(false);
@ -1019,7 +1023,7 @@ void MainWindow::enableServer(bool enable)
{ {
qDebug(enable ? "server enabled" : "server disabled"); qDebug(enable ? "server enabled" : "server disabled");
m_AppConfig.setServerGroupChecked(enable); m_AppConfig.setServerGroupChecked(enable);
ui->m_pRadioGroupServer->setChecked(enable); ui->rbModeServer->setChecked(enable);
ui->m_pWidgetServer->setEnabled(enable); ui->m_pWidgetServer->setEnabled(enable);
ui->m_pWidgetServerInput->setVisible(m_AppConfig.invertConnection()); ui->m_pWidgetServerInput->setVisible(m_AppConfig.invertConnection());
@ -1043,7 +1047,7 @@ void MainWindow::enableClient(bool enable)
{ {
qDebug(enable ? "client enabled" : "client disabled"); qDebug(enable ? "client enabled" : "client disabled");
m_AppConfig.setClientGroupChecked(enable); m_AppConfig.setClientGroupChecked(enable);
ui->m_pRadioGroupClient->setChecked(enable); ui->rbModeClient->setChecked(enable);
ui->m_pWidgetClientInput->setEnabled(enable); ui->m_pWidgetClientInput->setEnabled(enable);
ui->m_pWidgetClientInput->setVisible(!m_AppConfig.invertConnection()); ui->m_pWidgetClientInput->setVisible(!m_AppConfig.invertConnection());

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

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
* Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2008 Volker Lanz (vl@fidra.de) * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
* *
@ -132,11 +133,8 @@ private slots:
void resetCore(); void resetCore();
void showMyFingerprint(); void showMyFingerprint();
// void setModeServer();
// Auto-connect slots void setModeClient();
//
void on_m_pRadioGroupServer_clicked(bool);
void on_m_pRadioGroupClient_clicked(bool);
private: private:
std::unique_ptr<Ui::MainWindow> ui; std::unique_ptr<Ui::MainWindow> ui;

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

@ -135,7 +135,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QRadioButton" name="m_pRadioGroupServer"> <widget class="QRadioButton" name="rbModeServer">
<property name="text"> <property name="text">
<string>Use this computer's keyboard and mouse</string> <string>Use this computer's keyboard and mouse</string>
</property> </property>
@ -323,7 +323,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QRadioButton" name="m_pRadioGroupClient"> <widget class="QRadioButton" name="rbModeClient">
<property name="text"> <property name="text">
<string>Use another computer’s mouse and keyboard</string> <string>Use another computer’s mouse and keyboard</string>
</property> </property>
@ -613,8 +613,8 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>m_pRadioGroupServer</tabstop> <tabstop>rbModeServer</tabstop>
<tabstop>m_pRadioGroupClient</tabstop> <tabstop>rmModeClient</tabstop>
<tabstop>lineClientIp</tabstop> <tabstop>lineClientIp</tabstop>
<tabstop>btnConnectToClient</tabstop> <tabstop>btnConnectToClient</tabstop>
<tabstop>m_pButtonConfigureServer</tabstop> <tabstop>m_pButtonConfigureServer</tabstop>