summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-02-15 15:10:24 (UTC)
committer mickeyl <mickeyl>2003-02-15 15:10:24 (UTC)
commit2c635885e562ed5e2c687cd14164d2f509231994 (patch) (unidiff)
tree675721962838237158f501a5ae17ce50a11c592a
parentd838049d27006ea7ad0fc5bbd83e24bda8b3aa34 (diff)
downloadopie-2c635885e562ed5e2c687cd14164d2f509231994.zip
opie-2c635885e562ed5e2c687cd14164d2f509231994.tar.gz
opie-2c635885e562ed5e2c687cd14164d2f509231994.tar.bz2
- setCaption during scanning
- add some tr() - shut down / boot up interface after scanning (should work better than cardctl eject; cardctl insert)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp15
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
@@ -228,7 +228,8 @@ void Wellenreiter::buttonClicked()
228 daemonRunning = false; 228 daemonRunning = false;
229 229
230 logwindow->log( "(i) Daemon has been stopped." ); 230 logwindow->log( "(i) Daemon has been stopped." );
231 button->setText( "Start Scanning" ); 231 button->setText( tr( "Start Scanning" ) );
232 setCaption( tr( "Scanning in progress..." ) );
232 233
233 // Stop daemon - ugly for now... later better 234 // Stop daemon - ugly for now... later better
234 235
@@ -237,17 +238,12 @@ void Wellenreiter::buttonClicked()
237 // get configuration from config window 238 // get configuration from config window
238 239
239 const QString& interface = configwindow->interfaceName->currentText(); 240 const QString& interface = configwindow->interfaceName->currentText();
240 const QString& cardtype = configwindow->deviceType->currentText();
241 //const QString& interval = configwindow->hopInterval->cleanText();
242 241
243 // reset the card trying to get into a usable state again 242 // reset the interface trying to get it into a usable state again
244 243
245 QString cmdline; 244 QString cmdline;
246 cmdline.sprintf( "cardctl eject; cardctl insert" ); 245 cmdline.sprintf( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface );
247 system( cmdline ); 246 system( cmdline );
248 cmdline.sprintf( "killall -14 dhcpcd" );
249 system( cmdline );
250 cmdline.sprintf( "killall -10 udhcpc" );
251 247
252 // message the user 248 // message the user
253 249
@@ -280,7 +276,8 @@ void Wellenreiter::buttonClicked()
280 276
281 logwindow->log( "(i) Daemon has been started." ); 277 logwindow->log( "(i) Daemon has been started." );
282 daemonRunning = true; 278 daemonRunning = true;
283 button->setText( "Stop Scanning" ); 279 button->setText( tr( "Stop Scanning" ) );
280 setCaption( tr( "Wellenreiter/Opie" ) );
284 281
285 } 282 }
286} 283}