1 files changed, 24 insertions, 6 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 924d191..13954c5 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -1,183 +1,179 @@
 /*
  * bluebase.cpp *
  * ---------------------
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include "scandialog.h"
 #include "hciconfwrapper.h"
 #include "devicehandler.h"
 #include "btconnectionitem.h"
 #include "rfcommassigndialogimpl.h"
 #include "forwarder.h"
+#include "servicesdialog.h"
 #include <termios.h>
 #include <string.h>
 #include <errno.h>
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qtabwidget.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qlist.h>
 #include <qfile.h>
 
 /* STD */
 #include <remotedevice.h>
 #include <services.h>
 #include <stdlib.h>
 
 using namespace OpieTooth;
 //Array of possible speeds of the serial port
 struct SerSpeed {
     const char* str; //string value
     int val; //value itself
 } speeds[] = { 
       { "150", B150 },   { "300", B300 },   { "600", B600 }, { "1200", B1200 }, 
     { "2400", B2400 }, { "4800", B4800 }, { "9600", B9600 }, 
     { "19200", B19200 }, { "38400", B38400 }, { "57600", B57600 }, 
     { "115200", B115200}
 };
 
 BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl )
 {
     m_localDevice = new Manager( "hci0" );
 
     connect( PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
     connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
 
     connect( rfcommBindButton,  SIGNAL( clicked() ),  this,  SLOT( rfcommDialog() ) );
 
     connect( devicesView, SIGNAL( clicked(QListViewItem*)),
              this, SLOT( startServiceActionClicked(QListViewItem*) ) );
     connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
              this,  SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) );
     connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ),
              this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) );
     connect( m_localDevice, SIGNAL( available(const QString&,bool) ),
              this, SLOT( deviceActive(const QString&,bool) ) );
     connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ),
              this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) );
     connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ),
              this, SLOT( addSignalStrength(const QString&,const QString&) ) );
     connect(runButton, SIGNAL(clicked()), this, SLOT(doForward()));
     connect(encCheckBox, SIGNAL(toggled(bool)), this, SLOT(doEncrypt(bool)));
+    connect(servicesEditButton, SIGNAL(clicked()), this, SLOT(editServices()));
 
     // let hold be rightButtonClicked()
     QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold);
 
     //Load all icons needed
     m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
     m_onPix = Resource::loadPixmap( "opietooth/connected" );
     m_findPix = Resource::loadPixmap( "opietooth/find" );
 
     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();
 
     devicesView->setRootIsDecorated(true);
     m_iconLoader = new BTIconLoader();
     writeToHciConfig();
     addConnectedDevices();
     readSavedDevices();
     addServicesToDevices();
     QTimer::singleShot( 3000, this, SLOT( addServicesToDevices() ) );
     forwarder = NULL;
-    serDevName->setText(tr("/dev/ircomm0"));
-    for (unsigned int i = 0; i < (sizeof(speeds) / sizeof(speeds[0])); i++) {
-        serSpeed->insertItem(speeds[i].str);
-    }
-    serSpeed->setCurrentItem((sizeof(speeds) / sizeof(speeds[0])) - 1);
-    encCheckBox->setChecked(true);
 }
 
 /**
  * Reads all options from the config file
  */
 void BlueBase::readConfig()
 {
 
     Config cfg( "bluetoothmanager" );
     cfg.setGroup( "bluezsettings" );
 
     m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
     m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
     m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE );
     m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE );
     m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE );
     m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE );
 }
 
 /**
  * Writes all options to the config file
  */
 void BlueBase::writeConfig()
 {
 
     Config cfg( "bluetoothmanager" );
     cfg.setGroup( "bluezsettings" );
 
     cfg.writeEntry( "name" , m_deviceName );
     cfg.writeEntryCrypt( "passkey" , m_defaultPasskey );
     cfg.writeEntry( "useEncryption" , m_useEncryption );
     cfg.writeEntry( "enableAuthentification" , m_enableAuthentification );
     cfg.writeEntry( "enablePagescan" , m_enablePagescan );
     cfg.writeEntry( "enableInquiryscan" , m_enableInquiryscan );
 
     writeToHciConfig();
 }
 
 /**
  * Modify the hcid.conf file to our needs
  */
 void BlueBase::writeToHciConfig()
 {
     QFile pinFile("/etc/bluetooth/pin"); // /etc/bluetooth/pin file
     owarn << "writeToHciConfig" << oendl;
     //Write /etc/bluetooth/hcid.conf file
     HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
     hciconf.load();
@@ -208,96 +204,102 @@ void BlueBase::readSavedDevices()
     loadedDevices = handler.load();
 
     addSearchedDevices( loadedDevices );
 }
 
 
 /**
  * Write the list of already known devices
  */
 void BlueBase::writeSavedDevices()
 {
     QListViewItemIterator it( devicesView );
     BTListItem* item;
     BTDeviceItem* device;
     RemoteDevice::ValueList list;
     for ( ; it.current(); ++it )
     {
         item = (BTListItem*)it.current();
         if(item->typeId() != BTListItem::Device )
             continue;
         device = (BTDeviceItem*)item;
 
         list.append( device->remoteDevice() );
     }
     /*
      * if not empty save the List through DeviceHandler
      */
     if ( list.isEmpty() )
         return;
     DeviceHandler handler;
     handler.save( list );
 }
 
 
 /**
  * Set up the gui
  */
 void BlueBase::initGui()
 {
     StatusLabel->setText( status() ); // maybe move it to getStatus()
     cryptCheckBox->setChecked( m_useEncryption );
     authCheckBox->setChecked( m_enableAuthentification );
     pagescanCheckBox->setChecked( m_enablePagescan );
     inquiryscanCheckBox->setChecked( m_enableInquiryscan );
     deviceNameLine->setText( m_deviceName );
     passkeyLine->setText( m_defaultPasskey );
     // set info tab
     setInfo();
+    serDevName->setText(tr("/dev/ircomm0"));
+    for (unsigned int i = 0; i < (sizeof(speeds) / sizeof(speeds[0])); i++) {
+        serSpeed->insertItem(speeds[i].str);
+    }
+    serSpeed->setCurrentItem((sizeof(speeds) / sizeof(speeds[0])) - 1);
+    encCheckBox->setChecked(true);
 }
 
 
 /**
  * Get the status informations and returns it
  * @return QString the status informations gathered
  */
 QString BlueBase::status()const
 {
     QString infoString = tr( "<b>Device name : </b> Ipaq" );
     infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
     infoString += QString(  "<br><b>" + tr( "Class" ) + "</b> PDA" );
 
     return (infoString);
 }
 
 
 /**
  * Read the current values from the gui and invoke writeConfig()
  */
 void BlueBase::applyConfigChanges()
 {
     m_deviceName =  deviceNameLine->text();
     m_defaultPasskey = passkeyLine->text();
     m_useEncryption = cryptCheckBox->isChecked();
     m_enableAuthentification = authCheckBox->isChecked();
     m_enablePagescan = pagescanCheckBox->isChecked();
     m_enableInquiryscan = inquiryscanCheckBox->isChecked();
 
     writeConfig();
 
     QMessageBox::information( this, tr("Test") , tr("Changes were applied.") );
 }
 
 /**
  * Launch Rfcomm Bind dialog
  *
  */
 void BlueBase::rfcommDialog()
 {
     RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp  );
 
     if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted )
     {
         rfcommAssign.saveConfig();
     }
 }
 
@@ -715,49 +717,65 @@ bool BlueBase::find( const RemoteDevice& rem )
 }
 
 /**
  * Start process of the cell phone forwarding
  */
 void BlueBase::doForward()
 {
     if (forwarder && forwarder->isRunning()) {
         runButton->setText("start gateway");
         forwarder->stop();
         delete forwarder;
         forwarder = NULL;
         return;
     }
     QString str = serDevName->text();
     forwarder = new SerialForwarder(str, speeds[serSpeed->currentItem()].val);
     connect(forwarder, SIGNAL(processExited(Opie::Core::OProcess*)), 
         this, SLOT(forwardExited(Opie::Core::OProcess*)));
     if (forwarder->start(OProcess::NotifyOnExit) < 0) {
         QMessageBox::critical(this, tr("Forwarder Error"), 
             tr("Forwarder start error:") + tr(strerror(errno)));
         return;
     }
     runButton->setText("stop gateway");
 }
 
 /**
  * React on the process end
  */
 void BlueBase::forwardExit(Opie::Core::OProcess* proc)
 {
     if (proc->exitStatus() != 0)
         QMessageBox::critical(this, tr("Forwarder Error"), 
             tr("Forwarder start error"));
     delete proc;
     forwarder = NULL;
     runButton->setText("start gateway");
 }
 
 /**
  * Encrypt entered passkey
  * doit - do encryption of the key
  */
 void BlueBase::doEncrypt(bool doit)
 {
     passkeyLine->setEchoMode((doit)? QLineEdit::Password: QLineEdit::Normal);
 }
 
+/**
+ * Start services edit dialog
+ */
+void BlueBase::editServices()
+{
+    QString conf = "/etc/default/bluetooth";
+//// Use for debugging purposes    
+////    QString conf = "/mnt/net/opie/bin/bluetooth";
+    ServicesDialog svcEdit(conf, this, "ServicesDialog", true, 
+        WStyle_ContextHelp);
+
+    if (QPEApplication::execDialog(&svcEdit) == QDialog::Accepted)
+    {
+    }
+}
+
 //eof