summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp11
-rw-r--r--noncore/net/opietooth/manager/manager.pro4
-rw-r--r--noncore/net/opietooth/manager/obexdialog.h2
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp3
-rw-r--r--noncore/net/opietooth/manager/stdpopups.cpp3
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
@@ -292,20 +292,21 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
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 );
@@ -339,16 +340,18 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
* 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");
}
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
@@ -2,26 +2,26 @@ 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
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
@@ -13,17 +13,17 @@ 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:
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
@@ -26,10 +26,11 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item )
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();
}
}