Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -296,12 +296,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
296 | if ( ((BTListItem*)item)->type() == "device") { | 296 | if ( ((BTListItem*)item)->type() == "device") { |
297 | 297 | ||
298 | QPopupMenu *groups = new QPopupMenu(); | 298 | QPopupMenu *groups = new QPopupMenu(); |
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 | ||
305 | ret = menu->exec( point , 0); | 306 | ret = menu->exec( point , 0); |
306 | 307 | ||
307 | switch(ret) { | 308 | switch(ret) { |
@@ -343,8 +344,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
343 | BTServiceItem* service = (BTServiceItem*)item; | 344 | BTServiceItem* service = (BTServiceItem*)item; |
344 | QMap<int, QString> list = service->services().classIdList(); | 345 | QMap<int, QString> list = service->services().classIdList(); |
345 | QMap<int, QString>::Iterator it = list.begin(); | 346 | QMap<int, QString>::Iterator it = list.begin(); |
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() ) { |
348 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); | 351 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); |
349 | popup = m_popHelper.find( it.key() /*1*/, | 352 | popup = m_popHelper.find( it.key() /*1*/, |
350 | service->services(), | 353 | service->services(), |
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 | |||
@@ -6,18 +6,18 @@ HEADERS = btconnectionitem.h btdeviceitem.h \ | |||
6 | popuphelper.h bluebase.h \ | 6 | popuphelper.h bluebase.h \ |
7 | scandialog.h btlistitem.h \ | 7 | scandialog.h btlistitem.h \ |
8 | hciconfwrapper.h bticonloader.h \ | 8 | hciconfwrapper.h bticonloader.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 | ||
12 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | 12 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ |
13 | btserviceitem.cpp stdpopups.cpp \ | 13 | btserviceitem.cpp stdpopups.cpp \ |
14 | popuphelper.cpp main.cpp \ | 14 | popuphelper.cpp main.cpp \ |
15 | bluebase.cpp scandialog.cpp \ | 15 | bluebase.cpp scandialog.cpp \ |
16 | btlistitem.cpp hciconfwrapper.cpp \ | 16 | btlistitem.cpp hciconfwrapper.cpp \ |
17 | bticonloader.cpp pppdialog.cpp \ | 17 | bticonloader.cpp pppdialog.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 |
21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
22 | DEPENDPATH += $(OPIEDIR)/include | 22 | DEPENDPATH += $(OPIEDIR)/include |
23 | LIBS += -lqpe -lopietooth -lopie | 23 | LIBS += -lqpe -lopietooth -lopie |
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 | |||
@@ -17,9 +17,9 @@ namespace OpieTooth { | |||
17 | 17 | ||
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | 19 | ||
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(); |
23 | 23 | ||
24 | 24 | ||
25 | private slots: | 25 | private slots: |
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 | |||
@@ -30,6 +30,7 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) | |||
30 | 30 | ||
31 | void PopupHelper::init() { | 31 | void PopupHelper::init() { |
32 | insert( 4355, newRfcComPopup ); | 32 | insert( 4355, newRfcComPopup ); |
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 | |||
@@ -1,6 +1,7 @@ | |||
1 | 1 | ||
2 | #include "rfcpopup.h" | 2 | #include "rfcpopup.h" |
3 | #include "obexpopup.h" | ||
3 | 4 | ||
4 | #include "stdpopups.h" | 5 | #include "stdpopups.h" |
5 | 6 | ||
6 | extern "C" { | 7 | extern "C" { |
@@ -9,7 +10,7 @@ extern "C" { | |||
9 | return new OpieTooth::RfcCommPopup(/* servive, item*/ ); // fix spellin RfComm vs. RfcComm and paramaters | 10 | return new OpieTooth::RfcCommPopup(/* servive, item*/ ); // fix spellin RfComm vs. RfcComm and paramaters |
10 | //return 0l; | 11 | //return 0l; |
11 | } | 12 | } |
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 | } |
15 | } | 16 | } |