summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-21 20:58:37 (UTC)
committer harlekin <harlekin>2002-07-21 20:58:37 (UTC)
commit2fb3b8fdf9cb4e660e217ae563a1a49557864ca9 (patch) (side-by-side diff)
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
@@ -80,4 +80,5 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
//Load all icons needed
- m_offPix = Resource::loadPixmap( "editdelete" );
- m_onPix = Resource::loadPixmap( "installed" );
+ m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
+ m_onPix = Resource::loadPixmap( "opietooth/connected" );
+ m_findPix = Resource::loadPixmap( "opietooth/find" );
@@ -359,4 +360,2 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
int test1 = popup->insertItem( tr("Test1:"), 0);
- int con = popup->insertItem( tr("connect"), 1);
- int del = popup->insertItem( tr("delete"), 2);
@@ -364,11 +363,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
qWarning("returned from exec() ");
- if ( ret == -1 )
+ if ( ret == -1 ) {
;
- else if ( ret == test1 )
+ } else if ( ret == test1 ) {
;
- else if ( ret == con )
- ;
- else if ( ret == del ) {
- // take item first? -zecke
- delete item;
}
@@ -388,3 +382,3 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
RemoteDevice device = item->remoteDevice();
- m_deviceList.insert( item->mac() , item );
+ m_deviceList.insert( item->mac() , item );
// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
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
@@ -72,2 +72,3 @@ namespace OpieTooth {
QPixmap m_onPix;
+ QPixmap m_findPix;
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
@@ -20,3 +20,3 @@ namespace OpieTooth {
public:
- PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
+ PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0);
~PPPDialog();
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
@@ -60,3 +60,7 @@ RfcCommPopup::~RfcCommPopup() {
void RfcCommPopup::slotConnect() {
+
qWarning("connect");
+
+
+
PPPDialog pppDialog;