-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 | |||
@@ -71,4 +71,6 @@ void BTConfigWidget::load( const Profile& prof ) { | |||
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 | } |
@@ -127,2 +129,5 @@ void BTConfigWidget::save( Profile& prof ) { | |||
127 | break; | 129 | break; |
130 | case IOLayerBase::NonePar: | ||
131 | parity = 0; | ||
132 | break; | ||
128 | } | 133 | } |
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 | |||
@@ -23,12 +23,12 @@ static const ColorEntry color_table[TABLE_COLORS] = | |||
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 | }; |
@@ -44,2 +44,3 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const | |||
44 | 44 | ||
45 | |||
45 | // initialize scrollbar related vars | 46 | // initialize scrollbar related vars |
@@ -51,4 +52,4 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const | |||
51 | 52 | ||
52 | // load config | 53 | // load config |
53 | reloadConfig( config ); | 54 | reloadConfig( config ); |
54 | 55 | ||
@@ -111,2 +112,3 @@ QSize EmulationWidget::calcSize( int cols, int lins ) const | |||
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(); |
@@ -235,3 +237,7 @@ void EmulationWidget::calcGeometry() | |||
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 | { |
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 | |||
@@ -39,2 +39,3 @@ bool IOModem::open() { | |||
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); |
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 | |||
@@ -11,2 +11,3 @@ namespace { | |||
11 | enum ParityIds { | 11 | enum ParityIds { |
12 | id_parity_none, | ||
12 | id_parity_odd, | 13 | id_parity_odd, |
@@ -44,2 +45,3 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
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 ); |
@@ -63,2 +65,3 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
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 ); |
@@ -92,2 +95,5 @@ 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: |
@@ -134,6 +140,9 @@ IOLayerBase::Flow IOLayerBase::flow()const { | |||
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 | ||
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 | |||
@@ -13,6 +13,8 @@ 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, |
@@ -40,3 +42,3 @@ private: | |||
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; |
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 | |||
@@ -61,4 +61,6 @@ void IrdaConfigWidget::load( const Profile& prof ) { | |||
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 | } |
@@ -117,2 +119,5 @@ void IrdaConfigWidget::save( Profile& prof ) { | |||
117 | break; | 119 | break; |
120 | case IOLayerBase::NonePar: | ||
121 | parity = 0; | ||
122 | break; | ||
118 | } | 123 | } |
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 | |||
@@ -85,6 +85,9 @@ void ModemConfigWidget::load( const Profile& prof ) { | |||
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 | } |
@@ -147,2 +150,5 @@ void ModemConfigWidget::save( Profile& prof ) { | |||
147 | break; | 150 | break; |
151 | case IOLayerBase::NonePar: | ||
152 | parity = 0; | ||
153 | break; | ||
148 | } | 154 | } |
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 | |||
@@ -80,6 +80,6 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
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 ); |
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 | |||
@@ -63,4 +63,6 @@ void SerialConfigWidget::load( const Profile& prof ) { | |||
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 | } |
@@ -118,2 +120,5 @@ void SerialConfigWidget::save( Profile& prof ) { | |||
118 | break; | 120 | break; |
121 | case IOLayerBase::NonePar: | ||
122 | parity = 0; | ||
123 | break; | ||
119 | } | 124 | } |