summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-21 20:58:37 (UTC)
committer harlekin <harlekin>2002-07-21 20:58:37 (UTC)
commit2fb3b8fdf9cb4e660e217ae563a1a49557864ca9 (patch) (unidiff)
tree975738ed841eb216946191a12d5dd19585fd738d
parent99e354d845a38e5366d954c7f8f9c71b65ad0820 (diff)
downloadopie-2fb3b8fdf9cb4e660e217ae563a1a49557864ca9.zip
opie-2fb3b8fdf9cb4e660e217ae563a1a49557864ca9.tar.gz
opie-2fb3b8fdf9cb4e660e217ae563a1a49557864ca9.tar.bz2
nicer connection state icons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp18
-rw-r--r--noncore/net/opietooth/manager/bluebase.h1
-rw-r--r--noncore/net/opietooth/manager/pppdialog.h2
-rw-r--r--noncore/net/opietooth/manager/rfcpopup.cpp4
4 files changed, 12 insertions, 13 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index ec05a95..f400ce6 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -78,8 +78,9 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
78 QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold); 78 QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
79 79
80 //Load all icons needed 80 //Load all icons needed
81 m_offPix = Resource::loadPixmap( "editdelete" ); 81 m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
82 m_onPix = Resource::loadPixmap( "installed" ); 82 m_onPix = Resource::loadPixmap( "opietooth/connected" );
83 m_findPix = Resource::loadPixmap( "opietooth/find" );
83 84
84 QPalette pal = this->palette(); 85 QPalette pal = this->palette();
85 QColor col = pal.color( QPalette::Active, QColorGroup::Background ); 86 QColor col = pal.color( QPalette::Active, QColorGroup::Background );
@@ -357,20 +358,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
357 } 358 }
358 359
359 int test1 = popup->insertItem( tr("Test1:"), 0); 360 int test1 = popup->insertItem( tr("Test1:"), 0);
360 int con = popup->insertItem( tr("connect"), 1);
361 int del = popup->insertItem( tr("delete"), 2);
362 361
363 ret = popup->exec( point ); 362 ret = popup->exec( point );
364 qWarning("returned from exec() "); 363 qWarning("returned from exec() ");
365 if ( ret == -1 ) 364 if ( ret == -1 ) {
366 ; 365 ;
367 else if ( ret == test1 ) 366 } else if ( ret == test1 ) {
368 ; 367 ;
369 else if ( ret == con )
370 ;
371 else if ( ret == del ) {
372 // take item first? -zecke
373 delete item;
374 } 368 }
375 delete popup; 369 delete popup;
376 } 370 }
@@ -386,7 +380,7 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
386 qDebug("addServicesToDevice"); 380 qDebug("addServicesToDevice");
387 // row of mac adress text(3) 381 // row of mac adress text(3)
388 RemoteDevice device = item->remoteDevice(); 382 RemoteDevice device = item->remoteDevice();
389 m_deviceList.insert( item->mac() , item ); 383 m_deviceList.insert( item->mac() , item );
390 // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back 384 // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
391 m_localDevice->searchServices( device ); 385 m_localDevice->searchServices( device );
392} 386}
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index a68a04b..0326daf 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -70,6 +70,7 @@ namespace OpieTooth {
70 70
71 QPixmap m_offPix; 71 QPixmap m_offPix;
72 QPixmap m_onPix; 72 QPixmap m_onPix;
73 QPixmap m_findPix;
73 74
74 BTIconLoader *m_iconLoader; 75 BTIconLoader *m_iconLoader;
75 76
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h
index 6fdc90a..bb8b734 100644
--- a/noncore/net/opietooth/manager/pppdialog.h
+++ b/noncore/net/opietooth/manager/pppdialog.h
@@ -18,7 +18,7 @@ namespace OpieTooth {
18 Q_OBJECT 18 Q_OBJECT
19 19
20 public: 20 public:
21 PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); 21 PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0);
22 ~PPPDialog(); 22 ~PPPDialog();
23 23
24 private slots: 24 private slots:
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index 1b53f4b..cc87b6c 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -58,7 +58,11 @@ RfcCommPopup::~RfcCommPopup() {
58 58
59 59
60void RfcCommPopup::slotConnect() { 60void RfcCommPopup::slotConnect() {
61
61 qWarning("connect"); 62 qWarning("connect");
63
64
65
62 PPPDialog pppDialog; 66 PPPDialog pppDialog;
63 pppDialog.showMaximized(); 67 pppDialog.showMaximized();
64 pppDialog.exec(); 68 pppDialog.exec();