Diffstat (limited to 'noncore/apps/opie-console/modemconfigwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp index 0968f62..ac62e45 100644 --- a/noncore/apps/opie-console/modemconfigwidget.cpp +++ b/noncore/apps/opie-console/modemconfigwidget.cpp | |||
@@ -5,9 +5,8 @@ | |||
5 | #include <qpushbutton.h> | 5 | #include <qpushbutton.h> |
6 | #include <qhbox.h> | 6 | #include <qhbox.h> |
7 | 7 | ||
8 | #include "iolayerbase.h" | 8 | |
9 | #include "modemconfigwidget.h" | 9 | #include "modemconfigwidget.h" |
10 | #include "atconfigdialog.h" | ||
11 | #include "dialdialog.h" | 10 | #include "dialdialog.h" |
12 | 11 | ||
13 | namespace { | 12 | namespace { |
@@ -24,8 +23,7 @@ namespace { | |||
24 | } | 23 | } |
25 | } | 24 | } |
26 | 25 | ||
27 | ModemConfigWidget::ModemConfigWidget( const QString& name, | 26 | ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent, |
28 | QWidget* parent, | ||
29 | const char* na ) | 27 | const char* na ) |
30 | : ProfileDialogConnectionWidget( name, parent, na ) { | 28 | : ProfileDialogConnectionWidget( name, parent, na ) { |
31 | 29 | ||
@@ -60,7 +58,7 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, | |||
60 | m_deviceCmb->insertItem( "/dev/ttyS1" ); | 58 | m_deviceCmb->insertItem( "/dev/ttyS1" ); |
61 | m_deviceCmb->insertItem( "/dev/ttyS2" ); | 59 | m_deviceCmb->insertItem( "/dev/ttyS2" ); |
62 | 60 | ||
63 | 61 | atConf = new ATConfigDialog( this, "ATConfig", true ); | |
64 | } | 62 | } |
65 | 63 | ||
66 | ModemConfigWidget::~ModemConfigWidget() { | 64 | ModemConfigWidget::~ModemConfigWidget() { |
@@ -110,10 +108,14 @@ void ModemConfigWidget::load( const Profile& prof ) { | |||
110 | break; | 108 | break; |
111 | } | 109 | } |
112 | 110 | ||
113 | if ( prof.readEntry("Device").isEmpty() ) return; | 111 | if ( prof.readEntry( "Device" ).isEmpty() ) { |
112 | return; | ||
113 | } | ||
114 | setCurrent( prof.readEntry("Device"), m_deviceCmb ); | 114 | setCurrent( prof.readEntry("Device"), m_deviceCmb ); |
115 | 115 | ||
116 | atConf->readConfig( prof ); | ||
116 | } | 117 | } |
118 | |||
117 | /* | 119 | /* |
118 | * save speed, | 120 | * save speed, |
119 | * flow, | 121 | * flow, |
@@ -170,11 +172,10 @@ void ModemConfigWidget::save( Profile& prof ) { | |||
170 | } | 172 | } |
171 | 173 | ||
172 | void ModemConfigWidget::slotAT() { | 174 | void ModemConfigWidget::slotAT() { |
173 | ATConfigDialog conf( this, "ATConfig", true ); | 175 | // ATConfigDialog conf( this, "ATConfig", true ); |
174 | conf.readConfig(); | 176 | atConf->showMaximized(); |
175 | conf.showMaximized(); | 177 | if ( atConf->exec() == QDialog::Accepted ) { |
176 | if ( conf.exec() == QDialog::Accepted ) { | 178 | // atConf->writeConfig(); |
177 | conf.writeConfig(); | ||
178 | } | 179 | } |
179 | } | 180 | } |
180 | 181 | ||