14 files changed, 498 insertions, 31 deletions

diff --git a/noncore/apps/opie-console/btconfigwidget.cpp b/noncore/apps/opie-console/btconfigwidget.cpp
new file mode 100644
index 0000000..acc4811
--- a/dev/null
+++ b/noncore/apps/opie-console/btconfigwidget.cpp
@@ -0,0 +1,140 @@
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qcombobox.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_deviceCmb->setEditable( TRUE );
+
+    m_base = new IOLayerBase(this, "base");
+
+    m_lay->addWidget( m_device );
+    m_lay->addWidget( m_deviceCmb );
+    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");
+
+
+    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 {
+        m_base->setParity( IOLayerBase::Odd );
+    }
+
+    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;
+    }
+
+    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);
+}
diff --git a/noncore/apps/opie-console/btconfigwidget.h b/noncore/apps/opie-console/btconfigwidget.h
new file mode 100644
index 0000000..64190ad
--- a/dev/null
+++ b/noncore/apps/opie-console/btconfigwidget.h
@@ -0,0 +1,29 @@
+#ifndef OPIE_BT_CONFIG_WIDGET_H
+#define OPIE_BT_CONFIG_WIDGET_H
+
+#include "profiledialogwidget.h"
+
+class QVBoxLayout;
+class QLabel;
+class QComboBox;
+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;
+
+};
+
+
+#endif
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp
index da6f3e2..62f02f5 100644
--- a/noncore/apps/opie-console/default.cpp
+++ b/noncore/apps/opie-console/default.cpp
@@ -1,56 +1,58 @@
 #include "io_serial.h"
 #include "sz_transfer.h"
 #include "serialconfigwidget.h"
+#include "irdaconfigwidget.h"
+#include "btconfigwidget.h"
 #include "terminalwidget.h"
 #include "vt102emulation.h"
 
 #include "default.h"
 
 extern "C" {
     // FILE Transfer Stuff
     FileTransferLayer* newSZTransfer(IOLayer* lay) {
         return new SzTransfer( SzTransfer::SZ, lay );
     }
     FileTransferLayer* newSYTransfer(IOLayer* lay) {
         return new SzTransfer( SzTransfer::SY, lay );
     }
     FileTransferLayer* newSXTransfer(IOLayer* lay) {
         return new SzTransfer( SzTransfer::SX, lay );
     }
 
     // Layer stuff
     IOLayer* newSerialLayer( const Profile& prof) {
         return new IOSerial( prof );
     }
     IOLayer* newBTLayer( const Profile&  ) {
         return 0l;
     }
     IOLayer* newIrDaLayer( const Profile& ) {
         return 0l;
     }
 
     // Connection Widgets
-    ProfileDialogWidget* newSerialWidget(const QString& str, QWidget* wid) {
-        return new SerialConfigWidget(str, wid );
+    ProfileDialogWidget* newSerialWidget( const QString& str, QWidget* wid ) {
+        return new SerialConfigWidget( str, wid );
     }
-    ProfileDialogWidget* newIrDaWidget( const QString& str, QWidget* wid) {
-        return newSerialWidget(str, wid);
+    ProfileDialogWidget* newIrDaWidget( const QString& str, QWidget* wid ) {
+        return new IrdaConfigWidget( str, wid );
     }
-    ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid) {
-        return newSerialWidget(str, wid );
+    ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid ) {
+        return new BTConfigWidget(str, wid );
     }
 
     // Terminal Widget(s)
     ProfileDialogWidget* newTerminalWidget(const QString& na, QWidget* wid) {
         return new TerminalWidget(na, wid,0 );
     }
 
     // VT Emulations
     EmulationLayer* newVT102( Widget* wid ) {
         return new Vt102Emulation( wid );
     }
 
 };
 
 Default::Default( MetaFactory* fact ) {
     fact->addFileTransferLayer( "SZ", QObject::tr("Z-Modem"), newSZTransfer );
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
new file mode 100644
index 0000000..8e31e82
--- a/dev/null
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -0,0 +1,60 @@
+
+#include "io_irda.h"
+
+IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
+    m_attach = 0;
+}
+
+
+IOIrda::~IOIrda() {
+    if ( m_attach ) {
+        delete m_attach;
+    }
+}
+
+
+void IOIrda::close() {
+
+    IOSerial::close();
+    // still need error handling
+    delete m_attach;
+}
+
+bool IOIrda::open() {
+
+    // irdaattach here
+    m_attach = new OProcess();
+    *m_attach << "irattach /dev/ttyS2 -s";
+
+    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;
+    }
+}
+
+void IOIrda::reload( const Profile &config ) {
+    m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE);
+    m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD);
+    m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY);
+    m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS);
+    m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS);
+    m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW);
+}
+
+
+QString IOIrda::identifier() const {
+    return "irda";
+}
+
+QString IOIrda::name() const {
+    return "Irda IO Layer";
+}
+
+void IOIrda::slotExited(OProcess* proc ){
+    close();
+}
diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h
new file mode 100644
index 0000000..3aee951
--- a/dev/null
+++ b/noncore/apps/opie-console/io_irda.h
@@ -0,0 +1,46 @@
+#ifndef OPIE_IO_IRDA
+#define OPIE_IO_IRDA
+
+#include <opie/oprocess.h>
+#include "io_serial.h"
+
+/* Default values to be used if the profile information is incomplete */
+#define IRDA_DEFAULT_DEVICE       "/dev/ircomm0"
+#define IRDA_DEFAULT_BAUD         9600
+#define IRDA_DEFAULT_PARITY       0
+#define IRDA_DEFAULT_DBITS        8
+#define IRDA_DEFAULT_SBITS        1
+#define IRDA_DEFAULT_FLOW         0
+
+/* IOSerial implements a RS232 IO Layer */
+
+class IOIrda : public IOSerial {
+
+    Q_OBJECT
+
+public:
+
+    IOIrda(const Profile &);
+    ~IOIrda();
+
+    QString identifier() const;
+    QString name() const;
+
+signals:
+    void received(const QByteArray &);
+    void error(int, const QString &);
+
+public slots:
+    bool open();
+    void close();
+    void reload(const Profile &);
+
+private:
+    OProcess *m_attach;
+
+private slots:
+    void slotExited(OProcess* proc);
+
+};
+
+#endif /* OPIE_IO_IRDA */
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index 99b6cc1..ec88b49 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -2,98 +2,105 @@
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qbuttongroup.h>
 #include <qhbuttongroup.h>
 #include <qradiobutton.h>
 
 #include "iolayerbase.h"
 
 namespace {
     enum ParityIds {
         id_parity_odd,
         id_parity_even
     };
 
     enum FlowIds {
         id_flow_hw,
-        id_flow_sw
+        id_flow_sw,
+        id_flow_none,
     };
 
     enum SpeedIds {
         id_baud_115200,
         id_baud_57600,
         id_baud_38400,
         id_baud_19200,
         id_baud_9600
     };
 
 }
 
 
 IOLayerBase::IOLayerBase( QWidget* par,  const char* name )
     : QWidget( par, name )
 {
     m_speedLabel = new QLabel(tr("Speed"), this );
     m_speedBox = new QComboBox(this );
 
     m_groupFlow = new QButtonGroup(tr("Flow control"),this );
     m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow );
     m_flowSw = new QRadioButton(tr("Software"), m_groupFlow );
+    m_flowNone = new QRadioButton( tr("None"), m_groupFlow );
 
     m_groupParity = new QButtonGroup(tr("Parity"), this );
     m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity );
     m_parityEven = new QRadioButton(tr("Even"), m_groupParity );
 
-    m_lroot = new QVBoxLayout(this );
+    m_lroot = new QVBoxLayout( this );
     m_lroot->add(m_speedLabel );
     m_lroot->add(m_speedBox );
     m_lroot->setStretchFactor(m_speedLabel, 1);
     m_lroot->setStretchFactor(m_speedBox, 1 );
 
     m_hbox = new QHBoxLayout(m_groupFlow, 2 );
     m_hbox->add(m_flowHw );
     m_hbox->add(m_flowSw );
+    m_hbox->add(m_flowNone );
     m_lroot->add(m_groupFlow );
     m_lroot->setStretchFactor(m_groupFlow, 2 );
 
     m_hboxPar = new QHBoxLayout( m_groupParity, 2 );
     m_hboxPar->add(m_parityOdd );
     m_hboxPar->add(m_parityEven );
     m_lroot->add(m_groupParity );
     m_lroot->setStretchFactor(m_groupParity, 2 );
 
     // profiles
     m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 );
     m_speedBox->insertItem(tr("57600 baud"), id_baud_57600   );
     m_speedBox->insertItem(tr("38400 baud"), id_baud_38400   );
     m_speedBox->insertItem(tr("19200 baud"), id_baud_19200   );
     m_speedBox->insertItem(tr("9600 baud"), id_baud_9600     );
 };
 IOLayerBase::~IOLayerBase() {
 
 }
 void IOLayerBase::setFlow( Flow flo ) {
     switch ( flo ) {
     case Software:
         m_flowSw->setChecked( true );
         break;
     case Hardware:
         m_flowHw->setChecked( true );
         break;
+    case None:
+        m_flowNone->setChecked( true );
+        break;
     }
 }
+
 void IOLayerBase::setParity( Parity par ) {
     switch( par ) {
     case Odd:
         m_parityOdd->setChecked( true );
         break;
     case Even:
         m_parityEven->setChecked( true );
         break;
     }
 }
 void IOLayerBase::setSpeed( Speed sp ) {
     int index;
     switch( sp ) {
     case Baud_115200:
         index = id_baud_115200;
         break;
@@ -103,35 +110,38 @@ void IOLayerBase::setSpeed( Speed sp ) {
     case Baud_38400:
         index = id_baud_38400;
         break;
     case Baud_19200:
         index = id_baud_19200;
         break;
     case Baud_9600:
         index = id_baud_9600;
         break;
     }
     m_speedBox->setCurrentItem(index );
 }
 IOLayerBase::Flow IOLayerBase::flow()const {
     if (m_flowHw->isChecked() ) {
         qWarning("Hardware flow");
         return Hardware;
-    }else {
+    }else if( m_flowSw->isChecked() ) {
         qWarning("Software");
         return Software;
+    } else {
+        qWarning("None");
+        return None;
     }
 }
 IOLayerBase::Parity IOLayerBase::parity()const {
     if (m_parityOdd->isChecked() )
         return Odd;
     else
         return Even;
 
 }
 IOLayerBase::Speed IOLayerBase::speed()const{
     switch( m_speedBox->currentItem() ) {
     case id_baud_115200:
         return Baud_115200;
         break;
     case id_baud_57600:
         return Baud_57600;
diff --git a/noncore/apps/opie-console/iolayerbase.h b/noncore/apps/opie-console/iolayerbase.h
index 151a04b..d14f334 100644
--- a/noncore/apps/opie-console/iolayerbase.h
+++ b/noncore/apps/opie-console/iolayerbase.h
@@ -1,47 +1,47 @@
 #ifndef OPIE_IO_LAYER_BASE_H
 #define OPIE_IO_LAYER_BASE_H
 
 
 #include <qwidget.h>
 
 class QLabel;
 class QComboBox;
 class QVBoxLayout;
 class QButtonGroup;
 class QRadioButton;
 class QHBoxLayout;
 class IOLayerBase : public QWidget {
     Q_OBJECT
 public:
-    enum Flow { Hardware, Software };
+    enum Flow { Hardware, Software, None };
     enum Parity{ Odd  =2 , Even =1 };
     enum Speed{ Baud_115200,
                 Baud_57600,
                 Baud_38400,
                 Baud_19200,
                 Baud_9600 };
     IOLayerBase( QWidget* base,  const char* name = 0l);
     ~IOLayerBase();
 
     void setFlow( Flow flo );
     void setParity( Parity par );
     void setSpeed( Speed speed );
 
     Flow flow()const;
     Parity parity()const;
     Speed speed()const;
 private:
     QVBoxLayout* m_lroot;
     QLabel* m_speedLabel;
     QComboBox* m_speedBox;
     QButtonGroup* m_groupFlow;
-    QRadioButton *m_flowHw, *m_flowSw;
+    QRadioButton *m_flowHw, *m_flowSw, *m_flowNone;
 
     QButtonGroup* m_groupParity;
     QRadioButton *m_parityOdd, *m_parityEven;
     QHBoxLayout* m_hbox;
     QHBoxLayout* m_hboxPar;
 };
 
 
 #endif
diff --git a/noncore/apps/opie-console/irdaconfigwidget.cpp b/noncore/apps/opie-console/irdaconfigwidget.cpp
new file mode 100644
index 0000000..1cc041b
--- a/dev/null
+++ b/noncore/apps/opie-console/irdaconfigwidget.cpp
@@ -0,0 +1,141 @@
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qcombobox.h>
+
+#include "iolayerbase.h"
+#include "irdaconfigwidget.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 );
+    }
+
+
+}
+
+IrdaConfigWidget::IrdaConfigWidget( 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_deviceCmb->setEditable( TRUE );
+
+    m_base = new IOLayerBase(this, "base");
+
+    m_lay->addWidget( m_device );
+    m_lay->addWidget( m_deviceCmb );
+    m_lay->addWidget( m_base );
+
+    m_deviceCmb->insertItem( "/dev/ircomm0" );
+    m_deviceCmb->insertItem( "/dev/ircomm1" );
+}
+
+IrdaConfigWidget::~IrdaConfigWidget() {
+
+}
+void IrdaConfigWidget::load( const Profile& prof ) {
+    int rad_flow = prof.readNumEntry("Flow");
+    int rad_parity = prof.readNumEntry("Parity");
+    int speed = prof.readNumEntry("Speed");
+
+    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 {
+        m_base->setParity( IOLayerBase::Odd );
+    }
+
+    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 IrdaConfigWidget::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;
+    }
+
+    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);
+}
diff --git a/noncore/apps/opie-console/irdaconfigwidget.h b/noncore/apps/opie-console/irdaconfigwidget.h
new file mode 100644
index 0000000..56d8089
--- a/dev/null
+++ b/noncore/apps/opie-console/irdaconfigwidget.h
@@ -0,0 +1,29 @@
+#ifndef OPIE_IRDA_CONFIG_WIDGET_H
+#define OPIE_IRDA_CONFIG_WIDGET_H
+
+#include "profiledialogwidget.h"
+
+class QVBoxLayout;
+class QLabel;
+class QComboBox;
+class IOLayerBase;
+class IrdaConfigWidget : public ProfileDialogConnectionWidget {
+
+    Q_OBJECT
+
+public:
+    IrdaConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
+    ~IrdaConfigWidget();
+
+    void load( const Profile& );
+    void save( Profile& );
+private:
+    QVBoxLayout* m_lay;
+    QLabel* m_device;
+    QComboBox* m_deviceCmb;
+    IOLayerBase* m_base;
+
+};
+
+
+#endif
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index ea6d759..e1e5248 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,63 +1,64 @@
 TEMPLATE     = app
 #CONFIG       = qt warn_on release
 CONFIG 	     = qt debug
 DESTDIR      = $(OPIEDIR)/bin
-HEADERS      = io_layer.h io_serial.h \
+HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h \
 	       file_layer.h sz_transfer.h \
 	       metafactory.h \
 	       session.h \
 	       mainwindow.h \
 	       profile.h \
 	       profileconfig.h \
 	       profilemanager.h  \
 	       configwidget.h \
 	       tabwidget.h \
 	       configdialog.h \
                emulation_layer.h \
                widget.h \
                vt102emulation.h \
                common.h \
                history.h \
                screen.h \
 	       keytrans.h \
 	       widget_layer.h \
 	       transferdialog.h \
 	       profiledialogwidget.h \
 	       profileeditordialog.h \
 	       default.h \
 	       terminalwidget.h \
 	       iolayerbase.h \
-	       serialconfigwidget.h
+	       serialconfigwidget.h irdaconfigwidget.h btconfigwidget.h \
 
-SOURCES      = io_layer.cpp io_serial.cpp \
+
+SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \
 	       file_layer.cpp sz_transfer.cpp \
                main.cpp \
 	       metafactory.cpp \
 	       session.cpp \
 	       mainwindow.cpp \
 	       profile.cpp \
 	       profileconfig.cpp \
 	       profilemanager.cpp  \
 	       tabwidget.cpp \
 	       configdialog.cpp \
 	       emulation_layer.cpp \
 	       widget.cpp \
 	       vt102emulation.cpp \
 	       history.cpp \
 	       screen.cpp \
 	       keytrans.cpp \
 	       widget_layer.cpp \
 	       transferdialog.cpp \
 	       profiledialogwidget.cpp \
 	       profileeditordialog.cpp \
 	       default.cpp \
 	       terminalwidget.cpp \
 	       iolayerbase.cpp \
-	       serialconfigwidget.cpp
+	       serialconfigwidget.cpp irdaconfigwidget.cpp btconfigwidget.cpp \
    
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = opie-console
 
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index faf9c39..914fd25 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -166,33 +166,33 @@ QString ProfileEditorDialog::profName()const
 QCString ProfileEditorDialog::profType()const
 {
     /*QStringList w = m_fact->configWidgets();
 	for(QStringList::Iterator it = w.begin(); it != w.end(); it++)
 		if(device_box->currentText() == m_fact->name((*it))) return (*it);
     */
     return QCString();
 }
 /*
  * we need to switch the widget
  */
 void ProfileEditorDialog::slotConActivated( const QString& str ) {
     delete m_con;
     m_con = m_fact->newConnectionPlugin( str, m_tabCon );
 
     if (m_con ) {
-        m_con->load(m_prof );
+        m_con->load( m_prof );
         m_layCon->addWidget( m_con );
     }
 }
 /*
  * we need to switch the widget
  */
 void ProfileEditorDialog::slotTermActivated( const QString& str ) {
     delete m_term;
     m_term = m_fact->newTerminalPlugin( str, m_tabTerm );
     qWarning("past");
 
     if (m_term) {
         m_term->load(m_prof );
         m_layTerm->addWidget( m_term );
     }
 }
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp
index c11c854..937516c 100644
--- a/noncore/apps/opie-console/profileeditorplugins.cpp
+++ b/noncore/apps/opie-console/profileeditorplugins.cpp
@@ -181,41 +181,44 @@ QWidget *ProfileEditorPlugin::terminal_widget()
 	// Signals
 
 	connect(terminal_box, SIGNAL(activated(int)), SLOT(slotTermTerm(int)));
 	connect(colour_box, SIGNAL(activated(int)), SLOT(slotTermColour(int)));
 	connect(group_size, SIGNAL(clicked(int)), SLOT(slotTermFont(int)));
 
 	connect(option_echo, SIGNAL(toggled(bool)), SLOT(slotTermEcho(bool)));
 	connect(option_wrap, SIGNAL(toggled(bool)), SLOT(slotTermWrap(bool)));
 	connect(conv_inbound, SIGNAL(toggled(bool)), SLOT(slotTermInbound(bool)));
 	connect(conv_outbound, SIGNAL(toggled(bool)), SLOT(slotTermOutbound(bool)));
 
 	return root;
 }
 
 void ProfileEditorPlugin::slotConnFlow(int id)
 {
-	switch(id)
-	{
-		case id_flow_hw:
-			m_profile->writeEntry("Flow", IOSerial::FlowHW);
-			break;
-		case id_flow_sw:
-			m_profile->writeEntry("Flow", IOSerial::FlowSW);
-			break;
-	}
+    switch(id)
+    {
+    case id_flow_hw:
+        m_profile->writeEntry("Flow", IOSerial::FlowHW);
+        break;
+    case id_flow_sw:
+        m_profile->writeEntry("Flow", IOSerial::FlowSW);
+        break;
+    case id_flow_sw:
+        m_profile->writeEntry("None", IOSerial::None);
+        break;
+    }
 }
 
 void ProfileEditorPlugin::slotConnParity(int id)
 {
 	switch(id)
 	{
 		case id_parity_odd:
 			m_profile->writeEntry("Parity", IOSerial::ParityEven);
 			break;
 		case id_parity_even:
 			m_profile->writeEntry("Parity", IOSerial::ParityOdd);
 			break;
 	}
 }
 
 void ProfileEditorPlugin::slotConnSpeed(int id)
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index a427302..b1ec408 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -38,36 +38,39 @@ SerialConfigWidget::SerialConfigWidget( const QString& name,
     m_lay->addWidget( m_base );
 
     m_deviceCmb->insertItem( "/dev/ttyS0" );
     m_deviceCmb->insertItem( "/dev/ttyS1" );
     m_deviceCmb->insertItem( "/dev/ttySA0");
     m_deviceCmb->insertItem( "/dev/ttySA1");
 
 }
 SerialConfigWidget::~SerialConfigWidget() {
 
 }
 void SerialConfigWidget::load( const Profile& prof ) {
     int rad_flow = prof.readNumEntry("Flow");
     int rad_parity = prof.readNumEntry("Parity");
     int speed = prof.readNumEntry("Speed");
 
-    if (rad_flow == 0)
+    if (rad_flow == 1) {
         m_base->setFlow( IOLayerBase::Hardware );
-    else
+    } 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
         m_base->setParity( IOLayerBase::Odd );
 
     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;
@@ -81,37 +84,40 @@ void SerialConfigWidget::load( const Profile& prof ) {
     }
 
     if ( prof.readEntry("Device").isEmpty() ) return;
     setCurrent( prof.readEntry("Device"), m_deviceCmb );
 
 }
 /*
  * save speed,
  * flow,
  * parity
  */
 void SerialConfigWidget::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 = 1;
+        flow = 2;
         break;
     case IOLayerBase::Hardware:
-        flow = 0;
+        flow = 1;
         break;
     }
 
     switch( m_base->parity() ) {
     case IOLayerBase::Odd:
         parity = 2;
         break;
     case IOLayerBase::Even:
         parity = 1;
         break;
     }
 
     switch( m_base->speed() ) {
     case IOLayerBase::Baud_115200:
         speed = 115200;
         break;
diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h
index c91a957..6e2e61e 100644
--- a/noncore/apps/opie-console/widget_layer.h
+++ b/noncore/apps/opie-console/widget_layer.h
@@ -74,49 +74,49 @@ public:
 
 	/**
 	 * @return int m_columns, the columns count
 	 */
 	int columns()	{ return m_columns; }
 
 	/**
 	 * insert current selection (currently this is only the clipboard)
 	 */
 	void insertSelection();
 
 	/**
 	 * insert text
 	 * @param QString text, the text to be inserted
 	 */
 	void insertText( QString text );
-	
+
 	/**
 	 * set selection (clipboard) to text
 	 * @param const QString &text, the text to be selected
 	 */
 	void setSelection( const QString &text );
 
 	/**
 	 * paste content of clipboard
 	 */
 	void pasteClipboard();
 
 
 	/**
 	 * reload configuration
 	 */
-	virtual void reloadConfig();
+	virtual void reloadConfig() = 0;
 
 
 signals:
 
 	/**
 	 * key was pressed
 	 */
 	void keyPressed( QKeyEvent *e );
 
 	/**
 	 * whenever Mouse selects something
 	 * @param int button, the button that us pressed :
 	 * 		0	left Button
 	 * 		3	Button released
 	 * @param int x, x position
 	 * @param int y, y position