Diffstat (limited to 'noncore/net/opietooth/manager/scandialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index 63c5472..70ea77a 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -19,32 +19,35 @@ #include "scandialog.h" #include <qframe.h> #include <qheader.h> #include <qlabel.h> #include <qlistview.h> #include <qpushbutton.h> #include <qlayout.h> #include <qvariant.h> #include <qtooltip.h> #include <qwhatsthis.h> #include <qprogressbar.h> +#include <qlist.h> #include <manager.h> #include <device.h> -#include <remotedevice.h> + namespace OpieTooth { +#include <remotedevice.h> + /* */ ScanDialog::ScanDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { if ( !name ) setName( "ScanDialog" ); resize( 240, 320 ); setCaption( tr( "Scan for devices" ) ); Frame7 = new QFrame( this, "Frame7" ); Frame7->setGeometry( QRect( 0, 0, 240, 331 ) ); @@ -54,37 +57,38 @@ namespace OpieTooth { QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" ); privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 280 ) ); Layout11 = new QVBoxLayout( privateLayoutWidget ); Layout11->setSpacing( 6 ); Layout11->setMargin( 0 ); progress = new QProgressBar(privateLayoutWidget, "progbar"); progress->setTotalSteps(20); QFrame *buttonFrame = new QFrame(Frame7, ""); StartButton = new QPushButton( buttonFrame, "StartButton" ); - StartButton->setText( tr( "Start" ) ); + StartButton->setText( tr( "Start scan" ) ); StopButton = new QPushButton( buttonFrame, "StopButton" ); - StopButton->setText( tr( "Cancel" ) ); + StopButton->setText( tr( "Cancel scan" ) ); QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame); + buttonLayout->addWidget(StartButton); buttonLayout->addWidget(StopButton); ListView1 = new QListView( privateLayoutWidget, "ListView1" ); - ListView1->addColumn( tr( "Add" ) ); - ListView1->addColumn( tr( "Device Name" ) ); + //ListView1->addColumn( tr( "Add" ) ); + ListView1->addColumn( tr( "Add Device" ) ); //ListView1->addColumn( tr( "Type" ) ); Layout11->addWidget( ListView1); Layout11->addWidget(progress); Layout11->addWidget( buttonFrame); localDevice = new Manager( "hci0" ); connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); connect( (QObject*)localDevice, SIGNAL( foundDevices( const QString& , RemoteDevices::ValueList ) ), this, SLOT(fillList(const QString& , RemoteDevices::ValueList ) ) ) ; @@ -97,42 +101,70 @@ namespace OpieTooth { progressStat++; if (progressStat++ < 20) { QTimer::singleShot( 1000, this, SLOT(progressTimer() ) ); } progress->setProgress(progressStat++); } void ScanDialog::startSearch() { progress->setProgress(0); progressStat = 0; + QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox ); + deviceItem2->setText(1, "BLAH" ); + progressTimer(); // when finished, it emmite foundDevices() // checken ob initialisiert , qcop ans applet. localDevice->searchDevices(); } void ScanDialog::stopSearch() { } void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { - QListViewItem * deviceItem; + QCheckListItem * deviceItem; RemoteDevices::ValueList::Iterator it; for( it = deviceList.begin(); it != deviceList.end(); ++it ) { - deviceItem = new QListViewItem( ListView1, (*it).name() ); + deviceItem = new QCheckListItem( ListView1, (*it).name() ); + deviceItem->setText(1, (*it).mac() ); + } + + } + +/* + * Iterates trough the items, and collects the checked items. + * Then it emits it, so the manager can connect to the signal to fill the listing. + */ + void ScanDialog::emitToManager() { + + if (!ListView1) { + return; + } + + QList<RemoteDevices> *deviceList = new QList<RemoteDevices>; + + QListViewItemIterator it( ListView1 ); + for ( ; it.current(); ++it ) { + if ( it.current()->isSelected() ) { + RemoteDevices* device = new RemoteDevices( it.current()->text(1), it.current()->text(0)); + deviceList->append( device ); + } } + emit selectedDevices( *deviceList ); } /* * Cleanup */ ScanDialog::~ScanDialog() { + emitToManager(); delete localDevice; } } |