summaryrefslogtreecommitdiffstats
path: root/LogReceiver/ndgui.h
diff options
context:
space:
mode:
authorNiklas2011-09-29 14:24:48 +0200
committerNiklas2011-09-29 14:24:48 +0200
commit46da51f8701747376999dcca8f034e41eeb206e0 (patch)
treeb8318e357428aa62acd96623d9312c5215356673 /LogReceiver/ndgui.h
parentadded some more initial parameters (diff)
downloadfbgui-46da51f8701747376999dcca8f034e41eeb206e0.tar.gz
fbgui-46da51f8701747376999dcca8f034e41eeb206e0.tar.xz
fbgui-46da51f8701747376999dcca8f034e41eeb206e0.zip
did some refactoring. added a user choice screen which is shown 2 seconds before the magic begins. (press F5 to get a choice)
Diffstat (limited to 'LogReceiver/ndgui.h')
-rw-r--r--LogReceiver/ndgui.h16
1 files changed, 9 insertions, 7 deletions
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<QString> _ifNameList; // maps interfaceName to its gateway