diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-05-27 22:46:58 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-01 20:35:26 +0000 |
| commit | 697996a8b0cea260e89bab709a5b556f3ba7b1c6 (patch) | |
| tree | 9a685c63f3fc9bf8d745aea54e6c57644e0cb60f /ui/qt/column_preferences_frame.cpp | |
| parent | 374266296d6f8994910e70c7365097b9e5e809a6 (diff) | |
| download | wireshark-697996a8b0cea260e89bab709a5b556f3ba7b1c6.tar.gz | |
Create a FieldFilterEdit class and apply it to custom column preference field.
DisplayFilterEdit deals with entire filters and some edit boxes just need a
single protocol field. This control will do the trick.
Bug: 12321
Change-Id: I8e5837ea9a6955ada29b7e516ea022ab1dd46f0d
Reviewed-on: https://code.wireshark.org/review/15595
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/column_preferences_frame.cpp')
| -rw-r--r-- | ui/qt/column_preferences_frame.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp index f2c159ea88..769ed31cf0 100644 --- a/ui/qt/column_preferences_frame.cpp +++ b/ui/qt/column_preferences_frame.cpp @@ -34,6 +34,7 @@ #include "column_preferences_frame.h" #include <ui_column_preferences_frame.h> #include "syntax_line_edit.h" +#include "field_filter_edit.h" #include "wireshark_application.h" #include <QComboBox> @@ -282,12 +283,12 @@ void ColumnPreferencesFrame::on_columnTreeWidget_itemActivated(QTreeWidgetItem * } case custom_fields_col_: { - SyntaxLineEdit *syntax_edit = new SyntaxLineEdit(); + FieldFilterEdit *field_filter_edit = new FieldFilterEdit(); saved_col_string_ = item->text(custom_fields_col_); - connect(syntax_edit, SIGNAL(textChanged(QString)), - syntax_edit, SLOT(checkCustomColumn(QString))); - connect(syntax_edit, SIGNAL(editingFinished()), this, SLOT(customFieldsEditingFinished())); - editor = cur_line_edit_ = syntax_edit; + connect(field_filter_edit, SIGNAL(textChanged(QString)), + field_filter_edit, SLOT(checkCustomColumn(QString))); + connect(field_filter_edit, SIGNAL(editingFinished()), this, SLOT(customFieldsEditingFinished())); + editor = cur_line_edit_ = field_filter_edit; //Save off the current column type in case it needs to be restored if ((item->text(custom_fields_col_) == "") && (item->text(custom_occurrence_col_) == "")) { |