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

fix: Store server config window state in memory instead of on disk

Browse source
This commit is contained in:
Nick Bolton 2025-09-10 09:38:29 +01:00 committed by Chris Rizzitello
parent 2b203c8cdd
commit 0f335d46bb
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/common/Settings.h
View file

@ -87,7 +87,6 @@ public:
}; };
struct Server struct Server
{ {
inline static const auto ConfigVisible = QStringLiteral("server/configVisible");
inline static const auto ExternalConfig = QStringLiteral("server/externalConfig"); inline static const auto ExternalConfig = QStringLiteral("server/externalConfig");
inline static const auto ExternalConfigFile = QStringLiteral("server/externalConfigFile"); inline static const auto ExternalConfigFile = QStringLiteral("server/externalConfigFile");
}; };
@ -197,7 +196,6 @@ private:
, Settings::Security::CheckPeers , Settings::Security::CheckPeers
, Settings::Security::KeySize , Settings::Security::KeySize
, Settings::Security::TlsEnabled , Settings::Security::TlsEnabled
, Settings::Server::ConfigVisible
, Settings::Server::ExternalConfig , Settings::Server::ExternalConfig
, Settings::Server::ExternalConfigFile , Settings::Server::ExternalConfigFile
}; };

4
src/lib/gui/MainWindow.cpp
View file

@ -645,12 +645,12 @@ void MainWindow::updateNetworkInfo()
void MainWindow::serverConnectionConfigureClient(const QString &clientName) void MainWindow::serverConnectionConfigureClient(const QString &clientName)
{ {
Settings::setValue(Settings::Server::ConfigVisible, true); m_serverConnection.serverConfigDialogVisible(true);
ServerConfigDialog dialog(this, m_serverConfig); ServerConfigDialog dialog(this, m_serverConfig);
if (dialog.addClient(clientName) && dialog.exec() == QDialog::Accepted) { if (dialog.addClient(clientName) && dialog.exec() == QDialog::Accepted) {
m_coreProcess.restart(); m_coreProcess.restart();
} }
Settings::setValue(Settings::Server::ConfigVisible, false); m_serverConnection.serverConfigDialogVisible(false);
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

8
src/lib/gui/core/ServerConnection.cpp
View file

@ -6,11 +6,9 @@
#include "ServerConnection.h" #include "ServerConnection.h"
#include "ServerMessage.h"
#include "common/Settings.h"
#include "Messages.h" #include "Messages.h"
#include "ServerMessage.h"
#include "common/Settings.h"
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>
@ -65,7 +63,7 @@ void ServerConnection::handleLogLine(const QString &logLine)
return; return;
} }
if (Settings::value(Settings::Server::ConfigVisible).toBool()) { if (m_serverConfigDialogVisible) {
qDebug("server config dialog visible, skipping new client prompt"); qDebug("server config dialog visible, skipping new client prompt");
return; return;
} }

5
src/lib/gui/core/ServerConnection.h
View file

@ -30,6 +30,10 @@ public:
QWidget *parent, IServerConfig &serverConfig, std::shared_ptr<Deps> deps = std::make_shared<Deps>() QWidget *parent, IServerConfig &serverConfig, std::shared_ptr<Deps> deps = std::make_shared<Deps>()
); );
void handleLogLine(const QString &logLine); void handleLogLine(const QString &logLine);
void serverConfigDialogVisible(bool visible)
{
m_serverConfigDialogVisible = visible;
}
Q_SIGNALS: Q_SIGNALS:
void messageShowing(); void messageShowing();
@ -45,6 +49,7 @@ private:
std::shared_ptr<Deps> m_pDeps; std::shared_ptr<Deps> m_pDeps;
QSet<QString> m_connectedClients; QSet<QString> m_connectedClients;
bool m_messageShowing = false; bool m_messageShowing = false;
bool m_serverConfigDialogVisible = false;
}; };
} // namespace deskflow::gui } // namespace deskflow::gui