summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/terminalwidget.cpp20
-rw-r--r--noncore/apps/opie-console/terminalwidget.h6
2 files changed, 14 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp
index fc0f3ce..eb14a3f 100644
--- a/noncore/apps/opie-console/terminalwidget.cpp
+++ b/noncore/apps/opie-console/terminalwidget.cpp
@@ -6,7 +6,9 @@
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 <qlayout.h> 10#include <qlayout.h>
11#include <qhbox.h>
10 12
11#include "terminalwidget.h" 13#include "terminalwidget.h"
12 14
@@ -41,31 +43,28 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
41 m_colorLabel = new QLabel(tr("Color scheme"), this); 43 m_colorLabel = new QLabel(tr("Color scheme"), this);
42 m_colorCmb = new QComboBox(this ); 44 m_colorCmb = new QComboBox(this );
43 45
44 m_groupSize = new QButtonGroup(tr("Font size"), this ); 46 m_groupSize = new QHButtonGroup(tr("Font size"), this );
45 m_sizeSmall = new QRadioButton(tr("small"), m_groupSize ); 47 m_sizeSmall = new QRadioButton(tr("small"), m_groupSize );
46 m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize ); 48 m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize );
47 m_sizeLarge = new QRadioButton(tr("large"), m_groupSize ); 49 m_sizeLarge = new QRadioButton(tr("large"), m_groupSize );
48 50
49 m_groupConv = new QHGroupBox(tr("Line-break conversions"), this ); 51 m_groupConv = new QHGroupBox(tr("Line-break conversions"), this );
50 m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv ); 52 m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv );
51 m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv ); 53 m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv );
54 m_groupConv->hide();
52 55
53 m_groupOptions = new QHGroupBox( tr("Options"), this ); 56 m_groupOptions = new QHGroupBox( tr("Options"), this );
54 m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions ); 57 m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions );
55 m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions ); 58 m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions );
59 m_groupOptions->hide();
56 60
57 m_lroot = new QVBoxLayout(this, 2 ); 61 m_lroot = new QVBoxLayout( this );
58 m_typeBox = new QVBoxLayout( m_lroot ); 62 m_typeBox = new QVBoxLayout( m_lroot );
59 m_hbox = new QHBoxLayout( m_groupSize, 2 );
60 m_colorBox = new QVBoxLayout( m_lroot ); 63 m_colorBox = new QVBoxLayout( m_lroot );
61 64
62 // Layout 65 // Layout
63 m_typeBox->add(m_terminal ); 66 m_typeBox->add(m_terminal );
64 m_typeBox->add(m_terminalBox ); 67 m_typeBox->add(m_terminalBox );
65
66 m_hbox->add(m_sizeSmall );
67 m_hbox->add(m_sizeMedium );
68 m_hbox->add(m_sizeLarge );
69 m_lroot->add(m_groupSize ); 68 m_lroot->add(m_groupSize );
70 69
71 m_colorBox->add( m_colorLabel ); 70 m_colorBox->add( m_colorLabel );
@@ -73,6 +72,7 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
73 72
74 m_lroot->add(m_groupConv ); 73 m_lroot->add(m_groupConv );
75 m_lroot->add(m_groupOptions ); 74 m_lroot->add(m_groupOptions );
75 m_lroot->addStretch( 0 );
76 76
77 // Fill in some options 77 // Fill in some options
78 qWarning("Options for terminal box"); 78 qWarning("Options for terminal box");
diff --git a/noncore/apps/opie-console/terminalwidget.h b/noncore/apps/opie-console/terminalwidget.h
index c6c2be2..217fea7 100644
--- a/noncore/apps/opie-console/terminalwidget.h
+++ b/noncore/apps/opie-console/terminalwidget.h
@@ -11,9 +11,12 @@ class QButtonGroup;
11class QRadioButton; 11class QRadioButton;
12class QCheckBox; 12class QCheckBox;
13class QHGroupBox; 13class QHGroupBox;
14class QHBox;
14 15
15class TerminalWidget : public ProfileDialogTerminalWidget { 16class TerminalWidget : public ProfileDialogTerminalWidget {
17
16 Q_OBJECT 18 Q_OBJECT
19
17public: 20public:
18 TerminalWidget(const QString& name, QWidget* wid, 21 TerminalWidget(const QString& name, QWidget* wid,
19 const char* na ) ; 22 const char* na ) ;
@@ -21,11 +24,10 @@ public:
21 24
22 void load( const Profile& ); 25 void load( const Profile& );
23 void save( Profile& ); 26 void save( Profile& );
27
24private: 28private:
25 QVBoxLayout* m_lroot, *m_typeBox, *m_colorBox; 29 QVBoxLayout* m_lroot, *m_typeBox, *m_colorBox;
26 30
27 QHBoxLayout* m_hbox;
28
29 QLabel* m_terminal, *m_colorLabel; 31 QLabel* m_terminal, *m_colorLabel;
30 32
31 QComboBox* m_terminalBox, *m_colorCmb; 33 QComboBox* m_terminalBox, *m_colorCmb;