Diffstat (limited to 'noncore/net/opietooth/manager/scandialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 69 |
1 files changed, 20 insertions, 49 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 @@ -20,5 +20,3 @@ -#include <qframe.h> #include <qheader.h> -#include <qlabel.h> #include <qlistview.h> @@ -36,3 +34,2 @@ - namespace OpieTooth { @@ -41,3 +38,3 @@ namespace OpieTooth { -/* +/** */ @@ -46,15 +43,5 @@ namespace OpieTooth { - 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 ); @@ -62,17 +49,9 @@ namespace OpieTooth { - 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" ); @@ -82,5 +61,5 @@ namespace OpieTooth { - Layout11->addWidget( ListView1); - Layout11->addWidget(progress); - Layout11->addWidget( buttonFrame); + Layout11->addWidget( ListView1 ); + Layout11->addWidget( progress ); + Layout11->addWidget( StartStopButton ); @@ -90,4 +69,4 @@ namespace OpieTooth { 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; @@ -100,7 +79,6 @@ namespace OpieTooth { 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++ ); } - } @@ -125,5 +103,2 @@ namespace OpieTooth { - QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox ); - deviceItem2->setText(1, "BLAH" ); - progressTimer(); @@ -131,3 +106,3 @@ namespace OpieTooth { // checken ob initialisiert , qcop ans applet. - StartStopButton->setText( tr("Stop scan")); + StartStopButton->setText( tr( "Stop scan" ) ); @@ -144,3 +119,2 @@ namespace OpieTooth { progressStat = 0; - qDebug("fill List"); QCheckListItem * deviceItem; @@ -151,9 +125,9 @@ namespace OpieTooth { 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. @@ -162,3 +136,2 @@ namespace OpieTooth { void ScanDialog::emitToManager() { - qDebug("vor liste durchsuchen"); @@ -172,4 +145,4 @@ namespace OpieTooth { 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 ); @@ -177,3 +150,2 @@ namespace OpieTooth { } - qDebug("vor emit"); emit selectedDevices( deviceList ); @@ -181,3 +153,3 @@ namespace OpieTooth { -/* +/** * Cleanup @@ -188,3 +160,2 @@ namespace OpieTooth { } - } |