From 3b81d83bf449ef6242489805af15b7da7b197d58 Mon Sep 17 00:00:00 2001 From: Niklas Date: Wed, 21 Sep 2011 16:59:09 +0200 Subject: gui is now html based. still some problems with the jQuery stuff. it does not display anything. --- LogReceiver/ndgui.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'LogReceiver/ndgui.h') diff --git a/LogReceiver/ndgui.h b/LogReceiver/ndgui.h index b320770..fd34ec4 100644 --- a/LogReceiver/ndgui.h +++ b/LogReceiver/ndgui.h @@ -1,10 +1,8 @@ #ifndef NDGUI_H #define NDGUI_H -#include -#include -#include -#include +#include +#include #include #include #include @@ -16,17 +14,17 @@ #include "ui_ndgui.h" -class ndgui: public QWidget { +class ndgui: public QMainWindow { Q_OBJECT public: - ndgui(QWidget *parent = 0); + ndgui(QMainWindow *parent = 0); ~ndgui(); public slots: void handleProgress(QString ifName, int newValue); void addNewInterface(QString ifName); - void handleConnectionEstablished(QString ifName, QString gateway); + void handleConnectionEstablished(interfaceconfiguration *ifConf); void handleAbortBoot(QString msg); void handleUpdateStatusLabel(QString ifName, QString status); void handleAllProcessesFinished(); @@ -40,15 +38,23 @@ public slots: void showChooseInterfaceDialog(); /*test for html gui version*/ - void addInterface(); + void attachToDOM(); + void loadJQuery(); + void addInterface(const QString &ifName); + void updateIfStatus(const QString &ifName, const QString &status); + void updateStatus(const QString &status); + void updateIfProgressBar(const QString &ifName, const int& percent); + void loadFinished(bool ok); + void notifyCall(); private: Ui::ndguiClass ui; + QWebView * _webView; + LogReceiver logReceiver; - QStringList finalUsableInterfaces; - QMap finalUsableIntefacesMap; // maps interfaceName to its gateway + QMap finalUsableIntefacesMap; // maps interfaceName to its gateway int numberOfInterfaces; -- cgit v1.2.3-55-g7522