summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp1
-rw-r--r--noncore/apps/opie-console/profile.h2
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp1
-rw-r--r--noncore/apps/opie-console/terminalwidget.cpp21
4 files changed, 15 insertions, 10 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 27bcc09..415259e 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -271,12 +271,13 @@ void MainWindow::slotConfigure() {
271 271
272 int ret = conf.exec(); 272 int ret = conf.exec();
273 273
274 if ( QDialog::Accepted == ret ) { 274 if ( QDialog::Accepted == ret ) {
275 qWarning("conf %d", conf.list().count() ); 275 qWarning("conf %d", conf.list().count() );
276 manager()->setProfiles( conf.list() ); 276 manager()->setProfiles( conf.list() );
277 manager()->save();
277 populateProfiles(); 278 populateProfiles();
278 } 279 }
279} 280}
280/* 281/*
281 * we will remove 282 * we will remove
282 * this window from the tabwidget 283 * this window from the tabwidget
diff --git a/noncore/apps/opie-console/profile.h b/noncore/apps/opie-console/profile.h
index 78fe6ab..1b71cda 100644
--- a/noncore/apps/opie-console/profile.h
+++ b/noncore/apps/opie-console/profile.h
@@ -15,13 +15,13 @@
15class Profile { 15class Profile {
16public: 16public:
17 typedef QValueList<Profile> ValueList; 17 typedef QValueList<Profile> ValueList;
18 enum Color { Black = 0, 18 enum Color { Black = 0,
19 White, 19 White,
20 Gray }; 20 Gray };
21 enum Terminal {VT102 = 0 }; 21 enum Terminal {VT102 = 0, VT100 };
22 enum Font { Micro = 0, Small, Medium }; 22 enum Font { Micro = 0, Small, Medium };
23 Profile(); 23 Profile();
24 Profile( const QString& name, 24 Profile( const QString& name,
25 const QCString& iolayerName, 25 const QCString& iolayerName,
26 const QCString& termName, 26 const QCString& termName,
27 int background, 27 int background,
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 914fd25..094c871 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -55,12 +55,13 @@ Profile ProfileEditorDialog::profile() const
55void ProfileEditorDialog::initUI() 55void ProfileEditorDialog::initUI()
56{ 56{
57 m_con = m_term = 0l; 57 m_con = m_term = 0l;
58 58
59 QVBoxLayout *mainLayout = new QVBoxLayout( this ); 59 QVBoxLayout *mainLayout = new QVBoxLayout( this );
60 OTabWidget *tabWidget = new OTabWidget( this ); 60 OTabWidget *tabWidget = new OTabWidget( this );
61 tabWidget->setTabStyle(OTabWidget::TextTab);
61 mainLayout->add(tabWidget); 62 mainLayout->add(tabWidget);
62 63
63 QWidget *tabprof; 64 QWidget *tabprof;
64 65
65 /* base tabs */ 66 /* base tabs */
66 tabprof = new QWidget(this); 67 tabprof = new QWidget(this);
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp
index 80627c4..2d37be2 100644
--- a/noncore/apps/opie-console/terminalwidget.cpp
+++ b/noncore/apps/opie-console/terminalwidget.cpp
@@ -10,13 +10,13 @@
10 10
11#include "terminalwidget.h" 11#include "terminalwidget.h"
12 12
13namespace { 13namespace {
14 enum TermIds { 14 enum TermIds {
15 id_term_vt100, 15 id_term_vt100,
16 id_term_vt220, 16 id_term_vt102,
17 id_term_ansi 17 id_term_ansi
18 }; 18 };
19 19
20 enum ColourIds { 20 enum ColourIds {
21 id_term_black, 21 id_term_black,
22 id_term_white 22 id_term_white
@@ -70,14 +70,14 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
70 70
71 m_lroot->add(m_groupConv ); 71 m_lroot->add(m_groupConv );
72 m_lroot->add(m_groupOptions ); 72 m_lroot->add(m_groupOptions );
73 73
74 // Fill in some options 74 // Fill in some options
75 m_terminalBox->insertItem( tr("VT 100"), id_term_vt100 ); 75 m_terminalBox->insertItem( tr("VT 100"), id_term_vt100 );
76 m_terminalBox->insertItem( tr("VT 220"), id_term_vt220 ); 76 m_terminalBox->insertItem( tr("VT 102"), id_term_vt102 );
77 m_terminalBox->insertItem( tr("ANSI"), id_term_ansi ); 77 //m_terminalBox->insertItem( tr("ANSI"), id_term_ansi );
78 78
79 m_colorCmb->insertItem( tr("black on white"), id_term_black ); 79 m_colorCmb->insertItem( tr("black on white"), id_term_black );
80 m_colorCmb->insertItem( tr("white on black"), id_term_white ); 80 m_colorCmb->insertItem( tr("white on black"), id_term_white );
81 81
82 // signals + slots 82 // signals + slots
83 /* 83 /*
@@ -107,15 +107,18 @@ void TerminalWidget::load( const Profile& prof ) {
107 int opt_echo = prof.readNumEntry("Echo"); 107 int opt_echo = prof.readNumEntry("Echo");
108 int opt_wrap = prof.readNumEntry("Wrap"); 108 int opt_wrap = prof.readNumEntry("Wrap");
109 int opt_inbound = prof.readNumEntry("Inbound"); 109 int opt_inbound = prof.readNumEntry("Inbound");
110 int opt_outbound = prof.readNumEntry("Outbound"); 110 int opt_outbound = prof.readNumEntry("Outbound");
111 111
112 switch( term ) { 112 switch( term ) {
113 case Profile::VT102: 113 case Profile::VT100:
114 m_terminalBox->setCurrentItem(id_term_vt100 ); 114 m_terminalBox->setCurrentItem(id_term_vt100 );
115 break; 115 break;
116 case Profile::VT102:
117 m_terminalBox->setCurrentItem(id_term_vt102 );
118 break;
116 default: 119 default:
117 break; 120 break;
118 }; 121 };
119 122
120 switch( color ) { 123 switch( color ) {
121 case Profile::Black: 124 case Profile::Black:
@@ -149,20 +152,20 @@ void TerminalWidget::load( const Profile& prof ) {
149 if (opt_outbound) m_convOutbound->setChecked( true ); 152 if (opt_outbound) m_convOutbound->setChecked( true );
150 153
151} 154}
152void TerminalWidget::save( Profile& profile ) { 155void TerminalWidget::save( Profile& profile ) {
153 switch(m_terminalBox->currentItem() ) { 156 switch(m_terminalBox->currentItem() ) {
154 case id_term_vt100: 157 case id_term_vt100:
155 profile.writeEntry("Terminal", Profile::VT102 ); 158 profile.writeEntry("Terminal", Profile::VT100 );
156 break;
157 case id_term_vt220:
158 profile.writeEntry("Terminal", Profile::VT102 );
159 break; 159 break;
160 case id_term_ansi: 160 case id_term_vt102:
161 profile.writeEntry("Terminal", Profile::VT102 ); 161 profile.writeEntry("Terminal", Profile::VT102 );
162 break; 162 break;
163 //case id_term_ansi:
164 // profile.writeEntry("Terminal", Profile::VT102 );
165 // break;
163 default: 166 default:
164 break; 167 break;
165 }; 168 };
166 169
167 // color 170 // color
168 switch(m_colorCmb->currentItem() ) { 171 switch(m_colorCmb->currentItem() ) {