1 files changed, 35 insertions, 11 deletions

diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 3ddba3e..842466a 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -28,4 +28,5 @@
 #include <qtooltip.h>
 #include <qwhatsthis.h>
+#include <qprogressbar.h>
 
 #include <manager.h>
@@ -37,5 +38,4 @@ namespace OpieTooth {
 
 /*
-
  */
     ScanDialog::ScanDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
@@ -44,5 +44,5 @@ namespace OpieTooth {
         if ( !name )
             setName( "ScanDialog" );
-        resize( 360, 392 );
+        resize( 240, 320 );
         setCaption( tr( "Scan for devices" ) );
 
@@ -52,4 +52,5 @@ namespace OpieTooth {
         Frame7->setFrameShadow( QFrame::Raised );
 
+
         QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" );
         privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 310 ) );
@@ -59,22 +60,23 @@ namespace OpieTooth {
 
 
-        TextLabel10 = new QLabel( privateLayoutWidget, "TextLabel10" );
-        TextLabel10->setText( tr( "ersetzen durch qprogressbar" ) );
+        progress = new QProgressBar(privateLayoutWidget,  "progbar");
+        progress->setTotalSteps(20);
 
-        Layout11->addMultiCellWidget( TextLabel10, 1, 1, 0, 1 );
+        //Layout11->addMultiCellWidget( progress, 1, 1, 0, 1 );
+        Layout11->addWidget(progress,  2, 2);
 
-        StartButton = new QPushButton( privateLayoutWidget, "PushButton13" );
+        StartButton = new QPushButton( privateLayoutWidget, "StartButton" );
         StartButton->setText( tr( "Start" ) );
 
         Layout11->addWidget( StartButton, 2, 0 );
 
-        PushButton6 = new QPushButton( privateLayoutWidget, "PushButton6" );
-        PushButton6->setText( tr( "Stop" ) );
+        StopButton = new QPushButton( privateLayoutWidget, "StopButton" );
+        StopButton->setText( tr( "Cancel" ) );
 
-        Layout11->addWidget( PushButton6, 2, 1 );
+        Layout11->addWidget( StopButton, 2, 1 );
 
         ListView1 = new QListView( privateLayoutWidget, "ListView1" );
 
-        //     ListView1->addColumn( tr( "In List" ) );
+        ListView1->addColumn( tr( "Add" ) );
         ListView1->addColumn( tr( "Device Name" ) );
         //ListView1->addColumn( tr( "Type" ) );
@@ -83,22 +85,44 @@ namespace OpieTooth {
 
         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 ) ) ) ;
+        progressStat = 0;
+    }
+
+// hack, make cleaner later
+    void ScanDialog::progressTimer(int maxSeconds) {
+
+        progressStat++;
+            if (progressStat++ < maxSeconds) {
+                QTimer::singleShot( 1000, this, SLOT(progressTimer ) );
+            }
+
     }
 
     void ScanDialog::startSearch() {
+        progress->setProgress(0);
+        progressStat = 0;
          // read it from config later
         localDevice = new Manager( "hci0" );
+        progressTimer(20);
+        // when finished, it emmite foundDevices()
+        // checken ob initialisiert , qcop ans applet.
         localDevice->searchDevices();
+        progress->setProgress(20);
     }
 
+    void ScanDialog::stopSearch() {
+
+    }
 
     void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) {
 
+        QListViewItem * deviceItem;
 
         RemoteDevices::ValueList::Iterator it;
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
 
-
+            deviceItem = new QListViewItem( ListView1, (*it).name() );
         }
     }