-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 11 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.cpp | 3 |
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 | |||
299 | 299 | ||
300 | menu->insertItem( tr("rescan sevices:"), 0); | 300 | menu->insertItem( ((BTDeviceItem*)item)->name(),0 ); |
301 | menu->insertItem( tr("to group"), groups , 1); | 301 | menu->insertSeparator(1); |
302 | // menu->insertItem( tr("bound device"), 2); | 302 | menu->insertItem( tr("rescan sevices"), 2); |
303 | menu->insertItem( tr("delete"), 3); | 303 | menu->insertItem( tr("to group"), groups , 3); |
304 | menu->insertItem( tr("delete"), 4); | ||
304 | 305 | ||
@@ -346,2 +347,4 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
346 | QPopupMenu *popup =0l; | 347 | QPopupMenu *popup =0l; |
348 | popup->insertItem( (service->services()).serviceName() ); | ||
349 | popup->insertSeparator(); | ||
347 | if ( it != list.end() ) { | 350 | 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 \ | |||
9 | pppdialog.h obexdialog.h \ | 9 | pppdialog.h obexdialog.h \ |
10 | devicehandler.h rfcpopup.h | 10 | devicehandler.h rfcpopup.h obexpopup.h \ |
11 | 11 | ||
@@ -18,3 +18,3 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | |||
18 | obexdialog.cpp devicehandler.cpp \ | 18 | obexdialog.cpp devicehandler.cpp \ |
19 | rfcpopup.cpp | 19 | rfcpopup.cpp obexpopup.cpp |
20 | INCLUDEPATH += $(OPIEDIR)/include | 20 | 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 { | |||
20 | public: | 20 | public: |
21 | ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); | 21 | ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); |
22 | ~ObexDialog(); | 22 | ~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() { | |||
33 | insert( 4353, newRfcComPopup ); | 33 | insert( 4353, newRfcComPopup ); |
34 | insert( 3, newObexPushPopup ); | 34 | insert( 4357, newObexPushPopup ); |
35 | insert( 4358, newObexPushPopup ); | ||
35 | } | 36 | } |
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 @@ | |||
2 | #include "rfcpopup.h" | 2 | #include "rfcpopup.h" |
3 | #include "obexpopup.h" | ||
3 | 4 | ||
@@ -12,3 +13,3 @@ extern "C" { | |||
12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ) { | 13 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ) { |
13 | return 0l; | 14 | return new OpieTooth::ObexPopup(); |
14 | } | 15 | } |