summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-20 23:54:44 (UTC)
committer harlekin <harlekin>2002-07-20 23:54:44 (UTC)
commit76d7938ec6b89aa11f54f9fbdad40bb358b4886a (patch) (unidiff)
tree0dfa86240e9674cefa489d85ac4841a94d43e175
parent594dfd3535846a536cebdb3381f4858239404c49 (diff)
downloadopie-76d7938ec6b89aa11f54f9fbdad40bb358b4886a.zip
opie-76d7938ec6b89aa11f54f9fbdad40bb358b4886a.tar.gz
opie-76d7938ec6b89aa11f54f9fbdad40bb358b4886a.tar.bz2
update
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
@@ -18,6 +18,11 @@
18#include "bluebase.h" 18#include "bluebase.h"
19#include "scandialog.h" 19#include "scandialog.h"
20#include "hciconfwrapper.h" 20#include "hciconfwrapper.h"
21#include "devicehandler.h"
22#include "btconnectionitem.h"
23
24#include <remotedevice.h>
25#include <services.h>
21 26
22#include <stdlib.h> 27#include <stdlib.h>
23 28
@@ -26,7 +31,6 @@
26#include <qpushbutton.h> 31#include <qpushbutton.h>
27#include <qlayout.h> 32#include <qlayout.h>
28#include <qvariant.h> 33#include <qvariant.h>
29#include <qwhatsthis.h>
30#include <qimage.h> 34#include <qimage.h>
31#include <qpixmap.h> 35#include <qpixmap.h>
32#include <qtabwidget.h> 36#include <qtabwidget.h>
@@ -40,14 +44,10 @@
40#include <qpopupmenu.h> 44#include <qpopupmenu.h>
41#include <qtimer.h> 45#include <qtimer.h>
42 46
47#include <qpe/qpeapplication.h>
43#include <qpe/resource.h> 48#include <qpe/resource.h>
44#include <qpe/config.h> 49#include <qpe/config.h>
45 50
46#include <remotedevice.h>
47#include <services.h>
48
49#include "devicehandler.h"
50#include "btconnectionitem.h"
51 51
52using namespace OpieTooth; 52using namespace OpieTooth;
53 53
@@ -72,6 +72,11 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
72 connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ), 72 connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ),
73 this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) ); 73 this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) );
74 74
75
76 // let hold be rightButtonClicked()
77 QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
78 QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
79
75 //Load all icons needed 80 //Load all icons needed
76 m_offPix = Resource::loadPixmap( "editdelete" ); 81 m_offPix = Resource::loadPixmap( "editdelete" );
77 m_onPix = Resource::loadPixmap( "installed" ); 82 m_onPix = Resource::loadPixmap( "installed" );
@@ -162,7 +167,6 @@ void BlueBase::writeToHciConfig() {
162 167
163/** 168/**
164 * Read the list of allready known devices 169 * Read the list of allready known devices
165 *
166 */ 170 */
167void BlueBase::readSavedDevices() { 171void BlueBase::readSavedDevices() {
168 172
@@ -176,7 +180,6 @@ void BlueBase::readSavedDevices() {
176 180
177/** 181/**
178 * Write the list of allready known devices 182 * Write the list of allready known devices
179 *
180 */ 183 */
181void BlueBase::writeSavedDevices() { 184void BlueBase::writeSavedDevices() {
182 QListViewItemIterator it( ListView2 ); 185 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,23 +8,28 @@ using namespace OpieTooth;
8PopupHelper::PopupHelper() { 8PopupHelper::PopupHelper() {
9 init(); 9 init();
10} 10}
11
11PopupHelper::~PopupHelper() { 12PopupHelper::~PopupHelper() {
12 13
13} 14}
15
14void PopupHelper::insert( int id, popupFactory fact ) { 16void PopupHelper::insert( int id, popupFactory fact ) {
15 m_map.insert(id, fact ); 17 m_map.insert(id, fact );
16} 18}
19
17QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { 20QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
18 //qWarning("find"); 21 //qWarning("find");
19 FactoryMap::Iterator it = m_map.find(id ); 22 FactoryMap::Iterator it = m_map.find(id );
20 if ( it != m_map.end() ) { 23 if ( it != m_map.end() ) {
21 //qWarning("found"); 24 //qWarning("found");
22 popupFactory fact = it.data(); 25 popupFactory fact = it.data();
23 return (*fact)(ser, item); 26 return (*fact)(ser, item);
24 } 27 }
25 return 0l; 28 return 0l;
26} 29}
30
27void PopupHelper::init() { 31void PopupHelper::init() {
28 insert( 1, newRfcComPopup ); 32 insert( 4355, newRfcComPopup );
29 insert(2, newObexPushPopup ); 33 insert( 4353, newRfcComPopup );
34 insert( 3, newObexPushPopup );
30} 35}
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,11 +3,14 @@
3 3
4#include "stdpopups.h" 4#include "stdpopups.h"
5 5
6extern "C" {
7
8 QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
9 // return OpieTooth::RfcComPopup( servive, item );
10 return 0l;
11 }
12 QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
13 return 0l;
14 }
6 15
7QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) {
8 // return OpieTooth::RfcComPopup( servive, item );
9 return 0l;
10}
11QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) {
12 return 0l;
13} 16}