Qt: Add preference for show selected packet number

The information about the selected packet number is available from
the Number column and from the Frame entry in the Packet Details
so make the entry in the status bar optional.

Also remove duplicate "Packet:" entry, add the UTF8_MIDDLE_DOT
separator and rename the prefix to "Selected Packet:".

Bug: 13902
Change-Id: I0e7ba884bdcbdc87a5738223ef92f52e4ac195e5
Reviewed-on: https://code.wireshark.org/review/22807
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

4 files changed, 27 insertions, 8 deletions

diff --git a/ui/qt/layout_preferences_frame.cpp b/ui/qt/layout_preferences_frame.cpp
index c2808b5c81..1dcde93c7d 100644
--- a/ui/qt/layout_preferences_frame.cpp
+++ b/ui/qt/layout_preferences_frame.cpp
@@ -50,6 +50,9 @@ LayoutPreferencesFrame::LayoutPreferencesFrame(QWidget *parent) :
 
     pref_packet_list_separator_ = prefFromPrefPtr(&prefs.gui_qt_packet_list_separator);
     ui->packetListSeparatorCheckBox->setChecked(prefs_get_bool_value(pref_packet_list_separator_, pref_stashed));
+
+    pref_show_selected_packet_ = prefFromPrefPtr(&prefs.gui_qt_show_selected_packet);
+    ui->statusBarShowSelectedPacketCheckBox->setChecked(prefs_get_bool_value(pref_show_selected_packet_, pref_stashed));
 }
 
 LayoutPreferencesFrame::~LayoutPreferencesFrame()
@@ -287,6 +290,7 @@ void LayoutPreferencesFrame::on_restoreButtonBox_clicked(QAbstractButton *)
     updateWidgets();
 
     ui->packetListSeparatorCheckBox->setChecked(prefs_get_bool_value(pref_packet_list_separator_, pref_default));
+    ui->statusBarShowSelectedPacketCheckBox->setChecked(prefs_get_bool_value(pref_show_selected_packet_, pref_default));
 }
 
 void LayoutPreferencesFrame::on_packetListSeparatorCheckBox_toggled(bool checked)
@@ -294,6 +298,11 @@ void LayoutPreferencesFrame::on_packetListSeparatorCheckBox_toggled(bool checked
     prefs_set_bool_value(pref_packet_list_separator_, (gboolean) checked, pref_stashed);
 }
 
+void LayoutPreferencesFrame::on_statusBarShowSelectedPacketCheckBox_toggled(bool checked)
+{
+    prefs_set_bool_value(pref_show_selected_packet_, (gboolean) checked, pref_stashed);
+}
+
 /*
  * Editor modelines
  *
diff --git a/ui/qt/layout_preferences_frame.h b/ui/qt/layout_preferences_frame.h
index 5fe260df6d..bed0baeae8 100644
--- a/ui/qt/layout_preferences_frame.h
+++ b/ui/qt/layout_preferences_frame.h
@@ -50,6 +50,7 @@ private:
     pref_t *pref_layout_content_2_;
     pref_t *pref_layout_content_3_;
     pref_t *pref_packet_list_separator_;
+    pref_t *pref_show_selected_packet_;
 
     void updateWidgets();
 
@@ -74,6 +75,7 @@ private slots:
     void on_pane3NoneRadioButton_toggled(bool checked);
     void on_restoreButtonBox_clicked(QAbstractButton *button);
     void on_packetListSeparatorCheckBox_toggled(bool checked);
+    void on_statusBarShowSelectedPacketCheckBox_toggled(bool checked);
 
 };
 
diff --git a/ui/qt/layout_preferences_frame.ui b/ui/qt/layout_preferences_frame.ui
index b580e2e6b2..74b4a7d05d 100644
--- a/ui/qt/layout_preferences_frame.ui
+++ b/ui/qt/layout_preferences_frame.ui
@@ -352,6 +352,13 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="statusBarShowSelectedPacketCheckBox">
+     <property name="text">
+      <string>Show selected packet number in the status bar</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 0e2bdd7479..b2d5c947e3 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -26,6 +26,7 @@
 #include "file.h"
 
 #include <epan/expert.h>
+#include <epan/prefs.h>
 
 #include <wsutil/filesystem.h>
 #include <wsutil/utf8_entities.h>
@@ -426,18 +427,18 @@ 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));
+        if (prefs.gui_qt_show_selected_packet && cap_file_->current_frame) {
+            packets_str.append(QString(tr("Selected Packet: %1 %2 "))
+                              .arg(cap_file_->current_frame->num)
+                              .arg(UTF8_MIDDLE_DOT));
         }
         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));
+        if (prefs.gui_qt_show_selected_packet && cap_file_->current_frame) {
+            packets_str.append(QString(tr("Selected Packet: %1 %2 "))
+                              .arg(cap_file_->current_frame->num)
+                              .arg(UTF8_MIDDLE_DOT));
         }
         packets_str.append(QString(tr("Packets: %1 %4 Displayed: %2 (%3%)"))
                           .arg(cap_file_->count)