diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-02-01 13:30:51 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-02-02 16:51:00 +0000 |
| commit | 8834e8f8946d1f4907bacb6575a5439dadbd6294 (patch) | |
| tree | fd97a1fe1e36b9efb8b585a27bf9a4282d4eff77 | |
| parent | 6641987c8925dc9e1ed8be1f86d4e472170f3c82 (diff) | |
| download | wireshark-8834e8f8946d1f4907bacb6575a5439dadbd6294.tar.gz | |
Display Filter Expression dialog updates.
De Morganize an expression.
Clear the selection at start. Selecting the first item (104apci) seems
to confuse people.
Change-Id: I8fcd1f068f1801042a2658940175b46bdfb2b462
Reviewed-on: https://code.wireshark.org/review/13647
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ui/qt/display_filter_expression_dialog.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/qt/display_filter_expression_dialog.cpp b/ui/qt/display_filter_expression_dialog.cpp index 0a109fc213..6de0ba2c28 100644 --- a/ui/qt/display_filter_expression_dialog.cpp +++ b/ui/qt/display_filter_expression_dialog.cpp @@ -128,9 +128,10 @@ DisplayFilterExpressionDialog::DisplayFilterExpressionDialog(QWidget *parent) : connect(ui->rangeLineEdit, SIGNAL(textEdited(QString)), this, SLOT(updateWidgets())); // Trigger updateWidgets - if (ui->fieldTreeWidget->topLevelItemCount() > 0) { - ui->fieldTreeWidget->topLevelItem(0)->setSelected(true); - } + ui->fieldTreeWidget->selectionModel()->clear(); +// if (ui->fieldTreeWidget->topLevelItemCount() > 0) { +// ui->fieldTreeWidget->topLevelItem(0)->setSelected(true); +// } } DisplayFilterExpressionDialog::~DisplayFilterExpressionDialog() @@ -195,8 +196,8 @@ void DisplayFilterExpressionDialog::updateWidgets() QPushButton *ok_bt = ui->buttonBox->button(QDialogButtonBox::Ok); if (ok_bt) { - bool ok_enable = !ui->displayFilterLineEdit->text().isEmpty() - && (ui->displayFilterLineEdit->syntaxState() != SyntaxLineEdit::Invalid); + bool ok_enable = !(ui->displayFilterLineEdit->text().isEmpty() + || (ui->displayFilterLineEdit->syntaxState() == SyntaxLineEdit::Invalid)); ok_bt->setEnabled(ok_enable); } } |