author | skyhusker <skyhusker> | 2005-06-12 14:06:21 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-06-12 14:06:21 (UTC) |
commit | dc88bc9ebf2514d53eceb17ebcd1c67b89c6da70 (patch) (unidiff) | |
tree | fd2f894a842408325106e19887b5f1107b1f5a59 | |
parent | d13a1a3345270ea71215d421627665a40f16454c (diff) | |
download | opie-dc88bc9ebf2514d53eceb17ebcd1c67b89c6da70.zip opie-dc88bc9ebf2514d53eceb17ebcd1c67b89c6da70.tar.gz opie-dc88bc9ebf2514d53eceb17ebcd1c67b89c6da70.tar.bz2 |
Added splash for user messages
-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 | |||
@@ -6,16 +6,17 @@ | |||
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | //#include <qapplication.h> | 7 | //#include <qapplication.h> |
8 | #include <qdatetime.h> | 8 | #include <qdatetime.h> |
9 | #include <qpopupmenu.h> | 9 | #include <qpopupmenu.h> |
10 | #include <qstatusbar.h> | 10 | #include <qstatusbar.h> |
11 | #include <qlayout.h> | 11 | #include <qlayout.h> |
12 | #include <qwhatsthis.h> | 12 | #include <qwhatsthis.h> |
13 | #include <qtimer.h> | 13 | #include <qtimer.h> |
14 | #include <qprogressbar.h> | ||
14 | 15 | ||
15 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
16 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
17 | //#include <qpe/global.h> | 18 | //#include <qpe/global.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
19 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
20 | 21 | ||
21 | #include <opie2/odebug.h> | 22 | #include <opie2/odebug.h> |
@@ -270,17 +271,32 @@ void OpieStumbler::slotJoinNetwork() | |||
270 | return; | 271 | return; |
271 | 272 | ||
272 | QListIterator<StumblerStation> it(m_stationsHistory); | 273 | QListIterator<StumblerStation> it(m_stationsHistory); |
273 | 274 | ||
274 | for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it ); | 275 | for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it ); |
275 | 276 | ||
276 | if( !it.current() ) | 277 | if( !it.current() ) |
277 | return; | 278 | return; |
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; |
280 | 296 | ||
281 | odebug << "Bringing interface down" << oendl; | 297 | odebug << "Bringing interface down" << oendl; |
282 | wiface->setUp(FALSE); | 298 | wiface->setUp(FALSE); |
283 | 299 | ||
284 | odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl; | 300 | odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl; |
285 | wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" ); | 301 | wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" ); |
286 | 302 | ||
@@ -289,33 +305,40 @@ void OpieStumbler::slotJoinNetwork() | |||
289 | 305 | ||
290 | odebug << "Setting SSID to " << station->ssid << oendl; | 306 | odebug << "Setting SSID to " << station->ssid << oendl; |
291 | wiface->setSSID(station->ssid); | 307 | wiface->setSSID(station->ssid); |
292 | 308 | ||
293 | wiface->commit(); | 309 | wiface->commit(); |
294 | 310 | ||
295 | odebug << "Bringing interface up" << oendl; | 311 | odebug << "Bringing interface up" << oendl; |
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 |
298 | QTimer::singleShot(5000, this, SLOT(slotAssociated())); | 315 | QTimer::singleShot(5000, this, SLOT(slotAssociated())); |
299 | } | 316 | } |
300 | 317 | ||
301 | void OpieStumbler::slotAssociated() | 318 | void OpieStumbler::slotAssociated() |
302 | { | 319 | { |
303 | OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); | 320 | OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); |
304 | 321 | ||
305 | if( !wiface ) | 322 | if( !wiface ) { |
323 | slotCleanSplash(); | ||
306 | return; | 324 | return; |
325 | } | ||
307 | 326 | ||
308 | if (!wiface->isAssociated()) { | 327 | if (!wiface->isAssociated()) { |
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; |
311 | } | 332 | } |
312 | 333 | ||
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 | ||
315 | if(m_proc) { | 338 | if(m_proc) { |
316 | m_proc->kill(); | 339 | m_proc->kill(); |
317 | delete m_proc; | 340 | delete m_proc; |
318 | } | 341 | } |
319 | 342 | ||
320 | m_proc = new Opie::Core::OProcess(this); | 343 | m_proc = new Opie::Core::OProcess(this); |
321 | 344 | ||
@@ -323,26 +346,40 @@ void OpieStumbler::slotAssociated() | |||
323 | m_proc->start(Opie::Core::OProcess::DontCare); | 346 | m_proc->start(Opie::Core::OProcess::DontCare); |
324 | QTimer::singleShot(5000, this, SLOT(slotCheckDHCP())); | 347 | QTimer::singleShot(5000, this, SLOT(slotCheckDHCP())); |
325 | } | 348 | } |
326 | 349 | ||
327 | void OpieStumbler::slotCheckDHCP() | 350 | void OpieStumbler::slotCheckDHCP() |
328 | { | 351 | { |
329 | if(!m_proc->isRunning()) { | 352 | if(!m_proc->isRunning()) { |
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; |
334 | } | 359 | } |
335 | m_listCurrent->show(); | 360 | m_listCurrent->show(); |
361 | m_pbar->setProgress(3); | ||
336 | 362 | ||
337 | |||
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(); |
365 | m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Obtained IP")).arg(ipv4)); | ||
366 | Global::statusMessage(tr("Obtained IP") + " " + ipv4); | ||
367 | QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); | ||
368 | |||
340 | } | 369 | } |
341 | 370 | ||
371 | void OpieStumbler::slotCleanSplash() | ||
372 | { | ||
373 | delete m_pbar; | ||
374 | m_pbar = 0; | ||
342 | 375 | ||
376 | delete m_infoLabel; | ||
377 | m_infoLabel = 0; | ||
343 | 378 | ||
344 | 379 | delete m_splashBox; | |
345 | 380 | m_splashBox = 0; | |
346 | 381 | ||
347 | 382 | delete m_splash; | |
383 | m_splash = 0; | ||
384 | } | ||
348 | 385 | ||
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 | |||
@@ -7,16 +7,20 @@ | |||
7 | #include "stumblerstation.h" | 7 | #include "stumblerstation.h" |
8 | 8 | ||
9 | class QString; | 9 | class QString; |
10 | class QPopupMenu; | 10 | class QPopupMenu; |
11 | class Stumbler; | 11 | class Stumbler; |
12 | class QCopChannel; | 12 | class QCopChannel; |
13 | class QListView; | 13 | class QListView; |
14 | class QListViewItem; | 14 | class QListViewItem; |
15 | class QFrame; | ||
16 | class QLabel; | ||
17 | class QProgressBar; | ||
18 | class QVBoxLayout; | ||
15 | 19 | ||
16 | namespace Opie{ | 20 | namespace Opie{ |
17 | namespace Net { | 21 | namespace Net { |
18 | class OMacAddress; | 22 | class OMacAddress; |
19 | class OStation; | 23 | class OStation; |
20 | class OManufacturerDB; | 24 | class OManufacturerDB; |
21 | } | 25 | } |
22 | 26 | ||
@@ -45,26 +49,33 @@ protected slots: | |||
45 | void slotMessageReceived( const QCString &, const QByteArray & ); | 49 | void slotMessageReceived( const QCString &, const QByteArray & ); |
46 | void slotCurrentMousePressed(int button, QListViewItem *item, const QPoint &point, int c); | 50 | void slotCurrentMousePressed(int button, QListViewItem *item, const QPoint &point, int c); |
47 | void slotHistoryMousePressed(int button, QListViewItem *item, const QPoint &point, int c); | 51 | void slotHistoryMousePressed(int button, QListViewItem *item, const QPoint &point, int c); |
48 | void slotShowDetails(); | 52 | void slotShowDetails(); |
49 | void slotLoadManufacturers(); | 53 | void slotLoadManufacturers(); |
50 | void slotJoinNetwork(); | 54 | void slotJoinNetwork(); |
51 | void slotAssociated(); | 55 | void slotAssociated(); |
52 | void slotCheckDHCP(); | 56 | void slotCheckDHCP(); |
57 | void slotCleanSplash(); | ||
53 | protected: | 58 | protected: |
54 | void loadConfig(); | 59 | void loadConfig(); |
60 | |||
55 | QListView *m_listCurrent; | 61 | QListView *m_listCurrent; |
56 | QListView *m_listHistory; | 62 | QListView *m_listHistory; |
57 | QString m_interface; | 63 | QString m_interface; |
58 | Stumbler *m_stumbler; | 64 | Stumbler *m_stumbler; |
59 | QCopChannel *m_channel; | 65 | QCopChannel *m_channel; |
60 | QList <Opie::Net::OStation> *m_stationsCurrent; | 66 | QList <Opie::Net::OStation> *m_stationsCurrent; |
61 | QList <StumblerStation> m_stationsHistory; | 67 | QList <StumblerStation> m_stationsHistory; |
62 | QPopupMenu *m_popupCurrent; | 68 | QPopupMenu *m_popupCurrent; |
63 | QPopupMenu *m_popupHistory; | 69 | QPopupMenu *m_popupHistory; |
64 | Opie::Net::OManufacturerDB *m_db; | 70 | Opie::Net::OManufacturerDB *m_db; |
65 | QString m_mac; | 71 | QString m_mac; |
72 | QString m_ssid; | ||
66 | Opie::Core::OProcess *m_proc; | 73 | Opie::Core::OProcess *m_proc; |
74 | QFrame *m_splash; | ||
75 | QVBoxLayout *m_splashBox; | ||
76 | QLabel *m_infoLabel; | ||
77 | QProgressBar *m_pbar; | ||
67 | 78 | ||
68 | }; | 79 | }; |
69 | 80 | ||
70 | #endif /* OPIESTUMBLER_H */ | 81 | #endif /* OPIESTUMBLER_H */ |