Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 84 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 11 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/btlistitem.cpp | 60 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/btlistitem.h | 21 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 9 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/popuphelper.h | 6 |
7 files changed, 78 insertions, 117 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 85c6717..9cfeaa2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -44,6 +44,8 @@ #include <remotedevice.h> #include <services.h> +#include "btconnectionitem.h" + using namespace OpieTooth; BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) @@ -87,10 +89,13 @@ using namespace OpieTooth; //TESTING ListView2->setRootIsDecorated(true); - BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" ); + BTDeviceItem *topLV2 = new BTDeviceItem( ListView2, RemoteDevice("xx:", "Siemens S45" ) ); topLV2->setPixmap( 1, m_onPix ); - (void) new BTListItem( topLV2, "Serial" ,"", "service" ); - (void) new BTListItem( topLV2, "BlueNiC" , "", "service" ); + Services s1; + s1.setServiceName( "Serial" ); + (void) new BTServiceItem( topLV2, s1 ); + s1.setServiceName( "BlueNic" ); + (void) new BTServiceItem( topLV2, s1 ); writeToHciConfig(); // search conncetions @@ -184,13 +189,19 @@ using namespace OpieTooth; */ void BlueBase::writeSavedDevices() { QListViewItemIterator it( ListView2 ); + BTListItem* item; + BTDeviceItem* device; for ( ; it.current(); ++it ) { + item = (BTListItem*)it.current(); + if(item->typeId() != BTListItem::Device ) + continue; + device = (BTDeviceItem*)item; // seperate config file for each device, to store more information in future. - qDebug( "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf"); - Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf", Config::File ); + qDebug( "/Settings/bluetooth/" + device->mac() + ".conf"); + Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + device->mac() + ".conf", Config::File ); conf.setGroup( "Info" ); - conf.writeEntry( "name", ((BTListItem*)it.current())->name() ); + conf.writeEntry( "name", device->name() ); } } @@ -245,11 +256,12 @@ using namespace OpieTooth; * */ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { - BTListItem * deviceItem; + BTDeviceItem * deviceItem; QValueList<RemoteDevice>::ConstIterator it; for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { - deviceItem = new BTListItem( ListView2 , (*it).name(), (*it).mac(), "device" ); + + deviceItem = new BTDeviceItem( ListView2 , (*it) ); deviceItem->setExpandable ( true ); // look if device is avail. atm, async @@ -326,10 +338,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin * Search and display avail. services for a device (on expand from device listing) * */ - void BlueBase::addServicesToDevice( BTListItem * item ) { + void BlueBase::addServicesToDevice( BTDeviceItem * item ) { qDebug("addServicesToDevice"); // row of mac adress text(3) - RemoteDevice device( item->mac(), item->name() ); + RemoteDevice device = item->remoteDevice(); m_deviceList.insert( item->mac() , item ); // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back m_localDevice->searchServices( device ); @@ -344,28 +356,31 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { qDebug("fill services list"); - QMap<QString,BTListItem*>::Iterator it; - BTListItem* deviceItem = 0; + QMap<QString,BTDeviceItem*>::Iterator it; + BTDeviceItem* deviceItem = 0; // get the right devices which requested the search - for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) { - if ( it.key() == device ) { - deviceItem = it.data(); - } - } + it = m_deviceList.find( device ); + if( it == m_deviceList.end() ) + return; + deviceItem = it.data(); QValueList<OpieTooth::Services>::Iterator it2; - BTListItem * serviceItem; + BTServiceItem * serviceItem; if (!servicesList.isEmpty() ) { // add services for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { - serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" ); + serviceItem = new BTServiceItem( deviceItem , (*it2) ); serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) ); } } else { - serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" ); + Services s1; + s1.setServiceName( tr("no serives found") ); + serviceItem = new BTServiceItem( deviceItem, s1 ); } + // now remove them from the list + m_deviceList.remove( it ); } @@ -378,17 +393,19 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin } - void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) { - QValueList<OpieTooth::Connection>::Iterator it; - BTListItem * connectionItem; + void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) { + QValueList<OpieTooth::ConnectionState>::Iterator it; + BTConnectionItem * connectionItem; if ( !connectionList.isEmpty() ) { for (it = connectionList.begin(); it != connectionList.end(); ++it) { - connectionItem = new BTListItem( ListView4 , (*it).mac() , (*it).mac() , "connection" ); + connectionItem = new BTConnectionItem( ListView4 , (*it) ); } } else { - connectionItem = new BTListItem( ListView4 , tr("No connections found"), "", "connection" ); + ConnectionState con; + con.setMac( tr("No connections found") ); + connectionItem = new BTConnectionItem( ListView4 , con ); } // recall connection search after some time @@ -400,6 +417,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin */ void BlueBase::deviceActive( const RemoteDevice &device ) { // search by mac, async, gets a signal back + // We should have a BTDeviceItem there or where does it get added to the map -zecke m_localDevice->isAvailable( device.mac() ); } @@ -411,21 +429,21 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin void BlueBase::deviceActive( const QString& device, bool connected ) { qDebug("deviceActive slot"); - QMap<QString,BTListItem*>::Iterator it; - BTListItem* deviceItem = 0; + QMap<QString,BTDeviceItem*>::Iterator it; + + it = m_deviceList.find( device ); + if( it == m_deviceList.end() ) + return; + + BTDeviceItem* deviceItem = it.data(); - // get the right devices which requested the search - for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) { - if ( it.key() == device ) { - deviceItem = it.data(); - } - } if ( connected ) { deviceItem->setPixmap( 1, m_onPix ); } else { deviceItem->setPixmap( 1, m_offPix ); } + m_deviceList.remove( it ); } /** diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index 73fac97..a8f4fe4 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -10,7 +10,10 @@ #include <qpixmap.h> #include "bluetoothbase.h" -#include "btlistitem.h" + +#include "btserviceitem.h" +#include "btdeviceitem.h" + #include "bticonloader.h" #include <remotedevice.h> @@ -51,7 +54,7 @@ namespace OpieTooth { void initGui(); void setInfo(); Manager *m_localDevice; - QMap<QString,BTListItem*> m_deviceList; + QMap<QString,BTDeviceItem*> m_deviceList; void deviceActive( const RemoteDevice &device ); @@ -69,10 +72,10 @@ namespace OpieTooth { private slots: void addSearchedDevices( const QValueList<RemoteDevice> &newDevices ); - void addServicesToDevice( BTListItem *item ); + void addServicesToDevice( BTDeviceItem *item ); void addServicesToDevice( const QString& device, Services::ValueList ); void addConnectedDevices(); - void addConnectedDevices( Connection::ValueList ); + void addConnectedDevices( ConnectionState::ValueList ); void startServiceActionClicked( QListViewItem *item ); void startServiceActionHold( QListViewItem *, const QPoint &, int ); void deviceActive( const QString& mac, bool connected ); diff --git a/noncore/net/opietooth/manager/btlistitem.cpp b/noncore/net/opietooth/manager/btlistitem.cpp index 82e7c00..36816f8 100644 --- a/noncore/net/opietooth/manager/btlistitem.cpp +++ b/noncore/net/opietooth/manager/btlistitem.cpp @@ -1,61 +1,11 @@ #include "btlistitem.h" -namespace OpieTooth { +using namespace OpieTooth; - BTListItem::BTListItem( QListView * parent ) : QListViewItem( parent ) { - } +BTListItem::BTListItem( QListView * parent ) : QListViewItem( parent ) { +} - BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) { - } - - - // name, and then mac and then servicetype - BTListItem::BTListItem( QListView * parent, const QString &name , const QString& mac, const QString& type ) - : QListViewItem( parent, name ){ - - m_name = name; - m_mac = mac; - m_type = type; - - } - - BTListItem::BTListItem( QListViewItem * parent , const QString& name, const QString& mac, const QString& type ) - : QListViewItem( parent, name ){ - - m_name = name; - m_mac = mac; - m_type = type; - } - - - void BTListItem::setMac( const QString& mac ) { - m_mac = mac; - } - - QString BTListItem::mac() const { - return m_mac; - } - - void BTListItem::setName( const QString& name ) { - m_name = name; - } - - QString BTListItem::name() const { - return m_name; - } - - void BTListItem::setType( const QString& type ) { - m_type = type; - } - - QString BTListItem::type() const { - return m_type; - } - - - BTListItem::~BTListItem() { - } - -}; +BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) { +} diff --git a/noncore/net/opietooth/manager/btlistitem.h b/noncore/net/opietooth/manager/btlistitem.h index d7ce03b..6b529d1 100644 --- a/noncore/net/opietooth/manager/btlistitem.h +++ b/noncore/net/opietooth/manager/btlistitem.h @@ -6,27 +6,12 @@ namespace OpieTooth { class BTListItem : public QListViewItem { - public: + enum Types { Device =0, Service, Connection }; BTListItem( QListView * parent ); BTListItem( QListViewItem * parent ); - - // name, and then mac and then servicetype - BTListItem( QListView * , const QString&, const QString&, const QString& ); - BTListItem( QListViewItem * parent , const QString&, const QString& , const QString& ); - ~BTListItem(); - - void setMac( const QString& ); - QString mac()const; - void setName( const QString& ); - QString name()const; - void setType( const QString& ); - QString type()const; - private: - QString m_name; - QString m_mac; - QString m_type; - + virtual QString type() const = 0; + virtual int typeId() const = 0; }; }; diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 4f0ea60..d36b8df2 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro @@ -1,8 +1,8 @@ TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release -HEADERS = popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h -SOURCES = popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp +HEADERS = btconnectionitem.h btdeviceitem.h btserviceitem.h stdpopups.h popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h +SOURCES = btconnectionitem.cpp btdeviceitem.cpp btserviceitem.h stdpopups.cpp popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp INCLUDEPATH += $(OPIEDIR)/include INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib DEPENDPATH += $(OPIEDIR)/include diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index 2a6dad0..d8404d6 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp @@ -1,4 +1,6 @@ +#include "stdpopups.h" + #include "popuphelper.h" using namespace OpieTooth; @@ -12,14 +14,15 @@ PopupHelper::~PopupHelper() { void PopupHelper::insert( int id, popupFactory fact ) { m_map.insert(id, fact ); } -QPopupMenu* PopupHelper::find( int id ) { +QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { FactoryMap::Iterator it = m_map.find(id ); if ( it != m_map.end() ) { popupFactory fact = it.data(); - return (*fact)(); + return (*fact)(ser, item); } return 0l; } void PopupHelper::init() { - + insert( 1, newRfcComPopup ); + insert(2, newObexPushPopup ); } diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h index 7485f71..7541ac5 100644 --- a/noncore/net/opietooth/manager/popuphelper.h +++ b/noncore/net/opietooth/manager/popuphelper.h @@ -2,19 +2,21 @@ #ifndef OPIE_TOOTH_POPUP_HELPER #define OPIE_TOOTH_POPUP_HELPER +#include <qlistview.h> #include <qpopupmenu.h> #include <qmap.h> +#include <services.h> namespace OpieTooth { - typedef QPopupMenu* (*popupFactory)(void); + typedef QPopupMenu* (*popupFactory)(const Services&, QListViewItem*); typedef QMap<int, popupFactory> FactoryMap; class PopupHelper { public: PopupHelper(); ~PopupHelper(); void insert( int id, popupFactory fact ); - QPopupMenu* find( int id ); + QPopupMenu* find( int id, const Services&, QListViewItem* ); private: void init(); FactoryMap m_map; |