diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index ab92de1c6..ffeca7fdd 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -237,15 +237,15 @@ void MainWindow::connectSlots() connect(&m_configScopes, &ConfigScopes::saving, this, &MainWindow::configScopesSaving, Qt::DirectConnection); connect(&m_appConfig, &AppConfig::tlsChanged, this, &MainWindow::appConfigTlsChanged); - connect(&m_appConfig, &AppConfig::screenNameChanged, this, &MainWindow::appConfigScreenNameChanged); - connect(&m_appConfig, &AppConfig::invertConnectionChanged, this, &MainWindow::appConfigInvertConnection); + connect(&m_appConfig, &AppConfig::screenNameChanged, this, &MainWindow::updateScreenName); + connect(&m_appConfig, &AppConfig::invertConnectionChanged, this, &MainWindow::applyConfig); connect(&m_coreProcess, &CoreProcess::starting, this, &MainWindow::coreProcessStarting, Qt::DirectConnection); connect(&m_coreProcess, &CoreProcess::error, this, &MainWindow::coreProcessError); connect(&m_coreProcess, &CoreProcess::logLine, this, &MainWindow::handleLogLine); connect(&m_coreProcess, &CoreProcess::processStateChanged, this, &MainWindow::coreProcessStateChanged); connect(&m_coreProcess, &CoreProcess::connectionStateChanged, this, &MainWindow::coreConnectionStateChanged); - connect(&m_coreProcess, &CoreProcess::secureSocket, this, &MainWindow::coreProcessSecureSocket); + connect(&m_coreProcess, &CoreProcess::secureSocket, this, &MainWindow::secureSocket); connect(m_actionAbout, &QAction::triggered, this, &MainWindow::openAboutDialog); connect(m_actionClearSettings, &QAction::triggered, this, &MainWindow::clearSettings); @@ -354,16 +354,6 @@ void MainWindow::versionCheckerUpdateFound(const QString &version) ui->lblUpdate->setText(text); } -void MainWindow::appConfigScreenNameChanged() -{ - updateScreenName(); -} - -void MainWindow::appConfigInvertConnection() -{ - applyConfig(); -} - void MainWindow::coreProcessError(CoreProcess::Error error) { if (error == CoreProcess::Error::AddressMissing) { @@ -761,11 +751,6 @@ void MainWindow::showFirstConnectedMessage() messages::showFirstConnectedMessage(this, m_appConfig.closeToTray(), m_appConfig.enableService(), isServer); } -void MainWindow::coreProcessSecureSocket(bool enabled) -{ - secureSocket(enabled); -} - void MainWindow::updateStatus() { const auto connection = m_coreProcess.connectionState(); diff --git a/src/apps/deskflow-gui/MainWindow.h b/src/apps/deskflow-gui/MainWindow.h index 45b39e95f..19edd9e2c 100644 --- a/src/apps/deskflow-gui/MainWindow.h +++ b/src/apps/deskflow-gui/MainWindow.h @@ -98,13 +98,10 @@ private: void configScopesSaving(); void appConfigTlsChanged(); - void appConfigScreenNameChanged(); - void appConfigInvertConnection(); void coreProcessStarting(); void coreProcessError(CoreProcess::Error error); void coreConnectionStateChanged(CoreProcess::ConnectionState state); void coreProcessStateChanged(CoreProcess::ProcessState state); - void coreProcessSecureSocket(bool enabled); void versionCheckerUpdateFound(const QString &version); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void serverConnectionConfigureClient(const QString &clientName);