either device or mac address

4 files changed, 71 insertions, 19 deletions

diff --git a/noncore/apps/opie-console/btconfigwidget.cpp b/noncore/apps/opie-console/btconfigwidget.cpp
index 7673d0b..6246f92 100644
--- a/noncore/apps/opie-console/btconfigwidget.cpp
+++ b/noncore/apps/opie-console/btconfigwidget.cpp
@@ -1,157 +1,188 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
+#include <qhbox.h>
+#include <qradiobutton.h>
 
 #include "iolayerbase.h"
 #include "btconfigwidget.h"
 
 namespace {
     void setCurrent( const QString& str, QComboBox* bo ) {
         uint b = bo->count();
         for (uint i = 0; i < bo->count(); i++ ) {
             if ( bo->text(i) == str ) {
                 bo->setCurrentItem( i );
                 return;
             }
         }
         bo->insertItem( str );
         bo->setCurrentItem( b );
     }
 }
 
 BTConfigWidget::BTConfigWidget( const QString& name,
                                 QWidget* parent,
                                 const char* na )
     : ProfileDialogConnectionWidget( name, parent, na ) {
 
-    m_lay = new QVBoxLayout(this );
-    m_device = new QLabel(tr("Device"), this );
-    m_deviceCmb = new QComboBox(this );
+    m_lay = new QVBoxLayout( this );
+
+    m_device = new QLabel( tr( "Device" ), this );
+    QHBox *deviceBox = new QHBox( this );
+    m_devRadio = new QRadioButton( deviceBox );
+    connect( m_devRadio, SIGNAL( toggled( bool ) ), this, SLOT( slotDevRadio( bool ) ) );
+    m_deviceCmb = new QComboBox( deviceBox );
     m_deviceCmb->setEditable( TRUE );
 
     QLabel *macLabel = new QLabel( this );
-    macLabel->setText( tr("Enter peer mac address here:") );
-    m_mac = new QLineEdit( this );
+    macLabel->setText( tr( "Or peer mac address" ) );
+    QHBox *macBox = new QHBox( this );
+    m_macRadio = new QRadioButton( macBox );
+    connect( m_macRadio, SIGNAL( toggled( bool ) ), this, SLOT( slotMacRadio( bool ) ) );
+    m_mac = new QLineEdit( macBox );
 
     m_base = new IOLayerBase(this, "base");
 
     m_lay->addWidget( m_device );
-    m_lay->addWidget( m_deviceCmb );
+    m_lay->addWidget( deviceBox );
     m_lay->addWidget( macLabel );
-    m_lay->addWidget( m_mac );
+    m_lay->addWidget( macBox );
     m_lay->addWidget( m_base );
 
     m_deviceCmb->insertItem( "/dev/ttyU0" );
     m_deviceCmb->insertItem( "/dev/ttyU1" );
 }
 
 BTConfigWidget::~BTConfigWidget() {
 
 }
 void BTConfigWidget::load( const Profile& prof ) {
     int rad_flow = prof.readNumEntry("Flow");
     int rad_parity = prof.readNumEntry("Parity");
     int speed = prof.readNumEntry("Speed");
     QString mac = prof.readEntry("Mac");
 
     if (!mac.isEmpty() ) {
         m_mac->setText( mac );
+    } else {
+        m_devRadio->setChecked( true );
     }
 
     if (rad_flow == 1) {
         m_base->setFlow( IOLayerBase::Hardware );
     } else if (rad_flow == 2) {
         m_base->setFlow( IOLayerBase::Software );
     } else if (rad_flow == 0) {
          m_base->setFlow( IOLayerBase::None );
     }
 
     if (rad_parity == 1) {
         m_base->setParity( IOLayerBase::Even );
     } else if ( rad_parity == 2 ) {
         m_base->setParity( IOLayerBase::Odd );
     } else {
         m_base->setParity( IOLayerBase::NonePar );
     }
 
     switch( speed ) {
     case 115200:
         m_base->setSpeed(IOLayerBase::Baud_115200 );
         break;
     case 57600:
         m_base->setSpeed( IOLayerBase::Baud_57600  );
         break;
     case 38400:
         m_base->setSpeed(IOLayerBase::Baud_38400  );
         break;
     case 19200:
         m_base->setSpeed( IOLayerBase::Baud_19200  );
         break;
     case 9600:
     default:
         m_base->setSpeed(IOLayerBase::Baud_9600 );
         break;
     }
 
     if ( prof.readEntry("Device").isEmpty() ) return;
     setCurrent( prof.readEntry("Device"), m_deviceCmb );
 
 }
 /*
  * save speed,
  * flow,
  * parity
  */
 void BTConfigWidget::save( Profile& prof ) {
     int flow, parity, speed;
     prof.writeEntry("Device", m_deviceCmb->currentText() );
 
 
     switch( m_base->flow() ) {
     case IOLayerBase::None:
         flow = 0;
         break;
     case IOLayerBase::Software:
         flow = 2;
         break;
     case IOLayerBase::Hardware:
         flow = 1;
         break;
     }
 
     switch( m_base->parity() ) {
     case IOLayerBase::Odd:
         parity = 2;
         break;
     case IOLayerBase::Even:
         parity = 1;
         break;
     case IOLayerBase::NonePar:
         parity = 0;
         break;
     }
 
     switch( m_base->speed() ) {
     case IOLayerBase::Baud_115200:
         speed = 115200;
         break;
     case IOLayerBase::Baud_57600:
         speed = 57600;
         break;
     case IOLayerBase::Baud_38400:
         speed = 38400;
         break;
     case IOLayerBase::Baud_19200:
         speed = 19200;
         break;
     case IOLayerBase::Baud_9600:
         speed = 9600;
         break;
     }
 
     prof.writeEntry("Flow",  flow);
     prof.writeEntry("Parity", parity);
     prof.writeEntry("Speed",  speed);
     prof.writeEntry("Mac", m_mac->text() );
 }
+
+void BTConfigWidget::slotMacRadio( bool on  ) {
+    if ( on ) {
+        m_devRadio->setChecked( false );
+        m_deviceCmb->setEnabled( false );
+        m_mac->setEnabled( true );
+    } else {
+        m_devRadio->setChecked( true );
+    }
+}
+
+void BTConfigWidget::slotDevRadio( bool on  ) {
+    if ( on ) {
+        m_macRadio->setChecked( false );
+        m_deviceCmb->setEnabled( true );
+        m_mac->setEnabled( false );
+    } else {
+        m_macRadio->setChecked( true );
+    }
+}
diff --git a/noncore/apps/opie-console/btconfigwidget.h b/noncore/apps/opie-console/btconfigwidget.h
index ceb13ee..d60d8a2 100644
--- a/noncore/apps/opie-console/btconfigwidget.h
+++ b/noncore/apps/opie-console/btconfigwidget.h
@@ -1,31 +1,37 @@
 #ifndef OPIE_BT_CONFIG_WIDGET_H
 #define OPIE_BT_CONFIG_WIDGET_H
 
 #include "profiledialogwidget.h"
 
 class QVBoxLayout;
 class QLabel;
 class QComboBox;
 class QLineEdit;
+class QRadioButton;
 class IOLayerBase;
 class BTConfigWidget : public ProfileDialogConnectionWidget {
 
     Q_OBJECT
 
 public:
     BTConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
     ~BTConfigWidget();
 
     void load( const Profile& );
     void save( Profile& );
 private:
     QVBoxLayout* m_lay;
     QLabel* m_device;
     QComboBox* m_deviceCmb;
     IOLayerBase* m_base;
     QLineEdit* m_mac;
+    QRadioButton *m_macRadio;
+    QRadioButton *m_devRadio;
 
+private slots:
+    void slotMacRadio( bool on );
+    void slotDevRadio( bool on );
 };
 
 
 #endif
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 0831faf..d71aacc 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,64 +1,78 @@
 
 #include "io_bt.h"
 
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOBt::~IOBt() {
     if ( m_attach ) {
         delete m_attach;
     }
 }
 
 
 void IOBt::close() {
 
     IOSerial::close();
     // still need error handling
-    delete m_attach;
+    if ( m_attach ) {
+        delete m_attach;
+        m_attach = 0;
+    }
 }
 
 bool IOBt::open() {
 
-    // hciattach here
-    m_attach = new OProcess();
-    *m_attach << "hciattach /dev/ttyS2 any 57600";
+    // only set up bt stuff if mac address was set, otherwise use the device set
+    if ( !m_mac.isEmpty() ) {
 
-    // then start hcid, then rcfomm handling (m_mac)
+        // now it should also be checked, if there is a connection to the device with that mac allready
 
-    connect( m_attach, SIGNAL( processExited( OProcess* ) ),
-            this, SLOT( slotExited( OProcess* ) ) );
+        // hciattach here
+        m_attach = new OProcess();
+        *m_attach << "hciattach /dev/ttyS2 any 57600";
 
-    if ( m_attach->start() ) {
-        IOSerial::open();
+        // then start hcid, then rcfomm handling (m_mac)
+
+        connect( m_attach, SIGNAL( processExited( OProcess* ) ),
+                 this, SLOT( slotExited( OProcess* ) ) );
+
+        if ( m_attach->start() ) {
+            IOSerial::open();
+        } else {
+            qWarning("could not attach to device");
+            delete m_attach;
+            m_attach = 0;
+        }
     } else {
-        qWarning("could not attach to device");
-        delete m_attach;
-	m_attach = 0;
+        // directly to the normal serial
+        // TODO: look first if the connection really exists. ( is set up )
+
+        IOSerial::open();
     }
 }
 
 void IOBt::reload( const Profile &config ) {
     m_device = config.readEntry("Device", BT_DEFAULT_DEVICE);
     m_mac = config.readEntry("Mac", BT_DEFAULT_MAC);
     m_baud = config.readNumEntry("Baud", BT_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", BT_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", BT_DEFAULT_DBITS);
     m_sbits = config.readNumEntry("StopBits", BT_DEFAULT_SBITS);
     m_flow = config.readNumEntry("Flow", BT_DEFAULT_FLOW);
 }
 
 
 QString IOBt::identifier() const {
     return "bluetooth";
 }
 
 QString IOBt::name() const {
     return "BLuetooth IO Layer";
 }
 
 void IOBt::slotExited( OProcess* proc ){
     close();
 }
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index cc63c58..e6d1688 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -1,64 +1,65 @@
+
 #include <fcntl.h>
 #include <termios.h>
 #include <errno.h>
 #include <unistd.h>
 #include "io_serial.h"
 
 IOSerial::IOSerial(const Profile &config) : IOLayer(config) {
     m_read = 0l;
     m_error = 0l;
     m_fd = 0;
     m_connected = false;
     reload(config);
 }
 
 
 IOSerial::~IOSerial() {
     if (m_fd) {
         close();
     }
 }
 
 void IOSerial::send(const QByteArray &data) {
     if (m_fd) {
         write(m_fd, data.data(), data.size());
     } else {
         emit error(Refuse, tr("Not connected"));
     }
 }
 
 void IOSerial::close() {
     if (m_fd) {
         delete m_read;
         delete m_error;
         ::close(m_fd);
         m_fd = 0;
         m_connected = false;
     } else {
         m_connected = false;
         emit error(Refuse, tr("Not connected"));
     }
 }
 
 bool IOSerial::open() {
     if (!m_fd) {
         struct termios tty;
         m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK);
         if (m_fd < 0) {
             emit error(CouldNotOpen, strerror(errno));
             m_fd = 0;
             return FALSE;
         }
         tcgetattr(m_fd, &tty);
 
         /* Baud rate */
         int speed = baud(m_baud);
         if (speed == -1) {
             emit error(Refuse, tr("Invalid baud rate"));
         }
         cfsetospeed(&tty, speed);
         cfsetispeed(&tty, speed);
 
         /* Take care of Space / Mark parity */
         if (m_dbits == 7 && (m_parity == ParitySpace || m_parity == ParityMark)) {
             m_dbits = 8;