summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp8
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h2
-rw-r--r--noncore/apps/opie-console/serialconfigwidget.cpp2
3 files changed, 7 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index b709cf3..5c5c2b3 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -6,8 +6,6 @@
6#include <qcombobox.h> 6#include <qcombobox.h>
7 7
8 8
9#include <opie/otabwidget.h>
10
11#include "profileeditorplugins.h" 9#include "profileeditorplugins.h"
12#include "metafactory.h" 10#include "metafactory.h"
13#include "profileeditordialog.h" 11#include "profileeditordialog.h"
@@ -57,7 +55,7 @@ void ProfileEditorDialog::initUI()
57 m_con = m_term = 0l; 55 m_con = m_term = 0l;
58 56
59 QVBoxLayout *mainLayout = new QVBoxLayout( this ); 57 QVBoxLayout *mainLayout = new QVBoxLayout( this );
60 OTabWidget *tabWidget = new OTabWidget( this ); 58 tabWidget = new OTabWidget( this );
61 tabWidget->setTabStyle(OTabWidget::TextTab); 59 tabWidget->setTabStyle(OTabWidget::TextTab);
62 mainLayout->add(tabWidget); 60 mainLayout->add(tabWidget);
63 61
@@ -173,9 +171,11 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
173 delete m_con; 171 delete m_con;
174 m_con = m_fact->newConnectionPlugin( str, m_tabCon ); 172 m_con = m_fact->newConnectionPlugin( str, m_tabCon );
175 173
176 if (m_con ) { 174 if ( m_con ) {
177 m_con->load( m_prof ); 175 m_con->load( m_prof );
178 m_layCon->addWidget( m_con ); 176 m_layCon->addWidget( m_con );
177 } else {
178 tabWidget->removePage( m_tabCon );
179 } 179 }
180} 180}
181/* 181/*
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 3b67bb3..6fde839 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -2,6 +2,7 @@
2#define PROFILE_EDITOR_DIALOG 2#define PROFILE_EDITOR_DIALOG
3 3
4#include <qdialog.h> 4#include <qdialog.h>
5#include <opie/otabwidget.h>
5 6
6#include "profile.h" 7#include "profile.h"
7 8
@@ -46,6 +47,7 @@ private:
46 QWidget *m_tabCon, *m_tabTerm; 47 QWidget *m_tabCon, *m_tabTerm;
47 ProfileDialogWidget* m_con, *m_term; 48 ProfileDialogWidget* m_con, *m_term;
48 QHBoxLayout *m_layCon, *m_layTerm; 49 QHBoxLayout *m_layCon, *m_layTerm;
50 OTabWidget *tabWidget;
49}; 51};
50 52
51#endif 53#endif
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index d216c92..1e97a24 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -56,7 +56,7 @@ void SerialConfigWidget::load( const Profile& prof ) {
56 } else if (rad_flow == 2) { 56 } else if (rad_flow == 2) {
57 m_base->setFlow( IOLayerBase::Software ); 57 m_base->setFlow( IOLayerBase::Software );
58 } else { 58 } else {
59 m_base->setFlow( IOLayerBase::None ); 59 m_base->setFlow( IOLayerBase::None );
60 } 60 }
61 61
62 if (rad_parity == 1) { 62 if (rad_parity == 1) {