| -rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 7 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index b0ffbb3..63c5472 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -51,19 +51,16 @@ namespace OpieTooth { 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->setSpacing( 6 ); Layout11->setMargin( 0 ); - progress = new QProgressBar(privateLayoutWidget, "progbar"); progress->setTotalSteps(20); - - QFrame *buttonFrame = new QFrame(Frame7, ""); + QFrame *buttonFrame = new QFrame(Frame7, ""); StartButton = new QPushButton( buttonFrame, "StartButton" ); StartButton->setText( tr( "Start" ) ); @@ -71,7 +68,6 @@ namespace OpieTooth { StopButton = new QPushButton( buttonFrame, "StopButton" ); StopButton->setText( tr( "Cancel" ) ); - QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame); buttonLayout->addWidget(StartButton); buttonLayout->addWidget(StopButton); @@ -102,6 +98,7 @@ namespace OpieTooth { if (progressStat++ < 20) { QTimer::singleShot( 1000, this, SLOT(progressTimer() ) ); } + progress->setProgress(progressStat++); } diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h index 22ee01d..fcaee6e 100644 --- a/noncore/net/opietooth/manager/scandialog.h +++ b/noncore/net/opietooth/manager/scandialog.h @@ -60,10 +60,10 @@ class Device; private slots: void stopSearch(); void startSearch(); + void progressTimer(); void fillList(const QString& device, RemoteDevices::ValueList list); private: - void progressTimer(int maxSeconds); Manager *localDevice; int progressStat; }; |