From 4d90f2e092802775e5e3e457768d1c1f4760a1f0 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 19 Jun 2017 16:28:10 -0400 Subject: 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 Reviewed-by: Simon Barber Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- ui/qt/main_window_slots.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ui/qt/main_window_slots.cpp') 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) { -- cgit v1.2.1