diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 654c8c74ba..73666b884f 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -37,7 +37,9 @@ since version 2.4.0: * SMI private enterprise numbers are now read from the "enterprises.tsv" configuration file. * QUIC dissector is rename to G(oogle) QUIC (quic => gquic) * Selected packet number can now be shown in the Status Bar by enabling - Preferences -> Appearance -> Layout -> Show selected packet number in the Status Bar + Preferences -> Appearance -> Layout -> Show selected packet number +* File load time in Status Bar is now disabled by default and can be enabled in + Preferences -> Appearance -> Layout -> Show file load time //=== Removed Dissectors diff --git a/epan/prefs.c b/epan/prefs.c index febd18e39d..72fad4d59e 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -3300,6 +3300,11 @@ prefs_register_modules(void) "Show selected packet in the Status Bar", &prefs.gui_qt_show_selected_packet); + prefs_register_bool_preference(gui_layout_module, "show_file_load_time.enabled", + "Show file load time in the Status Bar", + "Show file load time in the Status Bar", + &prefs.gui_qt_show_file_load_time); + prefs_register_bool_preference(gui_module, "packet_editor.enabled", "Enable Packet Editor", "Enable Packet Editor (Experimental)", @@ -4048,6 +4053,7 @@ pre_init_prefs(void) prefs.gui_qt_packet_list_separator = FALSE; prefs.gui_qt_show_selected_packet = FALSE; + prefs.gui_qt_show_file_load_time = FALSE; if (prefs.col_list) { free_col_info(prefs.col_list); diff --git a/epan/prefs.h b/epan/prefs.h index 81d441abf9..5411362391 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -228,6 +228,7 @@ typedef struct _e_prefs { gboolean unknown_colorfilters; /* Warn when saving unknown or obsolete color filters. */ gboolean gui_qt_packet_list_separator; gboolean gui_qt_show_selected_packet; + gboolean gui_qt_show_file_load_time; gboolean gui_packet_editor; /* Enable Packet Editor */ elide_mode_e gui_packet_list_elide_mode; gboolean gui_packet_list_show_related; 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,12 +352,46 @@ - + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + - Show selected packet number in the status bar + Status Bar settings: + + + + + + Show selected packet number + + + + + + + Show file load time + + + + + 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"))