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

feat(ServerConfigDialog): enable reset option

Browse source
This commit is contained in:
sithlord48 2026-08-14 22:59:49 -04:00 committed by Nick Bolton
parent f7ae12d772
commit 0d72bf131f
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,9 +39,9 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
layout()->addWidget(m_buttonBox); layout()->addWidget(m_buttonBox);
m_buttonBox->enableReset(false);
m_buttonBox->enableRestoreDefaults(false); m_buttonBox->enableRestoreDefaults(false);
setOriginalServerConfig(serverConfig());
loadFromConfig(); loadFromConfig();
ui->lblRemoveScreen->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64))); ui->lblRemoveScreen->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64)));
@ -457,10 +457,23 @@ void ServerConfigDialog::loadFromConfig()
updateControls(); updateControls();
} }
void ServerConfigDialog::resetFromSettings()
{
m_serverConfig = m_originalServerConfig;
m_serverConfig.setConfigFile(m_originalServerConfigUsesExternalFile);
m_serverConfig.setUseExternalConfig(m_originalServerConfigIsExternal);
loadFromConfig();
if (ui->tabWidget->currentWidget() == ui->tabComputers) {
ui->screenSetupView->reset();
ui->screenSetupView->update();
}
}
void ServerConfigDialog::initConnections() const void ServerConfigDialog::initConnections() const
{ {
connect(m_buttonBox, &SettingsDialogButtonBox::accepted, this, &ServerConfigDialog::save); connect(m_buttonBox, &SettingsDialogButtonBox::accepted, this, &ServerConfigDialog::save);
connect(m_buttonBox, &SettingsDialogButtonBox::rejected, this, &ServerConfigDialog::cancel); connect(m_buttonBox, &SettingsDialogButtonBox::rejected, this, &ServerConfigDialog::cancel);
connect(m_buttonBox, &SettingsDialogButtonBox::reset, this, &ServerConfigDialog::resetFromSettings);
connect(ui->lblRemoveScreen, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved); connect(ui->lblRemoveScreen, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
connect(ui->btnNewHotkey, &QPushButton::clicked, this, &ServerConfigDialog::addHotkey); connect(ui->btnNewHotkey, &QPushButton::clicked, this, &ServerConfigDialog::addHotkey);
connect(ui->btnEditHotkey, &QPushButton::clicked, this, &ServerConfigDialog::editHotkey); connect(ui->btnEditHotkey, &QPushButton::clicked, this, &ServerConfigDialog::editHotkey);
@ -527,6 +540,7 @@ void ServerConfigDialog::updateControls() const
ui->sbSwitchDoubleTap->setEnabled(writable && ui->cbSwitchDoubleTap->isChecked()); ui->sbSwitchDoubleTap->setEnabled(writable && ui->cbSwitchDoubleTap->isChecked());
ui->sbSwitchDelay->setEnabled(writable && ui->cbSwitchDelay->isChecked()); ui->sbSwitchDelay->setEnabled(writable && ui->cbSwitchDelay->isChecked());
ui->groupExternalConfig->setEnabled(writable); ui->groupExternalConfig->setEnabled(writable);
setButtonBoxEnabledButtons();
} }
bool ServerConfigDialog::addComputer(const QString &clientName, bool doSilent) bool ServerConfigDialog::addComputer(const QString &clientName, bool doSilent)
@ -566,4 +580,5 @@ void ServerConfigDialog::setButtonBoxEnabledButtons() const
{ {
const bool writable = Settings::isWritable(); const bool writable = Settings::isWritable();
m_buttonBox->enableSave(writable && (isGeneralConfigModified() || !(m_originalServerConfig == m_serverConfig))); m_buttonBox->enableSave(writable && (isGeneralConfigModified() || !(m_originalServerConfig == m_serverConfig)));
m_buttonBox->enableReset(writable && (isGeneralConfigModified() || !(m_originalServerConfig == m_serverConfig)));
} }

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

@ -88,6 +88,7 @@ private:
void save(); void save();
void cancel(); void cancel();
void loadFromConfig(); void loadFromConfig();
void resetFromSettings();
void initConnections() const; void initConnections() const;
void updateControls() const; void updateControls() const;
bool isGeneralConfigModified() const; bool isGeneralConfigModified() const;