summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp69
-rw-r--r--noncore/net/opietooth/manager/scandialog.h13
2 files changed, 24 insertions, 58 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 9ce1b6a..de4f742 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -18,9 +18,7 @@
#include "scandialog.h"
-#include <qframe.h>
#include <qheader.h>
-#include <qlabel.h>
#include <qlistview.h>
#include <qpushbutton.h>
#include <qlayout.h>
@@ -34,62 +32,43 @@
#include <device.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 ) );
- Frame7->setFrameShape( QFrame::StyledPanel );
- Frame7->setFrameShadow( QFrame::Raised );
-
- QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" );
- privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 280 ) );
- Layout11 = new QVBoxLayout( privateLayoutWidget );
+ Layout11 = new QVBoxLayout( this );
Layout11->setSpacing( 6 );
Layout11->setMargin( 0 );
- progress = new QProgressBar(privateLayoutWidget, "progbar");
+ progress = new QProgressBar( this, "progbar");
progress->setTotalSteps(20);
- QFrame *buttonFrame = new QFrame(Frame7, "");
-
- StartStopButton = new QPushButton( buttonFrame, "StartButton" );
+ StartStopButton = new QPushButton( this, "StartButton" );
StartStopButton->setText( tr( "Start scan" ) );
-
- QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame);
-
- buttonLayout->addWidget(StartStopButton);
-// buttonLayout->addWidget(StopButton);
-
- ListView1 = new QListView( privateLayoutWidget, "ListView1" );
+ ListView1 = new QListView( this, "ListView1" );
//ListView1->addColumn( tr( "Add" ) );
ListView1->addColumn( tr( "Add Device" ) );
//ListView1->addColumn( tr( "Type" ) );
- Layout11->addWidget( ListView1);
- Layout11->addWidget(progress);
- Layout11->addWidget( buttonFrame);
+ Layout11->addWidget( ListView1 );
+ Layout11->addWidget( progress );
+ Layout11->addWidget( StartStopButton );
localDevice = new Manager( "hci0" );
connect( StartStopButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
connect( localDevice, SIGNAL( foundDevices( const QString& , RemoteDevice::ValueList ) ),
- this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ;
- // connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() ));
+ this, SLOT( fillList( const QString& , RemoteDevice::ValueList ) ) ) ;
+
progressStat = 0;
m_search = false;
}
@@ -98,11 +77,10 @@ namespace OpieTooth {
void ScanDialog::progressTimer() {
progressStat++;
- if (progressStat++ < 20 && m_search ) {
- QTimer::singleShot( 2000, this, SLOT(progressTimer() ) );
- progress->setProgress(progressStat++);
+ if ( progressStat++ < 20 && m_search ) {
+ QTimer::singleShot( 2000, this, SLOT( progressTimer() ) );
+ progress->setProgress( progressStat++ );
}
-
}
void ScanDialog::accept() {
@@ -123,13 +101,10 @@ namespace OpieTooth {
// empty list before a new scan
ListView1->clear();
- QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox );
- deviceItem2->setText(1, "BLAH" );
-
progressTimer();
// when finished, it emmite foundDevices()
// checken ob initialisiert , qcop ans applet.
- StartStopButton->setText( tr("Stop scan"));
+ StartStopButton->setText( tr( "Stop scan" ) );
localDevice->searchDevices();
@@ -142,25 +117,23 @@ namespace OpieTooth {
void ScanDialog::fillList(const QString&, RemoteDevice::ValueList deviceList) {
progress->setProgress(0);
progressStat = 0;
- qDebug("fill List");
QCheckListItem * deviceItem;
RemoteDevice::ValueList::Iterator it;
for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox );
- deviceItem->setText(1, (*it).mac() );
+ deviceItem->setText( 1, (*it).mac() );
}
m_search = false;
- StartStopButton->setText(tr ("Start scan") );
+ StartStopButton->setText( tr( "Start scan" ) );
}
-/*
+/**
* 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;
@@ -170,21 +143,19 @@ namespace OpieTooth {
QListViewItemIterator it( ListView1 );
for ( ; it.current(); ++it ) {
- if ( ((QCheckListItem*)it.current())->isOn() ) {
- RemoteDevice device( it.current()->text(1), it.current()->text(0));
+ if ( ( (QCheckListItem*)it.current() )->isOn() ) {
+ RemoteDevice device( it.current()->text(1), it.current()->text(0) );
deviceList.append( device );
}
}
- qDebug("vor emit");
emit selectedDevices( deviceList );
}
-/*
+/**
* Cleanup
*/
ScanDialog::~ScanDialog() {
qWarning("delete scan dialog");
delete localDevice;
}
-
}
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index 8f8d39a..a644e96 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -23,9 +23,7 @@
#include <remotedevice.h>
class QVBoxLayout;
-class QHBoxLayout;
class QGridLayout;
-class QFrame;
class QLabel;
class QListView;
class QListViewItem;
@@ -35,7 +33,6 @@ class QProgressBar;
namespace OpieTooth {
-
class Manager;
class Device;
@@ -46,11 +43,9 @@ class Device;
ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~ScanDialog();
- private: // make them private -zecke
- QFrame* Frame7;
- QProgressBar* progress;
+ private:
+ QProgressBar* progress;
QPushButton* StartStopButton;
-// QPushButton* StopButton;
QListView* ListView1;
public slots:
@@ -63,7 +58,7 @@ class Device;
void stopSearch();
void startSearch();
void progressTimer();
- void fillList(const QString& device, RemoteDevice::ValueList list);
+ void fillList( const QString& device, RemoteDevice::ValueList list );
private:
bool m_search:1;
@@ -72,7 +67,7 @@ class Device;
int progressStat;
signals:
- void selectedDevices(const QValueList<RemoteDevice>&);
+ void selectedDevices( const QValueList<RemoteDevice>& );
};