diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/column_editor_frame.cpp | 27 | ||||
| -rw-r--r-- | ui/qt/column_editor_frame.h | 1 |
2 files changed, 12 insertions, 16 deletions
diff --git a/ui/qt/column_editor_frame.cpp b/ui/qt/column_editor_frame.cpp index dcacada1ef..9f83d0bfcb 100644 --- a/ui/qt/column_editor_frame.cpp +++ b/ui/qt/column_editor_frame.cpp @@ -58,6 +58,14 @@ ColumnEditorFrame::~ColumnEditorFrame() delete ui; } +bool ColumnEditorFrame::syntaxIsValid(void) +{ + // Fields must be a valid filter. + // Occurrence must be empty or valid. + return ((ui->fieldsNameLineEdit->syntaxState() == SyntaxLineEdit::Valid) && + (ui->occurrenceLineEdit->syntaxState() != SyntaxLineEdit::Invalid)); +} + void ColumnEditorFrame::setFields(int index) { bool ok = true; @@ -67,10 +75,7 @@ void ColumnEditorFrame::setFields(int index) ui->fieldsNameLineEdit->checkCustomColumn(saved_fields_); ui->occurrenceLineEdit->setText(saved_occurrence_); ui->occurrenceLineEdit->checkInteger(saved_occurrence_); - if ((ui->fieldsNameLineEdit->syntaxState() != SyntaxLineEdit::Valid) || - (ui->occurrenceLineEdit->syntaxState() != SyntaxLineEdit::Valid)) { - ok = false; - } + ok = syntaxIsValid(); } else { ui->fieldsNameLineEdit->clear(); ui->fieldsNameLineEdit->setSyntaxState(SyntaxLineEdit::Empty); @@ -103,12 +108,7 @@ void ColumnEditorFrame::on_fieldsNameLineEdit_textEdited(const QString &fields) ui->occurrenceLineEdit->setText(saved_occurrence_); } - bool ok = true; - if ((ui->fieldsNameLineEdit->syntaxState() == SyntaxLineEdit::Invalid) || - ((ui->typeComboBox->currentIndex() == COL_CUSTOM) && - (ui->occurrenceLineEdit->syntaxState() == SyntaxLineEdit::Empty))) - ok = false; - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok); + ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(syntaxIsValid()); saved_fields_ = fields; } @@ -121,12 +121,7 @@ void ColumnEditorFrame::on_occurrenceLineEdit_textEdited(const QString &occurren ui->fieldsNameLineEdit->setText(saved_fields_); } - bool ok = true; - if ((ui->occurrenceLineEdit->syntaxState() == SyntaxLineEdit::Invalid) || - ((ui->typeComboBox->currentIndex() == COL_CUSTOM) && - (ui->occurrenceLineEdit->syntaxState() == SyntaxLineEdit::Empty))) - ok = false; - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok); + ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(syntaxIsValid()); saved_occurrence_ = occurrence; } diff --git a/ui/qt/column_editor_frame.h b/ui/qt/column_editor_frame.h index 7ee6023a5d..1832cccbe7 100644 --- a/ui/qt/column_editor_frame.h +++ b/ui/qt/column_editor_frame.h @@ -48,6 +48,7 @@ private slots: void on_buttonBox_accepted(); private: + bool syntaxIsValid(void); Ui::ColumnEditorFrame *ui; int cur_column_; QString saved_fields_; |