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

chore: ServerConfigDialog, conform to naming standards for members

Browse source
This commit is contained in:
sithlord48 2025-09-01 09:30:34 -04:00 committed by Nick Bolton
parent 340df69ca2
commit eae089d3ec
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/lib/gui/dialogs/ServerConfigDialog.cpp
View file

@ -26,11 +26,11 @@ using enum NetworkProtocol;
ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config) ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
ui{std::make_unique<Ui::ServerConfigDialog>()}, ui{std::make_unique<Ui::ServerConfigDialog>()},
m_OriginalServerConfig(config), m_originalServerConfig(config),
m_OriginalServerConfigIsExternal(config.useExternalConfig()), m_originalServerConfigIsExternal(config.useExternalConfig()),
m_OriginalServerConfigUsesExternalFile(config.configFile()), m_originalServerConfigUsesExternalFile(config.configFile()),
m_ScreenSetupModel(config.screens(), config.numColumns(), config.numRows()), m_screenSetupModel(config.screens(), config.numColumns(), config.numRows()),
m_ServerConfig(config) m_serverConfig(config)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -149,7 +149,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
for (const Hotkey &hotkey : std::as_const(serverConfig().hotkeys())) for (const Hotkey &hotkey : std::as_const(serverConfig().hotkeys()))
ui->listHotkeys->addItem(hotkey.text()); ui->listHotkeys->addItem(hotkey.text());
ui->screenSetupView->setModel(&m_ScreenSetupModel); ui->screenSetupView->setModel(&m_screenSetupModel);
auto &screens = serverConfig().screens(); auto &screens = serverConfig().screens();
auto server = std::ranges::find_if(screens, [this](const Screen &screen) { auto server = std::ranges::find_if(screens, [this](const Screen &screen) {
@ -167,7 +167,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
onChange(); onChange();
// computers // computers
connect(&m_ScreenSetupModel, &ScreenSetupModel::screensChanged, this, &ServerConfigDialog::onChange); connect(&m_screenSetupModel, &ScreenSetupModel::screensChanged, this, &ServerConfigDialog::onChange);
} }
ServerConfigDialog::~ServerConfigDialog() = default; ServerConfigDialog::~ServerConfigDialog() = default;
@ -199,8 +199,8 @@ void ServerConfigDialog::accept()
void ServerConfigDialog::reject() void ServerConfigDialog::reject()
{ {
serverConfig().setUseExternalConfig(m_OriginalServerConfigIsExternal); serverConfig().setUseExternalConfig(m_originalServerConfigIsExternal);
serverConfig().setConfigFile(m_OriginalServerConfigUsesExternalFile); serverConfig().setConfigFile(m_originalServerConfigUsesExternalFile);
QDialog::reject(); QDialog::reject();
} }
@ -500,8 +500,8 @@ bool ServerConfigDialog::addComputer(const QString &clientName, bool doSilent)
void ServerConfigDialog::onChange() void ServerConfigDialog::onChange()
{ {
bool isAppConfigDataEqual = m_OriginalServerConfigIsExternal == serverConfig().useExternalConfig() && bool isAppConfigDataEqual = m_originalServerConfigIsExternal == serverConfig().useExternalConfig() &&
m_OriginalServerConfigUsesExternalFile == serverConfig().configFile(); m_originalServerConfigUsesExternalFile == serverConfig().configFile();
ui->buttonBox->button(QDialogButtonBox::Ok) ui->buttonBox->button(QDialogButtonBox::Ok)
->setEnabled(!isAppConfigDataEqual || !(m_OriginalServerConfig == m_ServerConfig)); ->setEnabled(!isAppConfigDataEqual || !(m_originalServerConfig == m_serverConfig));
} }

20
src/lib/gui/dialogs/ServerConfigDialog.h
View file

@ -33,7 +33,7 @@ public Q_SLOTS:
void reject() override; void reject() override;
void message(const QString &message) void message(const QString &message)
{ {
m_Message = message; m_message = message;
} }
protected Q_SLOTS: protected Q_SLOTS:
@ -82,25 +82,25 @@ protected:
ServerConfig &serverConfig() ServerConfig &serverConfig()
{ {
return m_ServerConfig; return m_serverConfig;
} }
void setOriginalServerConfig(const ServerConfig &s) void setOriginalServerConfig(const ServerConfig &s)
{ {
m_OriginalServerConfig = s; m_originalServerConfig = s;
} }
ScreenSetupModel &model() ScreenSetupModel &model()
{ {
return m_ScreenSetupModel; return m_screenSetupModel;
} }
private: private:
std::unique_ptr<Ui::ServerConfigDialog> ui; std::unique_ptr<Ui::ServerConfigDialog> ui;
QString m_Message = ""; QString m_message = "";
ServerConfig &m_OriginalServerConfig; ServerConfig &m_originalServerConfig;
bool m_OriginalServerConfigIsExternal; bool m_originalServerConfigIsExternal;
QString m_OriginalServerConfigUsesExternalFile; QString m_originalServerConfigUsesExternalFile;
ScreenSetupModel m_ScreenSetupModel; ScreenSetupModel m_screenSetupModel;
ServerConfig m_ServerConfig; ServerConfig m_serverConfig;
private Q_SLOTS: private Q_SLOTS:
void onChange(); void onChange();