commit 7e52449490aef003a978201d4adf2e8217b2eeee
author Qi Zhao <qi.zhao@cs.ucla.edu> Thu Mar 02 15:05:45 2017 -0800
committer Qi Zhao <qi.zhao@cs.ucla.edu> Fri Mar 10 23:15:51 2017 -0800
tree 6aefd1490a10ca441a4196c04360538032323b7f
parent ec8ddd2389cf2b950e6e206dbf29ff979c6f423c

Rearrange the Preferences window

- Move all status display into a new window "NFD Status"
- Keep "Auto-config Status" at the original tab place
- Remove security tab
- Remove useless statements

Change-Id: Iecdae2619f50124e151323f4b52b5df01e5cc6fb

src/tray-menu.hpp

diff --git a/src/tray-menu.hpp b/src/tray-menu.hpp
index 878c0a6..1159a1d 100644
--- a/src/tray-menu.hpp
+++ b/src/tray-menu.hpp
@@ -37,6 +37,7 @@
 #include <QtQml/QQmlContext>
 
 #include "key-viewer-dialog.hpp"
+#include "status-viewer.hpp"
 
 #ifdef OSX_BUILD
 #include "osx-auto-update-sparkle.hpp"
@@ -64,7 +65,7 @@
 
 public:
   explicit
-  TrayMenu(QQmlContext* context, Face& face);
+  TrayMenu(QQmlContext* context, Face& face, KeyChain& keyChain);
 
   ~TrayMenu();
 
@@ -147,6 +148,7 @@
   QSystemTrayIcon* m_tray;
   QMenu* m_menu;
   QAction* m_entryPref;
+  QAction* m_entryStatus;
   QAction* m_entrySec;
   QProcess* m_acProc;
   QSettings* m_settings;
@@ -161,6 +163,8 @@
 
   ncc::KeyViewerDialog* m_keyViewerDialog;
   Face& m_face;
+  KeyChain& m_keyChain;
+  StatusViewer* m_statusViewer;
 };
 
 } // namespace ncc