summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp12
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h2
2 files changed, 11 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index c48ea53..d124067 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -47,66 +47,65 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
47} 47}
48 48
49Profile ProfileEditorDialog::profile() const 49Profile ProfileEditorDialog::profile() const
50{ 50{
51 return m_prof; 51 return m_prof;
52} 52}
53 53
54void ProfileEditorDialog::initUI() 54void ProfileEditorDialog::initUI()
55{ 55{
56 m_con = m_term = 0l; 56 m_con = m_term = 0l;
57 57
58 QVBoxLayout *mainLayout = new QVBoxLayout( this ); 58 QVBoxLayout *mainLayout = new QVBoxLayout( this );
59 tabWidget = new OTabWidget( this ); 59 tabWidget = new OTabWidget( this );
60 tabWidget->setTabStyle(OTabWidget::TextTab); 60 tabWidget->setTabStyle(OTabWidget::TextTab);
61 mainLayout->add(tabWidget); 61 mainLayout->add(tabWidget);
62 62
63 QWidget *tabprof;
64
65 /* base tabs */ 63 /* base tabs */
66 tabprof = new QWidget(this); 64 tabprof = new QWidget(this);
67 m_tabTerm = new QWidget(this); 65 m_tabTerm = new QWidget(this);
68 m_tabCon = new QWidget(this); 66 m_tabCon = new QWidget(this);
69 67
70 /* base layout for tabs */ 68 /* base layout for tabs */
71 m_layCon = new QHBoxLayout( m_tabCon , 2 ); 69 m_layCon = new QHBoxLayout( m_tabCon , 2 );
72 m_layTerm = new QHBoxLayout( m_tabTerm, 2 ); 70 m_layTerm = new QHBoxLayout( m_tabTerm, 2 );
73 71
74 // profile tab 72 // profile tab
75 73
76 QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof); 74 QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof);
77 m_name = new QLineEdit(tabprof); 75 m_name = new QLineEdit(tabprof);
78 QLabel *con = new QLabel(tr("Connection"), tabprof ); 76 QLabel *con = new QLabel(tr("Connection"), tabprof );
79 QLabel *term = new QLabel(tr("Terminal"), tabprof ); 77 QLabel *term = new QLabel(tr("Terminal"), tabprof );
80 m_conCmb = new QComboBox( tabprof ); 78 m_conCmb = new QComboBox( tabprof );
81 m_termCmb = new QComboBox( tabprof ); 79 m_termCmb = new QComboBox( tabprof );
82 m_autoConnect = new QCheckBox(tr("Auto connect after load"), tabprof); 80 m_autoConnect = new QCheckBox(tr("Auto connect after load"), tabprof);
83 81
84 // layouting 82 // layouting
85 QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2); 83 QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
86 vbox3->add(name); 84 vbox3->add(name);
87 vbox3->add(m_name); 85 vbox3->add(m_name);
88 vbox3->add(con ); 86 vbox3->add(con );
89 vbox3->add(m_conCmb ); 87 vbox3->add(m_conCmb );
90 vbox3->add(term ); 88 vbox3->add(term );
91 vbox3->add(m_termCmb ); 89 vbox3->add(m_termCmb );
92 vbox3->add(m_autoConnect); 90 vbox3->add(m_autoConnect);
93 vbox3->addStretch(1); 91 vbox3->addStretch(1);
94 92
93 m_showconntab = 0;
95 tabWidget->addTab(tabprof, "", QObject::tr("Profile")); 94 tabWidget->addTab(tabprof, "", QObject::tr("Profile"));
96 tabWidget->addTab(m_tabCon, "", QObject::tr("Connection")); 95 //tabWidget->addTab(m_tabCon, "", QObject::tr("Connection"));
97 tabWidget->addTab(m_tabTerm, "", QObject::tr("Terminal")); 96 tabWidget->addTab(m_tabTerm, "", QObject::tr("Terminal"));
98 tabWidget->setCurrentTab( tabprof ); 97 tabWidget->setCurrentTab( tabprof );
99 98
100 99
101 // fill the comboboxes 100 // fill the comboboxes
102 QStringList list = m_fact->connectionWidgets(); 101 QStringList list = m_fact->connectionWidgets();
103 QStringList::Iterator it; 102 QStringList::Iterator it;
104 for (it =list.begin(); it != list.end(); ++it ) { 103 for (it =list.begin(); it != list.end(); ++it ) {
105 m_conCmb->insertItem( (*it) ); 104 m_conCmb->insertItem( (*it) );
106 } 105 }
107 list = m_fact->terminalWidgets(); 106 list = m_fact->terminalWidgets();
108 for (it =list.begin(); it != list.end(); ++it ) { 107 for (it =list.begin(); it != list.end(); ++it ) {
109 m_termCmb->insertItem( (*it) ); 108 m_termCmb->insertItem( (*it) );
110 } 109 }
111 110
112 // load profile values 111 // load profile values
@@ -166,33 +165,40 @@ QCString ProfileEditorDialog::profType()const
166 /*QStringList w = m_fact->configWidgets(); 165 /*QStringList w = m_fact->configWidgets();
167 for(QStringList::Iterator it = w.begin(); it != w.end(); it++) 166 for(QStringList::Iterator it = w.begin(); it != w.end(); it++)
168 if(device_box->currentText() == m_fact->name((*it))) return (*it); 167 if(device_box->currentText() == m_fact->name((*it))) return (*it);
169 */ 168 */
170 return QCString(); 169 return QCString();
171} 170}
172/* 171/*
173 * we need to switch the widget 172 * we need to switch the widget
174 */ 173 */
175void ProfileEditorDialog::slotConActivated( const QString& str ) { 174void ProfileEditorDialog::slotConActivated( const QString& str ) {
176 delete m_con; 175 delete m_con;
177 m_con = m_fact->newConnectionPlugin( str, m_tabCon ); 176 m_con = m_fact->newConnectionPlugin( str, m_tabCon );
178 177
179 if ( m_con ) { 178 if ( m_con ) {
180 m_con->load( m_prof ); 179 m_con->load( m_prof );
181 m_layCon->addWidget( m_con ); 180 m_layCon->addWidget( m_con );
181 if(!m_showconntab)
182 {
183 tabWidget->addTab( m_tabCon, "", QObject::tr("Connection") );
184 tabWidget->setCurrentTab( tabprof );
185 m_showconntab = 1;
186 }
182 } else { 187 } else {
183 tabWidget->removePage( m_tabCon ); 188 tabWidget->removePage( m_tabCon );
189 m_showconntab = 0;
184 } 190 }
185} 191}
186/* 192/*
187 * we need to switch the widget 193 * we need to switch the widget
188 */ 194 */
189void ProfileEditorDialog::slotTermActivated( const QString& str ) { 195void ProfileEditorDialog::slotTermActivated( const QString& str ) {
190 delete m_term; 196 delete m_term;
191 m_term = m_fact->newTerminalPlugin( str, m_tabTerm ); 197 m_term = m_fact->newTerminalPlugin( str, m_tabTerm );
192 198
193 if (m_term) { 199 if (m_term) {
194 m_term->load(m_prof ); 200 m_term->load(m_prof );
195 m_layTerm->addWidget( m_term ); 201 m_layTerm->addWidget( m_term );
196 } 202 }
197} 203}
198 204
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index e01e636..cbda689 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -37,19 +37,21 @@ private:
37 void initUI(); 37 void initUI();
38 QString profName()const; 38 QString profName()const;
39 QCString profType()const; 39 QCString profType()const;
40 40
41 MetaFactory* m_fact; 41 MetaFactory* m_fact;
42 QHBoxLayout* m_lay; 42 QHBoxLayout* m_lay;
43 Profile m_prof; 43 Profile m_prof;
44 44
45 QLineEdit *m_name; 45 QLineEdit *m_name;
46 QComboBox *m_conCmb, *m_termCmb; 46 QComboBox *m_conCmb, *m_termCmb;
47 QCheckBox *m_autoConnect; 47 QCheckBox *m_autoConnect;
48 48
49 QWidget *m_tabCon, *m_tabTerm; 49 QWidget *m_tabCon, *m_tabTerm;
50 ProfileDialogWidget* m_con, *m_term; 50 ProfileDialogWidget* m_con, *m_term;
51 QHBoxLayout *m_layCon, *m_layTerm; 51 QHBoxLayout *m_layCon, *m_layTerm;
52 OTabWidget *tabWidget; 52 OTabWidget *tabWidget;
53 QWidget *tabprof;
54 int m_showconntab;
53}; 55};
54 56
55#endif 57#endif