Qt: Removed applyRecentColumnWidths from recentFilesRead

Adjusting column widths from recent settings is only needed
when columns has changed.

Don't recreate the columns when changing timestamp options or
name resolution, only reset columns.

Change-Id: I4c9a9f63c34542935dd282188d98b2b5b013c5f3
Reviewed-on: https://code.wireshark.org/review/12579
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 444deadc42a4fcb94df2538949195908a400abfb..2bdf68d40fa989a231be2b1c8aa26608b9b6c054 100644 (file)
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -454,8 +454,6 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(&capture_file_, SIGNAL(captureFileReadFinished()),
             wsApp, SLOT(updateTaps()));
 
-    connect(wsApp, SIGNAL(recentFilesRead()),
-            packet_list_, SLOT(applyRecentColumnWidths()));
     connect(wsApp, SIGNAL(columnsChanged()),
             packet_list_, SLOT(columnsChanged()));
     connect(wsApp, SIGNAL(preferencesChanged()),

diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index a14928ddb17c33d3f8ef96a8dba82f06bb368b17..1e89ff23e8e02eca5eafcc85a473b4d5babef6d2 100644 (file)
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -2126,7 +2126,7 @@ void MainWindow::setTimestampFormat(QAction *action)
             cf_timestamp_auto_precision(capture_file_.capFile());
         }
         if (packet_list_) {
-            packet_list_->columnsChanged();
+            packet_list_->resetColumns();
         }
     }
 }
@@ -2148,7 +2148,7 @@ void MainWindow::setTimestampPrecision(QAction *action)
             cf_timestamp_auto_precision(capture_file_.capFile());
         }
         if (packet_list_) {
-            packet_list_->columnsChanged();
+            packet_list_->resetColumns();
         }
     }
 }
@@ -2167,7 +2167,7 @@ void MainWindow::on_actionViewTimeDisplaySecondsWithHoursAndMinutes_triggered(bo
         cf_timestamp_auto_precision(capture_file_.capFile());
     }
     if (packet_list_) {
-        packet_list_->columnsChanged();
+        packet_list_->resetColumns();
     }
 }
 
@@ -2191,7 +2191,7 @@ void MainWindow::setNameResolution()
     gbl_resolv_flags.transport_name = main_ui_->actionViewNameResolutionTransport->isChecked() ? TRUE : FALSE;
 
     if (packet_list_) {
-        packet_list_->columnsChanged();
+        packet_list_->resetColumns();
     }
 }
 

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index a71e861dd4f1b44b796be44e15ada053b1c998ef..22bab097001af04777e844e9873ef663aeeea33f 100644 (file)
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -667,6 +667,11 @@ void PacketList::redrawVisiblePackets() {
     drawCurrentPacket();
 }
 
+void PacketList::resetColumns()
+{
+    packet_list_model_->resetColumns();
+}
+
 // prefs.col_list has changed.
 void PacketList::columnsChanged()
 {
@@ -681,7 +686,7 @@ void PacketList::columnsChanged()
     build_column_format_array(&cap_file_->cinfo, prefs.num_cols, FALSE);
     setColumnVisibility();
     create_far_overlay_ = true;
-    packet_list_model_->resetColumns();
+    resetColumns();
     applyRecentColumnWidths();
     columns_changed_ = false;
 }
@@ -697,12 +702,11 @@ void PacketList::fieldsChanged(capture_file *cf)
 
 // Column widths should
 // - Load from recent when we load a new profile (including at starting up).
+// - Reapply when changing columns.
 // - Persist across freezes and thaws.
 // - Persist across file closing and opening.
 // - Save to recent when we save our profile (including shutting down).
 // - Not be affected by the behavior of stretchLastSection.
-
-// Called via recentFilesRead.
 void PacketList::applyRecentColumnWidths()
 {
     // Either we've just started up or a profile has changed. Read

diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 4bd89f6d8260ecb71259034fc39572ff3b11f934..9e825fbed07d26d7218abe33112ca8cc3dfc5c4f 100644 (file)
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -74,6 +74,7 @@ public:
     void setVerticalAutoScroll(bool enabled = true);
     void setCaptureInProgress(bool in_progress = false) { capture_in_progress_ = in_progress; tail_at_end_ = in_progress; }
     void captureFileReadFinished();
+    void resetColumns();
 
 protected:
     void showEvent(QShowEvent *);
@@ -126,6 +127,7 @@ private:
     void setRecentColumnWidth(int column);
     void initHeaderContextMenu();
     void drawCurrentPacket();
+    void applyRecentColumnWidths();
 
 signals:
     void packetDissectionChanged();
@@ -156,7 +158,6 @@ public slots:
     void redrawVisiblePackets();
     void columnsChanged();
     void fieldsChanged(capture_file *cf);
-    void applyRecentColumnWidths();
     void preferencesChanged();
 
 private slots: