diff options
author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-12-11 09:34:08 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-12-20 08:21:02 +0000 |
commit | 9bb3f6be4c18822267a64633c298e1a8f1809221 (patch) | |
tree | de9b8934c58f239e29d0227039ad7f55f3d42f06 /ui/qt/column_editor_frame.h | |
parent | 7e0ec2c8eb3c88e70992dc40b130c76177b83a30 (diff) |
Qt: Add missing multi-field column validation
GTK already has it, but Qt forgot about it, so multi-field custom column
works ok if previously saved in GTK-shark. Invalid validation prevent from
modifying and saving multi-field custom column in Qt version.
While at it, rename "custom field" to "custom fields" to ensure
we think about multi-field custom column.
Change-Id: I99588150ccb38be11b75f5dd5b0f6443e7055ebb
Reviewed-on: https://code.wireshark.org/review/12685
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/column_editor_frame.h')
-rw-r--r-- | ui/qt/column_editor_frame.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/column_editor_frame.h b/ui/qt/column_editor_frame.h index f7e019bad5..7ee6023a5d 100644 --- a/ui/qt/column_editor_frame.h +++ b/ui/qt/column_editor_frame.h @@ -42,7 +42,7 @@ signals: private slots: void on_typeComboBox_activated(int index); - void on_fieldNameLineEdit_textEdited(const QString &field); + void on_fieldsNameLineEdit_textEdited(const QString &fields); void on_occurrenceLineEdit_textEdited(const QString &occurrence); void on_buttonBox_rejected(); void on_buttonBox_accepted(); @@ -50,7 +50,7 @@ private slots: private: Ui::ColumnEditorFrame *ui; int cur_column_; - QString saved_field_; + QString saved_fields_; QString saved_occurrence_; void setFields(int index); }; |