1 files changed, 6 insertions, 9 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 4c1c972..c1aae86 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -199,88 +199,85 @@ typedef struct {
 
     else
 
     {
         qDebug( "unknown sniffer command." );
     }
 
 }
 
 void Wellenreiter::dataReceived()
 {
     logwindow->log( "(d) Received data from daemon" );
     handleMessage();
 }
 
 void Wellenreiter::buttonClicked()
 {
         /*
         // add some test stations, so that we can see if the GUI part works
         addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );
         addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
         addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
         addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
         addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
         */
 
 
     if ( daemonRunning )
     {
         daemonRunning = false;
 
         logwindow->log( "(i) Daemon has been stopped." );
-        button->setText( "Start Scanning" );
+        button->setText( tr( "Start Scanning" ) );
+        setCaption( tr( "Scanning in progress..." ) );
 
         // Stop daemon - ugly for now... later better
 
         system( "killall wellenreiterd" );
 
         // get configuration from config window
 
         const QString& interface = configwindow->interfaceName->currentText();
-        const QString& cardtype = configwindow->deviceType->currentText();
-        //const QString& interval = configwindow->hopInterval->cleanText();
 
-        // reset the card trying to get into a usable state again
+        // reset the interface trying to get it into a usable state again
 
         QString cmdline;
-        cmdline.sprintf( "cardctl eject; cardctl insert" );
+        cmdline.sprintf( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface );
         system( cmdline );
-        cmdline.sprintf( "killall -14 dhcpcd" );
-        system( cmdline );
-        cmdline.sprintf( "killall -10 udhcpc" );
 
         // message the user
 
         QMessageBox::information( this, "Wellenreiter/Opie", "Your wireless card\nshould now be usable again." );
     }
 
     else
     {
 
         // get configuration from config window
 
         const QString& interface = configwindow->interfaceName->currentText();
         const int cardtype = configwindow->daemonDeviceType();
         const int interval = configwindow->daemonHopInterval();
 
         if ( ( interface == "<select>" ) || ( cardtype == 0 ) )
         {
             QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." );
             return;
         }
 
         // start wellenreiterd
 
         QString cmdline;
         cmdline.sprintf( "wellenreiterd %s %d &", (const char*) interface, cardtype );
 
         qDebug( "about to execute '%s' ...", (const char*) cmdline );
         system( cmdline );
         qDebug( "done!" );
 
         logwindow->log( "(i) Daemon has been started." );
         daemonRunning = true;
-        button->setText( "Stop Scanning" );
+        button->setText( tr( "Stop Scanning" ) );
+        setCaption( tr( "Wellenreiter/Opie" ) );
 
     }
 }