| -rw-r--r-- | noncore/net/opiestumbler/opiestumbler.cpp | 55 | ||||
| -rw-r--r-- | noncore/net/opiestumbler/opiestumbler.h | 11 |
2 files changed, 57 insertions, 9 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 @@ #include <qtimer.h> +#include <qprogressbar.h> @@ -277,3 +278,18 @@ void OpieStumbler::slotJoinNetwork() return; - + + m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1); + m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize ); + m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised ); + m_splashBox = new QVBoxLayout( m_splash, 4, 4 ); + m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash ); + m_pbar = new QProgressBar( 3, m_splash ); + m_pbar->setCenterIndicator(true); + m_splashBox->addWidget( m_infoLabel ); + m_splashBox->addWidget( m_pbar ); + int sw = m_splashBox->sizeHint().width()*2; + int sh = m_splashBox->sizeHint().height(); + m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh); + m_splash->show(); + m_splash->raise(); + Opie::Net::OStation *station = it.current()->st; @@ -296,2 +312,3 @@ void OpieStumbler::slotJoinNetwork() wiface->setUp(TRUE); + m_pbar->setProgress(1); //Wait 5 sec for association @@ -304,4 +321,6 @@ void OpieStumbler::slotAssociated() - if( !wiface ) + if( !wiface ) { + slotCleanSplash(); return; + } @@ -309,2 +328,4 @@ void OpieStumbler::slotAssociated() Global::statusMessage(tr("Could not Join")); + m_infoLabel->setText(tr("Could not Join")); + QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); return; @@ -313,2 +334,4 @@ void OpieStumbler::slotAssociated() Global::statusMessage(tr("Joined")); + m_pbar->setProgress(2); + m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid)); @@ -330,4 +353,6 @@ void OpieStumbler::slotCheckDHCP() Global::statusMessage(tr("Could not Obtain an Address")); + m_infoLabel->setText(QString("<center><b>%1</b></center>").arg(tr("Could not Obtain an Address"))); delete m_proc; m_proc = NULL; + QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); return; @@ -335,14 +360,26 @@ void OpieStumbler::slotCheckDHCP() m_listCurrent->show(); + m_pbar->setProgress(3); - OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); - Global::statusMessage(tr("Obtained IP ") + wiface->ipV4Address().toString()); + QString ipv4 = wiface->ipV4Address().toString(); + m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Obtained IP")).arg(ipv4)); + Global::statusMessage(tr("Obtained IP") + " " + ipv4); + QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); + } - + +void OpieStumbler::slotCleanSplash() +{ + delete m_pbar; + m_pbar = 0; + delete m_infoLabel; + m_infoLabel = 0; - - - - + delete m_splashBox; + m_splashBox = 0; + + delete m_splash; + m_splash = 0; +} diff --git a/noncore/net/opiestumbler/opiestumbler.h b/noncore/net/opiestumbler/opiestumbler.h index 3f45a78..84a69ba 100644 --- a/noncore/net/opiestumbler/opiestumbler.h +++ b/noncore/net/opiestumbler/opiestumbler.h @@ -14,2 +14,6 @@ class QListView; class QListViewItem; +class QFrame; +class QLabel; +class QProgressBar; +class QVBoxLayout; @@ -52,4 +56,6 @@ protected slots: void slotCheckDHCP(); + void slotCleanSplash(); protected: void loadConfig(); + QListView *m_listCurrent; @@ -65,3 +71,8 @@ protected: QString m_mac; + QString m_ssid; Opie::Core::OProcess *m_proc; + QFrame *m_splash; + QVBoxLayout *m_splashBox; + QLabel *m_infoLabel; + QProgressBar *m_pbar; |