Discouple "clicked()" signal from apply button to close
of the standalone dialog.
This commit is contained in:
parent
4dddfbba98
commit
446ccd6d58
|
@ -38,7 +38,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget* parent): QDialog(parent) {
|
||||||
setWindowTitle("Configure window");
|
setWindowTitle("Configure window");
|
||||||
|
|
||||||
ConfigurationWidget* confWidget = Configuration::get()->buildWidget(ConfigurationWidget::StandAlone);
|
ConfigurationWidget* confWidget = Configuration::get()->buildWidget(ConfigurationWidget::StandAlone);
|
||||||
connect(confWidget->getApplyButton() , SIGNAL(clicked()), this, SLOT(close()));
|
connect(confWidget , SIGNAL(checkOk()), this, SLOT(close()));
|
||||||
connect(confWidget->getCancelButton(), SIGNAL(clicked()), this, SLOT(close()));
|
connect(confWidget->getCancelButton(), SIGNAL(clicked()), this, SLOT(close()));
|
||||||
connect(confWidget->getSaveButton() , SIGNAL(clicked()), this, SIGNAL(saveToFile()));
|
connect(confWidget->getSaveButton() , SIGNAL(clicked()), this, SIGNAL(saveToFile()));
|
||||||
|
|
||||||
|
|
|
@ -206,6 +206,8 @@ namespace Cfg {
|
||||||
if ( _log == NULL ) _log = new LogWidget(this);
|
if ( _log == NULL ) _log = new LogWidget(this);
|
||||||
_log->updateLogs ();
|
_log->updateLogs ();
|
||||||
_log->exec ();
|
_log->exec ();
|
||||||
|
} else {
|
||||||
|
emit checkOk();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,6 +79,7 @@ namespace Cfg {
|
||||||
void applyClicked ();
|
void applyClicked ();
|
||||||
signals:
|
signals:
|
||||||
void updateParameters ();
|
void updateParameters ();
|
||||||
|
void checkOk ();
|
||||||
private:
|
private:
|
||||||
unsigned int _flags;
|
unsigned int _flags;
|
||||||
QFont _boldFont;
|
QFont _boldFont;
|
||||||
|
|
Loading…
Reference in New Issue