- use OTabDialog::TextStyle (might be done for terminal sessions, too?)

- show only vt100 and vt102 entries
- save profiles upon closing profiles manager dialog

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() {
 
     int ret = conf.exec();
 
     if ( QDialog::Accepted == ret ) {
         qWarning("conf %d", conf.list().count() );
         manager()->setProfiles( conf.list() );
+        manager()->save();
         populateProfiles();
     }
 }
 /*
  * we will remove
  * 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 @@
 class Profile {
 public:
     typedef QValueList<Profile> ValueList;
     enum Color { Black = 0,
                  White,
                  Gray };
-    enum Terminal {VT102 = 0 };
+    enum Terminal {VT102 = 0, VT100 };
     enum Font { Micro = 0,  Small, Medium };
     Profile();
     Profile( const QString& name,
              const QCString& iolayerName,
              const QCString& termName,
              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
 void ProfileEditorDialog::initUI()
 {
     m_con = m_term = 0l;
 
     QVBoxLayout *mainLayout = new QVBoxLayout( this );
     OTabWidget *tabWidget = new OTabWidget( this );
+    tabWidget->setTabStyle(OTabWidget::TextTab);
     mainLayout->add(tabWidget);
 
     QWidget *tabprof;
 
     /* base tabs */
     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 @@
 
 #include "terminalwidget.h"
 
 namespace {
     enum TermIds {
         id_term_vt100,
-        id_term_vt220,
+        id_term_vt102,
         id_term_ansi
     };
 
     enum ColourIds {
         id_term_black,
         id_term_white
@@ -70,14 +70,14 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
 
     m_lroot->add(m_groupConv );
     m_lroot->add(m_groupOptions );
 
     // Fill in some options
     m_terminalBox->insertItem( tr("VT 100"), id_term_vt100 );
-    m_terminalBox->insertItem( tr("VT 220"), id_term_vt220 );
-    m_terminalBox->insertItem( tr("ANSI"), id_term_ansi );
+    m_terminalBox->insertItem( tr("VT 102"), id_term_vt102 );
+    //m_terminalBox->insertItem( tr("ANSI"), id_term_ansi );
 
     m_colorCmb->insertItem( tr("black on white"), id_term_black );
     m_colorCmb->insertItem( tr("white on black"), id_term_white );
 
     // signals + slots
     /*
@@ -107,15 +107,18 @@ void TerminalWidget::load( const Profile& prof ) {
     int opt_echo = prof.readNumEntry("Echo");
     int opt_wrap = prof.readNumEntry("Wrap");
     int opt_inbound = prof.readNumEntry("Inbound");
     int opt_outbound = prof.readNumEntry("Outbound");
 
     switch( term ) {
-    case Profile::VT102:
+    case Profile::VT100:
         m_terminalBox->setCurrentItem(id_term_vt100 );
         break;
+    case Profile::VT102:
+        m_terminalBox->setCurrentItem(id_term_vt102 );
+        break;
     default:
         break;
     };
 
     switch( color ) {
     case Profile::Black:
@@ -149,20 +152,20 @@ void TerminalWidget::load( const Profile& prof ) {
     if (opt_outbound) m_convOutbound->setChecked( true );
 
 }
 void TerminalWidget::save( Profile& profile ) {
     switch(m_terminalBox->currentItem() ) {
     case id_term_vt100:
-        profile.writeEntry("Terminal", Profile::VT102 );
-        break;
-    case id_term_vt220:
-        profile.writeEntry("Terminal", Profile::VT102 );
+        profile.writeEntry("Terminal", Profile::VT100 );
         break;
-    case id_term_ansi:
+    case id_term_vt102:
         profile.writeEntry("Terminal", Profile::VT102 );
         break;
+    //case id_term_ansi:
+    //    profile.writeEntry("Terminal", Profile::VT102 );
+    //    break;
     default:
         break;
     };
 
     // color
     switch(m_colorCmb->currentItem() ) {