- 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
@@ -213,126 +213,127 @@ void MainWindow::slotNew() {
 }
 
 void MainWindow::slotRecordScript() {
     if (currentSession()) {
         currentSession()->emulationLayer()->startRecording();
     }
 }
 
 void MainWindow::slotSaveScript() {
     if (currentSession() && currentSession()->emulationLayer()->isRecording()) {
         MimeTypes types;
         QStringList script;
         script << "text/plain";
         types.insert("Script", script);
         QString filename = OFileDialog::getSaveFileName(2, "/", QString::null, types);
         if (!filename.isEmpty()) {
             currentSession()->emulationLayer()->script()->saveTo(filename);
             currentSession()->emulationLayer()->clearScript();
         }
     }
 }
 
 void MainWindow::slotRunScript() {
     if (currentSession()) {
         MimeTypes types;
         QStringList script;
         script << "text/plain";
         types.insert("Script", script);
         QString filename = OFileDialog::getOpenFileName(2, "/", QString::null, types);
         if (!filename.isEmpty()) {
             Script script(DocLnk(filename).file());
             currentSession()->emulationLayer()->runScript(&script);
         }
     }
 }
 
 void MainWindow::slotConnect() {
     if ( currentSession() )
         currentSession()->layer()->open();
 }
 
 void MainWindow::slotDisconnect() {
     if ( currentSession() )
         currentSession()->layer()->close();
 }
 
 void MainWindow::slotTerminate() {
     if ( currentSession() )
         currentSession()->layer()->close();
 
     slotClose();
     /* FIXME move to the next session */
 }
 
 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");
     if (!currentSession() )
         return;
 
     tabWidget()->remove( currentSession() );
     /*it's autodelete */
     m_sessions.remove( m_curSession );
     m_curSession = m_sessions.first();
     tabWidget()->setCurrent( m_curSession );
 }
 
 /*
  * We will get the name
  * Then the profile
  * and then we will make a profile
  */
 void MainWindow::slotProfile( int id) {
     Profile prof = manager()->profile( m_sessionsPop->text( id)  );
     create( prof );
 }
 void MainWindow::create( const Profile& prof ) {
     Session *ses = manager()->fromProfile( prof, tabWidget() );
 
     m_sessions.append( ses );
     tabWidget()->add( ses );
     m_curSession = ses;
 
 }
 
 void MainWindow::slotTransfer()
 {
     //   if ( currentSession() ) {
 	TransferDialog dlg(this);
 	dlg.showMaximized();
 	dlg.exec();
          // }
 }
 
 
 void MainWindow::slotOpenKeb(bool state) {
 
     if (state) m_keyBar->show();
     else m_keyBar->hide();
 
 }
 void MainWindow::slotSessionChanged( Session* ses ) {
     if ( ses ) {
         qWarning("changing %s", ses->name().latin1() );
         m_curSession = ses;
     }
 }
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
@@ -1,71 +1,71 @@
 #ifndef OPIE_PROFILE_H
 #define OPIE_PROFILE_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 /**
  * 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 );
 
     ~Profile();
     QString name()const;
     QCString ioLayerName()const;
     QCString terminalName()const;
     int foreground()const;
     int background()const;
     int terminal()const;
 
     /*
      * config stuff
      */
     QMap<QString, QString> conf()const;
     void clearConf();
     void writeEntry( const QString& key,  const QString& value );
     void writeEntry( const QString& key,  int num );
     void writeEntry( const QString& key, bool b );
     void writeEntry( const QString& key, const QStringList&, const QChar& );
     QString readEntry( const QString& key, const QString& deflt = QString::null)const;
     int readNumEntry( const QString& key, int = -1 )const;
     bool readBoolEntry( const QString& key,  bool = FALSE )const;
 
     void setName( const QString& );
     void setIOLayer( const QCString& );
     void setTerminalName( const QCString& );
     void setBackground( int back );
     void setForeground( int fore );
     void setTerminal( int term );
     void setConf( const QMap<QString, QString>& );
 private:
     QMap<QString, QString> m_conf;
     QString m_name;
     QCString m_ioLayer, m_term;
     int m_back;
     int m_fore;
     int m_terminal;
 };
 
 #endif
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
@@ -1,124 +1,125 @@
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qstringlist.h>
 #include <qcombobox.h>
 
 
 #include <opie/otabwidget.h>
 
 #include "profileeditorplugins.h"
 #include "metafactory.h"
 #include "profileeditordialog.h"
 
 namespace {
     void setCurrent( const QString& str, QComboBox* bo ) {
         for (uint i = 0; i < bo->count(); i++ ) {
             if ( bo->text(i) == str ) {
                 bo->setCurrentItem( i );
             }
         }
     }
 
 
 }
 
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
                                           const Profile& prof )
     : QDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
 {
     initUI();
 
 	// Apply current profile
 	// plugin_plugin->load(profile);
 	// ... (reset profile name line edit etc.)
 }
 
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
     : QDialog(0, 0, TRUE), m_fact( fact )
 {
 	// Default profile
 	m_prof = Profile("New Profile", "serial", "default", Profile::Black, Profile::White, Profile::VT102);
 
 	initUI();
 
 	// Apply current profile
 	// plugin_plugin->load(profile);
 }
 
 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 );
 
     // profile tab
 
     QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof);
     m_name = new QLineEdit(tabprof);
     QLabel *con = new QLabel(tr("Connection"), tabprof );
     QLabel *term = new QLabel(tr("Terminal"), tabprof );
     m_conCmb = new QComboBox( tabprof );
     m_termCmb = new QComboBox( tabprof );
 
     // layouting
     QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
     vbox3->add(name);
     vbox3->add(m_name);
     vbox3->add(con );
     vbox3->add(m_conCmb );
     vbox3->add(term );
     vbox3->add(m_termCmb );
     vbox3->addStretch(1);
 
     tabWidget->addTab(tabprof, "", QObject::tr("Profile"));
     tabWidget->addTab(m_tabCon, "", QObject::tr("Connection"));
     tabWidget->addTab(m_tabTerm, "", QObject::tr("Terminal"));
     tabWidget->setCurrentTab( tabprof );
 
 
     // fill the comboboxes
     QStringList list = m_fact->connectionWidgets();
     QStringList::Iterator it;
     for (it =list.begin(); it != list.end(); ++it ) {
         m_conCmb->insertItem( (*it) );
     }
     list = m_fact->terminalWidgets();
     for (it =list.begin(); it != list.end(); ++it ) {
         m_termCmb->insertItem( (*it) );
     }
 
     // load profile values
     m_name->setText(m_prof.name());
     slotConActivated(  m_fact->external(m_prof.ioLayerName()  ) );
     slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
     setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
 
     qWarning("Layer: %s %s", m_prof.ioLayerName().data(),
              m_fact->external(m_prof.ioLayerName() ).latin1() );
     qWarning("Term: %s %s", m_prof.terminalName().data(),
              m_fact->external(m_prof.terminalName() ).latin1() );
 
     // signal and slots
     connect(m_conCmb, SIGNAL(activated(const QString& ) ),
             this, SLOT(slotConActivated(const QString&) ) );
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
@@ -1,191 +1,194 @@
 #include <qbuttongroup.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #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
     };
 };
 
 TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
                                 const char* na )
     : ProfileDialogTerminalWidget( name, parent, na ) {
 
     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_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_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_lroot = new QVBoxLayout(this, 2 );
     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 );
 
     // 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) ) );
 
     connect(m_optionEcho, SIGNAL(toggled(bool) ),
             this, SLOT(slotTermEcho(bool) ) );
     connect(m_optionWrap, SIGNAL(toggled(bool) ),
             this, SLOT(slotTermWrap(bool) ) );
     connect(m_convInbound, SIGNAL(toggled(bool) ),
             this, SLOT(slotTermInbound(bool) ) );
     connect(m_convOutbound, SIGNAL(toggled(bool) ),
             this, SLOT(slotTermOutbound(bool) ) );
 */
 }
 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:
         break;
     };
 
     switch( fontsize ) {
     case Profile::Micro:
         m_sizeSmall->setChecked(true );
         break;
     case Profile::Small:
         m_sizeMedium->setChecked(true );
         break;
     case Profile::Medium:
         m_sizeLarge->setChecked( true );
         break;
         m_sizeSmall->setChecked(true);
     default:
         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;
     default:
         break;
     };
 
     if (m_sizeSmall->isChecked() ) {
         profile.writeEntry("Font", Profile::Micro );
     }else if (m_sizeMedium->isChecked() ) {
         profile.writeEntry("Font", Profile::Small );
     }else {
         profile.writeEntry("Font", Profile::Medium );
     }
 
     profile.writeEntry("Echo", m_optionEcho->isChecked() );
     profile.writeEntry("Wrap", m_optionWrap->isChecked() );
     profile.writeEntry("Inbound", m_convInbound->isChecked() );
     profile.writeEntry("Outbound",m_convOutbound->isChecked() );
 }