Qt: Add preference for show file load time in the status bar

This will leave more room for messages on smaller screens.  Set the
default OFF because this is probably only useful for developers.

Group Status Bar settings in the Layout frame.

Change-Id: Iea9a55b6c088aac10ee7680b1e8a882ed00c73be
Reviewed-on: https://code.wireshark.org/review/22824
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 57 insertions, 5 deletions

diff --git a/ui/qt/layout_preferences_frame.cpp b/ui/qt/layout_preferences_frame.cpp
index 1dcde93c7d..6ae2dc4d60 100644
--- a/ui/qt/layout_preferences_frame.cpp
+++ b/ui/qt/layout_preferences_frame.cpp
@@ -48,11 +48,23 @@ LayoutPreferencesFrame::LayoutPreferencesFrame(QWidget *parent) :
     ui->layout5ToolButton->setStyleSheet(image_pad_ss);
     ui->layout6ToolButton->setStyleSheet(image_pad_ss);
 
+    QStyleOption style_opt;
+    QString indent_ss = QString(
+             "QCheckBox {"
+             "  margin-left: %1px;"
+             "}"
+             ).arg(ui->packetListSeparatorCheckBox->style()->subElementRect(QStyle::SE_CheckBoxContents, &style_opt).left());
+    ui->statusBarShowSelectedPacketCheckBox->setStyleSheet(indent_ss);
+    ui->statusBarShowFileLoadTimeCheckBox->setStyleSheet(indent_ss);
+
     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));
+
+    pref_show_file_load_time_ = prefFromPrefPtr(&prefs.gui_qt_show_file_load_time);
+    ui->statusBarShowFileLoadTimeCheckBox->setChecked(prefs_get_bool_value(pref_show_file_load_time_, pref_stashed));
 }
 
 LayoutPreferencesFrame::~LayoutPreferencesFrame()
@@ -278,7 +290,6 @@ void LayoutPreferencesFrame::on_pane3NoneRadioButton_toggled(bool checked)
     prefs_set_enum_value(pref_layout_content_3_, layout_pane_content_none, pref_stashed);
 }
 
-
 void LayoutPreferencesFrame::on_restoreButtonBox_clicked(QAbstractButton *)
 {
     reset_stashed_pref(pref_layout_type_);
@@ -291,6 +302,7 @@ void LayoutPreferencesFrame::on_restoreButtonBox_clicked(QAbstractButton *)
 
     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));
+    ui->statusBarShowFileLoadTimeCheckBox->setChecked(prefs_get_bool_value(pref_show_file_load_time_, pref_default));
 }
 
 void LayoutPreferencesFrame::on_packetListSeparatorCheckBox_toggled(bool checked)
@@ -303,6 +315,11 @@ void LayoutPreferencesFrame::on_statusBarShowSelectedPacketCheckBox_toggled(bool
     prefs_set_bool_value(pref_show_selected_packet_, (gboolean) checked, pref_stashed);
 }
 
+void LayoutPreferencesFrame::on_statusBarShowFileLoadTimeCheckBox_toggled(bool checked)
+{
+    prefs_set_bool_value(pref_show_file_load_time_, (gboolean) checked, pref_stashed);
+}
+
 /*
  * Editor modelines
  *
diff --git a/ui/qt/layout_preferences_frame.h b/ui/qt/layout_preferences_frame.h
index bed0baeae8..c0dacbe76c 100644
--- a/ui/qt/layout_preferences_frame.h
+++ b/ui/qt/layout_preferences_frame.h
@@ -51,6 +51,7 @@ private:
     pref_t *pref_layout_content_3_;
     pref_t *pref_packet_list_separator_;
     pref_t *pref_show_selected_packet_;
+    pref_t *pref_show_file_load_time_;
 
     void updateWidgets();
 
@@ -76,7 +77,7 @@ private slots:
     void on_restoreButtonBox_clicked(QAbstractButton *button);
     void on_packetListSeparatorCheckBox_toggled(bool checked);
     void on_statusBarShowSelectedPacketCheckBox_toggled(bool checked);
-
+    void on_statusBarShowFileLoadTimeCheckBox_toggled(bool checked);
 };
 
 #endif // LAYOUT_PREFERENCES_FRAME_H
diff --git a/ui/qt/layout_preferences_frame.ui b/ui/qt/layout_preferences_frame.ui
index 74b4a7d05d..b5f2cd1f88 100644
--- a/ui/qt/layout_preferences_frame.ui
+++ b/ui/qt/layout_preferences_frame.ui
@@ -352,13 +352,47 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="statusBarShowSelectedPacketCheckBox">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="statusBarSettings">
      <property name="text">
-      <string>Show selected packet number in the status bar</string>
+      <string>Status Bar settings:</string>
      </property>
     </widget>
    </item>
    <item>
+    <layout class="QVBoxLayout" name="statusBarSettingsVerticalLayout">
+     <item>
+      <widget class="QCheckBox" name="statusBarShowSelectedPacketCheckBox">
+       <property name="text">
+        <string>Show selected packet number</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="statusBarShowFileLoadTimeCheckBox">
+       <property name="text">
+        <string>Show file load time</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </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 b2d5c947e3..7c1e29ba05 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -463,7 +463,7 @@ void MainStatusBar::showCaptureStatistics()
                               .arg(cap_file_->ignored_count)
                               .arg((100.0*cap_file_->ignored_count)/cap_file_->count, 0, 'f', 1));
         }
-        if(!cap_file_->is_tempfile) {
+        if(prefs.gui_qt_show_file_load_time && !cap_file_->is_tempfile) {
             /* Loading an existing file */
             gulong computed_elapsed = cf_get_computed_elapsed(cap_file_);
             packets_str.append(QString(tr(" %1  Load time: %2:%3.%4"))