summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-20 23:54:44 (UTC)
committer harlekin <harlekin>2002-07-20 23:54:44 (UTC)
commit76d7938ec6b89aa11f54f9fbdad40bb358b4886a (patch) (side-by-side diff)
tree0dfa86240e9674cefa489d85ac4841a94d43e175
parent594dfd3535846a536cebdb3381f4858239404c49 (diff)
downloadopie-76d7938ec6b89aa11f54f9fbdad40bb358b4886a.zip
opie-76d7938ec6b89aa11f54f9fbdad40bb358b4886a.tar.gz
opie-76d7938ec6b89aa11f54f9fbdad40bb358b4886a.tar.bz2
update
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp19
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp9
-rw-r--r--noncore/net/opietooth/manager/stdpopups.cpp3
3 files changed, 21 insertions, 10 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
@@ -18,6 +18,11 @@
#include "bluebase.h"
#include "scandialog.h"
#include "hciconfwrapper.h"
+#include "devicehandler.h"
+#include "btconnectionitem.h"
+
+#include <remotedevice.h>
+#include <services.h>
#include <stdlib.h>
@@ -26,7 +31,6 @@
#include <qpushbutton.h>
#include <qlayout.h>
#include <qvariant.h>
-#include <qwhatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
#include <qtabwidget.h>
@@ -40,14 +44,10 @@
#include <qpopupmenu.h>
#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;
@@ -72,6 +72,11 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ),
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" );
m_onPix = Resource::loadPixmap( "installed" );
@@ -162,7 +167,6 @@ void BlueBase::writeToHciConfig() {
/**
* Read the list of allready known devices
- *
*/
void BlueBase::readSavedDevices() {
@@ -176,7 +180,6 @@ void BlueBase::readSavedDevices() {
/**
* Write the list of allready known devices
- *
*/
void BlueBase::writeSavedDevices() {
QListViewItemIterator it( ListView2 );
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
@@ -8,12 +8,15 @@ using namespace OpieTooth;
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");
FactoryMap::Iterator it = m_map.find(id );
@@ -24,7 +27,9 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* 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
@@ -3,6 +3,7 @@
#include "stdpopups.h"
+extern "C" {
QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
// return OpieTooth::RfcComPopup( servive, item );
@@ -11,3 +12,5 @@ QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* i
QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
return 0l;
}
+
+}