author | harlekin <harlekin> | 2002-10-14 19:01:58 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-14 19:01:58 (UTC) |
commit | 7d6fea084fc40160285fe3898bd56cec3902dca0 (patch) (unidiff) | |
tree | 071cdc8fc710557d4cfbde39e6bc7770e852c32b | |
parent | 678b36abe519019158765a1e57cd858dae55ca2f (diff) | |
download | opie-7d6fea084fc40160285fe3898bd56cec3902dca0.zip opie-7d6fea084fc40160285fe3898bd56cec3902dca0.tar.gz opie-7d6fea084fc40160285fe3898bd56cec3902dca0.tar.bz2 |
parity none added
-rw-r--r-- | noncore/apps/opie-console/btconfigwidget.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/emulation_widget.cpp | 32 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/iolayerbase.cpp | 13 | ||||
-rw-r--r-- | noncore/apps/opie-console/iolayerbase.h | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/irdaconfigwidget.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/serialconfigwidget.cpp | 7 |
9 files changed, 62 insertions, 23 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 | |||
@@ -66,14 +66,16 @@ void BTConfigWidget::load( const Profile& prof ) { | |||
66 | } else if (rad_flow == 0) { | 66 | } else if (rad_flow == 0) { |
67 | m_base->setFlow( IOLayerBase::None ); | 67 | m_base->setFlow( IOLayerBase::None ); |
68 | } | 68 | } |
69 | 69 | ||
70 | if (rad_parity == 1) { | 70 | if (rad_parity == 1) { |
71 | m_base->setParity( IOLayerBase::Even ); | 71 | m_base->setParity( IOLayerBase::Even ); |
72 | } else { | 72 | } else if ( rad_parity == 2 ) { |
73 | m_base->setParity( IOLayerBase::Odd ); | 73 | m_base->setParity( IOLayerBase::Odd ); |
74 | } else { | ||
75 | m_base->setParity( IOLayerBase::NonePar ); | ||
74 | } | 76 | } |
75 | 77 | ||
76 | switch( speed ) { | 78 | switch( speed ) { |
77 | case 115200: | 79 | case 115200: |
78 | m_base->setSpeed(IOLayerBase::Baud_115200 ); | 80 | m_base->setSpeed(IOLayerBase::Baud_115200 ); |
79 | break; | 81 | break; |
@@ -122,12 +124,15 @@ void BTConfigWidget::save( Profile& prof ) { | |||
122 | case IOLayerBase::Odd: | 124 | case IOLayerBase::Odd: |
123 | parity = 2; | 125 | parity = 2; |
124 | break; | 126 | break; |
125 | case IOLayerBase::Even: | 127 | case IOLayerBase::Even: |
126 | parity = 1; | 128 | parity = 1; |
127 | break; | 129 | break; |
130 | case IOLayerBase::NonePar: | ||
131 | parity = 0; | ||
132 | break; | ||
128 | } | 133 | } |
129 | 134 | ||
130 | switch( m_base->speed() ) { | 135 | switch( m_base->speed() ) { |
131 | case IOLayerBase::Baud_115200: | 136 | case IOLayerBase::Baud_115200: |
132 | speed = 115200; | 137 | speed = 115200; |
133 | break; | 138 | break; |
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 | |||
@@ -18,42 +18,43 @@ | |||
18 | #define SCRWIDTH 16 // width of scrollbar | 18 | #define SCRWIDTH 16 // width of scrollbar |
19 | 19 | ||
20 | 20 | ||
21 | static const ColorEntry color_table[TABLE_COLORS] = | 21 | static const ColorEntry color_table[TABLE_COLORS] = |
22 | { | 22 | { |
23 | ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback | 23 | ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback |
24 | ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red | 24 | ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red |
25 | ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow | 25 | ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow |
26 | ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta | 26 | ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta |
27 | ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White | 27 | ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White |
28 | // intensiv | 28 | // intensiv |
29 | ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ), | 29 | ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ), |
30 | ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ), | 30 | ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ), |
31 | ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ), | 31 | ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ), |
32 | ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), | 32 | ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), |
33 | ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 ) | 33 | ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 ) |
34 | }; | 34 | }; |
35 | 35 | ||
36 | EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const char* name ) : WidgetLayer( config, parent, name ) | 36 | EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const char* name ) : WidgetLayer( config, parent, name ) |
37 | { | 37 | { |
38 | 38 | ||
39 | // initialize font attributes | 39 | // initialize font attributes |
40 | QFontMetrics fm( font() ); | 40 | QFontMetrics fm( font() ); |
41 | f_height = fm.height(); | 41 | f_height = fm.height(); |
42 | f_width = fm.maxWidth(); | 42 | f_width = fm.maxWidth(); |
43 | f_ascent = fm.ascent(); | 43 | f_ascent = fm.ascent(); |
44 | 44 | ||
45 | |||
45 | // initialize scrollbar related vars | 46 | // initialize scrollbar related vars |
46 | m_scrollbar = new QScrollBar( this ); | 47 | m_scrollbar = new QScrollBar( this ); |
47 | m_scrollbar->setCursor( arrowCursor ); | 48 | m_scrollbar->setCursor( arrowCursor ); |
48 | 49 | ||
49 | // give reasonable defaults to m_columns, m_lines | 50 | // give reasonable defaults to m_columns, m_lines |
50 | calcGeometry(); | 51 | calcGeometry(); |
51 | 52 | ||
52 | // load config | 53 | // load config |
53 | reloadConfig( config ); | 54 | reloadConfig( config ); |
54 | 55 | ||
55 | m_resizing = false; | 56 | m_resizing = false; |
56 | } | 57 | } |
57 | 58 | ||
58 | void EmulationWidget::reloadConfig( const Profile& config ) | 59 | void EmulationWidget::reloadConfig( const Profile& config ) |
59 | { | 60 | { |
@@ -106,12 +107,13 @@ static QChar vt100extended(QChar c) | |||
106 | } | 107 | } |
107 | 108 | ||
108 | 109 | ||
109 | QSize EmulationWidget::calcSize( int cols, int lins ) const | 110 | QSize EmulationWidget::calcSize( int cols, int lins ) const |
110 | { | 111 | { |
111 | int frw = width() - contentsRect().width(); | 112 | int frw = width() - contentsRect().width(); |
113 | |||
112 | int frh = height() - contentsRect().height(); | 114 | int frh = height() - contentsRect().height(); |
113 | int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() ); | 115 | int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() ); |
114 | return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh ); | 116 | return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh ); |
115 | } | 117 | } |
116 | 118 | ||
117 | void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) | 119 | void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) |
@@ -230,13 +232,17 @@ void EmulationWidget::paintEvent( QPaintEvent* pe ) | |||
230 | } | 232 | } |
231 | 233 | ||
232 | void EmulationWidget::calcGeometry() | 234 | void EmulationWidget::calcGeometry() |
233 | { | 235 | { |
234 | m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() ); | 236 | m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() ); |
235 | 237 | ||
236 | switch( scrollLoc ) | 238 | qDebug( QString(" TEST").arg( contentsRect().width() ) ); |
239 | qDebug( QString(" TEST").arg( contentsRect().height() ) ); | ||
240 | qDebug("NEUER TESTT!!!!!!!!"); | ||
241 | |||
242 | switch( scrollLoc ) | ||
237 | { | 243 | { |
238 | case SCRNONE : | 244 | case SCRNONE : |
239 | m_columns = ( contentsRect().width() -2 * rimX ) / f_width; | 245 | m_columns = ( contentsRect().width() -2 * rimX ) / f_width; |
240 | m_blX = ( contentsRect().width() - ( m_columns*f_width ) ) / 2; | 246 | m_blX = ( contentsRect().width() - ( m_columns*f_width ) ) / 2; |
241 | m_brX = m_blX; | 247 | m_brX = m_blX; |
242 | m_scrollbar->hide(); | 248 | m_scrollbar->hide(); |
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 | |||
@@ -34,12 +34,13 @@ bool IOModem::open() { | |||
34 | return true; | 34 | return true; |
35 | } | 35 | } |
36 | else return false; | 36 | else return false; |
37 | } | 37 | } |
38 | 38 | ||
39 | void IOModem::reload( const Profile &config ) { | 39 | void IOModem::reload( const Profile &config ) { |
40 | |||
40 | m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); | 41 | m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); |
41 | m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); | 42 | m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); |
42 | m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); | 43 | m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); |
43 | m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); | 44 | m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); |
44 | m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); | 45 | m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); |
45 | m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); | 46 | m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); |
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 | |||
@@ -6,12 +6,13 @@ | |||
6 | #include <qradiobutton.h> | 6 | #include <qradiobutton.h> |
7 | 7 | ||
8 | #include "iolayerbase.h" | 8 | #include "iolayerbase.h" |
9 | 9 | ||
10 | namespace { | 10 | namespace { |
11 | enum ParityIds { | 11 | enum ParityIds { |
12 | id_parity_none, | ||
12 | id_parity_odd, | 13 | id_parity_odd, |
13 | id_parity_even | 14 | id_parity_even |
14 | }; | 15 | }; |
15 | 16 | ||
16 | enum FlowIds { | 17 | enum FlowIds { |
17 | id_flow_hw, | 18 | id_flow_hw, |
@@ -39,12 +40,13 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
39 | m_groupFlow = new QButtonGroup(tr("Flow control"),this ); | 40 | m_groupFlow = new QButtonGroup(tr("Flow control"),this ); |
40 | m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow ); | 41 | m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow ); |
41 | m_flowSw = new QRadioButton(tr("Software"), m_groupFlow ); | 42 | m_flowSw = new QRadioButton(tr("Software"), m_groupFlow ); |
42 | m_flowNone = new QRadioButton( tr("None"), m_groupFlow ); | 43 | m_flowNone = new QRadioButton( tr("None"), m_groupFlow ); |
43 | 44 | ||
44 | m_groupParity = new QButtonGroup(tr("Parity"), this ); | 45 | m_groupParity = new QButtonGroup(tr("Parity"), this ); |
46 | m_parityNone = new QRadioButton(tr("None"), m_groupParity ); | ||
45 | m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity ); | 47 | m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity ); |
46 | m_parityEven = new QRadioButton(tr("Even"), m_groupParity ); | 48 | m_parityEven = new QRadioButton(tr("Even"), m_groupParity ); |
47 | 49 | ||
48 | m_lroot = new QVBoxLayout( this ); | 50 | m_lroot = new QVBoxLayout( this ); |
49 | m_lroot->add(m_speedLabel ); | 51 | m_lroot->add(m_speedLabel ); |
50 | m_lroot->add(m_speedBox ); | 52 | m_lroot->add(m_speedBox ); |
@@ -58,12 +60,13 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
58 | m_lroot->add(m_groupFlow ); | 60 | m_lroot->add(m_groupFlow ); |
59 | m_lroot->setStretchFactor(m_groupFlow, 2 ); | 61 | m_lroot->setStretchFactor(m_groupFlow, 2 ); |
60 | 62 | ||
61 | m_hboxPar = new QHBoxLayout( m_groupParity, 2 ); | 63 | m_hboxPar = new QHBoxLayout( m_groupParity, 2 ); |
62 | m_hboxPar->add(m_parityOdd ); | 64 | m_hboxPar->add(m_parityOdd ); |
63 | m_hboxPar->add(m_parityEven ); | 65 | m_hboxPar->add(m_parityEven ); |
66 | m_hboxPar->add(m_parityNone ); | ||
64 | m_lroot->add(m_groupParity ); | 67 | m_lroot->add(m_groupParity ); |
65 | m_lroot->setStretchFactor(m_groupParity, 2 ); | 68 | m_lroot->setStretchFactor(m_groupParity, 2 ); |
66 | 69 | ||
67 | // profiles | 70 | // profiles |
68 | m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 ); | 71 | m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 ); |
69 | m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 ); | 72 | m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 ); |
@@ -87,12 +90,15 @@ void IOLayerBase::setFlow( Flow flo ) { | |||
87 | break; | 90 | break; |
88 | } | 91 | } |
89 | } | 92 | } |
90 | 93 | ||
91 | void IOLayerBase::setParity( Parity par ) { | 94 | void IOLayerBase::setParity( Parity par ) { |
92 | switch( par ) { | 95 | switch( par ) { |
96 | case NonePar: | ||
97 | m_parityNone->setChecked( true ); | ||
98 | break; | ||
93 | case Odd: | 99 | case Odd: |
94 | m_parityOdd->setChecked( true ); | 100 | m_parityOdd->setChecked( true ); |
95 | break; | 101 | break; |
96 | case Even: | 102 | case Even: |
97 | m_parityEven->setChecked( true ); | 103 | m_parityEven->setChecked( true ); |
98 | break; | 104 | break; |
@@ -129,16 +135,19 @@ IOLayerBase::Flow IOLayerBase::flow()const { | |||
129 | } else { | 135 | } else { |
130 | qWarning("None"); | 136 | qWarning("None"); |
131 | return None; | 137 | return None; |
132 | } | 138 | } |
133 | } | 139 | } |
134 | IOLayerBase::Parity IOLayerBase::parity()const { | 140 | IOLayerBase::Parity IOLayerBase::parity()const { |
135 | if (m_parityOdd->isChecked() ) | 141 | if ( m_parityOdd->isChecked() ) { |
136 | return Odd; | 142 | return Odd; |
137 | else | 143 | } else if ( m_parityEven->isChecked() ) { |
138 | return Even; | 144 | return Even; |
145 | } else { | ||
146 | return NonePar; | ||
147 | } | ||
139 | 148 | ||
140 | } | 149 | } |
141 | IOLayerBase::Speed IOLayerBase::speed()const{ | 150 | IOLayerBase::Speed IOLayerBase::speed()const{ |
142 | switch( m_speedBox->currentItem() ) { | 151 | switch( m_speedBox->currentItem() ) { |
143 | case id_baud_115200: | 152 | case id_baud_115200: |
144 | return Baud_115200; | 153 | return Baud_115200; |
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 | |||
@@ -8,16 +8,18 @@ class QLabel; | |||
8 | class QComboBox; | 8 | class QComboBox; |
9 | class QVBoxLayout; | 9 | class QVBoxLayout; |
10 | class QButtonGroup; | 10 | class QButtonGroup; |
11 | class QRadioButton; | 11 | class QRadioButton; |
12 | class QHBoxLayout; | 12 | class QHBoxLayout; |
13 | class IOLayerBase : public QWidget { | 13 | class IOLayerBase : public QWidget { |
14 | |||
14 | Q_OBJECT | 15 | Q_OBJECT |
16 | |||
15 | public: | 17 | public: |
16 | enum Flow { Hardware, Software, None }; | 18 | enum Flow { Hardware, Software, None }; |
17 | enum Parity{ Odd =2 , Even =1 }; | 19 | enum Parity{ Odd =2 , Even =1, NonePar =0 }; |
18 | enum Speed{ Baud_115200, | 20 | enum Speed{ Baud_115200, |
19 | Baud_57600, | 21 | Baud_57600, |
20 | Baud_38400, | 22 | Baud_38400, |
21 | Baud_19200, | 23 | Baud_19200, |
22 | Baud_9600 }; | 24 | Baud_9600 }; |
23 | IOLayerBase( QWidget* base, const char* name = 0l); | 25 | IOLayerBase( QWidget* base, const char* name = 0l); |
@@ -35,13 +37,13 @@ private: | |||
35 | QLabel* m_speedLabel; | 37 | QLabel* m_speedLabel; |
36 | QComboBox* m_speedBox; | 38 | QComboBox* m_speedBox; |
37 | QButtonGroup* m_groupFlow; | 39 | QButtonGroup* m_groupFlow; |
38 | QRadioButton *m_flowHw, *m_flowSw, *m_flowNone; | 40 | QRadioButton *m_flowHw, *m_flowSw, *m_flowNone; |
39 | 41 | ||
40 | QButtonGroup* m_groupParity; | 42 | QButtonGroup* m_groupParity; |
41 | QRadioButton *m_parityOdd, *m_parityEven; | 43 | QRadioButton *m_parityOdd, *m_parityEven, *m_parityNone; |
42 | QHBoxLayout* m_hbox; | 44 | QHBoxLayout* m_hbox; |
43 | QHBoxLayout* m_hboxPar; | 45 | QHBoxLayout* m_hboxPar; |
44 | }; | 46 | }; |
45 | 47 | ||
46 | 48 | ||
47 | #endif | 49 | #endif |
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 | |||
@@ -56,14 +56,16 @@ void IrdaConfigWidget::load( const Profile& prof ) { | |||
56 | } else { | 56 | } else { |
57 | m_base->setFlow( IOLayerBase::None ); | 57 | m_base->setFlow( IOLayerBase::None ); |
58 | } | 58 | } |
59 | 59 | ||
60 | if (rad_parity == 1) { | 60 | if (rad_parity == 1) { |
61 | m_base->setParity( IOLayerBase::Even ); | 61 | m_base->setParity( IOLayerBase::Even ); |
62 | } else { | 62 | } else if ( rad_parity == 2 ) { |
63 | m_base->setParity( IOLayerBase::Odd ); | 63 | m_base->setParity( IOLayerBase::Odd ); |
64 | } else { | ||
65 | m_base->setParity( IOLayerBase::NonePar ); | ||
64 | } | 66 | } |
65 | 67 | ||
66 | switch( speed ) { | 68 | switch( speed ) { |
67 | case 115200: | 69 | case 115200: |
68 | m_base->setSpeed(IOLayerBase::Baud_115200 ); | 70 | m_base->setSpeed(IOLayerBase::Baud_115200 ); |
69 | break; | 71 | break; |
@@ -112,12 +114,15 @@ void IrdaConfigWidget::save( Profile& prof ) { | |||
112 | case IOLayerBase::Odd: | 114 | case IOLayerBase::Odd: |
113 | parity = 2; | 115 | parity = 2; |
114 | break; | 116 | break; |
115 | case IOLayerBase::Even: | 117 | case IOLayerBase::Even: |
116 | parity = 1; | 118 | parity = 1; |
117 | break; | 119 | break; |
120 | case IOLayerBase::NonePar: | ||
121 | parity = 0; | ||
122 | break; | ||
118 | } | 123 | } |
119 | 124 | ||
120 | switch( m_base->speed() ) { | 125 | switch( m_base->speed() ) { |
121 | case IOLayerBase::Baud_115200: | 126 | case IOLayerBase::Baud_115200: |
122 | speed = 115200; | 127 | speed = 115200; |
123 | break; | 128 | break; |
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 | |||
@@ -80,16 +80,19 @@ void ModemConfigWidget::load( const Profile& prof ) { | |||
80 | } else if (rad_flow == 2) { | 80 | } else if (rad_flow == 2) { |
81 | m_base->setFlow( IOLayerBase::Software ); | 81 | m_base->setFlow( IOLayerBase::Software ); |
82 | } else if (rad_flow == 0) { | 82 | } else if (rad_flow == 0) { |
83 | m_base->setFlow( IOLayerBase::None ); | 83 | m_base->setFlow( IOLayerBase::None ); |
84 | } | 84 | } |
85 | 85 | ||
86 | |||
86 | if ( rad_parity == 1 ) { | 87 | if ( rad_parity == 1 ) { |
87 | m_base->setParity( IOLayerBase::Even ); | 88 | m_base->setParity( IOLayerBase::Even ); |
88 | } else { | 89 | } else if ( rad_parity == 2 ){ |
89 | m_base->setParity( IOLayerBase::Odd ); | 90 | m_base->setParity( IOLayerBase::Odd ); |
91 | } else { | ||
92 | m_base->setParity( IOLayerBase::NonePar ); | ||
90 | } | 93 | } |
91 | 94 | ||
92 | switch( speed ) { | 95 | switch( speed ) { |
93 | case 115200: | 96 | case 115200: |
94 | m_base->setSpeed( IOLayerBase::Baud_115200 ); | 97 | m_base->setSpeed( IOLayerBase::Baud_115200 ); |
95 | break; | 98 | break; |
@@ -142,12 +145,15 @@ void ModemConfigWidget::save( Profile& prof ) { | |||
142 | case IOLayerBase::Odd: | 145 | case IOLayerBase::Odd: |
143 | parity = 2; | 146 | parity = 2; |
144 | break; | 147 | break; |
145 | case IOLayerBase::Even: | 148 | case IOLayerBase::Even: |
146 | parity = 1; | 149 | parity = 1; |
147 | break; | 150 | break; |
151 | case IOLayerBase::NonePar: | ||
152 | parity = 0; | ||
153 | break; | ||
148 | } | 154 | } |
149 | 155 | ||
150 | switch( m_base->speed() ) { | 156 | switch( m_base->speed() ) { |
151 | case IOLayerBase::Baud_115200: | 157 | case IOLayerBase::Baud_115200: |
152 | speed = 115200; | 158 | speed = 115200; |
153 | break; | 159 | break; |
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 | |||
@@ -75,16 +75,16 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
75 | Session* session = new Session(); | 75 | Session* session = new Session(); |
76 | session->setName( prof.name() ); | 76 | session->setName( prof.name() ); |
77 | /* translate the internal name to the external */ | 77 | /* translate the internal name to the external */ |
78 | session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) , | 78 | session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) , |
79 | prof) ); | 79 | prof) ); |
80 | 80 | ||
81 | QWidgetStack *stack = new QWidgetStack(parent); | 81 | QWidgetStack *stack = new QWidgetStack( parent ); |
82 | session->setWidgetStack( stack ); | 82 | session->setWidgetStack( stack ); |
83 | QWidget* dummy = new QWidget( stack ); | 83 | QWidget* dummy = new QWidget( stack ); |
84 | QHBoxLayout* lay = new QHBoxLayout(dummy ); | 84 | QHBoxLayout* lay = new QHBoxLayout( dummy ); |
85 | stack->addWidget( dummy, 0 ); | 85 | stack->addWidget( dummy, 0 ); |
86 | stack->raiseWidget( 0 ); | 86 | stack->raiseWidget( 0 ); |
87 | EmulationHandler* handler = new EmulationHandler(prof,dummy ); | 87 | EmulationHandler* handler = new EmulationHandler(prof,dummy ); |
88 | lay->addWidget( handler->widget() ); | 88 | lay->addWidget( handler->widget() ); |
89 | // WidgetLayer* wid = new EmulationWidget( prof, dummy ); | 89 | // WidgetLayer* wid = new EmulationWidget( prof, dummy ); |
90 | // lay->addWidget( wid ); | 90 | // lay->addWidget( wid ); |
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 | |||
@@ -58,14 +58,16 @@ void SerialConfigWidget::load( const Profile& prof ) { | |||
58 | } else { | 58 | } else { |
59 | m_base->setFlow( IOLayerBase::None ); | 59 | m_base->setFlow( IOLayerBase::None ); |
60 | } | 60 | } |
61 | 61 | ||
62 | if (rad_parity == 1) { | 62 | if (rad_parity == 1) { |
63 | m_base->setParity( IOLayerBase::Even ); | 63 | m_base->setParity( IOLayerBase::Even ); |
64 | } else { | 64 | } else if ( rad_parity == 2 ) { |
65 | m_base->setParity( IOLayerBase::Odd ); | 65 | m_base->setParity( IOLayerBase::Odd ); |
66 | } else { | ||
67 | m_base->setParity( IOLayerBase::NonePar ); | ||
66 | } | 68 | } |
67 | 69 | ||
68 | switch( speed ) { | 70 | switch( speed ) { |
69 | case 115200: | 71 | case 115200: |
70 | m_base->setSpeed(IOLayerBase::Baud_115200 ); | 72 | m_base->setSpeed(IOLayerBase::Baud_115200 ); |
71 | break; | 73 | break; |
@@ -113,12 +115,15 @@ void SerialConfigWidget::save( Profile& prof ) { | |||
113 | case IOLayerBase::Odd: | 115 | case IOLayerBase::Odd: |
114 | parity = 2; | 116 | parity = 2; |
115 | break; | 117 | break; |
116 | case IOLayerBase::Even: | 118 | case IOLayerBase::Even: |
117 | parity = 1; | 119 | parity = 1; |
118 | break; | 120 | break; |
121 | case IOLayerBase::NonePar: | ||
122 | parity = 0; | ||
123 | break; | ||
119 | } | 124 | } |
120 | 125 | ||
121 | switch( m_base->speed() ) { | 126 | switch( m_base->speed() ) { |
122 | case IOLayerBase::Baud_115200: | 127 | case IOLayerBase::Baud_115200: |
123 | speed = 115200; | 128 | speed = 115200; |
124 | break; | 129 | break; |