1 files changed, 6 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
@@ -69,26 +69,27 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
              this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
     connect( m_localDevice, SIGNAL( available( const QString&, bool ) ),
              this, SLOT( deviceActive( const QString& , bool ) ) );
     connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ),
              this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) );
 
 
     // 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 );
     pal.setColor( QPalette::Disabled, QColorGroup::Button, col );
     this->setPalette( pal );
 
     setCaption( tr( "Bluetooth Manager" ) );
 
     readConfig();
@@ -348,54 +349,47 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
                                       service->services(),
                                       (BTDeviceItem*)service->parent() );
 	}else {
 	    qWarning("Empty");
 	}
 
         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;
 }
 
 
 /**
  * Search and display avail. services for a device (on expand from device listing)
  * @param item the service item returned
  */
 void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
     qDebug("addServicesToDevice");
     // row of mac adress text(3)
     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
     m_localDevice->searchServices( device );
 }
 
 
 /**
  * Overloaded. This one it the one that is connected to the foundServices signal
  * @param device the mac address of the remote device
  * @param servicesList the list with the service the device has.
  */
 void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) {
     qDebug("fill services list");