From 2ed3d91b45332a2cbb4114b61f18c80fb28a6840 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 18 Aug 2015 11:46:12 -0700 Subject: Add the WLAN statistics dialog. Instead of splitting the stats into two lists as with the GTK+ UI, add everything to an expandable tree. This allows viewing nodes on more than one network. Rename the top-level Bluetooth menu item to Wireless and put the WLAN stats dialog there. The Qt UI matches SSIDs (WlanNetworkTreeWidgetItem::isMatch) a bit differently than the GTK+ UI. Try to make the logic as plain as possible since we'll likely have to update it in the future. The addition of a custom BSSID address types means that we can't assume that everything is AT_ETHER. Add routines for checking for broadcast BSSIDs and comparing only the data portions of addresses. Move PercentBarDelegate into its own module. Use it in WlanStatisticsDialog. Change-Id: Ie4214eb00671a890871380c4a07213ebfb7585c6 Reviewed-on: https://code.wireshark.org/review/10171 Reviewed-by: Gerald Combs --- ui/qt/protocol_hierarchy_dialog.h | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'ui/qt/protocol_hierarchy_dialog.h') diff --git a/ui/qt/protocol_hierarchy_dialog.h b/ui/qt/protocol_hierarchy_dialog.h index 1c0fb47c59..b3963cd4df 100644 --- a/ui/qt/protocol_hierarchy_dialog.h +++ b/ui/qt/protocol_hierarchy_dialog.h @@ -22,11 +22,12 @@ #ifndef PROTOCOL_HIERARCHY_DIALOG_H #define PROTOCOL_HIERARCHY_DIALOG_H +#include + #include "filter_action.h" +#include "percent_bar_delegate.h" #include "wireshark_dialog.h" -#include - class QPushButton; class QTreeWidgetItem; @@ -34,24 +35,6 @@ namespace Ui { class ProtocolHierarchyDialog; } -#include - -class PercentBarDelegate : public QStyledItemDelegate -{ -public: - PercentBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { } -// void clear(); -// void addRelatedFrame(int frame_num); -// void setConversationSpan(int first_frame, int last_frame); -protected: - void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; - -private: -}; - class ProtocolHierarchyDialog : public WiresharkDialog { Q_OBJECT -- cgit v1.2.3