diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-09-02 14:51:33 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-09-06 01:43:21 +0000 |
commit | 0e9389bb47e54ff0f4bbc288cb1adfde4a9ed045 (patch) | |
tree | 41f8177b3a469e1e115fbc786e483bd0f9b307f3 /ui/qt/filter_dialog.h | |
parent | 4f5937a18bf97cdd380a3812cde81efb0025c116 (diff) |
Display filter edit updates.
Have the bookmark button operate on saved display filters, similar to
the "Filter:" button in the GTK+ UI. Expose the saved display filter
list via a popup menu.
Update the display filter icons. Make the "Apply" button wider. Remove
the old icon assets.
Add a StockIconToolButton class along with note explaining why it's
necessary.
Rename the "Filter Bookmarks" preference to "Filter Shortcuts".
Suggestion for a better name are welcome.
Change-Id: I0082d3f01b017253fa75e51cbff9beb17c41a209
Reviewed-on: https://code.wireshark.org/review/10390
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'ui/qt/filter_dialog.h')
-rw-r--r-- | ui/qt/filter_dialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/filter_dialog.h b/ui/qt/filter_dialog.h index 21a7d049d6..b7b525c3f0 100644 --- a/ui/qt/filter_dialog.h +++ b/ui/qt/filter_dialog.h @@ -37,7 +37,7 @@ class FilterDialog : public QDialog public: enum FilterType { CaptureFilter, DisplayFilter }; - explicit FilterDialog(QWidget *parent = 0, FilterType filter_type = CaptureFilter); + explicit FilterDialog(QWidget *parent = 0, FilterType filter_type = CaptureFilter, const QString new_filter = QString()); ~FilterDialog(); protected: @@ -49,10 +49,10 @@ private: enum FilterType filter_type_; // CaptureFilterSyntaxWorker *syntax_worker_; FilterTreeDelegate *filter_tree_delegate_; + QString new_filter_; void addFilter(QString name, QString filter, bool start_editing = false); - private slots: void updateWidgets(); // void setFilterSyntaxState(QString filter, bool valid, QString err_msg); |