Diffstat (limited to 'noncore/net/opiestumbler/opiestumbler.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opiestumbler/opiestumbler.cpp | 49 |
1 files changed, 43 insertions, 6 deletions
diff --git a/noncore/net/opiestumbler/opiestumbler.cpp b/noncore/net/opiestumbler/opiestumbler.cpp index f231fca..bc4a7ab 100644 --- a/noncore/net/opiestumbler/opiestumbler.cpp +++ b/noncore/net/opiestumbler/opiestumbler.cpp | |||
@@ -13,2 +13,3 @@ | |||
13 | #include <qtimer.h> | 13 | #include <qtimer.h> |
14 | #include <qprogressbar.h> | ||
14 | 15 | ||
@@ -278,2 +279,17 @@ void OpieStumbler::slotJoinNetwork() | |||
278 | 279 | ||
280 | m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1); | ||
281 | m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize ); | ||
282 | m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised ); | ||
283 | m_splashBox = new QVBoxLayout( m_splash, 4, 4 ); | ||
284 | m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash ); | ||
285 | m_pbar = new QProgressBar( 3, m_splash ); | ||
286 | m_pbar->setCenterIndicator(true); | ||
287 | m_splashBox->addWidget( m_infoLabel ); | ||
288 | m_splashBox->addWidget( m_pbar ); | ||
289 | int sw = m_splashBox->sizeHint().width()*2; | ||
290 | int sh = m_splashBox->sizeHint().height(); | ||
291 | m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh); | ||
292 | m_splash->show(); | ||
293 | m_splash->raise(); | ||
294 | |||
279 | Opie::Net::OStation *station = it.current()->st; | 295 | Opie::Net::OStation *station = it.current()->st; |
@@ -296,2 +312,3 @@ void OpieStumbler::slotJoinNetwork() | |||
296 | wiface->setUp(TRUE); | 312 | wiface->setUp(TRUE); |
313 | m_pbar->setProgress(1); | ||
297 | //Wait 5 sec for association | 314 | //Wait 5 sec for association |
@@ -304,4 +321,6 @@ void OpieStumbler::slotAssociated() | |||
304 | 321 | ||
305 | if( !wiface ) | 322 | if( !wiface ) { |
323 | slotCleanSplash(); | ||
306 | return; | 324 | return; |
325 | } | ||
307 | 326 | ||
@@ -309,2 +328,4 @@ void OpieStumbler::slotAssociated() | |||
309 | Global::statusMessage(tr("Could not Join")); | 328 | Global::statusMessage(tr("Could not Join")); |
329 | m_infoLabel->setText(tr("Could not Join")); | ||
330 | QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); | ||
310 | return; | 331 | return; |
@@ -313,2 +334,4 @@ void OpieStumbler::slotAssociated() | |||
313 | Global::statusMessage(tr("Joined")); | 334 | Global::statusMessage(tr("Joined")); |
335 | m_pbar->setProgress(2); | ||
336 | m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid)); | ||
314 | 337 | ||
@@ -330,4 +353,6 @@ void OpieStumbler::slotCheckDHCP() | |||
330 | Global::statusMessage(tr("Could not Obtain an Address")); | 353 | Global::statusMessage(tr("Could not Obtain an Address")); |
354 | m_infoLabel->setText(QString("<center><b>%1</b></center>").arg(tr("Could not Obtain an Address"))); | ||
331 | delete m_proc; | 355 | delete m_proc; |
332 | m_proc = NULL; | 356 | m_proc = NULL; |
357 | QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); | ||
333 | return; | 358 | return; |
@@ -335,14 +360,26 @@ void OpieStumbler::slotCheckDHCP() | |||
335 | m_listCurrent->show(); | 360 | m_listCurrent->show(); |
336 | 361 | m_pbar->setProgress(3); | |
337 | 362 | ||
338 | OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); | 363 | OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); |
339 | Global::statusMessage(tr("Obtained IP ") + wiface->ipV4Address().toString()); | 364 | QString ipv4 = wiface->ipV4Address().toString(); |
340 | } | 365 | m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Obtained IP")).arg(ipv4)); |
341 | 366 | Global::statusMessage(tr("Obtained IP") + " " + ipv4); | |
342 | 367 | QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); | |
343 | 368 | ||
369 | } | ||
344 | 370 | ||
371 | void OpieStumbler::slotCleanSplash() | ||
372 | { | ||
373 | delete m_pbar; | ||
374 | m_pbar = 0; | ||
345 | 375 | ||
376 | delete m_infoLabel; | ||
377 | m_infoLabel = 0; | ||
346 | 378 | ||
379 | delete m_splashBox; | ||
380 | m_splashBox = 0; | ||
347 | 381 | ||
382 | delete m_splash; | ||
383 | m_splash = 0; | ||
384 | } | ||
348 | 385 | ||