summaryrefslogtreecommitdiffstats
path: root/LogReceiver/logreceiver.h
diff options
context:
space:
mode:
authorNiklas2011-09-22 13:49:46 +0200
committerNiklas2011-09-22 13:49:46 +0200
commit72df64f423d579bcd2fd156e48007055faf57ca7 (patch)
treeffb631311f144b9da83d6809bd6a67d11df0c8c9 /LogReceiver/logreceiver.h
parentgui is now html based. still some problems with the jQuery stuff. it does not... (diff)
downloadfbgui-72df64f423d579bcd2fd156e48007055faf57ca7.tar.gz
fbgui-72df64f423d579bcd2fd156e48007055faf57ca7.tar.xz
fbgui-72df64f423d579bcd2fd156e48007055faf57ca7.zip
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
Diffstat (limited to 'LogReceiver/logreceiver.h')
-rw-r--r--LogReceiver/logreceiver.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/LogReceiver/logreceiver.h b/LogReceiver/logreceiver.h
index 172b1ae..41cd3c7 100644
--- a/LogReceiver/logreceiver.h
+++ b/LogReceiver/logreceiver.h
@@ -62,6 +62,7 @@ signals:
void abortBoot(QString msg);
void updateStatusLabel(QString ifName, QString status);
void allProcessesFinished();
+ void continueBoot(QString ifName);
private:
QLocalServer *server;
@@ -78,6 +79,8 @@ private:
QNetworkAccessManager *accessManager;
int numberOfProcesses;
routemanager rm;
+ bool _userChoice;
+ bool _blocked;
void handleNewInput(QLocalSocket * client);
@@ -85,7 +88,7 @@ private:
void runDHCPCD(QString interface);
QList<QString>checkCarrierState(QList<QString> &interfaces);
bool checkCarrierState(QString interface);
- void checkConnectivity(QString ifName);
+ bool checkConnectivity(QString ifName);
QList<QString> getListOfNetworkInterfaces();
bool checkBlackList(QString i);