aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/display_filter_edit.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-11-16 11:00:32 -0800
committerGuy Harris <guy@alum.mit.edu>2015-11-16 19:01:12 +0000
commite9dd7c8bd42cbb25ca92dde3cee0383db6c20705 (patch)
tree11d493ea7b67e728c41632bcb6d0163bbae59f2b /ui/qt/display_filter_edit.h
parent92d487a461414c9b797130e5b845488164c984cd (diff)
Label the filter in the file open dialog as a "read filter".
This matches what the Windows file open dialog says, and also should help prevent people thinking that it's a display filter, so that you can clear it and see all the packets in the file. I leave translations to native speakers. Bug: 11708 Change-Id: I060816357bf7958d516429d09708a7ce16d609c5 Reviewed-on: https://code.wireshark.org/review/11877 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/display_filter_edit.h')
-rw-r--r--ui/qt/display_filter_edit.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/ui/qt/display_filter_edit.h b/ui/qt/display_filter_edit.h
index dd1fbca62a..9c893f0789 100644
--- a/ui/qt/display_filter_edit.h
+++ b/ui/qt/display_filter_edit.h
@@ -28,11 +28,17 @@
class QEvent;
class StockIconToolButton;
+typedef enum {
+ DisplayFilterToApply,
+ DisplayFilterToEnter,
+ ReadFilterToApply,
+} DisplayFilterEditType;
+
class DisplayFilterEdit : public SyntaxLineEdit
{
Q_OBJECT
public:
- explicit DisplayFilterEdit(QWidget *parent = 0, bool plain = true);
+ explicit DisplayFilterEdit(QWidget *parent = 0, DisplayFilterEditType type = DisplayFilterToEnter);
protected:
void paintEvent(QPaintEvent *evt);
@@ -58,12 +64,13 @@ private slots:
void prepareFilter();
private:
- bool plain_;
+ DisplayFilterEditType type_;
QString placeholder_text_;
StockIconToolButton *bookmark_button_;
StockIconToolButton *clear_button_;
StockIconToolButton *apply_button_;
+ void setDefaultPlaceholderText();
void buildCompletionList(const QString& field_word);
signals: