diff options
author | Gerald Combs <gerald@zing.org> | 2014-12-21 13:23:02 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-12-22 18:12:31 +0000 |
commit | 5cdad9fe423662e2aea3d63540cd19b7e518b7c3 (patch) | |
tree | 16deed9efb4df400a81b564ec1aa5d9f5b1c9c61 /ui/qt/traffic_table_dialog.h | |
parent | 30c3d394adbf8deff83854f01dc1082db9cac598 (diff) | |
download | wireshark-5cdad9fe423662e2aea3d63540cd19b7e518b7c3.tar.gz |
Qt: Add methods to CaptureFile and WiresharkApplication.
Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add
application name and title separator convenience methods to
WiresharkApplication.
Convert traffic tables, conversations, and endpoints to use CaptureFile
directly and to let the user know when the capture file is closed. Set
the file dialog titles while we're here.
Change-Id: I990392786d3833e1e0b3638aa2d34a5ada39fa13
Reviewed-on: https://code.wireshark.org/review/5957
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/traffic_table_dialog.h')
-rw-r--r-- | ui/qt/traffic_table_dialog.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h index 605711cbb8..5fd77cab7c 100644 --- a/ui/qt/traffic_table_dialog.h +++ b/ui/qt/traffic_table_dialog.h @@ -30,6 +30,7 @@ #include "ui/follow.h" +#include "capture_file.h" #include "filter_action.h" #include <QPushButton> @@ -102,11 +103,11 @@ public: * @param filter Display filter to apply. * @param table_name If valid, add this protocol and bring it to the front. */ - explicit TrafficTableDialog(QWidget *parent = 0, capture_file *cf = NULL, const char *filter = NULL, const QString &table_name = tr("Unknown")); + explicit TrafficTableDialog(QWidget *parent, CaptureFile &cf, const char *filter = NULL, const QString &table_name = tr("Unknown")); ~TrafficTableDialog(); public slots: - virtual void setCaptureFile(capture_file *cf) { Q_UNUSED(cf) } + virtual void captureFileClosing(); signals: void filterAction(QString& filter, FilterAction::Action action, FilterAction::ActionType type); @@ -116,7 +117,8 @@ signals: protected: Ui::TrafficTableDialog *ui; - capture_file *cap_file_; + CaptureFile &cap_file_; + bool read_only_; QString filter_; QMenu traffic_type_menu_; QPushButton *copy_bt_; @@ -139,7 +141,9 @@ protected slots: void updateWidgets(); private: + void setWindowTitle(); QList<QVariant> curTreeRowData(int row) const; + QString window_name_; private slots: void on_nameResolutionCheckBox_toggled(bool checked); |