summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-14 19:01:58 (UTC)
committer harlekin <harlekin>2002-10-14 19:01:58 (UTC)
commit7d6fea084fc40160285fe3898bd56cec3902dca0 (patch) (side-by-side diff)
tree071cdc8fc710557d4cfbde39e6bc7770e852c32b
parent678b36abe519019158765a1e57cd858dae55ca2f (diff)
downloadopie-7d6fea084fc40160285fe3898bd56cec3902dca0.zip
opie-7d6fea084fc40160285fe3898bd56cec3902dca0.tar.gz
opie-7d6fea084fc40160285fe3898bd56cec3902dca0.tar.bz2
parity none added
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/btconfigwidget.cpp7
-rw-r--r--noncore/apps/opie-console/emulation_widget.cpp32
-rw-r--r--noncore/apps/opie-console/io_modem.cpp1
-rw-r--r--noncore/apps/opie-console/iolayerbase.cpp13
-rw-r--r--noncore/apps/opie-console/iolayerbase.h6
-rw-r--r--noncore/apps/opie-console/irdaconfigwidget.cpp7
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp8
-rw-r--r--noncore/apps/opie-console/profilemanager.cpp4
-rw-r--r--noncore/apps/opie-console/serialconfigwidget.cpp7
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 ) {
m_base->setParity( IOLayerBase::Even );
- } else {
+ } else if ( rad_parity == 2 ) {
m_base->setParity( IOLayerBase::Odd );
+ } else {
+ m_base->setParity( IOLayerBase::NonePar );
}
@@ -127,2 +129,5 @@ void BTConfigWidget::save( Profile& prof ) {
break;
+ case IOLayerBase::NonePar:
+ parity = 0;
+ 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
@@ -23,12 +23,12 @@ static const ColorEntry color_table[TABLE_COLORS] =
ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback
- ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
- ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
- ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
- ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
- // intensiv
- ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ),
- ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ),
- ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ),
- ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ),
- ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 )
+ ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
+ ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
+ ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
+ ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
+ // intensiv
+ ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ),
+ ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ),
+ ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ),
+ ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ),
+ ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 )
};
@@ -44,2 +44,3 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const
+
// initialize scrollbar related vars
@@ -51,4 +52,4 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const
- // load config
- reloadConfig( config );
+ // load config
+ reloadConfig( config );
@@ -111,2 +112,3 @@ QSize EmulationWidget::calcSize( int cols, int lins ) const
int frw = width() - contentsRect().width();
+
int frh = height() - contentsRect().height();
@@ -235,3 +237,7 @@ void EmulationWidget::calcGeometry()
- switch( scrollLoc )
+ qDebug( QString(" TEST").arg( contentsRect().width() ) );
+ qDebug( QString(" TEST").arg( contentsRect().height() ) );
+ qDebug("NEUER TESTT!!!!!!!!");
+
+ switch( scrollLoc )
{
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() {
void IOModem::reload( const Profile &config ) {
+
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 {
enum ParityIds {
+ id_parity_none,
id_parity_odd,
@@ -44,2 +45,3 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name )
m_groupParity = new QButtonGroup(tr("Parity"), this );
+ m_parityNone = new QRadioButton(tr("None"), m_groupParity );
m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity );
@@ -63,2 +65,3 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name )
m_hboxPar->add(m_parityEven );
+ m_hboxPar->add(m_parityNone );
m_lroot->add(m_groupParity );
@@ -92,2 +95,5 @@ void IOLayerBase::setParity( Parity par ) {
switch( par ) {
+ case NonePar:
+ m_parityNone->setChecked( true );
+ break;
case Odd:
@@ -134,6 +140,9 @@ IOLayerBase::Flow IOLayerBase::flow()const {
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;
+ }
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;
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,
@@ -40,3 +42,3 @@ private:
QButtonGroup* m_groupParity;
- QRadioButton *m_parityOdd, *m_parityEven;
+ QRadioButton *m_parityOdd, *m_parityEven, *m_parityNone;
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 ) {
m_base->setParity( IOLayerBase::Even );
- } else {
+ } else if ( rad_parity == 2 ) {
m_base->setParity( IOLayerBase::Odd );
+ } else {
+ m_base->setParity( IOLayerBase::NonePar );
}
@@ -117,2 +119,5 @@ void IrdaConfigWidget::save( Profile& prof ) {
break;
+ case IOLayerBase::NonePar:
+ parity = 0;
+ 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
@@ -85,6 +85,9 @@ void ModemConfigWidget::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 );
}
@@ -147,2 +150,5 @@ void ModemConfigWidget::save( Profile& prof ) {
break;
+ case IOLayerBase::NonePar:
+ parity = 0;
+ 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
@@ -80,6 +80,6 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) {
- QWidgetStack *stack = new QWidgetStack(parent);
+ QWidgetStack *stack = new QWidgetStack( parent );
session->setWidgetStack( stack );
QWidget* dummy = new QWidget( stack );
- QHBoxLayout* lay = new QHBoxLayout(dummy );
+ QHBoxLayout* lay = new QHBoxLayout( dummy );
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 ) {
m_base->setParity( IOLayerBase::Even );
- } else {
+ } else if ( rad_parity == 2 ) {
m_base->setParity( IOLayerBase::Odd );
+ } else {
+ m_base->setParity( IOLayerBase::NonePar );
}
@@ -118,2 +120,5 @@ void SerialConfigWidget::save( Profile& prof ) {
break;
+ case IOLayerBase::NonePar:
+ parity = 0;
+ break;
}