diff options
| -rw-r--r-- | src/fbgui/javascriptinterfacendgui.cpp | 4 | ||||
| -rw-r--r-- | src/fbgui/javascriptinterfacendgui.h | 5 | ||||
| -rw-r--r-- | src/fbgui/ndgui.cpp | 4 | ||||
| -rw-r--r-- | src/fbgui/ndgui.h | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/fbgui/javascriptinterfacendgui.cpp b/src/fbgui/javascriptinterfacendgui.cpp index f300866..4fd3763 100644 --- a/src/fbgui/javascriptinterfacendgui.cpp +++ b/src/fbgui/javascriptinterfacendgui.cpp @@ -106,6 +106,10 @@ void JavascriptInterfaceNDGUI::addInterface(const QString &ifName) { _targetFrame->evaluateJavaScript(code); } +void JavascriptInterfaceNDGUI::continueBoot(const QString& ifName) { + emit startFbgui(ifName); +} + /** * @brief just for debugging. */ diff --git a/src/fbgui/javascriptinterfacendgui.h b/src/fbgui/javascriptinterfacendgui.h index d286d79..cdf33f6 100644 --- a/src/fbgui/javascriptinterfacendgui.h +++ b/src/fbgui/javascriptinterfacendgui.h @@ -34,6 +34,8 @@ public: public slots: void abortBoot(QString msg); + void continueBoot(const QString& ifName); + void updateIfStatus(const QString &ifName, const QString &status); void updateStatus(const QString &status); void updateIfProgressBar(const QString &ifName, const int& percent); @@ -41,6 +43,9 @@ public slots: void chooseInterfaceDialog(const QList<QString>); void notifyCall(QString msg); +signals: + void startFbgui(const QString& ifName); + private: NetworkDiscovery* _nd; }; diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp index 40c7cea..0d99a22 100644 --- a/src/fbgui/ndgui.cpp +++ b/src/fbgui/ndgui.cpp @@ -69,6 +69,8 @@ void ndgui::init() { SLOT(handleAllProcessesFinished())); connect(_networkDiscovery, SIGNAL(continueBoot(QString)), this, SLOT(continueBoot(QString))); + connect(_jsi, SIGNAL(startFbgui(const QString&)), this, + SLOT(continueBoot(const QString&))); connect(_networkDiscovery, SIGNAL(continueBootWithoutCheck(QString )), this, SLOT(continueBootWithoutCheck(QString))); @@ -181,7 +183,7 @@ void ndgui::handleAllProcessesFinished() { * will start the fbgui screen. All networkDiscovery signals * will be ignored after this point. */ -void ndgui::continueBoot(QString ifName) { +void ndgui::continueBoot(const QString& ifName) { if (_networkDiscovery->checkConnectivity(ifName)) { LOG4CXX_DEBUG(ndLogger, " continue with interface: " << ifName); gInterfaceName = ifName; diff --git a/src/fbgui/ndgui.h b/src/fbgui/ndgui.h index 379479d..05e2665 100644 --- a/src/fbgui/ndgui.h +++ b/src/fbgui/ndgui.h @@ -41,7 +41,7 @@ public slots: /* to delete once the new jsi is tested ... */ // void addInterface(const QString &ifName); - void continueBoot(QString ifName); + void continueBoot(const QString& ifName); signals: |