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

fix: remove server config dialog custom show event

Browse source 
Fixes Crash with Qt 6.8
This commit is contained in:
sithlord48 2024-10-18 17:29:45 -04:00 committed by Chris Rizzitello
parent 6395630964
commit 3d2883ad02
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/src/ServerConfigDialog.cpp
View file

@ -41,7 +41,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
m_Message(""), m_Message(""),
m_appConfig(appConfig) m_appConfig(appConfig)
{ {
setupUi(this); setupUi(this);
// force the first tab, since qt creator sets the active tab as the last one // force the first tab, since qt creator sets the active tab as the last one
@ -99,7 +98,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
// computers // computers
connect(&m_ScreenSetupModel, &ScreenSetupModel::screensChanged, this, &ServerConfigDialog::onChange); connect(&m_ScreenSetupModel, &ScreenSetupModel::screensChanged, this, &ServerConfigDialog::onChange);
#if QT_VERSION <= QT_VERSION_CHECK(6, 7, 0) #if QT_VERSION <= QT_VERSION_CHECK(6, 7, 0)
// advanced // advanced
connect(m_pCheckBoxSwitchDelay, &QCheckBox::stateChanged, this, [this](const int &v) { connect(m_pCheckBoxSwitchDelay, &QCheckBox::stateChanged, this, [this](const int &v) {
@ -250,16 +248,6 @@ bool ServerConfigDialog::addClient(const QString &clientName)
return addComputer(clientName, true); return addComputer(clientName, true);
} }
void ServerConfigDialog::showEvent(QShowEvent *event)
{
QDialog::show();
if (!m_Message.isEmpty()) {
// TODO: ideally this massage box should pop up after the dialog is shown
QMessageBox::information(this, tr("Configure server"), m_Message);
}
}
void ServerConfigDialog::accept() void ServerConfigDialog::accept()
{ {
if (m_pCheckBoxUseExternalConfig->isChecked() && !QFile::exists(m_pEditConfigFile->text())) { if (m_pCheckBoxUseExternalConfig->isChecked() && !QFile::exists(m_pEditConfigFile->text())) {

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

@ -36,7 +36,6 @@ public:
public slots: public slots:
void accept() override; void accept() override;
void reject() override; void reject() override;
void showEvent(QShowEvent *event) override;
void message(const QString &message) void message(const QString &message)
{ {
m_Message = message; m_Message = message;