diff options
| author | Roland Knall <rknall@gmail.com> | 2016-10-17 11:57:00 +0200 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-10-17 14:43:22 +0000 |
| commit | 81904c70a85c5e335908b628667cac84e560beef (patch) | |
| tree | 2d333c089f19a818b72e7ecaf835359bf2b5b1d6 /ui/qt/interface_frame.h | |
| parent | 0c4eb2779f5507c498f9f076a993f0d0f988f1cd (diff) | |
| download | wireshark-81904c70a85c5e335908b628667cac84e560beef.tar.gz | |
InterfaceList: Change Buttons to combobox
Change the buttons to a combobox selector, and move that selector
to the right of the capture filter box.
Bug: 12971
Change-Id: Ib85d51cca128ed76eb08886e92660ede51d5982f
Reviewed-on: https://code.wireshark.org/review/18186
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/interface_frame.h')
| -rw-r--r-- | ui/qt/interface_frame.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/qt/interface_frame.h b/ui/qt/interface_frame.h index fb2a0d80b6..48ed095393 100644 --- a/ui/qt/interface_frame.h +++ b/ui/qt/interface_frame.h @@ -37,6 +37,8 @@ #include <QHBoxLayout> #include <QAbstractButton> #include <QTimer> +#include <QMenu> +#include <QPushButton> namespace Ui { class InterfaceFrame; @@ -51,10 +53,14 @@ public: int interfacesHidden(); + QMenu * getSelectionMenu(); + int interfacesPresent(); + Q_SIGNALS: void showExtcapOptions(QString device_name); void startCapture(); void itemSelectionChanged(); + void typeSelectionChanged(); public slots: void updateSelectedInterfaces(); @@ -68,8 +74,6 @@ protected: private: - QAbstractButton * createButton(QString text, QString property = QString(), QVariant content = QVariant()); - void resetInterfaceButtons(); void resetInterfaceTreeDisplay(); Ui::InterfaceFrame *ui; @@ -77,8 +81,6 @@ private: InterfaceSortFilterModel * proxyModel; InterfaceTreeModel * sourceModel; - QHBoxLayout * buttonLayout; - QMap<int, QString> ifTypeDescription; #ifdef HAVE_LIBPCAP @@ -95,6 +97,7 @@ private slots: void updateStatistics(void); void actionButton_toggled(bool checked); + void triggeredIfTypeButton(); }; #endif // INTERFACE_FRAME_H |