author | ar <ar> | 2004-02-21 15:27:41 (UTC) |
---|---|---|
committer | ar <ar> | 2004-02-21 15:27:41 (UTC) |
commit | 460258f203be746ff79e14f32a823f381b8ea513 (patch) (side-by-side diff) | |
tree | 87dddbacda3050027d343730cf021b53045e80cb /noncore/net/opietooth | |
parent | 76b70b355d2c1c32c0f74e844e0654e39db2a175 (diff) | |
download | opie-460258f203be746ff79e14f32a823f381b8ea513.zip opie-460258f203be746ff79e14f32a823f381b8ea513.tar.gz opie-460258f203be746ff79e14f32a823f381b8ea513.tar.bz2 |
improve support for BigScreen
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlg.cc | 41 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 261 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexpopup.cpp | 22 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | 51 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcpopup.cpp | 49 |
5 files changed, 261 insertions, 163 deletions
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc index 7d60d6c..9418a20 100644 --- a/noncore/net/opietooth/blue-pin/pindlg.cc +++ b/noncore/net/opietooth/blue-pin/pindlg.cc @@ -1,54 +1,65 @@ -#include <stdio.h> +#include "pindlg.h" + +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> +/* QT */ #include <qcheckbox.h> #include <qlabel.h> #include <qlineedit.h> #include <qtimer.h> -#include <qpe/config.h> - -#include "pindlg.h" +/* STD */ +#include <stdio.h> using namespace OpieTooth; PinDlg::PinDlg( const QString& status, const QString& mac, QWidget* parent, const char* name ) - : PinDlgBase( parent, name, WType_Modal ) + : PinDlgBase( parent, name, WType_Modal ) { m_mac = mac; test( mac ); txtStatus->setText(status); - showMaximized(); + QPEApplication::showDialog( this ); } -PinDlg::~PinDlg() { -} -void PinDlg::setMac( const QString& mac ) { +PinDlg::~PinDlg() +{} +void PinDlg::setMac( const QString& mac ) +{ txtStatus->setText( mac ); } -QString PinDlg::pin() const{ +QString PinDlg::pin() const +{ return lnePin->text(); } -void PinDlg::test( const QString& mac ) { - if (!mac.isEmpty() ) { +void PinDlg::test( const QString& mac ) +{ + if (!mac.isEmpty() ) + { Config cfg("bluepin"); cfg.setGroup(mac); lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) ); - if ( !lnePin->text().isEmpty() ) { + if ( !lnePin->text().isEmpty() ) + { //QTimer::singleShot(100, this, SLOT(accept() ) ); } } } -void PinDlg::accept() { - if ( ckbPin->isChecked() ) { +void PinDlg::accept() +{ + if ( ckbPin->isChecked() ) + { Config cfg("bluepin"); cfg.setGroup(m_mac ); cfg.writeEntryCrypt("pin", lnePin->text() ); } QDialog::accept(); } diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 2e68984..0ea45d2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -13,79 +13,81 @@ * 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 "rfcommassigndialogimpl.h" -#include <remotedevice.h> -#include <services.h> - -#include <stdlib.h> +/* OPIE */ +#include <qpe/qpeapplication.h> +#include <qpe/resource.h> +#include <qpe/config.h> +/* QT */ #include <qframe.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> #include <qvariant.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 <qlist.h> -#include <qpe/qpeapplication.h> -#include <qpe/resource.h> -#include <qpe/config.h> - +/* STD */ +#include <remotedevice.h> +#include <services.h> +#include <stdlib.h> using namespace OpieTooth; BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) - : BluetoothBase( parent, name, fl ) { + : BluetoothBase( parent, name, fl ) +{ m_localDevice = new Manager( "hci0" ); connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) ); -// not good since lib is async + // not good since lib is async // connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ), // this, SLOT( addServicesToDevice( QListViewItem * ) ) ); connect( ListView2, SIGNAL( clicked( QListViewItem* )), this, SLOT( startServiceActionClicked( QListViewItem* ) ) ); connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ), 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 ) ) ); connect( m_localDevice, SIGNAL( signalStrength( const QString&, const QString& ) ), - this, SLOT( addSignalStrength( const QString&, const QString& ) ) ); + this, SLOT( addSignalStrength( const QString&, const QString& ) ) ); // let hold be rightButtonClicked() QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold); QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold); //Load all icons needed m_offPix = Resource::loadPixmap( "opietooth/notconnected" ); m_onPix = Resource::loadPixmap( "opietooth/connected" ); m_findPix = Resource::loadPixmap( "opietooth/find" ); QPalette pal = this->palette(); @@ -106,226 +108,240 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) writeToHciConfig(); // search conncetions addConnectedDevices(); addSignalStrength(); m_iconLoader = new BTIconLoader(); readSavedDevices(); } /** * Reads all options from the config file */ -void BlueBase::readConfig() { +void BlueBase::readConfig() +{ Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE ); m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE ); m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE ); m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE ); } /** * Writes all options to the config file */ -void BlueBase::writeConfig() { +void BlueBase::writeConfig() +{ Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); cfg.writeEntry( "name" , m_deviceName ); cfg.writeEntryCrypt( "passkey" , m_defaultPasskey ); cfg.writeEntry( "useEncryption" , m_useEncryption ); cfg.writeEntry( "enableAuthentification" , m_enableAuthentification ); cfg.writeEntry( "enablePagescan" , m_enablePagescan ); cfg.writeEntry( "enableInquiryscan" , m_enableInquiryscan ); writeToHciConfig(); } /** * Modify the hcid.conf file to our needs */ -void BlueBase::writeToHciConfig() { +void BlueBase::writeToHciConfig() +{ qWarning("writeToHciConfig"); HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); hciconf.load(); hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); hciconf.setName( m_deviceName ); hciconf.setEncrypt( m_useEncryption ); hciconf.setAuth( m_enableAuthentification ); hciconf.setPscan( m_enablePagescan ); hciconf.setIscan( m_enableInquiryscan ); hciconf.save(); } /** * Read the list of allready known devices */ -void BlueBase::readSavedDevices() { +void BlueBase::readSavedDevices() +{ QValueList<RemoteDevice> loadedDevices; DeviceHandler handler; loadedDevices = handler.load(); addSearchedDevices( loadedDevices ); } /** * Write the list of allready known devices */ -void BlueBase::writeSavedDevices() { +void BlueBase::writeSavedDevices() +{ QListViewItemIterator it( ListView2 ); BTListItem* item; BTDeviceItem* device; RemoteDevice::ValueList list; - for ( ; it.current(); ++it ) { + for ( ; it.current(); ++it ) + { item = (BTListItem*)it.current(); if(item->typeId() != BTListItem::Device ) continue; device = (BTDeviceItem*)item; list.append( device->remoteDevice() ); } /* * if not empty save the List through DeviceHandler */ if ( list.isEmpty() ) return; DeviceHandler handler; handler.save( list ); } /** * Set up the gui */ -void BlueBase::initGui() { +void BlueBase::initGui() +{ StatusLabel->setText( status() ); // maybe move it to getStatus() cryptCheckBox->setChecked( m_useEncryption ); authCheckBox->setChecked( m_enableAuthentification ); pagescanCheckBox->setChecked( m_enablePagescan ); inquiryscanCheckBox->setChecked( m_enableInquiryscan ); deviceNameLine->setText( m_deviceName ); passkeyLine->setText( m_defaultPasskey ); // set info tab setInfo(); } /** * Get the status informations and returns it * @return QString the status informations gathered */ -QString BlueBase::status()const{ +QString BlueBase::status()const +{ QString infoString = tr( "<b>Device name : </b> Ipaq" ); infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); return (infoString); } /** * Read the current values from the gui and invoke writeConfig() */ -void BlueBase::applyConfigChanges() { +void BlueBase::applyConfigChanges() +{ m_deviceName = deviceNameLine->text(); m_defaultPasskey = passkeyLine->text(); m_useEncryption = cryptCheckBox->isChecked(); m_enableAuthentification = authCheckBox->isChecked(); m_enablePagescan = pagescanCheckBox->isChecked(); m_enableInquiryscan = inquiryscanCheckBox->isChecked(); writeConfig(); QMessageBox::information( this, tr("Test") , tr("Changes were applied.") ); } /** * Launch Rfcomm Bind dialog * */ -void BlueBase::rfcommDialog() { +void BlueBase::rfcommDialog() +{ RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp ); - rfcommAssign.showMaximized(); - - if ( rfcommAssign.exec() == QDialog::Accepted ) { + if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted ) + { rfcommAssign.saveConfig(); } } /** * Add fresh found devices from scan dialog to the listing * */ -void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { +void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) +{ BTDeviceItem * deviceItem; QValueList<RemoteDevice>::ConstIterator it; - for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { + for( it = newDevices.begin(); it != newDevices.end() ; ++it ) + { if (find( (*it) )) // is already inserted continue; deviceItem = new BTDeviceItem( ListView2 , (*it) ); deviceItem->setPixmap( 1, m_findPix ); deviceItem->setExpandable ( true ); // look if device is avail. atm, async deviceActive( (*it) ); // ggf auch hier? addServicesToDevice( deviceItem ); } } /** * Action that is toggled on entrys on click */ -void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { -} +void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) +{} /** * Action that are toggled on hold (mostly QPopups i guess) */ -void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { +void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) +{ if (!item ) return; QPopupMenu *menu = new QPopupMenu(); int ret=0; - if ( ((BTListItem*)item)->type() == "device") { + if ( ((BTListItem*)item)->type() == "device") + { QPopupMenu *groups = new QPopupMenu(); menu->insertItem( ((BTDeviceItem*)item)->name(),0 ); menu->insertSeparator(1); menu->insertItem( tr("rescan sevices"), 2); menu->insertItem( tr("to group"), groups , 3); menu->insertItem( tr("delete"), 4); ret = menu->exec( point , 0); - switch(ret) { + switch(ret) + { case -1: break; case 2: addServicesToDevice( (BTDeviceItem*)item ); break; case 4: // deletes childs too delete item; break; } delete groups; @@ -334,294 +350,339 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin /* * We got service sensitive PopupMenus in our factory * We will create one through the factory and will insert * our Separator + ShowInfo into the menu or create a new * one if the factory returns 0 * PopupMenu deletion is kind of weird. * If escaped( -1 ) or any of our items were chosen we'll * delete the PopupMenu otherwise it's the responsibility of * the PopupMenu to delete itself * */ - else if ( ((BTListItem*)item)->type() == "service") { + else if ( ((BTListItem*)item)->type() == "service") + { BTServiceItem* service = (BTServiceItem*)item; QMap<int, QString> list = service->services().classIdList(); QMap<int, QString>::Iterator it = list.begin(); QPopupMenu *popup =0l; - if ( it != list.end() ) { - qWarning("Searching id %d %s", it.key(), it.data().latin1() ); + if ( it != list.end() ) + { + qWarning("Searching id %d %s", it.key(), it.data().latin1() ); popup = m_popHelper.find( it.key(), service->services(), (BTDeviceItem*)service->parent() ); - }else { - qWarning("Empty"); - } + } + else + { + qWarning("Empty"); + } - if ( popup == 0l ) { + if ( popup == 0l ) + { qWarning("factory returned 0l"); popup = new QPopupMenu(); } int test1 = popup->insertItem( tr("Test1:"), 2); ret = popup->exec( point ); qWarning("returned from exec() "); - if ( ret == -1 ) { + if ( ret == -1 ) + { ; - } else if ( ret == test1 ) { + } + else if ( ret == test1 ) + { ; } delete popup; } delete menu; } /** * Search and display avail. services for a device (on expand from device listing) * @param item the service item returned */ -void BlueBase::addServicesToDevice( BTDeviceItem * item ) { +void BlueBase::addServicesToDevice( BTDeviceItem * item ) +{ qDebug("addServicesToDevice"); // row of mac adress text(3) 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 ); } /** * Overloaded. This one it the one that is ted to the foundServices signal * @param device the mac address of the remote device * @param servicesList the list with the service the device has. */ -void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { +void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) +{ qDebug("fill services list"); QMap<QString,BTDeviceItem*>::Iterator it; BTDeviceItem* deviceItem = 0; // get the right devices which requested the search it = m_deviceList.find( device ); if( it == m_deviceList.end() ) return; deviceItem = it.data(); // remove previous entries QList<QListViewItem> tempList; tempList.setAutoDelete( true ); QListViewItem * child = deviceItem->firstChild(); - while( child ) { - tempList.append( child ); - child = child->nextSibling(); + while( child ) + { + tempList.append( child ); + child = child->nextSibling(); } tempList.clear(); QValueList<OpieTooth::Services>::Iterator it2; BTServiceItem* serviceItem; - if (!servicesList.isEmpty() ) { + if (!servicesList.isEmpty() ) + { // add services QMap<int, QString> list; QMap<int, QString>::Iterator classIt; - for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { + for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) + { serviceItem = new BTServiceItem( deviceItem, (*it2) ); list = (*it2).classIdList(); classIt = list.begin(); int classId=0; - if ( classIt != list.end() ) { + if ( classIt != list.end() ) + { classId = classIt.key(); } serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) ); } - } else { + } + else + { Services s1; s1.setServiceName( tr("no services found") ); serviceItem = new BTServiceItem( deviceItem, s1 ); } // now remove them from the list m_deviceList.remove( it ); } -void BlueBase::addSignalStrength() { +void BlueBase::addSignalStrength() +{ - QListViewItemIterator it( ListView4 ); - for ( ; it.current(); ++it ) { - m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() ); - } + QListViewItemIterator it( ListView4 ); + for ( ; it.current(); ++it ) + { + m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() ); + } - QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) ); + QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) ); } -void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) { +void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) +{ - QListViewItemIterator it( ListView4 ); - for ( ; it.current(); ++it ) { - if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) { - ((BTConnectionItem*)it.current() )->setSignalStrength( strength ); - } - } + QListViewItemIterator it( ListView4 ); + for ( ; it.current(); ++it ) + { + if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) + { + ((BTConnectionItem*)it.current() )->setSignalStrength( strength ); + } + } } /** * Add the existing connections (pairs) to the connections tab. * This one triggers the search */ -void BlueBase::addConnectedDevices() { - m_localDevice->searchConnections(); +void BlueBase::addConnectedDevices() +{ + m_localDevice->searchConnections(); } /** * This adds the found connections to the connection tab. * @param connectionList the ValueList with all current connections */ -void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) { +void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) +{ QValueList<OpieTooth::ConnectionState>::Iterator it; BTConnectionItem * connectionItem; - if ( !connectionList.isEmpty() ) { + if ( !connectionList.isEmpty() ) + { - for (it = connectionList.begin(); it != connectionList.end(); ++it) { + for (it = connectionList.begin(); it != connectionList.end(); ++it) + { QListViewItemIterator it2( ListView4 ); - bool found = false; - for ( ; it2.current(); ++it2 ) { - if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) { - found = true; - } - } + bool found = false; + for ( ; it2.current(); ++it2 ) + { + if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) + { + found = true; + } + } - if ( found == false ) { - connectionItem = new BTConnectionItem( ListView4, (*it) ); + if ( found == false ) + { + connectionItem = new BTConnectionItem( ListView4, (*it) ); - if( m_deviceList.find((*it).mac()).data() ) { - connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() ); - } - } + if( m_deviceList.find((*it).mac()).data() ) + { + connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() ); + } + } - } + } QListViewItemIterator it2( ListView4 ); - for ( ; it2.current(); ++it2 ) { - bool found = false; - for (it = connectionList.begin(); it != connectionList.end(); ++it) { - if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) { - found = true; - } + for ( ; it2.current(); ++it2 ) + { + bool found = false; + for (it = connectionList.begin(); it != connectionList.end(); ++it) + { + if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) + { + found = true; + } } - if ( !found ) { - delete it2.current(); - } + if ( !found ) + { + delete it2.current(); + } } - } else { + } + else + { ListView4->clear(); ConnectionState con; con.setMac( tr("No connections found") ); connectionItem = new BTConnectionItem( ListView4 , con ); } // recall connection search after some time QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) ); } /** * Find out if a device can currently be reached * @param device */ -void BlueBase::deviceActive( const RemoteDevice &device ) { +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() ); } /** * The signal catcher. Set the avail. status on device. * @param device - the mac address * @param connected - if it is avail. or not */ -void BlueBase::deviceActive( const QString& device, bool connected ) { +void BlueBase::deviceActive( const QString& device, bool connected ) +{ qDebug("deviceActive slot"); QMap<QString,BTDeviceItem*>::Iterator it; it = m_deviceList.find( device ); if( it == m_deviceList.end() ) return; BTDeviceItem* deviceItem = it.data(); - if ( connected ) { + if ( connected ) + { deviceItem->setPixmap( 1, m_onPix ); - } else { + } + else + { deviceItem->setPixmap( 1, m_offPix ); } m_deviceList.remove( it ); } /** * Open the "scan for devices" dialog */ -void BlueBase::startScan() { +void BlueBase::startScan() +{ ScanDialog *scan = new ScanDialog( this, "ScanDialog", true, WDestructiveClose ); QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ), this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) ); - scan->showMaximized(); + QPEApplication::showDialog( scan ); } /** * Set the informations about the local device in information Tab */ -void BlueBase::setInfo() { +void BlueBase::setInfo() +{ StatusLabel->setText( status() ); } /** * Decontructor */ -BlueBase::~BlueBase() { +BlueBase::~BlueBase() +{ writeSavedDevices(); delete m_iconLoader; } /** * find searches the ListView for a BTDeviceItem containig * the same Device if found return true else false * @param dev RemoteDevice to find * @return returns true if found */ -bool BlueBase::find( const RemoteDevice& rem ) { +bool BlueBase::find( const RemoteDevice& rem ) +{ QListViewItemIterator it( ListView2 ); BTListItem* item; BTDeviceItem* device; - for (; it.current(); ++it ) { + for (; it.current(); ++it ) + { item = (BTListItem*) it.current(); if ( item->typeId() != BTListItem::Device ) continue; device = (BTDeviceItem*)item; if ( rem.equals( device->remoteDevice() ) ) return true; } return false; // not found } diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp index a550648..d147d52 100644 --- a/noncore/net/opietooth/manager/obexpopup.cpp +++ b/noncore/net/opietooth/manager/obexpopup.cpp @@ -1,41 +1,45 @@ -#include <qtimer.h> - #include "obexdialog.h" #include "obexpopup.h" +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ +#include <qtimer.h> + using namespace OpieTooth; /* * c'tor init the QAction */ ObexPopup::ObexPopup() - : QPopupMenu() { + : QPopupMenu() +{ qWarning("RfcCommPopup c'tor"); QAction* a; /* connect action */ a = new QAction( ); // so it's get deleted a->setText("Push file"); a->addTo( this ); connect( a, SIGNAL( activated() ), this, SLOT( slotPush() ) ); }; -ObexPopup::~ObexPopup() { -} +ObexPopup::~ObexPopup() +{} -void ObexPopup::slotPush() { +void ObexPopup::slotPush() +{ qWarning("push something"); - ObexDialog obexDialog; - obexDialog.showMaximized(); - obexDialog.exec(); + QPEApplication::execDialog( &obexDialog ); } diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp index b5cc074..fc76301 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp @@ -1,116 +1,131 @@ #include "rfcommassigndialogimpl.h" #include "rfcommassigndialogitem.h" #include "rfcommconfhandler.h" +/* OPIE */ #include <qpe/config.h> +#include <qpe/qpeapplication.h> +/* QT */ #include <qlayout.h> using namespace OpieTooth; // TODO: write only the file in bluebase? // muss rfcommd dann neu gestartet werden // sollte rfcomm bind all nicht eh default config sein ( polled das? - d.h. sobald nen gerät in der nähe ist bindet es? RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) - : RfcommAssignDialogBase( parent, name, modal, fl ) { + : RfcommAssignDialogBase( parent, name, modal, fl ) +{ m_range = 5; m_scrollView = new QScrollView( this ); m_scrollView->setResizePolicy( QScrollView::AutoOneFit ); m_scrollView->setHScrollBarMode( QScrollView::AlwaysOff ); RfcommAssignDialogBaseLayout->addWidget( m_scrollView ); m_box = new QVBox( m_scrollView->viewport() ); m_scrollView->addChild( m_box ); confHandler = new RfCommConfHandler( "/etc/bluetooth/rfcomm.conf" ); loadConfig(); } -RfcommAssignDialog::~RfcommAssignDialog() { - if ( confHandler ) { +RfcommAssignDialog::~RfcommAssignDialog() +{ + if ( confHandler ) + { delete confHandler; } } -void RfcommAssignDialog::newDevice( const QString & mac ) { +void RfcommAssignDialog::newDevice( const QString & mac ) +{ - for ( int i = 0 ; i < m_range; i++ ) { + for ( int i = 0 ; i < m_range; i++ ) + { QMap<QString, RfCommConfObject*>::Iterator it; it = confHandler->foundEntries().find( QString("%1").arg( i ) ); // make sure that rfcommX is not assigned yet - if ( it == confHandler->foundEntries().end() ) { + if ( it == confHandler->foundEntries().end() ) + { QDialog dialog( this, "newdevice", true, WStyle_ContextHelp ); - dialog.showMaximized(); + RfcommDialogItem *newDev = new RfcommDialogItem( &dialog ); newDev->setIdent( i ); newDev->setMac( mac ); - if ( dialog.exec() == QDialog::Accepted ) { + if ( QPEApplication::execDialog( &dialog ) == QDialog::Accepted ) + { RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); m_itemList.insert( i , rfcomm ); rfcomm->setIdent( i ); rfcomm->setMac( mac ); rfcomm->setChannel( newDev->channel() ); rfcomm->setComment( newDev->comment() ); qDebug( "New device set up" ); } } } } -void RfcommAssignDialog::loadConfig() { +void RfcommAssignDialog::loadConfig() +{ //Config cfg( "bluetoothmanager-rfcommbind" ); - for ( int i = 0 ; i < m_range; i++ ) { + for ( int i = 0 ; i < m_range; i++ ) + { // cfg.setGroup( QString("%1").arg( i ) ); RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); m_itemList.insert( i , rfcomm ); rfcomm->setIdent( i ); QMap<QString, RfCommConfObject*>::Iterator it; it = confHandler->foundEntries().find( QString("%1").arg( i ) ); - if ( it != confHandler->foundEntries().end() ) { + if ( it != confHandler->foundEntries().end() ) + { qDebug( "Found key in foundEntries() " ); rfcomm->setMac( it.data()->mac() ); rfcomm->setChannel( it.data()->channel() ); rfcomm->setComment( it.data()->comment() ); } - /* Use rfcomm.conf directly for now - * rfcomm->setMac( cfg.readEntry( "mac", "" ) ); - * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) ); - * rfcomm->setComment( cfg.readEntry( "comment", "" ) ); - */ + /* Use rfcomm.conf directly for now + * rfcomm->setMac( cfg.readEntry( "mac", "" ) ); + * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) ); + * rfcomm->setComment( cfg.readEntry( "comment", "" ) ); + */ } } -void RfcommAssignDialog::saveConfig() { +void RfcommAssignDialog::saveConfig() +{ //Config cfg( "bluetoothmanager-rfcommbind" ); QMap< int, RfcommDialogItem*>::Iterator it; QMap< QString, RfCommConfObject*> outMap; - for( it = m_itemList.begin(); it != m_itemList.end(); ++it ) { + for( it = m_itemList.begin(); it != m_itemList.end(); ++it ) + { //cfg.setGroup( QString("%1").arg( it.key() ) ); RfcommDialogItem *rfcomm = it.data(); outMap.insert( QString( "%1").arg( it.key() ), new RfCommConfObject( it.key(), rfcomm->mac(), rfcomm->channel(), rfcomm->comment() ) ); //cfg.writeEntry( "mac", rfcomm->mac() ); //cfg.writeEntry( "channel", rfcomm->channel() ); //cfg.writeEntry( "comment", rfcomm->comment() ); } diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index d95f14b..04bfe48 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp @@ -1,96 +1,103 @@ -#include <qtimer.h> - #include "pppdialog.h" #include "rfcpopup.h" #include "rfcommassigndialogimpl.h" +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ +#include <qtimer.h> + using namespace OpieTooth; /* * c'tor init the QAction */ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) - : QPopupMenu() { + : QPopupMenu() +{ qWarning("RfcCommPopup c'tor"); QAction* a; m_item = item; /* connect action */ a = new QAction( ); // so it's get deleted a->setText("Connect"); a->addTo( this ); connect( a, SIGNAL( activated() ), this, SLOT( slotConnect() ) ); /* disconnect action */ a = new QAction( ); a->setText("Disconnect"); a->addTo( this ); connect( a, SIGNAL( activated() ) , - this, SLOT( slotDisconnect() ) ); + this, SLOT( slotDisconnect() ) ); /* foo action */ a = new QAction( ); a->setText("Bind table"); a->addTo( this ); connect( a, SIGNAL( activated() ), - this, SLOT( slotBind() ) ); + this, SLOT( slotBind() ) ); /* bar action */ a = new QAction( ); a->setText( "Bar" ); a->addTo( this ); connect( a, SIGNAL( activated() ), - this, SLOT( slotBar() ) ); + this, SLOT( slotBar() ) ); }; -RfcCommPopup::~RfcCommPopup() { -/* delete m_con; - delete m_dis; - delete m_foo; - delete m_bar; */ +RfcCommPopup::~RfcCommPopup() +{ + /* delete m_con; + delete m_dis; + delete m_foo; + delete m_bar; */ } -void RfcCommPopup::slotConnect() { +void RfcCommPopup::slotConnect() +{ qWarning("connect"); - - PPPDialog pppDialog; - pppDialog.showMaximized(); - pppDialog.exec(); + QPEApplication::execDialog( &pppDialog ); } -void RfcCommPopup::slotDisconnect() { +void RfcCommPopup::slotDisconnect() +{ qWarning("slot disconnected"); } -void RfcCommPopup::slotBind() { +void RfcCommPopup::slotBind() +{ RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp ); - rfcommAssign.showMaximized(); rfcommAssign.newDevice( m_item->mac() ); - if ( rfcommAssign.exec() == QDialog::Accepted ) { + if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted ) + { rfcommAssign.saveConfig(); } } -void RfcCommPopup::slotBar() { +void RfcCommPopup::slotBar() +{ qWarning("slotBar"); }; |