openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

feat: serverConfigDialog, remove need for appConfig

Browse Source
This commit is contained in:
sithlord48
2025-03-09 23:15:32 -04:00
committed by Nick Bolton
parent 8bb325a2d2
commit 1e9f92c93f
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/deskflow-gui/MainWindow.cpp
View File

@ -616,7 +616,7 @@ void MainWindow::updateSecurityIcon(bool visible)
void MainWindow::serverConnectionConfigureClient(const QString &clientName)
{
m_serverConfigDialogState.setVisible(true);
ServerConfigDialog dialog(this, m_serverConfig, m_appConfig);
ServerConfigDialog dialog(this, m_serverConfig);
if (dialog.addClient(clientName) && dialog.exec() == QDialog::Accepted) {
m_coreProcess.restart();
}
@ -1075,7 +1075,7 @@ void MainWindow::hide()
void MainWindow::showConfigureServer(const QString &message)
{
ServerConfigDialog dialog(this, serverConfig(), m_appConfig);
ServerConfigDialog dialog(this, serverConfig());
dialog.message(message);
if ((dialog.exec() == QDialog::Accepted) && m_coreProcess.isStarted()) {
m_coreProcess.restart();

5
src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp
View File

@ -22,7 +22,7 @@
using enum ScreenConfig::SwitchCorner;
using ServerProtocol = synergy::gui::ServerProtocol;
ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig)
ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
ui{std::make_unique<Ui::ServerConfigDialog>()},
m_OriginalServerConfig(config),
@ -30,8 +30,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
m_OriginalServerConfigUsesExternalFile(config.configFile()),
m_ServerConfig(config),
m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows()),
m_Message(""),
m_appConfig(appConfig)
m_Message("")
{
ui->setupUi(this);

7
src/apps/deskflow-gui/dialogs/ServerConfigDialog.h
View File

@ -25,7 +25,7 @@ class ServerConfigDialog : public QDialog
Q_OBJECT
public:
ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig);
ServerConfigDialog(QWidget *parent, ServerConfig &config);
~ServerConfigDialog();
bool addClient(const QString &clientName);
@ -93,10 +93,6 @@ protected:
{
return m_ScreenSetupModel;
}
AppConfig &appConfig()
{
return m_appConfig;
}
private:
std::unique_ptr<Ui::ServerConfigDialog> ui;
@ -106,7 +102,6 @@ private:
QString m_OriginalServerConfigUsesExternalFile;
ScreenSetupModel m_ScreenSetupModel;
QString m_Message;
AppConfig &m_appConfig;
private slots:
void onChange();