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
@@ -299,6 +299,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
-        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);
 
@@ -346,2 +347,4 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         QPopupMenu *popup =0l;
+        popup->insertItem( (service->services()).serviceName() );
+        popup->insertSeparator();
         if ( it != list.end() ) {
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
@@ -9,3 +9,3 @@ HEADERS         = btconnectionitem.h btdeviceitem.h \
 		  pppdialog.h obexdialog.h \
-		  devicehandler.h rfcpopup.h
+		  devicehandler.h rfcpopup.h obexpopup.h \
 		  
@@ -18,3 +18,3 @@ SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \
 		  obexdialog.cpp devicehandler.cpp \
-		  rfcpopup.cpp
+		  rfcpopup.cpp obexpopup.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
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
@@ -20,3 +20,3 @@ namespace OpieTooth {
     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();
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
@@ -33,3 +33,4 @@ void PopupHelper::init() {
     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
@@ -2,2 +2,3 @@
 #include "rfcpopup.h"
+#include "obexpopup.h"
 
@@ -12,3 +13,3 @@ extern "C" {
     QPopupMenu* newObexPushPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* ) {
-        return 0l;
+        return  new OpieTooth::ObexPopup();
     }