added obex popup and dialog

5 files changed, 14 insertions, 9 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 433bd3a..1fd0ea2 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -1,559 +1,562 @@
 /*
  * bluebase.cpp *
  * ---------------------
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include "scandialog.h"
 #include "hciconfwrapper.h"
 #include "devicehandler.h"
 #include "btconnectionitem.h"
 
 #include <remotedevice.h>
 #include <services.h>
 
 #include <stdlib.h>
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qtabwidget.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 
 using namespace OpieTooth;
 
 BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
     : BluetoothBase( parent, name, fl ) {
 
     m_localDevice = new Manager( "hci0" );
 
     connect( PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
     connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
     // not good since lib is async
     //       connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
     //                  this, SLOT( addServicesToDevice( QListViewItem * ) ) );
     connect( ListView2, SIGNAL( clicked( QListViewItem* )),
              this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
     connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
              this,  SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
     connect( m_localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
              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( "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();
     initGui();
 
     //TESTING
     ListView2->setRootIsDecorated(true);
 
     BTDeviceItem *topLV2 = new BTDeviceItem( ListView2, RemoteDevice("xx:", "Siemens S45" ) );
     topLV2->setPixmap( 1, m_onPix );
     Services s1;
     s1.setServiceName( "Serial" );
     s1.insertClassId(1, "BlueNic");
     (void) new BTServiceItem( topLV2, s1 );
     s1.setServiceName( "BlueNic" );
     s1.insertClassId(2, "Obex");
     (void) new BTServiceItem( topLV2, s1 );
 
     writeToHciConfig();
     // search conncetions
     addConnectedDevices();
     m_iconLoader = new BTIconLoader();
     readSavedDevices();
 }
 
 /**
  * Reads all options from the config file
  */
 void BlueBase::readConfig() {
 
     Config cfg( "bluetoothmanager" );
     cfg.setGroup( "bluezsettings" );
 
     m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
     m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
     m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE );
     m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE );
     m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE );
     m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE );
 }
 
 /**
  * Writes all options to the config file
  */
 void BlueBase::writeConfig() {
 
     Config cfg( "bluetoothmanager" );
     cfg.setGroup( "bluezsettings" );
 
     cfg.writeEntry( "name" , m_deviceName );
     cfg.writeEntryCrypt( "passkey" , m_defaultPasskey );
     cfg.writeEntry( "useEncryption" , m_useEncryption );
     cfg.writeEntry( "enableAuthentification" , m_enableAuthentification );
     cfg.writeEntry( "enablePagescan" , m_enablePagescan );
     cfg.writeEntry( "enableInquiryscan" , m_enableInquiryscan );
 
     writeToHciConfig();
 }
 
 /**
  * Modify the hcid.conf file to our needs
  */
 void BlueBase::writeToHciConfig() {
     qWarning("writeToHciConfig");
     HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
     hciconf.load();
     hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
     hciconf.setName( m_deviceName );
     hciconf.setEncrypt( m_useEncryption );
     hciconf.setAuth( m_enableAuthentification );
     hciconf.setPscan( m_enablePagescan );
     hciconf.setIscan( m_enableInquiryscan );
     hciconf.save();
 }
 
 
 /**
  * Read the list of allready known devices
  */
 void BlueBase::readSavedDevices() {
 
     QValueList<RemoteDevice> loadedDevices;
     DeviceHandler handler;
     loadedDevices = handler.load();
 
     addSearchedDevices( loadedDevices );
 }
 
 
 /**
  * Write the list of allready known devices
  */
 void BlueBase::writeSavedDevices() {
     QListViewItemIterator it( ListView2 );
     BTListItem* item;
     BTDeviceItem* device;
     RemoteDevice::ValueList list;
     for ( ; it.current(); ++it ) {
         item = (BTListItem*)it.current();
         if(item->typeId() != BTListItem::Device )
             continue;
         device = (BTDeviceItem*)item;
 
         list.append( device->remoteDevice() );
     }
     /*
      * if not empty save the List through DeviceHandler
      */
     if ( list.isEmpty() )
         return;
     DeviceHandler handler;
     handler.save( list );
 }
 
 
 /**
  * Set up the gui
  */
 void BlueBase::initGui() {
     StatusLabel->setText( status() ); // maybe move it to getStatus()
     cryptCheckBox->setChecked( m_useEncryption );
     authCheckBox->setChecked( m_enableAuthentification );
     pagescanCheckBox->setChecked( m_enablePagescan );
     inquiryscanCheckBox->setChecked( m_enableInquiryscan );
     deviceNameLine->setText( m_deviceName );
     passkeyLine->setText( m_defaultPasskey );
     // set info tab
     setInfo();
 }
 
 
 /**
  * Get the status informations and returns it
  * @return QString the status informations gathered
  */
 QString BlueBase::status()const{
     QString infoString = tr( "<b>Device name : </b> Ipaq" );
     infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
     infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" );
 
     return (infoString);
 }
 
 
 /**
  * Read the current values from the gui and invoke writeConfig()
  */
 void BlueBase::applyConfigChanges() {
     m_deviceName =  deviceNameLine->text();
     m_defaultPasskey = passkeyLine->text();
     m_useEncryption = cryptCheckBox->isChecked();
     m_enableAuthentification = authCheckBox->isChecked();
     m_enablePagescan = pagescanCheckBox->isChecked();
     m_enableInquiryscan = inquiryscanCheckBox->isChecked();
 
     writeConfig();
 
     QMessageBox::information( this, tr("Test") , tr("Changes were applied.") );
 }
 
 /**
  * Add fresh found devices from scan dialog to the listing
  *
  */
 void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
     BTDeviceItem * deviceItem;
     QValueList<RemoteDevice>::ConstIterator it;
 
     for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
 
         if (find( (*it)  )) // is already inserted
             continue;
 
         deviceItem = new BTDeviceItem( ListView2 , (*it) );
         deviceItem->setPixmap( 1, m_findPix );
         deviceItem->setExpandable ( true );
 
         // look if device is avail. atm, async
         deviceActive( (*it) );
 
         // ggf auch hier?
         addServicesToDevice( deviceItem );
     }
 }
 
 
 /**
  * Action that is toggled on entrys on click
  */
 void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
 }
 
 
 /**
  * Action that are toggled on hold (mostly QPopups i guess)
  */
 void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
     if (!item )
         return;
 
     QPopupMenu *menu = new QPopupMenu();
     int ret=0;
 
     if ( ((BTListItem*)item)->type() == "device") {
 
         QPopupMenu *groups = new QPopupMenu();
 
-        menu->insertItem( tr("rescan sevices:"),  0);
-        menu->insertItem( tr("to group"), groups ,  1);
-        //      menu->insertItem( tr("bound device"), 2);
-        menu->insertItem( tr("delete"),  3);
+        menu->insertItem( ((BTDeviceItem*)item)->name(),0 );
+        menu->insertSeparator(1);
+        menu->insertItem( tr("rescan sevices"),  2);
+        menu->insertItem( tr("to group"), groups , 3);
+        menu->insertItem( tr("delete"),  4);
 
         ret = menu->exec( point  , 0);
 
         switch(ret) {
         case -1:
             break;
         case 0:
             addServicesToDevice( (BTDeviceItem*)item );
             break;
         case 1:
 
             break;
 
             // NO need to, since hcid does that on the fly
             // case 2:
             // make connection
             //m_localDevice->connectTo( ((BTDeviceItem*)item)->mac() );
             //break;
         case 3:
             // deletes childs too
             delete item;
             break;
         }
         delete groups;
 
     }
 
     /*
      * We got service sensitive PopupMenus in our factory
      * We will create one through the factory and will insert
      * our Separator + ShowInfo into the menu or create a new
      * one if the factory returns 0
      * PopupMenu deletion is kind of weird.
      * If escaped( -1 ) or any of our items were chosen we'll
      * delete the PopupMenu otherwise it's the responsibility of
      * the PopupMenu to delete itself
      *
      */
     else if ( ((BTListItem*)item)->type() == "service") {
         BTServiceItem* service = (BTServiceItem*)item;
         QMap<int, QString> list = service->services().classIdList();
         QMap<int, QString>::Iterator it = list.begin();
         QPopupMenu *popup =0l;
+        popup->insertItem( (service->services()).serviceName() );
+        popup->insertSeparator();
         if ( it != list.end() ) {
 	    qWarning("Searching id %d %s", it.key(), it.data().latin1() );
             popup = m_popHelper.find( it.key() /*1*/,
                                       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);
 
         ret = popup->exec( point );
         qWarning("returned from exec() ");
         if ( ret == -1 ) {
             ;
         } else if ( ret == test1 ) {
             ;
         }
         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 );
     // 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");
 
     QMap<QString,BTDeviceItem*>::Iterator it;
     BTDeviceItem* deviceItem = 0;
 
     // get the right devices which requested the search
     it = m_deviceList.find( device );
     if( it == m_deviceList.end() )
         return;
     deviceItem = it.data();
 
     QValueList<OpieTooth::Services>::Iterator it2;
     BTServiceItem * serviceItem;
 
     if (!servicesList.isEmpty() ) {
         // add services
         QMap<int, QString> list;
         QMap<int, QString>::Iterator classIt;
         for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
             serviceItem = new BTServiceItem( deviceItem  , (*it2)  );
             list = (*it2).classIdList();
             classIt = list.begin();
             int classId=0;
             if ( classIt != list.end() ) {
                 classId = classIt.key();
             }
 
             serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) );
         }
     } else {
         Services s1;
         s1.setServiceName( tr("no serives found") );
         serviceItem = new BTServiceItem( deviceItem, s1 );
     }
     // now remove them from the  list
     m_deviceList.remove( it );
 }
 
 
 /**
  * Add the existing connections (pairs) to the connections tab.
  * This one triggers the search
  */
 void BlueBase::addConnectedDevices() {
     m_localDevice->searchConnections();
 }
 
 
 /**
  * This adds the found connections to the connection tab.
  * @param connectionList the ValueList with all current connections
  */
 void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) {
 
     // clear the ListView first
     ListView4->clear();
 
     QValueList<OpieTooth::ConnectionState>::Iterator it;
     BTConnectionItem * connectionItem;
 
     if ( !connectionList.isEmpty() ) {
 
         for (it = connectionList.begin(); it != connectionList.end(); ++it) {
             connectionItem = new BTConnectionItem( ListView4 , (*it) );
         }
     } else {
         ConnectionState con;
         con.setMac( tr("No connections found") );
         connectionItem = new BTConnectionItem( ListView4 , con );
     }
 
     //  recall connection search after some time
     QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) );
 }
 
 
 /**
  * Find out if a device can  currently be reached
  * @param device
  */
 void BlueBase::deviceActive( const RemoteDevice &device ) {
     // search by mac, async, gets a signal back
     // We should have a BTDeviceItem there or where does it get added to the map -zecke
     m_localDevice->isAvailable( device.mac() );
 }
 
 
 /**
  * The signal catcher. Set the avail. status on device.
  * @param device - the mac address
  * @param connected - if it is avail. or not
  */
 void BlueBase::deviceActive( const QString& device, bool connected  ) {
     qDebug("deviceActive slot");
 
     QMap<QString,BTDeviceItem*>::Iterator it;
 
     it = m_deviceList.find( device );
     if( it == m_deviceList.end() )
         return;
 
     BTDeviceItem* deviceItem = it.data();
 
 
     if ( connected ) {
         deviceItem->setPixmap( 1, m_onPix );
     } else {
         deviceItem->setPixmap( 1, m_offPix );
     }
     m_deviceList.remove( it );
 }
 
 
 /**
  * Open the "scan for devices"  dialog
  */
 void BlueBase::startScan() {
     ScanDialog *scan = new ScanDialog( this, "ScanDialog",
                                        true, WDestructiveClose );
     QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ),
                       this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) );
 
     scan->showMaximized();
 }
 
 
 /**
  * Set the informations about the local device in information Tab
  */
 void BlueBase::setInfo() {
     StatusLabel->setText( status() );
 }
 
 
 /**
  * Decontructor
  */
 BlueBase::~BlueBase() {
     writeSavedDevices();
     delete m_iconLoader;
 }
 
 
 /**
  * find searches the ListView for a BTDeviceItem containig
  * the same Device if found return true else false
  * @param dev RemoteDevice to find
  * @return returns true if found
  */
 bool BlueBase::find( const RemoteDevice& rem ) {
     QListViewItemIterator it( ListView2 );
     BTListItem* item;
     BTDeviceItem* device;
     for (; it.current(); ++it ) {
         item = (BTListItem*) it.current();
         if ( item->typeId() != BTListItem::Device )
             continue;
 
         device = (BTDeviceItem*)item;
         if ( rem.equals( device->remoteDevice() ) )
             return true;
     }
     return false; // not found
 }
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 121c069..4684c67 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,41 +1,41 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG          = qt warn_on release
 HEADERS         = btconnectionitem.h btdeviceitem.h \
                   btserviceitem.h stdpopups.h \ 
 		  popuphelper.h bluebase.h \ 
 		  scandialog.h btlistitem.h \ 
 		  hciconfwrapper.h bticonloader.h \
 		  pppdialog.h obexdialog.h \
-		  devicehandler.h rfcpopup.h
+		  devicehandler.h rfcpopup.h obexpopup.h \
 		  
 SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \ 
 	          btserviceitem.cpp stdpopups.cpp \
 		  popuphelper.cpp main.cpp \
 		  bluebase.cpp scandialog.cpp \ 
 		  btlistitem.cpp hciconfwrapper.cpp \ 
 		  bticonloader.cpp pppdialog.cpp \
 		  obexdialog.cpp devicehandler.cpp \
-		  rfcpopup.cpp
+		  rfcpopup.cpp obexpopup.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth -lopie
 INTERFACES      = bluetoothbase.ui  devicedialog.ui  
 DESTDIR         = $(OPIEDIR)/bin
 TARGET          = bluetooth-manager
 
 TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \
 	 ../../../../i18n/en/bluetooth-manager.ts \
 	 ../../../../i18n/es/bluetooth-manager.ts \
 	 ../../../../i18n/fr/bluetooth-manager.ts \
 	 ../../../../i18n/hu/bluetooth-manager.ts \
 	 ../../../../i18n/ja/bluetooth-manager.ts \
 	 ../../../../i18n/ko/bluetooth-manager.ts \
 	 ../../../../i18n/no/bluetooth-manager.ts \
 	 ../../../../i18n/pl/bluetooth-manager.ts \
 	 ../../../../i18n/pt/bluetooth-manager.ts \
 	 ../../../../i18n/pt_BR/bluetooth-manager.ts \
 	 ../../../../i18n/sl/bluetooth-manager.ts \
 	 ../../../../i18n/zh_CN/bluetooth-manager.ts \
 	 ../../../../i18n/zh_TW/bluetooth-manager.ts
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h
index 28d2be2..b3d5e6d 100644
--- a/noncore/net/opietooth/manager/obexdialog.h
+++ b/noncore/net/opietooth/manager/obexdialog.h
@@ -1,39 +1,39 @@
 #ifndef OBEXDIALOG_H
 #define OBEXDIALOG_H
 
 
 #include <qdialog.h>
 #include <opie/oprocess.h>
 
 class QVBoxLayout;
 class QPushButton;
 class QMultiLineEdit;
 class QLineEdit;
 
 
 namespace OpieTooth {
 
     class ObexDialog : public QDialog {
 
         Q_OBJECT
 
     public:
-        ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0,  const QString& device = 0);
+        ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0,  const QString& device = 0);
         ~ObexDialog();
 
 
 private slots:
         void browse();
         void sendData();
 
     protected:
         QVBoxLayout* layout;
         QLineEdit* cmdLine;
         QLineEdit* chNameLine;
         QPushButton* sendButton;
     private:
         // Device that is used
         QString m_device;
     };
 }
 #endif
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index 4a4daf2..1571fab 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -1,35 +1,36 @@
 
 #include "stdpopups.h"
 
 #include "popuphelper.h"
 
 using namespace OpieTooth;
 
 PopupHelper::PopupHelper() {
     init();
 }
 
 PopupHelper::~PopupHelper() {
 
 }
 
 void PopupHelper::insert( int id, popupFactory fact ) {
     m_map.insert(id, fact );
 }
 
 QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) {
     //qWarning("find");
     FactoryMap::Iterator it = m_map.find(id );
     if ( it != m_map.end() ) {
         //qWarning("found");
         popupFactory fact = it.data();
         return (*fact)(ser, item);
     }
     return 0l;
 }
 
 void PopupHelper::init() {
     insert( 4355, newRfcComPopup );
     insert( 4353, newRfcComPopup );
-    insert( 3, newObexPushPopup );
+    insert( 4357, newObexPushPopup );
+    insert( 4358, newObexPushPopup );
 }
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp
index 750365e..3a52334 100644
--- a/noncore/net/opietooth/manager/stdpopups.cpp
+++ b/noncore/net/opietooth/manager/stdpopups.cpp
@@ -1,15 +1,16 @@
 
 #include "rfcpopup.h"
+#include "obexpopup.h"
 
 #include "stdpopups.h"
 
 extern "C" {
 
     QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive,  OpieTooth::BTDeviceItem* item ) {
         return new OpieTooth::RfcCommPopup(/* servive,  item*/ ); // fix spellin RfComm vs. RfcComm and paramaters
         //return 0l;
     }
     QPopupMenu* newObexPushPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* ) {
-        return 0l;
+        return  new OpieTooth::ObexPopup();
     }
 }