- 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
@@ -265,24 +265,25 @@ void MainWindow::slotTerminate() {
 }
 
 void MainWindow::slotConfigure() {
     qWarning("configure");
     ConfigDialog conf( manager()->all(), factory() );
     conf.showMaximized();
 
     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
  * remove it from the list
  * delete it
  * and set the currentSession()
  */
 void MainWindow::slotClose() {
     qWarning("close");
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
@@ -9,25 +9,25 @@
  * A session will be generated from a saved
  * profile. A profile contains the iolayername
  * a name.
  * We can generate a Session from a Profile
  * Configuration is contained here too
  */
 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,
              int foreground,
              int terminal);
     Profile( const Profile& );
     Profile &operator=( const Profile& );
     bool operator==( const Profile& prof );
 
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
@@ -49,24 +49,25 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 
 Profile ProfileEditorDialog::profile() const
 {
         return m_prof;
 }
 
 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);
     m_tabTerm = new QWidget(this);
     m_tabCon  = new QWidget(this);
 
     /* base layout for tabs */
     m_layCon  = new QHBoxLayout( m_tabCon , 2 );
     m_layTerm = new QHBoxLayout( m_tabTerm, 2 );
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
@@ -4,25 +4,25 @@
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qgroupbox.h>
 #include <qvbox.h>
 #include <qhgroupbox.h>
 #include <qlayout.h>
 
 #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
     };
 
     enum FontIds {
         id_size_small,
         id_size_medium,
         id_size_large
@@ -64,26 +64,26 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
     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 );
 
     // 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
     /*
     connect(m_terminalBox, SIGNAL(activated(int) ),
             this, SLOT(slotTermTerm(int) ) );
     connect(m_colorBox, SIGNAL(activated(int) ),
             tis, SLOT(slotTermColor(int) ) );
     connect(m_groupSize, SIGNAL(activated(int) ),
             this, SLOT(slotTermFont(int) ) );
@@ -101,27 +101,30 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
 TerminalWidget::~TerminalWidget() {
 }
 void TerminalWidget::load( const Profile& prof ) {
     int term = prof.readNumEntry("Terminal");
     int color = prof.readNumEntry("Color");
     int fontsize = prof.readNumEntry("Font");
     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:
         m_colorCmb->setCurrentItem(id_term_black );
         break;
     case Profile::White:
         m_colorCmb->setCurrentItem(id_term_white );
         break;
     default:
@@ -143,32 +146,32 @@ void TerminalWidget::load( const Profile& prof ) {
         break;
     };
 
     if (opt_echo) m_optionEcho->setChecked( true );
     if (opt_wrap) m_optionWrap->setChecked( true );
     if (opt_inbound) m_convInbound->setChecked( true );
     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() ) {
     case id_term_black:
         profile.writeEntry("Color", Profile::Black );
         break;
     case id_term_white:
         profile.writeEntry("Color", Profile::White );
         break;