update

2 files changed, 18 insertions, 7 deletions

diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index f8f7b15..ec8df82 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -90,6 +90,7 @@ 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 ) ) ) ;
+        connect( StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
+        connect( StopButton, SIGNAL( clicked() ),  this,  SLOT( stopSearch() ) );
+        connect( localDevice, SIGNAL( foundDevices( const QString& , RemoteDevice::ValueList ) ),
+                 this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ;
+        //     connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() ));
         progressStat = 0;
@@ -108,2 +109,8 @@ namespace OpieTooth {
 
+    void ScanDialog::accept() {
+        emitToManager();
+        QDialog::accept();
+    }
+
+
     void ScanDialog::startSearch() {
@@ -128,2 +135,3 @@ namespace OpieTooth {
 
+        qDebug("fill List");
         QCheckListItem * deviceItem;
@@ -133,3 +141,3 @@ namespace OpieTooth {
 
-            deviceItem = new QCheckListItem( ListView1, (*it).name() );
+            deviceItem = new QCheckListItem( ListView1, (*it).name(),  QCheckListItem::CheckBox );
             deviceItem->setText(1, (*it).mac() );
@@ -143,2 +151,3 @@ namespace OpieTooth {
     void ScanDialog::emitToManager() {
+        qDebug("vor liste durchsuchen");
 
@@ -158,2 +167,3 @@ namespace OpieTooth {
         }
+        qDebug("vor emit");
         emit selectedDevices( *deviceList );
@@ -166,3 +176,2 @@ namespace OpieTooth {
     ScanDialog::~ScanDialog() {
-        emitToManager();
         delete localDevice;
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index adc960c..7c84ce2 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -54,2 +54,4 @@ class Device;
 
+public slots:
+         void accept();
 
@@ -61,3 +63,3 @@ class Device;
         void startSearch();
-          void progressTimer();
+        void progressTimer();
         void fillList(const QString& device, RemoteDevice::ValueList list);