summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -3,13 +3,15 @@
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qradiobutton.h>
#include <qgroupbox.h>
#include <qvbox.h>
#include <qhgroupbox.h>
+#include <qhbuttongroup.h>
#include <qlayout.h>
+#include <qhbox.h>
#include "terminalwidget.h"
namespace {
enum TermIds {
id_term_vt100 = 0,
@@ -38,44 +40,42 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
m_terminal = new QLabel(tr("Terminal Type"), this );
m_terminalBox = new QComboBox(this);
m_colorLabel = new QLabel(tr("Color scheme"), this);
m_colorCmb = new QComboBox(this );
- m_groupSize = new QButtonGroup(tr("Font size"), this );
- m_sizeSmall = new QRadioButton(tr("small"), m_groupSize );
- m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize );
- m_sizeLarge = new QRadioButton(tr("large"), m_groupSize );
+ m_groupSize = new QHButtonGroup(tr("Font size"), this );
+ m_sizeSmall = new QRadioButton(tr("small"), m_groupSize );
+ m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize );
+ m_sizeLarge = new QRadioButton(tr("large"), m_groupSize );
m_groupConv = new QHGroupBox(tr("Line-break conversions"), this );
m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv );
m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv );
+ m_groupConv->hide();
m_groupOptions = new QHGroupBox( tr("Options"), this );
m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions );
m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions );
+ m_groupOptions->hide();
- m_lroot = new QVBoxLayout(this, 2 );
+ m_lroot = new QVBoxLayout( this );
m_typeBox = new QVBoxLayout( m_lroot );
- m_hbox = new QHBoxLayout( m_groupSize, 2 );
m_colorBox = new QVBoxLayout( m_lroot );
// Layout
m_typeBox->add(m_terminal );
m_typeBox->add(m_terminalBox );
-
- m_hbox->add(m_sizeSmall );
- m_hbox->add(m_sizeMedium );
- m_hbox->add(m_sizeLarge );
m_lroot->add(m_groupSize );
m_colorBox->add( m_colorLabel );
m_colorBox->add( m_colorCmb );
m_lroot->add(m_groupConv );
m_lroot->add(m_groupOptions );
+ m_lroot->addStretch( 0 );
// Fill in some options
qWarning("Options for terminal box");
m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ );
m_terminalBox->insertItem( tr("VT 102"), 1 ); // /* , id_term_vt102 */);
m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux );
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
@@ -8,27 +8,29 @@ class QLabel;
class QVBoxLayout;
class QHBoxLayout;
class QButtonGroup;
class QRadioButton;
class QCheckBox;
class QHGroupBox;
+class QHBox;
class TerminalWidget : public ProfileDialogTerminalWidget {
+
Q_OBJECT
+
public:
TerminalWidget(const QString& name, QWidget* wid,
const char* na ) ;
~TerminalWidget();
void load( const Profile& );
void save( Profile& );
+
private:
QVBoxLayout* m_lroot, *m_typeBox, *m_colorBox;
- QHBoxLayout* m_hbox;
-
QLabel* m_terminal, *m_colorLabel;
QComboBox* m_terminalBox, *m_colorCmb;
QButtonGroup* m_groupSize;