aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-06-19 16:28:10 -0400
committerMichael Mann <mmann78@netscape.net>2017-06-20 13:49:01 +0000
commit4d90f2e092802775e5e3e457768d1c1f4760a1f0 (patch)
treebf9013fd357111694c1bfc8c3e697a627f1c6803 /ui
parent3978462fd31665f30432689634812a15c476406b (diff)
Qt: make Wireless Timeline a separate item
Do not put the wireless timeline in the main view with splitters, it has a fixed size anyway and is not taken into account for layout and size calculations for the panes. Bug: 13776 Change-Id: I71da962950c3f1b215908674f4852afa76744343 Reviewed-on: https://code.wireshark.org/review/22242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Simon Barber <simon.barber@meraki.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/main_window.cpp5
-rw-r--r--ui/qt/main_window.h2
-rw-r--r--ui/qt/main_window.ui9
-rw-r--r--ui/qt/main_window_slots.cpp10
-rw-r--r--ui/qt/wireless_timeline.cpp18
-rw-r--r--ui/qt/wireless_timeline.h3
6 files changed, 29 insertions, 18 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 765450679b..dbbf0576ee 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -339,7 +339,6 @@ MainWindow::MainWindow(QWidget *parent) :
cur_layout_(QVector<unsigned>()),
df_combo_box_(NULL),
packet_list_(NULL),
- wireless_timeline_(NULL),
proto_tree_(NULL),
previous_focus_(NULL),
file_set_dialog_(NULL),
@@ -528,7 +527,7 @@ MainWindow::MainWindow(QWidget *parent) :
empty_pane_.setObjectName("emptyPane");
packet_list_ = new PacketList(&master_split_);
- wireless_timeline_ = new WirelessTimeline(&master_split_, packet_list_);
+ main_ui_->wirelessTimelineWidget->setPacketList(packet_list_);
proto_tree_ = new ProtoTree(&master_split_);
proto_tree_->installEventFilter(this);
@@ -2441,7 +2440,7 @@ void MainWindow::setForCapturedPackets(bool have_captured_packets)
main_ui_->actionViewNormalSize->setEnabled(have_captured_packets);
main_ui_->actionViewResizeColumns->setEnabled(have_captured_packets);
- bool wireless_timeline_visible = (wireless_timeline_ ? !wireless_timeline_->isHidden() : FALSE);
+ bool wireless_timeline_visible = (main_ui_->wirelessTimelineWidget ? !main_ui_->wirelessTimelineWidget->isHidden() : FALSE);
main_ui_->actionWirelessTimelineZoomIn->setEnabled(wireless_timeline_visible);
main_ui_->actionWirelessTimelineZoomOut->setEnabled(wireless_timeline_visible);
main_ui_->actionWirelessTimelineZoomFullOut->setEnabled(wireless_timeline_visible);
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 18df63840f..1849e63eb8 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -66,7 +66,6 @@ class FileSetDialog;
class FunnelStatistics;
class MainWelcome;
class PacketList;
-class WirelessTimeline;
class ProtoTree;
class WirelessFrame;
@@ -153,7 +152,6 @@ private:
// XXX - packet_list_, proto_tree_, and byte_view_tab_ should
// probably be full-on values instead of pointers.
PacketList *packet_list_;
- WirelessTimeline *wireless_timeline_;
ProtoTree *proto_tree_;
QWidget *previous_focus_;
FileSetDialog *file_set_dialog_;
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 83f45517c9..b275de8ffb 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -126,6 +126,9 @@
<widget class="FilterExpressionFrame" name="filterExpressionFrame"/>
</item>
<item>
+ <widget class="WirelessTimeline" name="wirelessTimelineWidget"/>
+ </item>
+ <item>
<widget class="QStackedWidget" name="mainStack">
<property name="enabled">
<bool>true</bool>
@@ -3068,6 +3071,12 @@
<header>filter_expression_frame.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>WirelessTimeline</class>
+ <extends>QWidget</extends>
+ <header>wireless_timeline.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources>
<include location="../../image/toolbar.qrc"/>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index dd140229df..b2f849bc9b 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -787,7 +787,7 @@ void MainWindow::captureFileReadStarted(const QString &action) {
main_ui_->statusBar->pushFileStatus(msg, msgtip);
main_ui_->mainStack->setCurrentWidget(&master_split_);
main_ui_->actionAnalyzeReloadLuaPlugins->setEnabled(false);
- wireless_timeline_->captureFileReadStarted(capture_file_.capFile());
+ main_ui_->wirelessTimelineWidget->captureFileReadStarted(capture_file_.capFile());
WiresharkApplication::processEvents();
}
@@ -809,7 +809,7 @@ void MainWindow::captureFileReadFinished() {
updateForUnsavedChanges();
/* enable wireless timeline if capture allows it */
- wireless_timeline_->captureFileReadFinished();
+ main_ui_->wirelessTimelineWidget->captureFileReadFinished();
/* Enable menu items that make sense if you have some captured packets. */
setForCapturedPackets(true);
@@ -2469,17 +2469,17 @@ void MainWindow::on_actionViewNormalSize_triggered()
void MainWindow::on_actionWirelessTimelineZoomIn_triggered()
{
- wireless_timeline_->zoomIn();
+ main_ui_->wirelessTimelineWidget->zoomIn();
}
void MainWindow::on_actionWirelessTimelineZoomOut_triggered()
{
- wireless_timeline_->zoomOut();
+ main_ui_->wirelessTimelineWidget->zoomOut();
}
void MainWindow::on_actionWirelessTimelineZoomFullOut_triggered()
{
- wireless_timeline_->zoomFullOut();
+ main_ui_->wirelessTimelineWidget->zoomFullOut();
}
void MainWindow::on_actionViewColorizePacketList_triggered(bool checked) {
diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp
index 3e29a4d3e3..9ed450360e 100644
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/wireless_timeline.cpp
@@ -309,9 +309,19 @@ int WirelessTimeline::position(guint64 tsf, float ratio)
}
-WirelessTimeline::WirelessTimeline(QWidget *parent, PacketList *packet_list) : QWidget(parent)
+WirelessTimeline::WirelessTimeline(QWidget *parent) : QWidget(parent)
{
setHidden(true);
+ zoom_level = 1.0;
+ setFixedHeight(TIMELINE_HEIGHT);
+ first_packet = 1;
+ setMouseTracking(true);
+
+ radio_packet_list = NULL;
+}
+
+void WirelessTimeline::setPacketList(PacketList *packet_list)
+{
this->packet_list = packet_list;
connect(packet_list->packetListModel(), SIGNAL(bgColorizationProgress(int,int)),
this, SLOT(bgColorizationProgress(int,int)));
@@ -319,12 +329,6 @@ WirelessTimeline::WirelessTimeline(QWidget *parent, PacketList *packet_list) : Q
this, SLOT(packetSelectionChanged()));
connect(wsApp, SIGNAL(appInitialized()),
this, SLOT(appInitialized()));
- zoom_level = 1.0;
- setFixedHeight(TIMELINE_HEIGHT);
- first_packet = 1;
- setMouseTracking(true);
-
- radio_packet_list = NULL;
}
void WirelessTimeline::tap_timeline_reset(void* tapdata)
diff --git a/ui/qt/wireless_timeline.h b/ui/qt/wireless_timeline.h
index 628524e4b4..9ecf26ba1c 100644
--- a/ui/qt/wireless_timeline.h
+++ b/ui/qt/wireless_timeline.h
@@ -59,7 +59,8 @@ class WirelessTimeline : public QWidget
Q_OBJECT
public:
- explicit WirelessTimeline(QWidget *parent, PacketList *packet_list);
+ explicit WirelessTimeline(QWidget *parent);
+ void setPacketList(PacketList *packet_list);
void captureFileReadStarted(capture_file *cf);
void captureFileReadFinished();
void zoomIn();