Qt: Update menus with new recent settings when changing profile

Update all View options to new recent settings to reflect the changes.
Also show/hide toolbars and packet panes accordingly.

Change-Id: Idb07bd5c51c01810b1f4467d2401936dc533731b
Reviewed-on: https://code.wireshark.org/review/12405
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>

4 files changed, 43 insertions, 23 deletions

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 9100ce7e4b..c2457e2a1d 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -382,6 +382,7 @@ MainWindow::MainWindow(QWidget *parent) :
     initTimePrecisionFormatMenu();
     initFreezeActions();
     updatePreferenceActions();
+    updateRecentActions();
     setForCaptureInProgress(false);
 
     setTabOrder(df_combo_box_, packet_list_);
@@ -459,6 +460,8 @@ MainWindow::MainWindow(QWidget *parent) :
             packet_list_, SLOT(preferencesChanged()));
     connect(wsApp, SIGNAL(recentFilesRead()),
             this, SLOT(applyRecentPaneGeometry()));
+    connect(wsApp, SIGNAL(recentFilesRead()),
+            this, SLOT(updateRecentActions()));
     connect(wsApp, SIGNAL(packetDissectionChanged()),
             this, SLOT(redissectPackets()));
     connect(wsApp, SIGNAL(appInitialized()),
@@ -1696,7 +1699,6 @@ void MainWindow::initMainToolbarIcons()
     main_ui_->actionGoAutoScroll->setIcon(StockIcon("x-stay-last"));
 
     main_ui_->actionViewColorizePacketList->setIcon(StockIcon("x-colorize-packets"));
-    main_ui_->actionViewColorizePacketList->setChecked(recent.packet_list_colorize);
 //    main_ui_->actionViewAutoScroll->setIcon(StockIcon("x-stay-last"));
 
     QList<QKeySequence> zi_seq = main_ui_->actionViewZoomIn->shortcuts();
@@ -1726,14 +1728,6 @@ void MainWindow::initShowHideMainWidgets()
     shmw_actions[main_ui_->actionViewPacketDetails] = proto_tree_;
     shmw_actions[main_ui_->actionViewPacketBytes] = byte_view_tab_;
 
-    main_ui_->actionViewMainToolbar->setChecked(recent.main_toolbar_show);
-    main_ui_->actionViewFilterToolbar->setChecked(recent.filter_toolbar_show);
-    main_ui_->actionViewWirelessToolbar->setChecked(recent.wireless_toolbar_show);
-    main_ui_->actionViewStatusBar->setChecked(recent.statusbar_show);
-    main_ui_->actionViewPacketList->setChecked(recent.packet_list_show);
-    main_ui_->actionViewPacketDetails->setChecked(recent.tree_view_show);
-    main_ui_->actionViewPacketBytes->setChecked(recent.byte_view_show);
-
     foreach (QAction *shmwa, shmw_actions.keys()) {
         shmwa->setData(qVariantFromValue(shmw_actions[shmwa]));
         show_hide_actions_->addAction(shmwa);
@@ -1752,7 +1746,6 @@ void MainWindow::initTimeDisplayFormatMenu()
     }
 
     time_display_actions_ = new QActionGroup(this);
-    QMap<QAction *, ts_type> td_actions;
 
     td_actions[main_ui_->actionViewTimeDisplayFormatDateYMDandTimeOfDay] = TS_ABSOLUTE_WITH_YMD;
     td_actions[main_ui_->actionViewTimeDisplayFormatDateYDOYandTimeOfDay] = TS_ABSOLUTE_WITH_YDOY;
@@ -1768,14 +1761,9 @@ void MainWindow::initTimeDisplayFormatMenu()
     foreach (QAction* tda, td_actions.keys()) {
         tda->setData(qVariantFromValue(td_actions[tda]));
         time_display_actions_->addAction(tda);
-        if (recent.gui_time_format == td_actions[tda]) {
-            tda->setChecked(true);
-        }
     }
 
     connect(time_display_actions_, SIGNAL(triggered(QAction*)), this, SLOT(setTimestampFormat(QAction*)));
-
-    main_ui_->actionViewTimeDisplaySecondsWithHoursAndMinutes->setChecked(recent.gui_seconds_format == TS_SECONDS_HOUR_MIN_SEC);
 }
 
 Q_DECLARE_METATYPE(ts_precision)
@@ -1787,7 +1775,7 @@ void MainWindow::initTimePrecisionFormatMenu()
     }
 
     time_precision_actions_ = new QActionGroup(this);
-    QMap<QAction *, ts_precision> tp_actions;
+
     tp_actions[main_ui_->actionViewTimeDisplayFormatPrecisionAutomatic] = TS_PREC_AUTO;
     tp_actions[main_ui_->actionViewTimeDisplayFormatPrecisionSeconds] = TS_PREC_FIXED_SEC;
     tp_actions[main_ui_->actionViewTimeDisplayFormatPrecisionDeciseconds] = TS_PREC_FIXED_DSEC;
@@ -1799,9 +1787,6 @@ void MainWindow::initTimePrecisionFormatMenu()
     foreach (QAction* tpa, tp_actions.keys()) {
         tpa->setData(qVariantFromValue(tp_actions[tpa]));
         time_precision_actions_->addAction(tpa);
-        if (recent.gui_time_precision == tp_actions[tpa]) {
-            tpa->setChecked(true);
-        }
     }
 
     connect(time_precision_actions_, SIGNAL(triggered(QAction*)), this, SLOT(setTimestampPrecision(QAction*)));
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index a6afdf560e..bb9d6b50d9 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -34,6 +34,7 @@
 
 #include <epan/prefs.h>
 #include <epan/plugin_if.h>
+#include <epan/timestamp.h>
 
 #ifdef HAVE_LIBPCAP
 #include "capture_opts.h"
@@ -142,6 +143,8 @@ private:
     FunnelStatistics *funnel_statistics_;
     QList<QPair<QAction *, bool> > freeze_actions_;
     QWidget *freeze_focus_;
+    QMap<QAction *, ts_type> td_actions;
+    QMap<QAction *, ts_precision> tp_actions;
 
     bool capture_stopping_;
     bool capture_filter_valid_;
@@ -231,6 +234,7 @@ public slots:
     void applyRecentPaneGeometry();
     void layoutToolbars();
     void updatePreferenceActions();
+    void updateRecentActions();
 
     void captureCapturePrepared(capture_session *);
     void captureCaptureUpdateStarted(capture_session *);
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index c4992ab5c0..25f8ed7254 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -302,7 +302,11 @@ void MainWindow::layoutPanes()
     QVector<unsigned> new_layout = QVector<unsigned>() << prefs.gui_layout_type
                                                        << prefs.gui_layout_content_1
                                                        << prefs.gui_layout_content_2
-                                                       << prefs.gui_layout_content_3;
+                                                       << prefs.gui_layout_content_3
+                                                       << recent.packet_list_show
+                                                       << recent.tree_view_show
+                                                       << recent.byte_view_show;
+
     if (cur_layout_ == new_layout) return;
 
     QSplitter *parents[3];
@@ -449,6 +453,11 @@ void MainWindow::layoutToolbars()
     }
 
     main_ui_->mainToolBar->setToolButtonStyle(tbstyle);
+
+    main_ui_->mainToolBar->setVisible(recent.main_toolbar_show);
+    main_ui_->displayFilterToolBar->setVisible(recent.filter_toolbar_show);
+    main_ui_->wirelessToolBar->setVisible(recent.wireless_toolbar_show);
+    main_ui_->statusBar->setVisible(recent.statusbar_show);
 }
 
 void MainWindow::updatePreferenceActions()
@@ -461,6 +470,31 @@ void MainWindow::updatePreferenceActions()
     main_ui_->actionGoAutoScroll->setChecked(prefs.capture_auto_scroll);
 }
 
+void MainWindow::updateRecentActions()
+{
+    main_ui_->actionViewMainToolbar->setChecked(recent.main_toolbar_show);
+    main_ui_->actionViewFilterToolbar->setChecked(recent.filter_toolbar_show);
+    main_ui_->actionViewWirelessToolbar->setChecked(recent.wireless_toolbar_show);
+    main_ui_->actionViewStatusBar->setChecked(recent.statusbar_show);
+    main_ui_->actionViewPacketList->setChecked(recent.packet_list_show);
+    main_ui_->actionViewPacketDetails->setChecked(recent.tree_view_show);
+    main_ui_->actionViewPacketBytes->setChecked(recent.byte_view_show);
+
+    foreach (QAction* tda, td_actions.keys()) {
+        if (recent.gui_time_format == td_actions[tda]) {
+            tda->setChecked(true);
+        }
+    }
+    foreach (QAction* tpa, tp_actions.keys()) {
+        if (recent.gui_time_precision == tp_actions[tpa]) {
+            tpa->setChecked(true);
+        }
+    }
+    main_ui_->actionViewTimeDisplaySecondsWithHoursAndMinutes->setChecked(recent.gui_seconds_format == TS_SECONDS_HOUR_MIN_SEC);
+
+    main_ui_->actionViewColorizePacketList->setChecked(recent.packet_list_colorize);
+}
+
 void MainWindow::filterAction(QString &action_filter, FilterAction::Action action, FilterAction::ActionType type)
 {
     QString cur_filter, new_filter;
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 33494bfb0a..40d069be67 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -397,9 +397,6 @@ void WiresharkApplication::setConfigurationProfile(const gchar *profile_name)
 
     emit localInterfaceListChanged();
     emit packetDissectionChanged();
-
-    /* Update menus with new recent values */
-    //    menu_recent_read_finished();
 }
 
 const QString WiresharkApplication::windowTitleString(QStringList title_parts)