parity none added

9 files changed, 47 insertions, 8 deletions

diff --git a/noncore/apps/opie-console/btconfigwidget.cpp b/noncore/apps/opie-console/btconfigwidget.cpp
index eac6a79..7673d0b 100644
--- a/noncore/apps/opie-console/btconfigwidget.cpp
+++ b/noncore/apps/opie-console/btconfigwidget.cpp
@@ -68,10 +68,12 @@ void BTConfigWidget::load( const Profile& prof ) {
     }
 
     if (rad_parity == 1) {
         m_base->setParity( IOLayerBase::Even );
-    } else {
+    } else if ( rad_parity == 2 ) {
         m_base->setParity( IOLayerBase::Odd );
+    } else {
+        m_base->setParity( IOLayerBase::NonePar );
     }
 
     switch( speed ) {
     case 115200:
@@ -124,8 +126,11 @@ void BTConfigWidget::save( Profile& prof ) {
         break;
     case IOLayerBase::Even:
         parity = 1;
         break;
+    case IOLayerBase::NonePar:
+        parity = 0;
+        break;
     }
 
     switch( m_base->speed() ) {
     case IOLayerBase::Baud_115200:
diff --git a/noncore/apps/opie-console/emulation_widget.cpp b/noncore/apps/opie-console/emulation_widget.cpp
index 9138f29..d8e342b 100644
--- a/noncore/apps/opie-console/emulation_widget.cpp
+++ b/noncore/apps/opie-console/emulation_widget.cpp
@@ -41,8 +41,9 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const
         f_height = fm.height();
         f_width = fm.maxWidth();
         f_ascent = fm.ascent();
 
+
         // initialize scrollbar related vars
         m_scrollbar = new QScrollBar( this );
         m_scrollbar->setCursor( arrowCursor );
 
@@ -108,8 +109,9 @@ static QChar vt100extended(QChar c)
 
 QSize EmulationWidget::calcSize( int cols, int lins ) const
 {
     int frw = width() - contentsRect().width();
+
     int frh = height() - contentsRect().height();
     int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() );
     return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh );
 }
@@ -232,8 +234,12 @@ void EmulationWidget::paintEvent( QPaintEvent* pe )
 void EmulationWidget::calcGeometry()
 {
         m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() );
 
+        qDebug( QString(" TEST").arg( contentsRect().width() ) );
+        qDebug( QString(" TEST").arg( contentsRect().height() ) );
+        qDebug("NEUER TESTT!!!!!!!!");
+
         switch( scrollLoc )
         {
         case SCRNONE :
                 m_columns = ( contentsRect().width() -2 * rimX ) / f_width;
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 28d1722..d93dc5a 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -36,8 +36,9 @@ bool IOModem::open() {
         else return false;
 }
 
 void IOModem::reload( const Profile &config ) {
+
     m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE);
     m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS);
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index ec88b49..08acb75 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -8,8 +8,9 @@
 #include "iolayerbase.h"
 
 namespace {
     enum ParityIds {
+        id_parity_none,
         id_parity_odd,
         id_parity_even
     };
 
@@ -41,8 +42,9 @@ IOLayerBase::IOLayerBase( QWidget* par,  const char* name )
     m_flowSw = new QRadioButton(tr("Software"), m_groupFlow );
     m_flowNone = new QRadioButton( tr("None"), m_groupFlow );
 
     m_groupParity = new QButtonGroup(tr("Parity"), this );
+    m_parityNone = new QRadioButton(tr("None"), m_groupParity );
     m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity );
     m_parityEven = new QRadioButton(tr("Even"), m_groupParity );
 
     m_lroot = new QVBoxLayout( this );
@@ -60,8 +62,9 @@ IOLayerBase::IOLayerBase( QWidget* par,  const char* name )
 
     m_hboxPar = new QHBoxLayout( m_groupParity, 2 );
     m_hboxPar->add(m_parityOdd );
     m_hboxPar->add(m_parityEven );
+    m_hboxPar->add(m_parityNone );
     m_lroot->add(m_groupParity );
     m_lroot->setStretchFactor(m_groupParity, 2 );
 
     // profiles
@@ -89,8 +92,11 @@ void IOLayerBase::setFlow( Flow flo ) {
 }
 
 void IOLayerBase::setParity( Parity par ) {
     switch( par ) {
+    case NonePar:
+        m_parityNone->setChecked( true );
+        break;
     case Odd:
         m_parityOdd->setChecked( true );
         break;
     case Even:
@@ -131,12 +137,15 @@ IOLayerBase::Flow IOLayerBase::flow()const {
         return None;
     }
 }
 IOLayerBase::Parity IOLayerBase::parity()const {
-    if (m_parityOdd->isChecked() )
+    if ( m_parityOdd->isChecked() ) {
         return Odd;
-    else
+    } else if  ( m_parityEven->isChecked() ) {
         return Even;
+    } else {
+        return NonePar;
+    }
 
 }
 IOLayerBase::Speed IOLayerBase::speed()const{
     switch( m_speedBox->currentItem() ) {
diff --git a/noncore/apps/opie-console/iolayerbase.h b/noncore/apps/opie-console/iolayerbase.h
index d14f334..74de46a 100644
--- a/noncore/apps/opie-console/iolayerbase.h
+++ b/noncore/apps/opie-console/iolayerbase.h
@@ -10,12 +10,14 @@ class QVBoxLayout;
 class QButtonGroup;
 class QRadioButton;
 class QHBoxLayout;
 class IOLayerBase : public QWidget {
+
     Q_OBJECT
+
 public:
     enum Flow { Hardware, Software, None };
-    enum Parity{ Odd  =2 , Even =1 };
+    enum Parity{ Odd  =2 , Even =1, NonePar =0 };
     enum Speed{ Baud_115200,
                 Baud_57600,
                 Baud_38400,
                 Baud_19200,
@@ -37,9 +39,9 @@ private:
     QButtonGroup* m_groupFlow;
     QRadioButton *m_flowHw, *m_flowSw, *m_flowNone;
 
     QButtonGroup* m_groupParity;
-    QRadioButton *m_parityOdd, *m_parityEven;
+    QRadioButton *m_parityOdd, *m_parityEven, *m_parityNone;
     QHBoxLayout* m_hbox;
     QHBoxLayout* m_hboxPar;
 };
 
diff --git a/noncore/apps/opie-console/irdaconfigwidget.cpp b/noncore/apps/opie-console/irdaconfigwidget.cpp
index 2341fd4..72e99a1 100644
--- a/noncore/apps/opie-console/irdaconfigwidget.cpp
+++ b/noncore/apps/opie-console/irdaconfigwidget.cpp
@@ -58,10 +58,12 @@ void IrdaConfigWidget::load( const Profile& prof ) {
     }
 
     if (rad_parity == 1) {
         m_base->setParity( IOLayerBase::Even );
-    } else {
+    } else if ( rad_parity == 2 ) {
         m_base->setParity( IOLayerBase::Odd );
+    } else {
+        m_base->setParity( IOLayerBase::NonePar );
     }
 
     switch( speed ) {
     case 115200:
@@ -114,8 +116,11 @@ void IrdaConfigWidget::save( Profile& prof ) {
         break;
     case IOLayerBase::Even:
         parity = 1;
         break;
+    case IOLayerBase::NonePar:
+        parity = 0;
+        break;
     }
 
     switch( m_base->speed() ) {
     case IOLayerBase::Baud_115200:
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index ac62e45..0f0ce7c 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -82,12 +82,15 @@ void ModemConfigWidget::load( const Profile& prof ) {
     } else if (rad_flow == 0) {
          m_base->setFlow( IOLayerBase::None );
     }
 
+
     if ( rad_parity == 1 ) {
         m_base->setParity( IOLayerBase::Even );
-    } else {
+    } else if ( rad_parity == 2 ){
         m_base->setParity( IOLayerBase::Odd );
+    } else {
+        m_base->setParity( IOLayerBase::NonePar );
     }
 
     switch( speed ) {
     case 115200:
@@ -144,8 +147,11 @@ void ModemConfigWidget::save( Profile& prof ) {
         break;
     case IOLayerBase::Even:
         parity = 1;
         break;
+    case IOLayerBase::NonePar:
+        parity = 0;
+        break;
     }
 
     switch( m_base->speed() ) {
     case IOLayerBase::Baud_115200:
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index 113327c..e8bdb2e 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index 89acc98..d216c92 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -60,10 +60,12 @@ void SerialConfigWidget::load( const Profile& prof ) {
     }
 
     if (rad_parity == 1) {
         m_base->setParity( IOLayerBase::Even );
-    } else {
+    } else if ( rad_parity == 2 ) {
         m_base->setParity( IOLayerBase::Odd );
+    } else {
+        m_base->setParity( IOLayerBase::NonePar );
     }
 
     switch( speed ) {
     case 115200:
@@ -115,8 +117,11 @@ void SerialConfigWidget::save( Profile& prof ) {
         break;
     case IOLayerBase::Even:
         parity = 1;
         break;
+    case IOLayerBase::NonePar:
+        parity = 0;
+        break;
     }
 
     switch( m_base->speed() ) {
     case IOLayerBase::Baud_115200: