diff options
author | Michael Mann <mmann78@netscape.net> | 2017-07-23 15:19:24 -0400 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2017-07-26 10:10:12 +0000 |
commit | 95930c2d1fa356d5301b7c5e53b20035876bb436 (patch) | |
tree | a61d58735e1b771aacaf1a3b914c5fe1428c5a90 /ui/qt | |
parent | 07d8fad852babaf9d1b02e7f13eb188f34ff58f5 (diff) |
Add current packet to the status bar.
For users with lots of columns, they may loose track of the current frame/packet.
Bug: 13902
Change-Id: I4d937dc437e254a09d938733aef5f5678ede1095
Reviewed-on: https://code.wireshark.org/review/22772
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/main_status_bar.cpp | 15 | ||||
-rw-r--r-- | ui/qt/main_status_bar.h | 1 | ||||
-rw-r--r-- | ui/qt/main_window.cpp | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 6a3767e801..a095f3909b 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -414,6 +414,11 @@ void MainStatusBar::popProgressStatus() progress_frame_.hide(); } +void MainStatusBar::packetSelectionChanged() +{ + showCaptureStatistics(); +} + void MainStatusBar::showCaptureStatistics() { QString packets_str; @@ -421,9 +426,19 @@ void MainStatusBar::showCaptureStatistics() #ifdef HAVE_LIBPCAP /* Do we have any packets? */ if (cs_fixed_ && cs_count_ > 0) { + if (cap_file_->current_frame) { + packets_str.append(QString(tr("Current Packet: %1 ")) + .arg(cap_file_->current_frame->num)); + } + packets_str.append(QString(tr("Packets: %1")) + .arg(cs_count_)); packets_str.append(QString(tr("Packets: %1")) .arg(cs_count_)); } else if (cap_file_ && cs_count_ > 0) { + if (cap_file_->current_frame) { + packets_str.append(QString(tr("Current Packet: %1 ")) + .arg(cap_file_->current_frame->num)); + } packets_str.append(QString(tr("Packets: %1 %4 Displayed: %2 (%3%)")) .arg(cap_file_->count) .arg(cap_file_->displayed_count) diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h index 8bf752936b..5f454f88a9 100644 --- a/ui/qt/main_status_bar.h +++ b/ui/qt/main_status_bar.h @@ -95,6 +95,7 @@ public slots: void pushProgressStatus(const QString &message, bool animate, bool terminate_is_stop = false, gboolean *stop_flag = NULL); void updateProgressStatus(int value); void popProgressStatus(); + void packetSelectionChanged(); void updateCaptureStatistics(capture_session * cap_session); void updateCaptureFixedStatistics(capture_session * cap_session); diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 6cc63fe44b..e306c95a5f 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -540,6 +540,8 @@ MainWindow::MainWindow(QWidget *parent) : main_ui_->wirelessTimelineWidget, SLOT(packetSelectionChanged())); connect(packet_list_->packetListModel(), SIGNAL(bgColorizationProgress(int,int)), main_ui_->wirelessTimelineWidget, SLOT(bgColorizationProgress(int,int))); + connect(packet_list_, SIGNAL(packetSelectionChanged()), + main_ui_->statusBar, SLOT(packetSelectionChanged())); proto_tree_ = new ProtoTree(&master_split_); proto_tree_->installEventFilter(this); |