author | harlekin <harlekin> | 2002-06-19 00:18:46 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-19 00:18:46 (UTC) |
commit | 35ecb27ed64368d30d6360cbd5e30acf3a216a46 (patch) (side-by-side diff) | |
tree | 814fd75d019af357c5c78f5166b0a0a0b218689c /noncore | |
parent | 14881bb4baf3ac470a135bdde6ffb115c91ea124 (diff) | |
download | opie-35ecb27ed64368d30d6360cbd5e30acf3a216a46.zip opie-35ecb27ed64368d30d6360cbd5e30acf3a216a46.tar.gz opie-35ecb27ed64368d30d6360cbd5e30acf3a216a46.tar.bz2 |
update
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 21 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index f8f7b15..ec8df82 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -85,16 +85,17 @@ namespace OpieTooth { 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 ) ) ) ; + connect( StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); + connect( StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); + connect( localDevice, SIGNAL( foundDevices( const QString& , RemoteDevice::ValueList ) ), + this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ; + // connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() )); progressStat = 0; } // hack, make cleaner later void ScanDialog::progressTimer() { @@ -103,12 +104,18 @@ namespace OpieTooth { QTimer::singleShot( 1000, this, SLOT(progressTimer() ) ); } progress->setProgress(progressStat++); } + void ScanDialog::accept() { + emitToManager(); + QDialog::accept(); + } + + void ScanDialog::startSearch() { progress->setProgress(0); progressStat = 0; QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox ); deviceItem2->setText(1, "BLAH" ); @@ -123,27 +130,29 @@ namespace OpieTooth { void ScanDialog::stopSearch() { } void ScanDialog::fillList(const QString& device, RemoteDevice::ValueList deviceList) { + qDebug("fill List"); QCheckListItem * deviceItem; RemoteDevice::ValueList::Iterator it; for( it = deviceList.begin(); it != deviceList.end(); ++it ) { - deviceItem = new QCheckListItem( ListView1, (*it).name() ); + deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox ); 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() { + qDebug("vor liste durchsuchen"); if (!ListView1) { return; } QList<RemoteDevice> *deviceList = new QList<RemoteDevice>; @@ -153,19 +162,19 @@ namespace OpieTooth { for ( ; it.current(); ++it ) { if ( ((QCheckListItem*)it.current())->isOn() ) { RemoteDevice * device = new RemoteDevice( it.current()->text(1), it.current()->text(0)); deviceList->append( device ); } } + qDebug("vor emit"); emit selectedDevices( *deviceList ); delete deviceList; } /* * Cleanup */ ScanDialog::~ScanDialog() { - emitToManager(); delete localDevice; } } diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h index adc960c..7c84ce2 100644 --- a/noncore/net/opietooth/manager/scandialog.h +++ b/noncore/net/opietooth/manager/scandialog.h @@ -49,20 +49,22 @@ class Device; QFrame* Frame7; QProgressBar* progress; QPushButton* StartButton; QPushButton* StopButton; QListView* ListView1; +public slots: + void accept(); protected: QVBoxLayout* Layout11; private slots: void stopSearch(); void startSearch(); - void progressTimer(); + void progressTimer(); void fillList(const QString& device, RemoteDevice::ValueList list); private: void emitToManager(); Manager *localDevice; int progressStat; |