summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp19
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp11
-rw-r--r--noncore/net/opietooth/manager/stdpopups.cpp15
3 files changed, 28 insertions, 17 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index af64663..c81d4d1 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -19,4 +19,9 @@
#include "scandialog.h"
#include "hciconfwrapper.h"
+#include "devicehandler.h"
+#include "btconnectionitem.h"
+
+#include <remotedevice.h>
+#include <services.h>
#include <stdlib.h>
@@ -27,5 +32,4 @@
#include <qlayout.h>
#include <qvariant.h>
-#include <qwhatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
@@ -41,12 +45,8 @@
#include <qtimer.h>
+#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
#include <qpe/config.h>
-#include <remotedevice.h>
-#include <services.h>
-
-#include "devicehandler.h"
-#include "btconnectionitem.h"
using namespace OpieTooth;
@@ -73,4 +73,9 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) );
+
+ // let hold be rightButtonClicked()
+ QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
+ QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
+
//Load all icons needed
m_offPix = Resource::loadPixmap( "editdelete" );
@@ -163,5 +168,4 @@ void BlueBase::writeToHciConfig() {
/**
* Read the list of allready known devices
- *
*/
void BlueBase::readSavedDevices() {
@@ -177,5 +181,4 @@ void BlueBase::readSavedDevices() {
/**
* Write the list of allready known devices
- *
*/
void BlueBase::writeSavedDevices() {
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index 4ef1ed5..ba91e04 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -9,10 +9,13 @@ PopupHelper::PopupHelper() {
init();
}
+
PopupHelper::~PopupHelper() {
}
+
void PopupHelper::insert( int id, popupFactory fact ) {
m_map.insert(id, fact );
}
+
QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
//qWarning("find");
@@ -21,10 +24,12 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item
//qWarning("found");
popupFactory fact = it.data();
- return (*fact)(ser, item);
+ return (*fact)(ser, item);
}
return 0l;
}
+
void PopupHelper::init() {
- insert( 1, newRfcComPopup );
- insert(2, newObexPushPopup );
+ insert( 4355, newRfcComPopup );
+ insert( 4353, newRfcComPopup );
+ insert( 3, newObexPushPopup );
}
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp
index f462368..2290b9a 100644
--- a/noncore/net/opietooth/manager/stdpopups.cpp
+++ b/noncore/net/opietooth/manager/stdpopups.cpp
@@ -4,10 +4,13 @@
#include "stdpopups.h"
+extern "C" {
+
+ QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
+ // return OpieTooth::RfcComPopup( servive, item );
+ return 0l;
+ }
+ QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
+ return 0l;
+ }
-QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
- // return OpieTooth::RfcComPopup( servive, item );
- return 0l;
-}
-QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
- return 0l;
}