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 | |||
@@ -70,6 +70,8 @@ void BTConfigWidget::load( const Profile& prof ) { | |||
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 | ||
@@ -126,4 +128,7 @@ void BTConfigWidget::save( Profile& prof ) { | |||
126 | parity = 1; | 128 | parity = 1; |
127 | break; | 129 | break; |
130 | case IOLayerBase::NonePar: | ||
131 | parity = 0; | ||
132 | break; | ||
128 | } | 133 | } |
129 | 134 | ||
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 | |||
@@ -22,14 +22,14 @@ 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 | ||
@@ -43,4 +43,5 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const | |||
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 ); |
@@ -50,6 +51,6 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const | |||
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; |
@@ -110,4 +111,5 @@ 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() ); |
@@ -234,5 +236,9 @@ void EmulationWidget::calcGeometry() | |||
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 : |
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 | |||
@@ -38,4 +38,5 @@ bool IOModem::open() { | |||
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); |
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 | |||
@@ -10,4 +10,5 @@ | |||
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 |
@@ -43,4 +44,5 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
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 ); |
@@ -62,4 +64,5 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
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 ); |
@@ -91,4 +94,7 @@ void IOLayerBase::setFlow( Flow flo ) { | |||
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 ); |
@@ -133,8 +139,11 @@ IOLayerBase::Flow IOLayerBase::flow()const { | |||
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 | } |
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 | |||
@@ -12,8 +12,10 @@ 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, |
@@ -39,5 +41,5 @@ private: | |||
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; |
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 | |||
@@ -60,6 +60,8 @@ void IrdaConfigWidget::load( const Profile& prof ) { | |||
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 | ||
@@ -116,4 +118,7 @@ void IrdaConfigWidget::save( Profile& prof ) { | |||
116 | parity = 1; | 118 | parity = 1; |
117 | break; | 119 | break; |
120 | case IOLayerBase::NonePar: | ||
121 | parity = 0; | ||
122 | break; | ||
118 | } | 123 | } |
119 | 124 | ||
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 | |||
@@ -84,8 +84,11 @@ void ModemConfigWidget::load( const Profile& prof ) { | |||
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 | ||
@@ -146,4 +149,7 @@ void ModemConfigWidget::save( Profile& prof ) { | |||
146 | parity = 1; | 149 | parity = 1; |
147 | break; | 150 | break; |
151 | case IOLayerBase::NonePar: | ||
152 | parity = 0; | ||
153 | break; | ||
148 | } | 154 | } |
149 | 155 | ||
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 | |||
@@ -79,8 +79,8 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
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 ); |
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 | |||
@@ -62,6 +62,8 @@ void SerialConfigWidget::load( const Profile& prof ) { | |||
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 | ||
@@ -117,4 +119,7 @@ void SerialConfigWidget::save( Profile& prof ) { | |||
117 | parity = 1; | 119 | parity = 1; |
118 | break; | 120 | break; |
121 | case IOLayerBase::NonePar: | ||
122 | parity = 0; | ||
123 | break; | ||
119 | } | 124 | } |
120 | 125 | ||