author | harlekin <harlekin> | 2002-07-21 21:51:12 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-21 21:51:12 (UTC) |
commit | 14ebec617bad2eb46173c09566c335ec6548b334 (patch) (side-by-side diff) | |
tree | bdccba4c5b812580ed484ed407a4b9cd2c57ca75 /noncore | |
parent | 9d54b1e1904a65decd54b6f1b5962bdb9ec26717 (diff) | |
download | opie-14ebec617bad2eb46173c09566c335ec6548b334.zip opie-14ebec617bad2eb46173c09566c335ec6548b334.tar.gz opie-14ebec617bad2eb46173c09566c335ec6548b334.tar.bz2 |
added obex popup and dialog
-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 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) { @@ -343,8 +344,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin 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(), 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 \ 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 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 { 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: 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 ) 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,6 +1,7 @@ #include "rfcpopup.h" +#include "obexpopup.h" #include "stdpopups.h" extern "C" { @@ -9,7 +10,7 @@ extern "C" { 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(); } } |