diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-02-18 17:18:27 -0800 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-02-24 09:58:03 +0000 |
commit | 30ed6a1d72f1a231e5c6cb7993239e95cd3c6038 (patch) | |
tree | 265a38525864c2514e81e998b0949562f6d1c131 /wireshark-qt.cpp | |
parent | f9fc25241ca0c735c0945bebf04669f17c3ffbff (diff) |
Qt: Apply recent settings.
Add PacketList::applyRecentColumnWidths which set the packet list
column widths from our recent settings. Make sure it gets called at
startup and when we change profiles.
Save the packet list header state so that we can restore it when we
reset the model (i.e. freezing and thawing) and load a new capture file.
Save the state when the user resizes a column. As a side effect this
works around a weird bug that adjusts the width of column 1 at an
inopportune time.
Add a profileChanging signal so that we can save the main window geometry
in each profile.
Get rid of MainWindow::configurationProfileChanged. It was unused.
Apply saved pane widths and heights. Note that we might want to add a
separate pair of recent settings for the Qt panes.
Use the last opened directory in the capture file dialog.
Git rid of some unneeded Q_UNUSEDs while we're here.
Bug: 10953
Change-Id: I812aff59818cf0b4d1598b580627d32728d2e9d7
Reviewed-on: https://code.wireshark.org/review/7247
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r-- | wireshark-qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index e6ee76f54c..32c2f0c954 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -721,7 +721,6 @@ DIAG_ON(cast-qual) "Could not open common recent file\n\"%s\": %s.", rf_path, strerror(rf_open_errno)); } - wsApp->emitAppSignal(WiresharkApplication::StaticRecentFilesRead); /* Init the "Open file" dialog directory */ /* (do this after the path settings are processed) */ @@ -765,7 +764,6 @@ DIAG_ON(cast-qual) "Could not open recent file\n\"%s\": %s.", rf_path, g_strerror(rf_open_errno)); } - wsApp->emitAppSignal(WiresharkApplication::StaticRecentFilesRead); if (recent.gui_fileopen_remembered_dir && test_for_directory(recent.gui_fileopen_remembered_dir) == EISDIR) { @@ -1282,6 +1280,8 @@ DIAG_ON(cast-qual) } build_column_format_array(&CaptureFile::globalCapFile()->cinfo, prefs_p->num_cols, TRUE); + wsApp->emitAppSignal(WiresharkApplication::ColumnsChanged); // We read "recent" widths above. + wsApp->emitAppSignal(WiresharkApplication::RecentFilesRead); // Must be emitted after PreferencesChanged. wsApp->setMonospaceFont(prefs.gui_qt_font_name); |