From 259a2e0ff8984325b59bc6dd7d9611867557865d Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 23 Feb 2012 10:03:25 +0100 Subject: improved user choice coding... --- src/fbgui/networkdiscovery.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/fbgui/networkdiscovery.h') diff --git a/src/fbgui/networkdiscovery.h b/src/fbgui/networkdiscovery.h index 3675120..3fb73a3 100644 --- a/src/fbgui/networkdiscovery.h +++ b/src/fbgui/networkdiscovery.h @@ -39,7 +39,7 @@ public: NetworkDiscovery(QObject *parent = 0); ~NetworkDiscovery(); - void initAndRun(bool userChoice, QStringList* args = NULL); + void init(QStringList* args = NULL); bool checkConnectivity(QString ifName); bool checkConnectivityViaTcp(); @@ -68,6 +68,8 @@ public slots: void handleProcessStarted(); void handleProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); + void activateUserChoice(); + signals: void updateStatus(QString status); @@ -75,13 +77,13 @@ signals: void updateIfStatus(QString ifName, QString status); void changeProgressBarValue(const QString & ifName, const int $newValue); - void allProcessesFinished(); + void allProcessesFinished(bool userChoice); void continueBootWithoutCheck(QString ifName); void abortBoot(QString msg); private: - void mainWork(); + void run(); void getListOfNetworkInterfaces(); void getListOfNetworkInterfacesWithAutoUp(); -- cgit v1.2.3-55-g7522