the html gui is working now. problem solved: LogReceiver/NetworkDiscovery started to early. so javascript jquery was not usable. also put the js code into the html file. it seems that qt has a problem using the code if it is not in the html file. also implemented the fast version. if one interface is usable we now go on directly to the continue boot screen

1 files changed, 5 insertions, 25 deletions

diff --git a/LogReceiver/ndgui.h b/LogReceiver/ndgui.h
index fd34ec4..d0752e7 100644
--- a/LogReceiver/ndgui.h
+++ b/LogReceiver/ndgui.h
@@ -22,11 +22,8 @@ public:
 	~ndgui();
 
 public slots:
-    void handleProgress(QString ifName, int newValue);
-    void addNewInterface(QString ifName);
     void handleConnectionEstablished(interfaceconfiguration *ifConf);
     void handleAbortBoot(QString msg);
-    void handleUpdateStatusLabel(QString ifName, QString status);
     void handleAllProcessesFinished();
 
     void restartSystem();
@@ -37,6 +34,8 @@ public slots:
     void showAbortBootDialog();
     void showChooseInterfaceDialog();
 
+    void startNetworkDiscovery();
+
     /*test for html gui version*/
     void attachToDOM();
     void loadJQuery();
@@ -44,11 +43,12 @@ public slots:
     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;
+
+	bool _started;
 
 	QWebView * _webView;
 
@@ -56,29 +56,9 @@ private:
 
 	QMap<QString, interfaceconfiguration*> finalUsableIntefacesMap;		// maps interfaceName to its gateway
 
-	int numberOfInterfaces;
-
 	ChooseInterfaceDialog *cID;
 	AbortBootDialog *aBD;
 
-	/*gui elements*/
-	QMap<QString, QProgressBar *> progressBars;
-	QMap<QString, QLabel*> statusLabels;
-	QLabel *ndStatusLabel;
-	QGroupBox *interfaceGroupBox;
-	QVBoxLayout *mainLayout;
-	QVBoxLayout *interfaceGroupBoxLayout;
-	/**/
-
-
-
-
-	/*gui functions*/
-	void buildGui();
-	void createInterfaceGroupBox();
-
-
-
 };
 
 #endif // NDGUI_H