update

4 files changed, 64 insertions, 11 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index e3b9e53..71da82e 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -32,32 +32,36 @@
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 
 namespace OpieTooth {
 
+    class RemoteDevices;
 
     BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl ) {
 
 
         QObject::connect( (QObject*) PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan()));
         QObject::connect((QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges()));
 
+
+
+
         QPalette pal = this->palette();
         QColor col = pal.color(QPalette::Active, QColorGroup::Background);
         pal.setColor(QPalette::Active, QColorGroup::Button, col);
         pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
         pal.setColor(QPalette::Normal, QColorGroup::Button, col);
         pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
         this->setPalette(pal);
 
         setCaption( tr( "Bluetooth Manager" ) );
 
         readConfig();
         initGui();
@@ -140,28 +144,38 @@ namespace OpieTooth {
         enableInquiryscan = inquiryscanCheckBox->isChecked();
 
         writeConfig();
 
         QMessageBox*  box = new QMessageBox(this, "Test");
         box->setText(tr("Changes applied"));
         box->show();
 
   // falls nötig hcid killhupen - die funktionalität adden
 }
 
 
+    void BlueBase::addSearchedDevices( QList<RemoteDevices> &newDevices ) {
+
+
+
+    }
+
+
 /**
  * Open the "scan for devices"  dialog
  */
     void BlueBase::startScan() {
         ScanDialog *scan = new ScanDialog( this, "", true);
+        QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevices>&) ),
+                         this, SLOT( addSearchedDevices(QList<RemoteDevices>& ) ));
+
         scan->showMaximized();
     }
 
 /**
  * Decontructor
  */
     BlueBase::~BlueBase(){
     }
 
 }
 
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 023af7a..ae5ce67 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -1,34 +1,37 @@
 
 #ifndef BLUEBASE_H
 #define BLUEBASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qscrollview.h>
 #include <qsplitter.h>
+#include <qlist.h>
 
 #include "bluetoothbase.h"
 
 class QVBox;
 class QHBoxLayout;
 class QGridLayout;
 class QFrame;
 class QLabel;
 class QPushButton;
 class QTabWidget;
 class QCheckBox;
 
 namespace OpieTooth {
 
+
+
     class BlueBase : public BluetoothBase {
         Q_OBJECT
 
     public:
         BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~BlueBase();
 
     protected:
 
 
             private slots:
         void startScan();
@@ -39,20 +42,20 @@ namespace OpieTooth {
         QString getStatus();
         void initGui();
 
 
         QString deviceName;
         QString defaultPasskey;
         int useEncryption;
         int enableAuthentification;
         int enablePagescan;
         int enableInquiryscan;
 
         private slots:
-
+        void addSearchedDevices( QList<RemoteDevices> &newDevices );
               void applyConfigChanges();
 
     };
 
 }
 
 #endif
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 63c5472..70ea77a 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -19,32 +19,35 @@
 #include "scandialog.h"
 
 #include <qframe.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qprogressbar.h>
+#include <qlist.h>
 
 #include <manager.h>
 #include <device.h>
-#include <remotedevice.h>
+
 
 
 namespace OpieTooth {
 
+#include <remotedevice.h>
+
 /*
  */
     ScanDialog::ScanDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
         : QDialog( parent, name, modal, fl ) {
 
         if ( !name )
             setName( "ScanDialog" );
         resize( 240, 320 );
         setCaption( tr( "Scan for devices" ) );
 
         Frame7 = new QFrame( this, "Frame7" );
         Frame7->setGeometry( QRect( 0, 0, 240, 331 ) );
@@ -54,37 +57,38 @@ namespace OpieTooth {
         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, "");
 
         StartButton = new QPushButton( buttonFrame, "StartButton" );
-        StartButton->setText( tr( "Start" ) );
+        StartButton->setText( tr( "Start scan" ) );
 
         StopButton = new QPushButton( buttonFrame, "StopButton" );
-        StopButton->setText( tr( "Cancel" ) );
+        StopButton->setText( tr( "Cancel scan" ) );
 
         QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame);
+
         buttonLayout->addWidget(StartButton);
         buttonLayout->addWidget(StopButton);
 
         ListView1 = new QListView( privateLayoutWidget, "ListView1" );
 
-        ListView1->addColumn( tr( "Add" ) );
-        ListView1->addColumn( tr( "Device Name" ) );
+        //ListView1->addColumn( tr( "Add" ) );
+        ListView1->addColumn( tr( "Add Device" ) );
         //ListView1->addColumn( tr( "Type" ) );
 
         Layout11->addWidget( ListView1);
         Layout11->addWidget(progress);
         Layout11->addWidget( buttonFrame);
 
         localDevice = new Manager( "hci0" );
 
         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 ) ) ) ;
@@ -97,42 +101,70 @@ namespace OpieTooth {
         progressStat++;
             if (progressStat++ < 20) {
                 QTimer::singleShot( 1000, this, SLOT(progressTimer() ) );
             }
             progress->setProgress(progressStat++);
 
     }
 
     void ScanDialog::startSearch() {
         progress->setProgress(0);
         progressStat = 0;
 
+        QCheckListItem  *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox );
+        deviceItem2->setText(1, "BLAH" );
+
         progressTimer();
         // when finished, it emmite foundDevices()
         // checken ob initialisiert , qcop ans applet.
         localDevice->searchDevices();
 
     }
 
     void ScanDialog::stopSearch() {
 
     }
 
     void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) {
 
-        QListViewItem * deviceItem;
+        QCheckListItem * deviceItem;
 
         RemoteDevices::ValueList::Iterator it;
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
 
-            deviceItem = new QListViewItem( ListView1, (*it).name() );
+            deviceItem = new QCheckListItem( ListView1, (*it).name() );
+            deviceItem->setText(1, (*it).mac() );
+        }
+
+    }
+
+/*
+ * Iterates trough the items, and collects the checked items.
+ * Then it emits it, so the manager can connect to the signal to fill the listing.
+ */
+    void ScanDialog::emitToManager() {
+
+        if (!ListView1) {
+            return;
+        }
+
+        QList<RemoteDevices> *deviceList = new QList<RemoteDevices>;
+
+        QListViewItemIterator it( ListView1 );
+        for ( ; it.current(); ++it ) {
+            if ( it.current()->isSelected() ) {
+                RemoteDevices* device = new RemoteDevices(  it.current()->text(1), it.current()->text(0));
+                   deviceList->append( device );
+            }
         }
+        emit selectedDevices( *deviceList );
     }
 
 /*
  * Cleanup
  */
     ScanDialog::~ScanDialog() {
+        emitToManager();
         delete localDevice;
     }
 
 }
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index fcaee6e..4785a62 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -10,42 +10,41 @@
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef SCANDIALOG_H
 #define SCANDIALOG_H
 
 #include <qvariant.h>
 #include <qdialog.h>
+#include <qlist.h>
 
 
-#include <remotedevice.h>
-
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QFrame;
 class QLabel;
 class QListView;
 class QListViewItem;
 class QPushButton;
 class QProgressBar;
 
 
 namespace OpieTooth {
 
-
+#include <remotedevices.h>
 class Manager;
 class Device;
 
     class ScanDialog : public QDialog {
         Q_OBJECT
 
     public:
         ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
         ~ScanDialog();
 
         QFrame* Frame7;
         QProgressBar* progress;
@@ -55,19 +54,24 @@ class Device;
 
 
     protected:
         QVBoxLayout* Layout11;
 
     private slots:
         void stopSearch();
         void startSearch();
           void progressTimer();
         void fillList(const QString& device, RemoteDevices::ValueList list);
 
     private:
+        void emitToManager();
         Manager *localDevice;
         int progressStat;
+
+    signals:
+        void selectedDevices(QList<RemoteDevices>&);
     };
 
+
 }
 
 #endif // SCANDIALOG_H