osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Stig Bjørlykke 2015-12-12 23:28:26 +01:00
parent 2290eba5cb
commit e73fc7e51e
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/main_window.cpp
View File

@ -454,8 +454,6 @@ MainWindow::MainWindow(QWidget *parent) :
connect(&capture_file_, SIGNAL(captureFileReadFinished()), connect(&capture_file_, SIGNAL(captureFileReadFinished()),
wsApp, SLOT(updateTaps())); wsApp, SLOT(updateTaps()));
connect(wsApp, SIGNAL(recentFilesRead()),
packet_list_, SLOT(applyRecentColumnWidths()));
connect(wsApp, SIGNAL(columnsChanged()), connect(wsApp, SIGNAL(columnsChanged()),
packet_list_, SLOT(columnsChanged())); packet_list_, SLOT(columnsChanged()));
connect(wsApp, SIGNAL(preferencesChanged()), connect(wsApp, SIGNAL(preferencesChanged()),

8
ui/qt/main_window_slots.cpp
View File

@ -2126,7 +2126,7 @@ void MainWindow::setTimestampFormat(QAction *action)
cf_timestamp_auto_precision(capture_file_.capFile()); cf_timestamp_auto_precision(capture_file_.capFile());
} }
if (packet_list_) { 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()); cf_timestamp_auto_precision(capture_file_.capFile());
} }
if (packet_list_) { 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()); cf_timestamp_auto_precision(capture_file_.capFile());
} }
if (packet_list_) { 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; gbl_resolv_flags.transport_name = main_ui_->actionViewNameResolutionTransport->isChecked() ? TRUE : FALSE;
if (packet_list_) { if (packet_list_) {
packet_list_->columnsChanged(); packet_list_->resetColumns();
} }
} }

10
ui/qt/packet_list.cpp
View File

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

3
ui/qt/packet_list.h
View File

@ -74,6 +74,7 @@ public:
void setVerticalAutoScroll(bool enabled = true); void setVerticalAutoScroll(bool enabled = true);
void setCaptureInProgress(bool in_progress = false) { capture_in_progress_ = in_progress; tail_at_end_ = in_progress; } void setCaptureInProgress(bool in_progress = false) { capture_in_progress_ = in_progress; tail_at_end_ = in_progress; }
void captureFileReadFinished(); void captureFileReadFinished();
void resetColumns();
protected: protected:
void showEvent(QShowEvent *); void showEvent(QShowEvent *);
@ -126,6 +127,7 @@ private:
void setRecentColumnWidth(int column); void setRecentColumnWidth(int column);
void initHeaderContextMenu(); void initHeaderContextMenu();
void drawCurrentPacket(); void drawCurrentPacket();
void applyRecentColumnWidths();
signals: signals:
void packetDissectionChanged(); void packetDissectionChanged();
@ -156,7 +158,6 @@ public slots:
void redrawVisiblePackets(); void redrawVisiblePackets();
void columnsChanged(); void columnsChanged();
void fieldsChanged(capture_file *cf); void fieldsChanged(capture_file *cf);
void applyRecentColumnWidths();
void preferencesChanged(); void preferencesChanged();
private slots: private slots: