summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp36
1 files changed, 23 insertions, 13 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
@@ -254,8 +254,14 @@ void Wellenreiter::buttonClicked()
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." );
}
@@ -263,4 +269,8 @@ void Wellenreiter::buttonClicked()
{
+ logwindow->log( "(i) Daemon has been started." );
+ daemonRunning = true;
+ button->setText( "Stop Scanning" );
+
// get configuration from config window
@@ -275,10 +285,6 @@ void Wellenreiter::buttonClicked()
}
- 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;
@@ -295,6 +301,8 @@ void Wellenreiter::buttonClicked()
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
@@ -303,10 +311,12 @@ void Wellenreiter::buttonClicked()
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