summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-25 22:58:59 (UTC)
committer harlekin <harlekin>2002-10-25 22:58:59 (UTC)
commit65ada01d36dc25f053a09222e8abdb21f2fc3a2a (patch) (unidiff)
treee51b8c0d8ebd28f5a129803733a2a60c016dfd7f
parente8ec7351bc460984a3202804e23c351b0d5606bd (diff)
downloadopie-65ada01d36dc25f053a09222e8abdb21f2fc3a2a.zip
opie-65ada01d36dc25f053a09222e8abdb21f2fc3a2a.tar.gz
opie-65ada01d36dc25f053a09222e8abdb21f2fc3a2a.tar.bz2
show widgets again since we need them now
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp3
-rw-r--r--noncore/apps/opie-console/terminalwidget.cpp2
2 files changed, 0 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index ce44dab..37eb184 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -1,91 +1,88 @@
1#include <qlabel.h> 1#include <qlabel.h>
2#include <qlayout.h> 2#include <qlayout.h>
3#include <qcombobox.h> 3#include <qcombobox.h>
4#include <qlineedit.h> 4#include <qlineedit.h>
5#include <qpushbutton.h> 5#include <qpushbutton.h>
6#include <qhbox.h> 6#include <qhbox.h>
7#include <qregexp.h> 7#include <qregexp.h>
8 8
9#include "modemconfigwidget.h" 9#include "modemconfigwidget.h"
10#include "dialdialog.h" 10#include "dialdialog.h"
11 11
12namespace { 12namespace {
13 void setCurrent( const QString& str, QComboBox* bo ) { 13 void setCurrent( const QString& str, QComboBox* bo ) {
14 uint b = bo->count(); 14 uint b = bo->count();
15 for (int i = 0; i < bo->count(); i++ ) { 15 for (int i = 0; i < bo->count(); i++ ) {
16 if ( bo->text(i) == str ) { 16 if ( bo->text(i) == str ) {
17 bo->setCurrentItem( i ); 17 bo->setCurrentItem( i );
18 return; 18 return;
19 } 19 }
20 } 20 }
21 bo->insertItem( str ); 21 bo->insertItem( str );
22 bo->setCurrentItem( b ); 22 bo->setCurrentItem( b );
23 } 23 }
24} 24}
25 25
26ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent, 26ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent,
27 const char* na ) 27 const char* na )
28 : ProfileDialogConnectionWidget( name, parent, na ) { 28 : ProfileDialogConnectionWidget( name, parent, na ) {
29 29
30 m_lay = new QVBoxLayout( this ); 30 m_lay = new QVBoxLayout( this );
31 m_device = new QLabel(tr( "Modem is attached to:" ), this ); 31 m_device = new QLabel(tr( "Modem is attached to:" ), this );
32 m_deviceCmb = new QComboBox(this ); 32 m_deviceCmb = new QComboBox(this );
33 m_deviceCmb->setEditable( TRUE ); 33 m_deviceCmb->setEditable( TRUE );
34 34
35 QLabel* telLabel = new QLabel( this ); 35 QLabel* telLabel = new QLabel( this );
36 telLabel->setText( tr( "Enter telefon number here:" ) ); 36 telLabel->setText( tr( "Enter telefon number here:" ) );
37 // m_telNumber = new QLineEdit( this );
38 QHBox *buttonBox = new QHBox( this ); 37 QHBox *buttonBox = new QHBox( this );
39 m_telNumber = new QLineEdit( buttonBox ); 38 m_telNumber = new QLineEdit( buttonBox );
40 QPushButton *atButton = new QPushButton( buttonBox ); 39 QPushButton *atButton = new QPushButton( buttonBox );
41 atButton->setText( tr( "AT commands" ) ); 40 atButton->setText( tr( "AT commands" ) );
42 // disabled for now
43 atButton->hide();
44 connect( atButton, SIGNAL( clicked() ), this, SLOT( slotAT() ) ); 41 connect( atButton, SIGNAL( clicked() ), this, SLOT( slotAT() ) );
45 42
46 QPushButton *dialButton = new QPushButton( buttonBox ); 43 QPushButton *dialButton = new QPushButton( buttonBox );
47 dialButton->setText( tr( "Enter number" ) ); 44 dialButton->setText( tr( "Enter number" ) );
48 connect( dialButton, SIGNAL( clicked() ), this, SLOT( slotDial() ) ); 45 connect( dialButton, SIGNAL( clicked() ), this, SLOT( slotDial() ) );
49 46
50 m_base = new IOLayerBase( this, "base" ); 47 m_base = new IOLayerBase( this, "base" );
51 48
52 m_lay->addWidget( m_device ); 49 m_lay->addWidget( m_device );
53 m_lay->addWidget( m_deviceCmb ); 50 m_lay->addWidget( m_deviceCmb );
54 m_lay->addWidget( telLabel ); 51 m_lay->addWidget( telLabel );
55 m_lay->addWidget( buttonBox ); 52 m_lay->addWidget( buttonBox );
56 m_lay->addWidget( m_base ); 53 m_lay->addWidget( m_base );
57 m_lay->addStretch( 0 ); 54 m_lay->addStretch( 0 );
58 55
59 m_deviceCmb->insertItem( "/dev/ttyS0" ); 56 m_deviceCmb->insertItem( "/dev/ttyS0" );
60 m_deviceCmb->insertItem( "/dev/ttyS1" ); 57 m_deviceCmb->insertItem( "/dev/ttyS1" );
61 m_deviceCmb->insertItem( "/dev/ttyS2" ); 58 m_deviceCmb->insertItem( "/dev/ttyS2" );
62 59
63 atConf = new ATConfigDialog( this, "ATConfig", true ); 60 atConf = new ATConfigDialog( this, "ATConfig", true );
64} 61}
65 62
66ModemConfigWidget::~ModemConfigWidget() { 63ModemConfigWidget::~ModemConfigWidget() {
67 64
68} 65}
69void ModemConfigWidget::load( const Profile& prof ) { 66void ModemConfigWidget::load( const Profile& prof ) {
70 67
71 int rad_flow = prof.readNumEntry( "Flow" ); 68 int rad_flow = prof.readNumEntry( "Flow" );
72 int rad_parity = prof.readNumEntry( "Parity" ); 69 int rad_parity = prof.readNumEntry( "Parity" );
73 int speed = prof.readNumEntry( "Speed" ); 70 int speed = prof.readNumEntry( "Speed" );
74 int dbits = prof.readNumEntry("DataBits"); 71 int dbits = prof.readNumEntry("DataBits");
75 int sbits = prof.readNumEntry("StopBits"); 72 int sbits = prof.readNumEntry("StopBits");
76 QString number = prof.readEntry( "Number" ); 73 QString number = prof.readEntry( "Number" );
77 74
78 if ( !number.isEmpty() ) { 75 if ( !number.isEmpty() ) {
79 m_telNumber->setText( number ); 76 m_telNumber->setText( number );
80 } 77 }
81 78
82 if ( rad_flow == 1 ) { 79 if ( rad_flow == 1 ) {
83 m_base->setFlow( IOLayerBase::Hardware ); 80 m_base->setFlow( IOLayerBase::Hardware );
84 } else if (rad_flow == 2) { 81 } else if (rad_flow == 2) {
85 m_base->setFlow( IOLayerBase::Software ); 82 m_base->setFlow( IOLayerBase::Software );
86 } else if (rad_flow == 0) { 83 } else if (rad_flow == 0) {
87 m_base->setFlow( IOLayerBase::None ); 84 m_base->setFlow( IOLayerBase::None );
88 } 85 }
89 86
90 87
91 if ( rad_parity == 1 ) { 88 if ( rad_parity == 1 ) {
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp
index eb14a3f..a8cee93 100644
--- a/noncore/apps/opie-console/terminalwidget.cpp
+++ b/noncore/apps/opie-console/terminalwidget.cpp
@@ -6,102 +6,100 @@
6#include <qgroupbox.h> 6#include <qgroupbox.h>
7#include <qvbox.h> 7#include <qvbox.h>
8#include <qhgroupbox.h> 8#include <qhgroupbox.h>
9#include <qhbuttongroup.h> 9#include <qhbuttongroup.h>
10#include <qlayout.h> 10#include <qlayout.h>
11#include <qhbox.h> 11#include <qhbox.h>
12 12
13#include "terminalwidget.h" 13#include "terminalwidget.h"
14 14
15namespace { 15namespace {
16 enum TermIds { 16 enum TermIds {
17 id_term_vt100 = 0, 17 id_term_vt100 = 0,
18 id_term_vt102, 18 id_term_vt102,
19 id_term_linux, 19 id_term_linux,
20 id_term_xterm 20 id_term_xterm
21 }; 21 };
22 22
23 enum ColourIds { 23 enum ColourIds {
24 id_term_black, 24 id_term_black,
25 id_term_white, 25 id_term_white,
26 id_term_green, 26 id_term_green,
27 id_term_orange 27 id_term_orange
28 }; 28 };
29 29
30 enum FontIds { 30 enum FontIds {
31 id_size_small, 31 id_size_small,
32 id_size_medium, 32 id_size_medium,
33 id_size_large 33 id_size_large
34 }; 34 };
35}; 35};
36 36
37TerminalWidget::TerminalWidget( const QString& name, QWidget* parent, 37TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
38 const char* na ) 38 const char* na )
39 : ProfileDialogTerminalWidget( name, parent, na ) { 39 : ProfileDialogTerminalWidget( name, parent, na ) {
40 40
41 m_terminal = new QLabel(tr("Terminal Type"), this ); 41 m_terminal = new QLabel(tr("Terminal Type"), this );
42 m_terminalBox = new QComboBox(this); 42 m_terminalBox = new QComboBox(this);
43 m_colorLabel = new QLabel(tr("Color scheme"), this); 43 m_colorLabel = new QLabel(tr("Color scheme"), this);
44 m_colorCmb = new QComboBox(this ); 44 m_colorCmb = new QComboBox(this );
45 45
46 m_groupSize = new QHButtonGroup(tr("Font size"), this ); 46 m_groupSize = new QHButtonGroup(tr("Font size"), this );
47 m_sizeSmall = new QRadioButton(tr("small"), m_groupSize ); 47 m_sizeSmall = new QRadioButton(tr("small"), m_groupSize );
48 m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize ); 48 m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize );
49 m_sizeLarge = new QRadioButton(tr("large"), m_groupSize ); 49 m_sizeLarge = new QRadioButton(tr("large"), m_groupSize );
50 50
51 m_groupConv = new QHGroupBox(tr("Line-break conversions"), this ); 51 m_groupConv = new QHGroupBox(tr("Line-break conversions"), this );
52 m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv ); 52 m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv );
53 m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv ); 53 m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv );
54 m_groupConv->hide();
55 54
56 m_groupOptions = new QHGroupBox( tr("Options"), this ); 55 m_groupOptions = new QHGroupBox( tr("Options"), this );
57 m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions ); 56 m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions );
58 m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions ); 57 m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions );
59 m_groupOptions->hide();
60 58
61 m_lroot = new QVBoxLayout( this ); 59 m_lroot = new QVBoxLayout( this );
62 m_typeBox = new QVBoxLayout( m_lroot ); 60 m_typeBox = new QVBoxLayout( m_lroot );
63 m_colorBox = new QVBoxLayout( m_lroot ); 61 m_colorBox = new QVBoxLayout( m_lroot );
64 62
65 // Layout 63 // Layout
66 m_typeBox->add(m_terminal ); 64 m_typeBox->add(m_terminal );
67 m_typeBox->add(m_terminalBox ); 65 m_typeBox->add(m_terminalBox );
68 m_lroot->add(m_groupSize ); 66 m_lroot->add(m_groupSize );
69 67
70 m_colorBox->add( m_colorLabel ); 68 m_colorBox->add( m_colorLabel );
71 m_colorBox->add( m_colorCmb ); 69 m_colorBox->add( m_colorCmb );
72 70
73 m_lroot->add(m_groupConv ); 71 m_lroot->add(m_groupConv );
74 m_lroot->add(m_groupOptions ); 72 m_lroot->add(m_groupOptions );
75 m_lroot->addStretch( 0 ); 73 m_lroot->addStretch( 0 );
76 74
77 // Fill in some options 75 // Fill in some options
78 qWarning("Options for terminal box"); 76 qWarning("Options for terminal box");
79 m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ ); 77 m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ );
80 m_terminalBox->insertItem( tr("VT 102"), 1 ); // /* , id_term_vt102 */); 78 m_terminalBox->insertItem( tr("VT 102"), 1 ); // /* , id_term_vt102 */);
81 m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux ); 79 m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux );
82 m_terminalBox->insertItem( tr("X-Terminal"), 3 ); //, id_term_xterm ); 80 m_terminalBox->insertItem( tr("X-Terminal"), 3 ); //, id_term_xterm );
83 //m_terminalBox->insertItem( tr("ANSI"), id_term_ansi ); 81 //m_terminalBox->insertItem( tr("ANSI"), id_term_ansi );
84 82
85 m_colorCmb->insertItem( tr("black on white"), id_term_black ); 83 m_colorCmb->insertItem( tr("black on white"), id_term_black );
86 m_colorCmb->insertItem( tr("white on black"), id_term_white ); 84 m_colorCmb->insertItem( tr("white on black"), id_term_white );
87 m_colorCmb->insertItem( tr("green on black"), id_term_green ); 85 m_colorCmb->insertItem( tr("green on black"), id_term_green );
88 m_colorCmb->insertItem( tr("orange on black"), id_term_orange ); 86 m_colorCmb->insertItem( tr("orange on black"), id_term_orange );
89 87
90 // signals + slots 88 // signals + slots
91 /* 89 /*
92 connect(m_terminalBox, SIGNAL(activated(int) ), 90 connect(m_terminalBox, SIGNAL(activated(int) ),
93 this, SLOT(slotTermTerm(int) ) ); 91 this, SLOT(slotTermTerm(int) ) );
94 connect(m_colorBox, SIGNAL(activated(int) ), 92 connect(m_colorBox, SIGNAL(activated(int) ),
95 tis, SLOT(slotTermColor(int) ) ); 93 tis, SLOT(slotTermColor(int) ) );
96 connect(m_groupSize, SIGNAL(activated(int) ), 94 connect(m_groupSize, SIGNAL(activated(int) ),
97 this, SLOT(slotTermFont(int) ) ); 95 this, SLOT(slotTermFont(int) ) );
98 96
99 connect(m_optionEcho, SIGNAL(toggled(bool) ), 97 connect(m_optionEcho, SIGNAL(toggled(bool) ),
100 this, SLOT(slotTermEcho(bool) ) ); 98 this, SLOT(slotTermEcho(bool) ) );
101 connect(m_optionWrap, SIGNAL(toggled(bool) ), 99 connect(m_optionWrap, SIGNAL(toggled(bool) ),
102 this, SLOT(slotTermWrap(bool) ) ); 100 this, SLOT(slotTermWrap(bool) ) );
103 connect(m_convInbound, SIGNAL(toggled(bool) ), 101 connect(m_convInbound, SIGNAL(toggled(bool) ),
104 this, SLOT(slotTermInbound(bool) ) ); 102 this, SLOT(slotTermInbound(bool) ) );
105 connect(m_convOutbound, SIGNAL(toggled(bool) ), 103 connect(m_convOutbound, SIGNAL(toggled(bool) ),
106 this, SLOT(slotTermOutbound(bool) ) ); 104 this, SLOT(slotTermOutbound(bool) ) );
107*/ 105*/