-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 19 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 11 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.cpp | 15 |
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 @@ -13,46 +13,46 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "bluebase.h" #include "scandialog.h" #include "hciconfwrapper.h" +#include "devicehandler.h" +#include "btconnectionitem.h" + +#include <remotedevice.h> +#include <services.h> #include <stdlib.h> #include <qframe.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> #include <qvariant.h> -#include <qwhatsthis.h> #include <qimage.h> #include <qpixmap.h> #include <qtabwidget.h> #include <qscrollview.h> #include <qvbox.h> #include <qmessagebox.h> #include <qcheckbox.h> #include <qlineedit.h> #include <qlistview.h> #include <qdir.h> #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; BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) : BluetoothBase( parent, name, fl ) { m_localDevice = new Manager( "hci0" ); @@ -67,16 +67,21 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) ); connect( m_localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ), this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); connect( m_localDevice, SIGNAL( available( const QString&, bool ) ), this, SLOT( deviceActive( const QString& , bool ) ) ); 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" ); QPalette pal = this->palette(); QColor col = pal.color( QPalette::Active, QColorGroup::Background ); pal.setColor( QPalette::Active, QColorGroup::Button, col ); pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); @@ -157,31 +162,29 @@ void BlueBase::writeToHciConfig() { hciconf.setPscan( m_enablePagescan ); hciconf.setIscan( m_enableInquiryscan ); hciconf.save(); } /** * Read the list of allready known devices - * */ void BlueBase::readSavedDevices() { QValueList<RemoteDevice> loadedDevices; DeviceHandler handler; loadedDevices = handler.load(); addSearchedDevices( loadedDevices ); } /** * Write the list of allready known devices - * */ void BlueBase::writeSavedDevices() { QListViewItemIterator it( ListView2 ); BTListItem* item; BTDeviceItem* device; RemoteDevice::ValueList list; for ( ; it.current(); ++it ) { item = (BTListItem*)it.current(); 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 @@ -3,28 +3,33 @@ #include "popuphelper.h" 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 ); if ( it != m_map.end() ) { //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 @@ -1,13 +1,16 @@ //#include "rfccompopup.h" #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; } |