summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-17 17:39:06 (UTC)
committer harlekin <harlekin>2002-10-17 17:39:06 (UTC)
commitec202e5d2956f2cde0f2a6be5c452bd67347e21f (patch) (unidiff)
tree54d5868f9c71ad953360b911f9c50ff21e070d03
parentfb44c86f420d9a77d7364ac8b8bbd25b0f6ab09a (diff)
downloadopie-ec202e5d2956f2cde0f2a6be5c452bd67347e21f.zip
opie-ec202e5d2956f2cde0f2a6be5c452bd67347e21f.tar.gz
opie-ec202e5d2956f2cde0f2a6be5c452bd67347e21f.tar.bz2
only show connection tab in profile config dialog if the current layer has connections - for local console mode
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
@@ -3,14 +3,12 @@
3#include <qlabel.h> 3#include <qlabel.h>
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 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"
14 12
15namespace { 13namespace {
16 void setCurrent( const QString& str, QComboBox* bo ) { 14 void setCurrent( const QString& str, QComboBox* bo ) {
@@ -54,13 +52,13 @@ Profile ProfileEditorDialog::profile() const
54 52
55void ProfileEditorDialog::initUI() 53void ProfileEditorDialog::initUI()
56{ 54{
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
64 QWidget *tabprof; 62 QWidget *tabprof;
65 63
66 /* base tabs */ 64 /* base tabs */
@@ -170,15 +168,17 @@ QCString ProfileEditorDialog::profType()const
170 * we need to switch the widget 168 * we need to switch the widget
171 */ 169 */
172void ProfileEditorDialog::slotConActivated( const QString& str ) { 170void 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/*
182 * we need to switch the widget 182 * we need to switch the widget
183 */ 183 */
184void ProfileEditorDialog::slotTermActivated( const QString& str ) { 184void ProfileEditorDialog::slotTermActivated( const QString& str ) {
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
@@ -1,10 +1,11 @@
1#ifndef PROFILE_EDITOR_DIALOG 1#ifndef PROFILE_EDITOR_DIALOG
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
8class MetaFactory; 9class MetaFactory;
9class EditBase; 10class EditBase;
10class QTabWidget; 11class QTabWidget;
@@ -43,9 +44,10 @@ private:
43 QLineEdit *m_name; 44 QLineEdit *m_name;
44 QComboBox *m_conCmb, *m_termCmb; 45 QComboBox *m_conCmb, *m_termCmb;
45 46
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
@@ -53,13 +53,13 @@ void SerialConfigWidget::load( const Profile& prof ) {
53 53
54 if (rad_flow == 1) { 54 if (rad_flow == 1) {
55 m_base->setFlow( IOLayerBase::Hardware ); 55 m_base->setFlow( IOLayerBase::Hardware );
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) {
63 m_base->setParity( IOLayerBase::Even ); 63 m_base->setParity( IOLayerBase::Even );
64 } else if ( rad_parity == 2 ) { 64 } else if ( rad_parity == 2 ) {
65 m_base->setParity( IOLayerBase::Odd ); 65 m_base->setParity( IOLayerBase::Odd );