Diffstat (limited to 'noncore/settings/networksettings/ppp/modeminfo.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/modeminfo.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp index 4dbbcf5..0bec186 100644 --- a/noncore/settings/networksettings/ppp/modeminfo.cpp +++ b/noncore/settings/networksettings/ppp/modeminfo.cpp | |||
@@ -28,26 +28,27 @@ | |||
28 | #include <qregexp.h> | 28 | #include <qregexp.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | // #include <kwin.h> | 30 | // #include <kwin.h> |
31 | // #include <kmessagebox.h> | 31 | // #include <kmessagebox.h> |
32 | // #include <kapplication.h> | 32 | // #include <kapplication.h> |
33 | #include <qmessagebox.h> | 33 | #include <qmessagebox.h> |
34 | #include <qapplication.h> | 34 | #include <qapplication.h> |
35 | #include "modeminfo.h" | 35 | #include "modeminfo.h" |
36 | #include "modem.h" | 36 | #include "modem.h" |
37 | //#include <klocale.h> | 37 | //#include <klocale.h> |
38 | #define i18n QObject::tr | 38 | #define i18n QObject::tr |
39 | 39 | ||
40 | ModemTransfer::ModemTransfer(QWidget *parent, const char *name) | 40 | ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name) |
41 | : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) | 41 | : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder), |
42 | _modem(mo) | ||
42 | { | 43 | { |
43 | setCaption(i18n("ATI Query")); | 44 | setCaption(i18n("ATI Query")); |
44 | // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); | 45 | // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); |
45 | 46 | ||
46 | QVBoxLayout *tl = new QVBoxLayout(this, 10, 10); | 47 | QVBoxLayout *tl = new QVBoxLayout(this, 10, 10); |
47 | 48 | ||
48 | progressBar = new QProgressBar(this, "bar"); | 49 | progressBar = new QProgressBar(this, "bar"); |
49 | progressBar->setTotalSteps(8); | 50 | progressBar->setTotalSteps(8); |
50 | 51 | ||
51 | statusBar = new QLabel(this,"sBar"); | 52 | statusBar = new QLabel(this,"sBar"); |
52 | statusBar->setFrameStyle(QFrame::Panel|QFrame::Sunken); | 53 | statusBar->setFrameStyle(QFrame::Panel|QFrame::Sunken); |
53 | statusBar->setAlignment(AlignCenter); | 54 | statusBar->setAlignment(AlignCenter); |
@@ -88,26 +89,26 @@ ModemTransfer::ModemTransfer(QWidget *parent, const char *name) | |||
88 | scripttimer = new QTimer(this); | 89 | scripttimer = new QTimer(this); |
89 | connect(scripttimer, SIGNAL(timeout()), SLOT(do_script())); | 90 | connect(scripttimer, SIGNAL(timeout()), SLOT(do_script())); |
90 | 91 | ||
91 | timeout_timer->start(15000,TRUE); // 15 secs single shot | 92 | timeout_timer->start(15000,TRUE); // 15 secs single shot |
92 | QTimer::singleShot(500, this, SLOT(init())); | 93 | QTimer::singleShot(500, this, SLOT(init())); |
93 | 94 | ||
94 | } | 95 | } |
95 | 96 | ||
96 | 97 | ||
97 | void ModemTransfer::ati_done() { | 98 | void ModemTransfer::ati_done() { |
98 | scripttimer->stop(); | 99 | scripttimer->stop(); |
99 | timeout_timer->stop(); | 100 | timeout_timer->stop(); |
100 | Modem::modem->closetty(); | 101 | _modem->closetty(); |
101 | Modem::modem->unlockdevice(); | 102 | _modem->unlockdevice(); |
102 | hide(); | 103 | hide(); |
103 | 104 | ||
104 | // open the result window | 105 | // open the result window |
105 | ModemInfo *mi = new ModemInfo(this); | 106 | ModemInfo *mi = new ModemInfo(this); |
106 | for(int i = 0; i < NUM_OF_ATI; i++) | 107 | for(int i = 0; i < NUM_OF_ATI; i++) |
107 | mi->setAtiString(i, ati_query_strings[i]); | 108 | mi->setAtiString(i, ati_query_strings[i]); |
108 | mi->showMaximized(); | 109 | mi->showMaximized(); |
109 | mi->exec(); | 110 | mi->exec(); |
110 | delete mi; | 111 | delete mi; |
111 | 112 | ||
112 | accept(); | 113 | accept(); |
113 | } | 114 | } |
@@ -117,89 +118,89 @@ void ModemTransfer::time_out_slot() { | |||
117 | timeout_timer->stop(); | 118 | timeout_timer->stop(); |
118 | scripttimer->stop(); | 119 | scripttimer->stop(); |
119 | 120 | ||
120 | QMessageBox::warning(this, tr("Error"), i18n("Modem Query timed out.")); | 121 | QMessageBox::warning(this, tr("Error"), i18n("Modem Query timed out.")); |
121 | reject(); | 122 | reject(); |
122 | } | 123 | } |
123 | 124 | ||
124 | 125 | ||
125 | void ModemTransfer::init() { | 126 | void ModemTransfer::init() { |
126 | 127 | ||
127 | qApp->processEvents(); | 128 | qApp->processEvents(); |
128 | 129 | ||
129 | int lock = Modem::modem->lockdevice(); | 130 | int lock = _modem->lockdevice(); |
130 | if (lock == 1) { | 131 | if (lock == 1) { |
131 | 132 | ||
132 | statusBar->setText(i18n("Modem device is locked.")); | 133 | statusBar->setText(i18n("Modem device is locked.")); |
133 | return; | 134 | return; |
134 | } | 135 | } |
135 | 136 | ||
136 | if (lock == -1) { | 137 | if (lock == -1) { |
137 | 138 | ||
138 | statusBar->setText(i18n("Unable to create modem lock file.")); | 139 | statusBar->setText(i18n("Unable to create modem lock file.")); |
139 | return; | 140 | return; |
140 | } | 141 | } |
141 | 142 | ||
142 | 143 | ||
143 | if(Modem::modem->opentty()) { | 144 | if(_modem->opentty()) { |
144 | if(Modem::modem->hangup()) { | 145 | if(_modem->hangup()) { |
145 | usleep(100000); // wait 0.1 secs | 146 | usleep(100000); // wait 0.1 secs |
146 | Modem::modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... | 147 | _modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... |
147 | 148 | ||
148 | statusBar->setText(i18n("Modem Ready")); | 149 | statusBar->setText(i18n("Modem Ready")); |
149 | qApp->processEvents(); | 150 | qApp->processEvents(); |
150 | usleep(100000); // wait 0.1 secs | 151 | usleep(100000); // wait 0.1 secs |
151 | qApp->processEvents(); | 152 | qApp->processEvents(); |
152 | scripttimer->start(1000); // this one does the ati query | 153 | scripttimer->start(1000); // this one does the ati query |
153 | 154 | ||
154 | // clear modem buffer | 155 | // clear modem buffer |
155 | Modem::modem->flush(); | 156 | _modem->flush(); |
156 | 157 | ||
157 | Modem::modem->notify(this, SLOT(readChar(unsigned char))); | 158 | _modem->notify(this, SLOT(readChar(unsigned char))); |
158 | return; | 159 | return; |
159 | } | 160 | } |
160 | } | 161 | } |
161 | 162 | ||
162 | // opentty() or hangup() failed | 163 | // opentty() or hangup() failed |
163 | statusBar->setText(Modem::modem->modemMessage()); | 164 | statusBar->setText(_modem->modemMessage()); |
164 | step = 99; // wait until cancel is pressed | 165 | step = 99; // wait until cancel is pressed |
165 | Modem::modem->unlockdevice(); | 166 | _modem->unlockdevice(); |
166 | } | 167 | } |
167 | 168 | ||
168 | 169 | ||
169 | void ModemTransfer::do_script() { | 170 | void ModemTransfer::do_script() { |
170 | QString msg; | 171 | QString msg; |
171 | QString query; | 172 | QString query; |
172 | 173 | ||
173 | switch(step) { | 174 | switch(step) { |
174 | case 0: | 175 | case 0: |
175 | readtty(); | 176 | readtty(); |
176 | statusBar->setText("ATI..."); | 177 | statusBar->setText("ATI..."); |
177 | progressBar->setProgress( progressBar->progress() + 1); | 178 | progressBar->setProgress( progressBar->progress() + 1); |
178 | Modem::modem->writeLine("ATI\n"); | 179 | _modem->writeLine("ATI\n"); |
179 | break; | 180 | break; |
180 | 181 | ||
181 | case 1: | 182 | case 1: |
182 | case 2: | 183 | case 2: |
183 | case 3: | 184 | case 3: |
184 | case 4: | 185 | case 4: |
185 | case 5: | 186 | case 5: |
186 | case 6: | 187 | case 6: |
187 | case 7: | 188 | case 7: |
188 | readtty(); | 189 | readtty(); |
189 | msg.sprintf("ATI %d ...", step); | 190 | msg.sprintf("ATI %d ...", step); |
190 | query.sprintf("ATI%d\n", step); | 191 | query.sprintf("ATI%d\n", step); |
191 | statusBar->setText(msg); | 192 | statusBar->setText(msg); |
192 | progressBar->setProgress( progressBar->progress() + 1); | 193 | progressBar->setProgress( progressBar->progress() + 1); |
193 | Modem::modem->writeLine(query.local8Bit()); | 194 | _modem->writeLine(query.local8Bit()); |
194 | break; | 195 | break; |
195 | 196 | ||
196 | default: | 197 | default: |
197 | readtty(); | 198 | readtty(); |
198 | ati_done(); | 199 | ati_done(); |
199 | } | 200 | } |
200 | step++; | 201 | step++; |
201 | } | 202 | } |
202 | 203 | ||
203 | void ModemTransfer::readChar(unsigned char c) { | 204 | void ModemTransfer::readChar(unsigned char c) { |
204 | if(readbuffer.length() < 255) | 205 | if(readbuffer.length() < 255) |
205 | readbuffer += c; | 206 | readbuffer += c; |
@@ -214,34 +215,34 @@ void ModemTransfer::readtty() { | |||
214 | readbuffer = readbuffer.stripWhiteSpace(); // strip of leading or trailing white | 215 | readbuffer = readbuffer.stripWhiteSpace(); // strip of leading or trailing white |
215 | // space | 216 | // space |
216 | 217 | ||
217 | if(step <= NUM_OF_ATI) | 218 | if(step <= NUM_OF_ATI) |
218 | ati_query_strings[step-1] = readbuffer.copy(); | 219 | ati_query_strings[step-1] = readbuffer.copy(); |
219 | 220 | ||
220 | readbuffer = ""; | 221 | readbuffer = ""; |
221 | } | 222 | } |
222 | 223 | ||
223 | 224 | ||
224 | void ModemTransfer::cancelbutton() { | 225 | void ModemTransfer::cancelbutton() { |
225 | scripttimer->stop(); | 226 | scripttimer->stop(); |
226 | Modem::modem->stop(); | 227 | _modem->stop(); |
227 | timeout_timer->stop(); | 228 | timeout_timer->stop(); |
228 | 229 | ||
229 | statusBar->setText(i18n("One moment please...")); | 230 | statusBar->setText(i18n("One moment please...")); |
230 | qApp->processEvents(); | 231 | qApp->processEvents(); |
231 | 232 | ||
232 | Modem::modem->hangup(); | 233 | _modem->hangup(); |
233 | 234 | ||
234 | Modem::modem->closetty(); | 235 | _modem->closetty(); |
235 | Modem::modem->unlockdevice(); | 236 | _modem->unlockdevice(); |
236 | reject(); | 237 | reject(); |
237 | } | 238 | } |
238 | 239 | ||
239 | 240 | ||
240 | void ModemTransfer::closeEvent( QCloseEvent *e ) { | 241 | void ModemTransfer::closeEvent( QCloseEvent *e ) { |
241 | cancelbutton(); | 242 | cancelbutton(); |
242 | e->accept(); | 243 | e->accept(); |
243 | } | 244 | } |
244 | 245 | ||
245 | 246 | ||
246 | ModemInfo::ModemInfo(QWidget *parent, const char* name) | 247 | ModemInfo::ModemInfo(QWidget *parent, const char* name) |
247 | : QDialog(parent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) | 248 | : QDialog(parent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) |