nicer connection state icons

4 files changed, 11 insertions, 12 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
@@ -75,14 +75,15 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
 
     // let hold be rightButtonClicked()
     QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
 
     //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" );
 
     QPalette pal = this->palette();
     QColor col = pal.color( QPalette::Active, QColorGroup::Background );
     pal.setColor( QPalette::Active, QColorGroup::Button, col );
     pal.setColor( QPalette::Inactive, QColorGroup::Button, col );
     pal.setColor( QPalette::Normal, QColorGroup::Button, col );
@@ -354,26 +355,19 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         if ( popup == 0l ) {
             qWarning("factory returned 0l");
             popup = new QPopupMenu();
         }
 
         int test1 = popup->insertItem( tr("Test1:"),  0);
-        int con = popup->insertItem( tr("connect"), 1);
-        int del = popup->insertItem( tr("delete"),  2);
 
         ret = popup->exec( point );
         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;
         }
         delete popup;
     }
     delete menu;
 }
 
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
@@ -67,12 +67,13 @@ namespace OpieTooth {
         bool m_enableAuthentification;
         bool m_enablePagescan;
         bool m_enableInquiryscan;
 
         QPixmap m_offPix;
         QPixmap m_onPix;
+        QPixmap m_findPix;
 
         BTIconLoader *m_iconLoader;
 
         private slots:
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
         void addServicesToDevice( BTDeviceItem *item );
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
@@ -15,13 +15,13 @@ namespace OpieTooth {
 
     class PPPDialog : public QDialog {
 
         Q_OBJECT
 
     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();
 
     private slots:
         void connectToDevice();
         void fillOutPut( OProcess* pppDial, char* cha, int len );
     protected:
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
@@ -55,13 +55,17 @@ RfcCommPopup::~RfcCommPopup() {
     delete m_foo;
     delete m_bar; */
 }
 
 
 void RfcCommPopup::slotConnect() {
+
     qWarning("connect");
+
+
+
     PPPDialog pppDialog;
     pppDialog.showMaximized();
     pppDialog.exec();
 }