commit 69abb97e547ce01df72f590cd956f4d2d5280628
author Ilya Moiseenko <iliamo@cs.ucla.edu> Mon Nov 04 16:02:20 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Nov 08 22:10:10 2013 -0800
tree 3814fffbf057e20bf3a7d74071d02791e2e4d245
parent a822b57fea321caa78a092445071eb1af55789ef

Fixed memory leaks and UI improvements

Change-Id: I830d838b287915e37fe018787a85c9a2dfb7a3a7

linux/tray-menu.h

diff --git a/linux/tray-menu.h b/linux/tray-menu.h
index 0badef0..fd05650 100644
--- a/linux/tray-menu.h
+++ b/linux/tray-menu.h
@@ -15,11 +15,13 @@
 #include <QTimer>
 #include <QProcess>
 #include <QThread>
-#include <QXmlStreamReader>
 #include <QStandardItemModel>
 #include <QtXml>
 #include <QThread>
 #include <QSettings>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
 
 #include "fib-input-dialog.h"
 #include "quit-dialog.h"
@@ -29,6 +31,7 @@
 #define NDND_STOP_COMMAND "/usr/local/bin/ndndstop"
 #define NDND_STATUS_COMMAND "/usr/local/bin/ndndsmoketest"
 #define NDND_FIB_COMMAND "/usr/local/bin/ndndc"
+#define XSLT_PROC "xsltproc"
 
 #define ALLOW_SOFTWARE_UPDATES "AllowAutomaticUpdates"
 #define ENABLE_HUB_DISCOVERY "EnableHubDiscovery"
@@ -37,6 +40,8 @@
 
 #define AUTOSTART_DIRECTORY "/.config/autostart/"
 #define SHORTCUT_FILE "ndnxcontrolcenter.desktop"
+#define STATUS_XSLT_FILE "status.xslt"
+#define FIB_XSLT_FILE "status-to-fib.xslt"
 
 namespace Ui
 {
@@ -75,11 +80,15 @@
     QTimer *daemonStatusTimer;
     QThread *statusUpdateThread;
 
+    QProcess *applyStatusXslt;
+    QProcess *applyFibXslt;
+
     QString statusXml;
     QString fibContentsXml;
 
     QStandardItemModel *model;
     int selectedRow;
+    int scrollPosition;
 
     QAction *statusIndicator;
     QAction *displayStatus;
@@ -99,6 +108,7 @@
     bool shutdownOnExit;
 
     NetworkManager *networkManager;
+    QNetworkAccessManager *urlManager;
 
 private slots:
     void trayIconClicked(QSystemTrayIcon::ActivationReason);
@@ -121,6 +131,9 @@
     void changeLoginStart();
     void changeShutdownExit();
     void copyFile();
+    void runXmlProc(QNetworkReply *reply);
+    void parseStatusXml();
+    void parseFibXml();
 };
 
 #endif // TRAYMENU_H