From 46da51f8701747376999dcca8f034e41eeb206e0 Mon Sep 17 00:00:00 2001 From: Niklas Date: Thu, 29 Sep 2011 14:24:48 +0200 Subject: did some refactoring. added a user choice screen which is shown 2 seconds before the magic begins. (press F5 to get a choice) --- LogReceiver/ndgui.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'LogReceiver/ndgui.h') diff --git a/LogReceiver/ndgui.h b/LogReceiver/ndgui.h index f841cc9..e0c12d1 100644 --- a/LogReceiver/ndgui.h +++ b/LogReceiver/ndgui.h @@ -11,7 +11,6 @@ class ndgui: public QMainWindow { Q_OBJECT -Q_PROPERTY(QString manualConfInterfaces READ manualConfInterfaces WRITE setManualConfInterfaces) public: ndgui(QMainWindow *parent = 0); @@ -30,6 +29,7 @@ public slots: void continueBoot(QString ifName, int userChoice); void showLog(); + void prepareNetworkDiscover(); void startNetworkDiscovery(); /*test for html gui version*/ @@ -41,19 +41,21 @@ public slots: void updateIfProgressBar(const QString &ifName, const int& percent); void notifyCall(QString msg); - // property functions - void setManualConfInterfaces(QString jsonArray) { - _manualConfInterfaces = jsonArray; - } - QString manualConfInterfaces() const - {return _manualConfInterfaces;} +private slots: + void setUserChoiceTrue(); private: + void createAction(); + + bool _userChoice; + bool _started; QWebView * _webView; + QAction * _allowUserChoice; + NetworkDiscovery networkDiscovery; QList _ifNameList; // maps interfaceName to its gateway -- cgit v1.2.3-55-g7522