| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 764ef34..0e95b28 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -252,17 +252,27 @@ void Wellenreiter::buttonClicked() { logwindow->log( "(i) Daemon has been stopped." ); button->setText( "Start Scanning" ); - // Stop daemon + // Stop daemon - ugly for now... later better - // find out pids of wellenreiterd and orinoco_hopper + system( "killall orinoco_hopper" ); + system( "killall wellenreiterd" ); + // FIXME: reset the card trying to get into a usable state again + + // for now, just message the user + + QMessageBox::information( this, "Wellenreiter/Opie", "You should reset your\ndevice before using it again." ); } else { + logwindow->log( "(i) Daemon has been started." ); + daemonRunning = true; + button->setText( "Stop Scanning" ); + // get configuration from config window const QString& interface = configwindow->interfaceName->currentText(); const QString& cardtype = configwindow->deviceType->currentText(); @@ -273,14 +283,10 @@ void Wellenreiter::buttonClicked() QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." ); return; } - logwindow->log( "(i) Daemon has been started." ); - button->setText( "Stop Scanning" ); - -#ifdef QWS - // set interface into monitor mode + /* Global::Execute definitely does not work very well with non-gui stuff! :( */ QString cmdline; cmdline.sprintf( "iwpriv %s monitor 2", (const char*) interface ); @@ -293,19 +299,23 @@ void Wellenreiter::buttonClicked() cmdline = "orinoco_hopper "; cmdline += interface; cmdline += " -i "; cmdline += interval; - //qDebug( "execute: %s", (const char*) cmdline ); - Global::execute( cmdline ); + cmdline += " &"; + qDebug( "execute: %s", (const char*) cmdline ); + system( cmdline ); + qDebug( "done" ); // start daemon cmdline = "wellenreiterd "; cmdline += interface; cmdline += " 3"; - //qDebug( "execute: %s", (const char*) cmdline ); - Global::execute( cmdline ); -#endif + cmdline += " &"; + + qDebug( "execute: %s", (const char*) cmdline ); + system( cmdline ); + qDebug( "done" ); /* // add some test stations, so that we can see if the GUI part works |