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
@@ -433,5 +433,6 @@ void MainWindow::create( const Profile& prof ) {
 
     // 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();
     }
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
@@ -10,5 +10,5 @@ Profile::Profile( const QString& name,
                   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 )
 {}
@@ -25,4 +25,5 @@ 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;
@@ -47,4 +48,8 @@ QCString Profile::terminalName( )const {
     return m_term;
 }
+bool Profile::autoConnect()const {
+
+    return m_autoConnect;
+}
 int Profile::foreground()const {
     return m_fore;
@@ -65,4 +70,8 @@ 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;
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
@@ -38,4 +38,5 @@ public:
     QCString ioLayerName()const;
     QCString terminalName()const;
+    bool autoConnect()const;
     int foreground()const;
     int background()const;
@@ -58,4 +59,5 @@ public:
     void setIOLayer( const QCString& );
     void setTerminalName( const QCString& );
+    void setAutoConnect( const bool );
     void setBackground( int back );
     void setForeground( int fore );
@@ -66,4 +68,5 @@ private:
     QString m_name;
     QCString m_ioLayer, m_term;
+    bool m_autoConnect;
     int m_back;
     int m_fore;
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
@@ -5,7 +5,8 @@
 #include <qstringlist.h>
 #include <qcombobox.h>
+#include <qcheckbox.h>
 
 
-#include "profileeditorplugins.h"
+//#include "profileeditorplugins.h"
 #include "metafactory.h"
 #include "profileeditordialog.h"
@@ -79,4 +80,5 @@ void ProfileEditorDialog::initUI()
     m_conCmb = new QComboBox( tabprof );
     m_termCmb = new QComboBox( tabprof );
+    m_autoConnect = new QCheckBox(tr("Auto connect after load"), tabprof);
 
     // layouting
@@ -88,4 +90,5 @@ void ProfileEditorDialog::initUI()
     vbox3->add(term );
     vbox3->add(m_termCmb );
+    vbox3->add(m_autoConnect);
     vbox3->addStretch(1);
 
@@ -113,4 +116,5 @@ void ProfileEditorDialog::initUI()
     setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
     setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
+    m_autoConnect->setChecked(m_prof.autoConnect());
 
 
@@ -142,4 +146,5 @@ void ProfileEditorDialog::accept()
         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 )
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
@@ -13,4 +13,5 @@ class QHBoxLayout;
 class QLineEdit;
 class QComboBox;
+class QCheckBox;
 class QLabel;
 class ProfileDialogWidget;
@@ -44,4 +45,5 @@ private:
     QLineEdit *m_name;
     QComboBox *m_conCmb, *m_termCmb;
+    QCheckBox *m_autoConnect;
 
     QWidget *m_tabCon, *m_tabTerm;
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
@@ -39,4 +39,5 @@ void ProfileManager::load() {
         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") );
@@ -115,4 +116,5 @@ void ProfileManager::save(  ) {
         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() );