author | harlekin <harlekin> | 2003-06-10 13:46:02 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-06-10 13:46:02 (UTC) |
commit | 8ffea5d37080bd173d55a458296c1fc461a54d13 (patch) (unidiff) | |
tree | 0c7f4a1129ed35d00742e55527ee4e4af59b562b | |
parent | 6189cb95c39acdd5b27e09f9d0798d91fa182e5a (diff) | |
download | opie-8ffea5d37080bd173d55a458296c1fc461a54d13.zip opie-8ffea5d37080bd173d55a458296c1fc461a54d13.tar.gz opie-8ffea5d37080bd173d55a458296c1fc461a54d13.tar.bz2 |
layout fixes
-rw-r--r-- | noncore/settings/networksettings/ppp/accounts.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/edit.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index 7760d5e..04905e8 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp | |||
@@ -224,49 +224,49 @@ int AccountWidget::doTab(){ | |||
224 | // // AUTH WIDGET | 224 | // // AUTH WIDGET |
225 | auth_w = new AuthWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script")); | 225 | auth_w = new AuthWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script")); |
226 | tabWindow->addTab( auth_w, tr("Authentication") ); | 226 | tabWindow->addTab( auth_w, tr("Authentication") ); |
227 | 227 | ||
228 | // // IP WIDGET | 228 | // // IP WIDGET |
229 | ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, tr("IP Setup")); | 229 | ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, tr("IP Setup")); |
230 | tabWindow->addTab( ip_w, tr("IP") ); | 230 | tabWindow->addTab( ip_w, tr("IP") ); |
231 | 231 | ||
232 | // // GATEWAY WIDGET | 232 | // // GATEWAY WIDGET |
233 | gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, tr("Gateway Setup")); | 233 | gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, tr("Gateway Setup")); |
234 | tabWindow->addTab( gateway_w, tr("Gateway") ); | 234 | tabWindow->addTab( gateway_w, tr("Gateway") ); |
235 | 235 | ||
236 | // // DNS WIDGET | 236 | // // DNS WIDGET |
237 | dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, tr("DNS Servers") ); | 237 | dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, tr("DNS Servers") ); |
238 | tabWindow->addTab( dns_w, tr("DNS") ); | 238 | tabWindow->addTab( dns_w, tr("DNS") ); |
239 | 239 | ||
240 | // // EXECUTE WIDGET | 240 | // // EXECUTE WIDGET |
241 | ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, tr("Execute Programs")); | 241 | ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, tr("Execute Programs")); |
242 | tabWindow->addTab( exec_w, tr("Execute") ); | 242 | tabWindow->addTab( exec_w, tr("Execute") ); |
243 | 243 | ||
244 | int result = 0; | 244 | int result = 0; |
245 | bool ok = false; | 245 | bool ok = false; |
246 | 246 | ||
247 | while (!ok){ | 247 | while (!ok){ |
248 | // dlg->showMinimized(); | 248 | dlg->showMaximized(); |
249 | result = dlg->exec(); | 249 | result = dlg->exec(); |
250 | ok = true; | 250 | ok = true; |
251 | 251 | ||
252 | if(result == QDialog::Accepted) { | 252 | if(result == QDialog::Accepted) { |
253 | if (!auth_w->check()){ | 253 | if (!auth_w->check()){ |
254 | ok = false; | 254 | ok = false; |
255 | } else if(!dial_w->save()) { | 255 | } else if(!dial_w->save()) { |
256 | QMessageBox::critical(this, "error", tr( "You must enter a unique account name")); | 256 | QMessageBox::critical(this, "error", tr( "You must enter a unique account name")); |
257 | ok = false; | 257 | ok = false; |
258 | }else{ | 258 | }else{ |
259 | ip_w->save(); | 259 | ip_w->save(); |
260 | dns_w->save(); | 260 | dns_w->save(); |
261 | gateway_w->save(); | 261 | gateway_w->save(); |
262 | auth_w->save(); | 262 | auth_w->save(); |
263 | exec_w->save(); | 263 | exec_w->save(); |
264 | } | 264 | } |
265 | } | 265 | } |
266 | } | 266 | } |
267 | 267 | ||
268 | delete dlg; | 268 | delete dlg; |
269 | 269 | ||
270 | return result; | 270 | return result; |
271 | } | 271 | } |
272 | 272 | ||
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index b880978..0c96253 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp | |||
@@ -194,48 +194,49 @@ void DialWidget::upNumber() { | |||
194 | if(idx != -1) { | 194 | if(idx != -1) { |
195 | QString item = numbers->text(idx); | 195 | QString item = numbers->text(idx); |
196 | numbers->removeItem(idx); | 196 | numbers->removeItem(idx); |
197 | numbers->insertItem(item, idx-1); | 197 | numbers->insertItem(item, idx-1); |
198 | numbers->setCurrentItem(idx-1); | 198 | numbers->setCurrentItem(idx-1); |
199 | numbersChanged(); | 199 | numbersChanged(); |
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | 203 | ||
204 | void DialWidget::downNumber() { | 204 | void DialWidget::downNumber() { |
205 | int idx = numbers->currentItem(); | 205 | int idx = numbers->currentItem(); |
206 | if(idx != -1) { | 206 | if(idx != -1) { |
207 | QString item = numbers->text(idx); | 207 | QString item = numbers->text(idx); |
208 | numbers->removeItem(idx); | 208 | numbers->removeItem(idx); |
209 | numbers->insertItem(item, idx+1); | 209 | numbers->insertItem(item, idx+1); |
210 | numbers->setCurrentItem(idx+1); | 210 | numbers->setCurrentItem(idx+1); |
211 | numbersChanged(); | 211 | numbersChanged(); |
212 | } | 212 | } |
213 | } | 213 | } |
214 | 214 | ||
215 | 215 | ||
216 | void DialWidget::pppdargsbutton() { | 216 | void DialWidget::pppdargsbutton() { |
217 | PPPdArguments pa(_pppdata, this); | 217 | PPPdArguments pa(_pppdata, this); |
218 | pa.showMaximized(); | ||
218 | pa.exec(); | 219 | pa.exec(); |
219 | } | 220 | } |
220 | 221 | ||
221 | 222 | ||
222 | 223 | ||
223 | ///////////////////////////////////////////////////////////////////////////// | 224 | ///////////////////////////////////////////////////////////////////////////// |
224 | // ExecWidget | 225 | // ExecWidget |
225 | ///////////////////////////////////////////////////////////////////////////// | 226 | ///////////////////////////////////////////////////////////////////////////// |
226 | ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) : | 227 | ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) : |
227 | QWidget(parent, name), _pppdata(pd) | 228 | QWidget(parent, name), _pppdata(pd) |
228 | { | 229 | { |
229 | QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint()); | 230 | QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint()); |
230 | 231 | ||
231 | QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this); | 232 | QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this); |
232 | 233 | ||
233 | tl->addWidget(l); | 234 | tl->addWidget(l); |
234 | tl->addStretch(1); | 235 | tl->addStretch(1); |
235 | 236 | ||
236 | QGridLayout *l1 = new QGridLayout(4, 2, 10); | 237 | QGridLayout *l1 = new QGridLayout(4, 2, 10); |
237 | tl->addLayout(l1); | 238 | tl->addLayout(l1); |
238 | l1->setColStretch(0, 0); | 239 | l1->setColStretch(0, 0); |
239 | l1->setColStretch(1, 1); | 240 | l1->setColStretch(1, 1); |
240 | 241 | ||
241 | before_connect_l = new QLabel(tr("Before connect:"), this); | 242 | before_connect_l = new QLabel(tr("Before connect:"), this); |