summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp47
-rw-r--r--noncore/net/opietooth/manager/scandialog.h7
2 files changed, 10 insertions, 44 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" );
@@ -84,3 +63,3 @@ namespace OpieTooth {
Layout11->addWidget(progress);
- Layout11->addWidget( buttonFrame);
+ Layout11->addWidget( StartStopButton );
@@ -91,3 +70,3 @@ namespace OpieTooth {
this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ;
- // connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() ));
+
progressStat = 0;
@@ -104,3 +83,2 @@ namespace OpieTooth {
}
-
}
@@ -125,5 +103,2 @@ namespace OpieTooth {
- QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox );
- deviceItem2->setText(1, "BLAH" );
-
progressTimer();
@@ -144,3 +119,2 @@ namespace OpieTooth {
progressStat = 0;
- qDebug("fill List");
QCheckListItem * deviceItem;
@@ -157,3 +131,3 @@ namespace OpieTooth {
-/*
+/**
* Iterates trough the items, and collects the checked items.
@@ -162,3 +136,2 @@ namespace OpieTooth {
void ScanDialog::emitToManager() {
- qDebug("vor liste durchsuchen");
@@ -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 {
}
-
}
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
@@ -25,5 +25,3 @@
class QVBoxLayout;
-class QHBoxLayout;
class QGridLayout;
-class QFrame;
class QLabel;
@@ -37,3 +35,2 @@ namespace OpieTooth {
-
class Manager;
@@ -48,7 +45,5 @@ class Device;
- private: // make them private -zecke
- QFrame* Frame7;
+ private:
QProgressBar* progress;
QPushButton* StartStopButton;
-// QPushButton* StopButton;
QListView* ListView1;