summaryrefslogtreecommitdiff
authorhash <hash>2002-10-18 19:50:27 (UTC)
committer hash <hash>2002-10-18 19:50:27 (UTC)
commitbb98ac35db9807efbcc1b59dd8abbdb05ad7656b (patch) (unidiff)
tree60f83f4c10c68da1ca7641b26b91b8970ef0eaa3
parent081001a515f23626b6299e39af4511f36db46d07 (diff)
downloadopie-bb98ac35db9807efbcc1b59dd8abbdb05ad7656b.zip
opie-bb98ac35db9807efbcc1b59dd8abbdb05ad7656b.tar.gz
opie-bb98ac35db9807efbcc1b59dd8abbdb05ad7656b.tar.bz2
added autoconnect support. feel free to revert if i messed something up.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp3
-rw-r--r--noncore/apps/opie-console/profile.cpp11
-rw-r--r--noncore/apps/opie-console/profile.h3
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp7
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h2
-rw-r--r--noncore/apps/opie-console/profilemanager.cpp2
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
@@ -432,7 +432,8 @@ void MainWindow::create( const Profile& prof ) {
432 432
433 433
434 // is io_layer wants direct connection, then autoconnect 434 // is io_layer wants direct connection, then autoconnect
435 if ( ( m_curSession->layer() )->supports()[0] == 1 ) { 435 //if ( ( m_curSession->layer() )->supports()[0] == 1 ) {
436 if (prof.autoConnect()) {
436 slotConnect(); 437 slotConnect();
437 } 438 }
438} 439}
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
@@ -9,7 +9,7 @@ Profile::Profile( const QString& name,
9 int background, 9 int background,
10 int foreground, 10 int foreground,
11 int terminal ) 11 int terminal )
12 : m_name( name ), m_ioLayer( iolayerName ), m_term( termName), 12 : m_name( name ), m_ioLayer( iolayerName ), m_term( termName), m_autoConnect(0),
13 m_back( background ), m_fore( foreground ), m_terminal( terminal ) 13 m_back( background ), m_fore( foreground ), m_terminal( terminal )
14{} 14{}
15Profile::Profile( const Profile& prof ) 15Profile::Profile( const Profile& prof )
@@ -24,6 +24,7 @@ bool Profile::operator==( const Profile& prof ) {
24Profile &Profile::operator=( const Profile& prof ) { 24Profile &Profile::operator=( const Profile& prof ) {
25 m_name = prof.m_name; 25 m_name = prof.m_name;
26 m_ioLayer = prof.m_ioLayer; 26 m_ioLayer = prof.m_ioLayer;
27 m_autoConnect = prof.m_autoConnect;
27 m_back = prof.m_back; 28 m_back = prof.m_back;
28 m_fore = prof.m_fore; 29 m_fore = prof.m_fore;
29 m_terminal = prof.m_terminal; 30 m_terminal = prof.m_terminal;
@@ -46,6 +47,10 @@ QCString Profile::ioLayerName()const {
46QCString Profile::terminalName( )const { 47QCString Profile::terminalName( )const {
47 return m_term; 48 return m_term;
48} 49}
50bool Profile::autoConnect()const {
51
52 return m_autoConnect;
53}
49int Profile::foreground()const { 54int Profile::foreground()const {
50 return m_fore; 55 return m_fore;
51} 56}
@@ -64,6 +69,10 @@ void Profile::setIOLayer( const QCString& name ) {
64void Profile::setTerminalName( const QCString& str ) { 69void Profile::setTerminalName( const QCString& str ) {
65 m_term = str; 70 m_term = str;
66} 71}
72void Profile::setAutoConnect( const bool c) {
73
74 m_autoConnect = c;
75}
67void Profile::setBackground( int back ) { 76void Profile::setBackground( int back ) {
68 m_back = back; 77 m_back = back;
69} 78}
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
@@ -37,6 +37,7 @@ public:
37 QString name()const; 37 QString name()const;
38 QCString ioLayerName()const; 38 QCString ioLayerName()const;
39 QCString terminalName()const; 39 QCString terminalName()const;
40 bool autoConnect()const;
40 int foreground()const; 41 int foreground()const;
41 int background()const; 42 int background()const;
42 int terminal()const; 43 int terminal()const;
@@ -57,6 +58,7 @@ public:
57 void setName( const QString& ); 58 void setName( const QString& );
58 void setIOLayer( const QCString& ); 59 void setIOLayer( const QCString& );
59 void setTerminalName( const QCString& ); 60 void setTerminalName( const QCString& );
61 void setAutoConnect( const bool );
60 void setBackground( int back ); 62 void setBackground( int back );
61 void setForeground( int fore ); 63 void setForeground( int fore );
62 void setTerminal( int term ); 64 void setTerminal( int term );
@@ -65,6 +67,7 @@ private:
65 QMap<QString, QString> m_conf; 67 QMap<QString, QString> m_conf;
66 QString m_name; 68 QString m_name;
67 QCString m_ioLayer, m_term; 69 QCString m_ioLayer, m_term;
70 bool m_autoConnect;
68 int m_back; 71 int m_back;
69 int m_fore; 72 int m_fore;
70 int m_terminal; 73 int m_terminal;
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
@@ -4,9 +4,10 @@
4#include <qmessagebox.h> 4#include <qmessagebox.h>
5#include <qstringlist.h> 5#include <qstringlist.h>
6#include <qcombobox.h> 6#include <qcombobox.h>
7#include <qcheckbox.h>
7 8
8 9
9#include "profileeditorplugins.h" 10//#include "profileeditorplugins.h"
10#include "metafactory.h" 11#include "metafactory.h"
11#include "profileeditordialog.h" 12#include "profileeditordialog.h"
12 13
@@ -78,6 +79,7 @@ void ProfileEditorDialog::initUI()
78 QLabel *term = new QLabel(tr("Terminal"), tabprof ); 79 QLabel *term = new QLabel(tr("Terminal"), tabprof );
79 m_conCmb = new QComboBox( tabprof ); 80 m_conCmb = new QComboBox( tabprof );
80 m_termCmb = new QComboBox( tabprof ); 81 m_termCmb = new QComboBox( tabprof );
82 m_autoConnect = new QCheckBox(tr("Auto connect after load"), tabprof);
81 83
82 // layouting 84 // layouting
83 QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2); 85 QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
@@ -87,6 +89,7 @@ void ProfileEditorDialog::initUI()
87 vbox3->add(m_conCmb ); 89 vbox3->add(m_conCmb );
88 vbox3->add(term ); 90 vbox3->add(term );
89 vbox3->add(m_termCmb ); 91 vbox3->add(m_termCmb );
92 vbox3->add(m_autoConnect);
90 vbox3->addStretch(1); 93 vbox3->addStretch(1);
91 94
92 tabWidget->addTab(tabprof, "", QObject::tr("Profile")); 95 tabWidget->addTab(tabprof, "", QObject::tr("Profile"));
@@ -112,6 +115,7 @@ void ProfileEditorDialog::initUI()
112 slotTermActivated( m_fact->external(m_prof.terminalName() ) ); 115 slotTermActivated( m_fact->external(m_prof.terminalName() ) );
113 setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb ); 116 setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
114 setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb ); 117 setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
118 m_autoConnect->setChecked(m_prof.autoConnect());
115 119
116 120
117 // signal and slots 121 // signal and slots
@@ -141,6 +145,7 @@ void ProfileEditorDialog::accept()
141 m_prof.setName(profName()); 145 m_prof.setName(profName());
142 m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText() ) ); 146 m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText() ) );
143 m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText() ) ); 147 m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText() ) );
148 m_prof.setAutoConnect( m_autoConnect->isChecked() );
144 149
145 if (m_con ) 150 if (m_con )
146 m_con->save( m_prof ); 151 m_con->save( m_prof );
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
@@ -12,6 +12,7 @@ class QTabWidget;
12class QHBoxLayout; 12class QHBoxLayout;
13class QLineEdit; 13class QLineEdit;
14class QComboBox; 14class QComboBox;
15class QCheckBox;
15class QLabel; 16class QLabel;
16class ProfileDialogWidget; 17class ProfileDialogWidget;
17 18
@@ -43,6 +44,7 @@ private:
43 44
44 QLineEdit *m_name; 45 QLineEdit *m_name;
45 QComboBox *m_conCmb, *m_termCmb; 46 QComboBox *m_conCmb, *m_termCmb;
47 QCheckBox *m_autoConnect;
46 48
47 QWidget *m_tabCon, *m_tabTerm; 49 QWidget *m_tabCon, *m_tabTerm;
48 ProfileDialogWidget* m_con, *m_term; 50 ProfileDialogWidget* m_con, *m_term;
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
@@ -38,6 +38,7 @@ void ProfileManager::load() {
38 prof.setName( conf.readEntry("name") ); 38 prof.setName( conf.readEntry("name") );
39 prof.setIOLayer( conf.readEntry("iolayer").utf8() ); 39 prof.setIOLayer( conf.readEntry("iolayer").utf8() );
40 prof.setTerminalName( conf.readEntry("term").utf8() ); 40 prof.setTerminalName( conf.readEntry("term").utf8() );
41 prof.setAutoConnect( conf.readBoolEntry("autoConnect") );
41 prof.setBackground( conf.readNumEntry("back") ); 42 prof.setBackground( conf.readNumEntry("back") );
42 prof.setForeground( conf.readNumEntry("fore") ); 43 prof.setForeground( conf.readNumEntry("fore") );
43 prof.setTerminal( conf.readNumEntry("terminal") ); 44 prof.setTerminal( conf.readNumEntry("terminal") );
@@ -114,6 +115,7 @@ void ProfileManager::save( ) {
114 115
115 conf.writeEntry( "iolayer", str ); 116 conf.writeEntry( "iolayer", str );
116 conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) ); 117 conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) );
118 conf.writeEntry( "autoConnect", (*it2).autoConnect());
117 conf.writeEntry( "back", (*it2).background() ); 119 conf.writeEntry( "back", (*it2).background() );
118 conf.writeEntry( "fore", (*it2).foreground() ); 120 conf.writeEntry( "fore", (*it2).foreground() );
119 conf.writeEntry( "terminal", (*it2).terminal() ); 121 conf.writeEntry( "terminal", (*it2).terminal() );