3 files changed, 52 insertions, 9 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index af65f14..b4b59c3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -14,12 +14,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include "scandialog.h"
+#include "hciconfwrapper.h"
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
@@ -27,13 +28,12 @@
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qtabwidget.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qmessagebox.h>
-#include <qapplication.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.h>
 #include <qpopupmenu.h>
 
@@ -55,14 +55,15 @@ namespace OpieTooth {
         connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
         // not good since lib is async
         //       connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
         //                  this, SLOT( addServicesToDevice( QListViewItem * ) ) );
         connect( ListView2, SIGNAL( clicked( QListViewItem* )),
                           this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
+        // hehe, cast right later
         connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
-                 this,  SLOT(startServiceActionHold( BTListItem *, const QPoint &, int) ) );
+                 this,  SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
         connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
                  this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
         connect( localDevice, SIGNAL( available( const QString&, bool ) ),
                  this, SLOT( deviceActive( const QString& , bool ) ) );
 
         //Load all icons needed
@@ -87,12 +88,13 @@ namespace OpieTooth {
         ListView2->setRootIsDecorated(true);
 
         BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" );
         topLV2->setPixmap( 1, onPix );
         (void) new BTListItem( topLV2, "Serial" ,"", "service" );
         (void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
+        writeToHciConfig();
     }
 
 
     /**
      * Reads all options from the config file
      */
@@ -123,13 +125,51 @@ namespace OpieTooth {
         cfg.writeEntry( "name" , deviceName );
         cfg.writeEntryCrypt( "passkey" , defaultPasskey );
         cfg.writeEntry( "useEncryption" , useEncryption );
         cfg.writeEntry( "enableAuthentification" , enableAuthentification );
         cfg.writeEntry( "enablePagescan" , enablePagescan );
         cfg.writeEntry( "enableInquiryscan" , enableInquiryscan );
-}
+
+        writeToHciConfig();
+    }
+
+    void BlueBase::writeToHciConfig() {
+
+        HciConfWrapper *hciconf = new HciConfWrapper( "/tmp/hcid.conf" );
+        hciconf->setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
+
+
+        //    hciconf->setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
+
+        hciconf->setName( deviceName );
+
+        if ( useEncryption == 1) {
+            hciconf->setEncrypt( true );
+        } else {
+            hciconf->setEncrypt( false );
+        }
+
+
+        if ( enableAuthentification == 1) {
+            hciconf->setAuth( true );
+        } else {
+            hciconf->setAuth( false );
+        }
+
+        if ( enablePagescan  == 1) {
+            hciconf->setPscan( true );
+        } else {
+            hciconf->setPscan( false );
+        }
+
+        if ( enableInquiryscan  == 1) {
+            hciconf->setIscan( true );
+        } else {
+            hciconf->setIscan( false );
+        }
+    }
 
 
     /**
      * Read the list of allready known devices
      *
      */
@@ -222,12 +262,13 @@ namespace OpieTooth {
         enableAuthentification = authCheckBox->isChecked();
         enablePagescan = pagescanCheckBox->isChecked();
         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
     }
 
@@ -271,21 +312,22 @@ namespace OpieTooth {
 
     }
 
     /**
      * Action that are toggled on hold (mostly QPopups i guess)
      */
-    void BlueBase::startServiceActionHold( BTListItem * item, const QPoint & point, int column ) {
+    void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) {
 
           QPopupMenu *menu = new QPopupMenu();
 
           int ret=0;
 
+
           //QSize s = menu->sizeHint ( );
 
-          if ( item->type() == "device") {
+          if ( ((BTListItem*)item)->type() == "device") {
 
               QPopupMenu *groups = new QPopupMenu();
 
               menu->insertItem( tr("rescan sevices:"),  0);
               menu->insertItem( tr("to group"), groups ,  1);
               menu->insertItem( tr("delete"),  2);
@@ -302,13 +344,13 @@ namespace OpieTooth {
                   // delete childs too
                   delete item;
                   break;
               }
               delete groups;
 
-          } else if ( item->type() == "service") {
+          } else if ( ((BTListItem*)item)->type() == "service") {
               menu->insertItem( tr("Test1:"),  0);
               menu->insertItem( tr("connect"), 1);
               menu->insertItem( tr("delete"),  2);
 
               ret = menu->exec( point  , 0);
 
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 481f0c9..ef67aa2 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -42,12 +42,13 @@ namespace OpieTooth {
 
     private:
         void readConfig();
         void writeConfig();
         void readSavedDevices();
         void writeSavedDevices();
+        void writeToHciConfig();
         QString getStatus();
         void initGui();
         void setInfo();
         Manager *localDevice;
         QMap<QString,BTListItem*> deviceList;
 
@@ -66,13 +67,13 @@ namespace OpieTooth {
         private slots:
         void addSearchedDevices( QList<RemoteDevice> &newDevices );
         void addServicesToDevice( BTListItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );
         void addConnectedDevices();
         void startServiceActionClicked( QListViewItem *item );
-        void startServiceActionHold( BTListItem *, const QPoint &, int );
+        void startServiceActionHold( QListViewItem *, const QPoint &, int );
         void deviceActive( const QString& mac, bool connected  );
         void applyConfigChanges();
 
     };
 
 }
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 39ddcaf..4fcf010 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,11 +1,11 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG          = qt warn_on release
-HEADERS         = bluebase.h scandialog.h btlistitem.h
-SOURCES         = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp
+HEADERS         = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h 
+SOURCES         = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth -lopie
 INTERFACES      = bluetoothbase.ui  devicedialog.ui  
 DESTDIR         = $(OPIEDIR)/bin