added autoconnect support. feel free to revert if i messed something up.

6 files changed, 25 insertions, 3 deletions

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index cf1fbc3..5900785 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -419,33 +419,34 @@ void MainWindow::create( const Profile& prof ) {
     tabWidget()->add( ses );
     m_curSession = ses;
 
     // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it
     m_connect->setEnabled( true );
     m_disconnect->setEnabled( false );
     m_terminate->setEnabled( true );
     m_transfer->setEnabled( true );
     m_recordScript->setEnabled( true );
     m_saveScript->setEnabled( true );
     m_runScript->setEnabled( true );
     m_fullscreen->setEnabled( true );
     m_closewindow->setEnabled( true );
 
 
     // is io_layer wants direct connection, then autoconnect
-    if ( ( m_curSession->layer() )->supports()[0] == 1 ) {
+    //if ( ( m_curSession->layer() )->supports()[0] == 1 ) {
+    if (prof.autoConnect()) {
         slotConnect();
     }
 }
 
 void MainWindow::slotTransfer()
 {
     if ( currentSession() ) {
         TransferDialog dlg(currentSession()->widgetStack(), this);
         dlg.showMaximized();
         //currentSession()->widgetStack()->add(dlg);
         dlg.exec();
     }
 }
 
 
 void MainWindow::slotOpenKeb(bool state) {
diff --git a/noncore/apps/opie-console/profile.cpp b/noncore/apps/opie-console/profile.cpp
index 1a94619..51d1aa8 100644
--- a/noncore/apps/opie-console/profile.cpp
+++ b/noncore/apps/opie-console/profile.cpp
@@ -1,82 +1,91 @@
 #include "profile.h"
 
 Profile::Profile() {
 
 }
 Profile::Profile( const QString& name,
                   const QCString& iolayerName,
                   const QCString& termName,
                   int background,
                   int foreground,
                   int terminal )
-    : m_name( name ), m_ioLayer( iolayerName ), m_term( termName),
+    : m_name( name ), m_ioLayer( iolayerName ), m_term( termName), m_autoConnect(0),
       m_back( background ), m_fore( foreground ), m_terminal( terminal )
 {}
 Profile::Profile( const Profile& prof )
 {
     (*this) = prof;
 }
 bool Profile::operator==( const Profile& prof ) {
     if ( m_name == prof.m_name ) return true;
 
     return false;
 }
 Profile &Profile::operator=( const Profile& prof ) {
     m_name = prof.m_name;
     m_ioLayer = prof.m_ioLayer;
+    m_autoConnect = prof.m_autoConnect;
     m_back = prof.m_back;
     m_fore = prof.m_fore;
     m_terminal = prof.m_terminal;
     m_conf = prof.m_conf;
     m_term = prof.m_term;
 
     return *this;
 }
 Profile::~Profile() {
 }
 QMap<QString, QString> Profile::conf()const {
     return m_conf;
 }
 QString Profile::name()const {
     return m_name;
 }
 QCString Profile::ioLayerName()const {
     return m_ioLayer;
 }
 QCString Profile::terminalName( )const {
     return m_term;
 }
+bool Profile::autoConnect()const {
+
+    return m_autoConnect;
+}
 int Profile::foreground()const {
     return m_fore;
 }
 int Profile::background()const {
     return m_back;
 }
 int Profile::terminal()const {
     return m_terminal;
 }
 void Profile::setName( const QString& str ) {
     m_name = str;
 }
 void Profile::setIOLayer( const QCString& name ) {
     m_ioLayer = name;
 }
 void Profile::setTerminalName( const QCString& str ) {
     m_term = str;
 }
+void Profile::setAutoConnect( const bool c) {
+
+    m_autoConnect = c;
+}
 void Profile::setBackground( int back ) {
     m_back = back;
 }
 void Profile::setForeground( int fore ) {
     m_fore = fore;
 }
 void Profile::setTerminal( int term ) {
     m_terminal =  term;
 }
 /* config stuff */
 void Profile::clearConf() {
     m_conf.clear();
 }
 void Profile::writeEntry( const QString& key,  const QString& value ) {
     m_conf.replace( key, value );
 }
diff --git a/noncore/apps/opie-console/profile.h b/noncore/apps/opie-console/profile.h
index 64eb022..4f9e9c2 100644
--- a/noncore/apps/opie-console/profile.h
+++ b/noncore/apps/opie-console/profile.h
@@ -24,50 +24,53 @@ public:
     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;
+    bool autoConnect()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 setAutoConnect( const bool );
     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;
+    bool m_autoConnect;
     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 5c5c2b3..c48ea53 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -1,25 +1,26 @@
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qstringlist.h>
 #include <qcombobox.h>
+#include <qcheckbox.h>
 
 
-#include "profileeditorplugins.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,
@@ -65,95 +66,99 @@ void ProfileEditorDialog::initUI()
     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 );
+    m_autoConnect = new QCheckBox(tr("Auto connect after load"), 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->add(m_autoConnect);
     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 );
+    m_autoConnect->setChecked(m_prof.autoConnect());
 
 
     // signal and slots
     connect(m_conCmb, SIGNAL(activated(const QString& ) ),
             this, SLOT(slotConActivated(const QString&) ) );
     connect(m_termCmb, SIGNAL(activated(const QString& ) ),
             this, SLOT(slotTermActivated(const QString& ) ) );
 
 }
 
 ProfileEditorDialog::~ProfileEditorDialog() {
 
 }
 void ProfileEditorDialog::accept()
 {
         if(profName().isEmpty())
         {
                 QMessageBox::information(this,
                         QObject::tr("Invalid profile"),
                         QObject::tr("Please enter a profile name."));
                 return;
         }
         // Save profile and plugin profile
         //if(plugin_plugin) plugin_plugin->save();
 
         // Save general values
         m_prof.setName(profName());
         m_prof.setIOLayer(      m_fact->internal(m_conCmb ->currentText()  ) );
         m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText()  ) );
+    m_prof.setAutoConnect( m_autoConnect->isChecked() );
 
         if (m_con )
             m_con->save( m_prof );
         if (m_term )
             m_term->save( m_prof );
 
         QDialog::accept();
 }
 
 
 QString ProfileEditorDialog::profName()const
 {
         return m_name->text();
 }
 
 QCString ProfileEditorDialog::profType()const
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 6fde839..e01e636 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -1,53 +1,55 @@
 #ifndef PROFILE_EDITOR_DIALOG
 #define PROFILE_EDITOR_DIALOG
 
 #include <qdialog.h>
 #include <opie/otabwidget.h>
 
 #include "profile.h"
 
 class MetaFactory;
 class EditBase;
 class QTabWidget;
 class QHBoxLayout;
 class QLineEdit;
 class QComboBox;
+class QCheckBox;
 class QLabel;
 class ProfileDialogWidget;
 
 class ProfileEditorDialog : public QDialog {
     Q_OBJECT
 public:
     ProfileEditorDialog(MetaFactory* fact,
                         const Profile& prof );
     ProfileEditorDialog(MetaFactory* fact );
     ~ProfileEditorDialog();
     Profile profile()const;
 
 
 
 public slots:
     void accept();
 
 private slots:
     void slotConActivated(const QString& );
     void slotTermActivated( const QString& );
 private:
     void initUI();
     QString profName()const;
     QCString profType()const;
 
     MetaFactory* m_fact;
     QHBoxLayout* m_lay;
     Profile m_prof;
 
     QLineEdit *m_name;
     QComboBox *m_conCmb, *m_termCmb;
+    QCheckBox *m_autoConnect;
 
     QWidget *m_tabCon, *m_tabTerm;
     ProfileDialogWidget* m_con, *m_term;
     QHBoxLayout *m_layCon, *m_layTerm;
     OTabWidget *tabWidget;
 };
 
 #endif
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index 7c15560..5d39d96 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -25,32 +25,33 @@ ProfileManager::~ProfileManager() {
 }
 void ProfileManager::load() {
     m_list.clear();
     ProfileConfig conf("opie-console-profiles");
     QStringList groups = conf.groups();
     QStringList::Iterator it;
 
     /*
      * for each profile
      */
     for ( it = groups.begin(); it != groups.end(); ++it ) {
         conf.setGroup( (*it) );
         Profile prof;
         prof.setName( conf.readEntry("name") );
         prof.setIOLayer( conf.readEntry("iolayer").utf8() );
         prof.setTerminalName( conf.readEntry("term").utf8() );
+        prof.setAutoConnect( conf.readBoolEntry("autoConnect") );
         prof.setBackground( conf.readNumEntry("back") );
         prof.setForeground( conf.readNumEntry("fore") );
         prof.setTerminal( conf.readNumEntry("terminal") );
 
         // THIS is evil because all data get's reset
         prof.setConf( conf.items( (*it) ) );
 
         /* now add it */
         m_list.append( prof );
     }
 
 }
 void ProfileManager::clear() {
     m_list.clear();
 }
 Profile::ValueList ProfileManager::all()const {
@@ -101,32 +102,33 @@ void ProfileManager::save(  ) {
     Profile::ValueList::Iterator it2;
     for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
         conf.setGroup( (*it2).name() );
 
         /* now the config stuff */
         QMap<QString, QString> map =  (*it2).conf();
         QMap<QString, QString>::Iterator confIt;
         for ( confIt = map.begin(); confIt != map.end(); ++confIt ) {
             conf.writeEntry( confIt.key(), confIt.data() );
         }
 
         conf.writeEntry( "name", (*it2).name() );
         QString str = QString::fromUtf8( (*it2).ioLayerName() );
 
         conf.writeEntry( "iolayer", str );
         conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName()  ) );
+        conf.writeEntry( "autoConnect", (*it2).autoConnect());
         conf.writeEntry( "back", (*it2).background() );
         conf.writeEntry( "fore", (*it2).foreground() );
         conf.writeEntry( "terminal", (*it2).terminal() );
     }
 }
 void ProfileManager::setProfiles( const Profile::ValueList& list ) {
     m_list = list;
 };
 Profile ProfileManager::profile( const QString& name )const {
     Profile prof;
     Profile::ValueList::ConstIterator it;
     for ( it = m_list.begin(); it != m_list.end(); ++it ) {
         if ( name == (*it).name() ) {
             prof = (*it);
             break;
         }