Allow to wait 6 seconds (instead of three) when initialising the modem

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/settings/networksettings/ppp/modemcmds.cpp b/noncore/settings/networksettings/ppp/modemcmds.cpp
index e797795..3d15b96 100644
--- a/noncore/settings/networksettings/ppp/modemcmds.cpp
+++ b/noncore/settings/networksettings/ppp/modemcmds.cpp
@@ -1,333 +1,333 @@
 /*
  *            kPPP: A front end for pppd for the KDE project
  *
  * $Id$
  *
  * Copyright (C) 1997 Bernd Johannes Wuebben
  * wuebben@math.cornell.edu
  *
  * based on EzPPP:
  * Copyright (C) 1997  Jay Painter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * License along with dummyWidget program; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <qlayout.h>
 #include <qslider.h>
 #include <qbuttongroup.h>
 #include <qscrollview.h>
 #include <qapplication.h>
 #include <stdlib.h>
 #include "modemcmds.h"
 #include "pppdata.h"
 
 #define ADJUSTEDIT(e) //e->setText("XXXXXXXXqy"); e->setMinimumSize(e->sizeHint()); /*e->setFixedHeight(e->sizeHint().height());*/ e->setText(""); e->setMaxLength(MODEMSTR_SIZE);
 
 // a little trick to make the label look like a disabled lineedit
 #define FORMATSLIDERLABEL(l) //l->setFixedWidth(l->sizeHint().width()); l->setFixedHeight(QLineEdit(dummyWidget).sizeHint().height()); l->setAlignment(AlignCenter); l->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); l->setLineWidth(2);
 
 ModemCommands::ModemCommands(PPPData *pd, QWidget *parent, const char *name , bool modal, WFlags f)
     : QDialog( parent, name, modal,  f ), _pppdata(pd)
 {
     setCaption(QObject::tr("Edit Modem Commands"));
 
   const int GRIDROWS = 22;
   int row = 0;
 
   QVBoxLayout *main = new QVBoxLayout( this );
   QScrollView *sv = new QScrollView( this );
   QWidget *mainW = new QWidget( sv->viewport() );
   sv->setResizePolicy( QScrollView::AutoOneFit );
   sv->setHScrollBarMode( QScrollView::AlwaysOff );
   sv->setFrameShape( QFrame::NoFrame );
   sv->addChild( mainW );
   main->addWidget( sv );
   // evil hack
   mainW->setMaximumWidth( QApplication::desktop()->width() - 10 );
 
   // toplevel layout
   QVBoxLayout *tl = new QVBoxLayout( mainW, 10, 4);
 
   // add grid + frame
   QGridLayout *l1 = new QGridLayout(GRIDROWS, 4);
   tl->addLayout(l1);
   box = new QGroupBox(mainW, "box");
   box->setMargin( 0 );
   l1->addMultiCellWidget(box, row++, GRIDROWS, 0, 3);
 
   // put slider and label into a separate H-Box
   QHBoxLayout *l2 = new QHBoxLayout;
   l1->addLayout(l2, row, 2);
   lpreinitslider = new QLabel("MMMM", mainW);
   FORMATSLIDERLABEL(lpreinitslider);
 
-  QSlider *preinitslider = new QSlider(0, 300, 1, 0,
+  QSlider *preinitslider = new QSlider(0, 600, 1, 0,
                                        QSlider::Horizontal, mainW);
 //  preinitslider->setFixedHeight(preinitslider->sizeHint().height());
   connect(preinitslider, SIGNAL(valueChanged(int)),
 	  lpreinitslider, SLOT(setNum(int)));
   l2->addWidget(lpreinitslider, 0);
   l2->addWidget(preinitslider, 1);
 
   lpreinit = new QLabel(QObject::tr("Pre-init delay (sec/100):"), mainW);
   l1->addWidget(lpreinit, row++, 1);
 
   for(int i = 0; i < PPPData::NumInitStrings; i++) {
       initstr[i] = new QLineEdit(mainW);
       QLabel *initLabel = new QLabel(QObject::tr("Initialization string %1:").arg(i + 1),
 				    mainW);
       ADJUSTEDIT(initstr[i]);
       l1->addWidget(initLabel, row, 1);
       l1->addWidget(initstr[i], row++, 2);
   }
 
   QHBoxLayout *l3 = new QHBoxLayout;
   l1->addLayout(l3, row, 2);
   linitslider = new QLabel("MMMM", mainW);
   FORMATSLIDERLABEL(linitslider);
   QSlider *initslider = new QSlider(1, 300, 1, 0,
 				QSlider::Horizontal, mainW);
 //  initslider->setFixedHeight(initslider->sizeHint().height());
   connect(initslider, SIGNAL(valueChanged(int)),
 	  linitslider, SLOT(setNum(int)));
   l3->addWidget(linitslider, 0);
   l3->addWidget(initslider, 1);
 
   label3 = new QLabel(QObject::tr("Post-init delay (sec/100):"), mainW);
   l1->addWidget(label3, row++, 1);
 
   /* Set ATS11 (Dial tone duration) between 0-255 (Default ~ 70) */
   QHBoxLayout *l4 = new QHBoxLayout;
   l1->addLayout(l4, row, 2);
   ldurationslider = new QLabel("MMMM", mainW);
   FORMATSLIDERLABEL(ldurationslider);
   QSlider *durationslider = new QSlider(1, 255, 1, 0,
 				QSlider::Horizontal, mainW);
 //  durationslider->setFixedHeight(durationslider->sizeHint().height());
   connect(durationslider, SIGNAL(valueChanged(int)),
 	  ldurationslider, SLOT(setNum(int)));
   l4->addWidget(ldurationslider, 0);
   l4->addWidget(durationslider, 1);
 
   lduration = new QLabel(QObject::tr("Dialing speed (sec/100):"), mainW);
   l1->addWidget(lduration, row++, 1);
 
 
   initresp = new QLineEdit(mainW);
   label2 = new QLabel(QObject::tr("Init response:"), mainW);
   ADJUSTEDIT(initresp);
   l1->addWidget(label2, row, 1);
   l1->addWidget(initresp, row++, 2);
 
   nodetectdialtone = new QLineEdit(mainW);
   lnodetectdialtone = new QLabel(QObject::tr("No dial tone detection:"), mainW);
   ADJUSTEDIT(nodetectdialtone);
   l1->addWidget(lnodetectdialtone, row, 1);
   l1->addWidget(nodetectdialtone, row++, 2);
 
   dialstr = new QLineEdit(mainW);
   label4 = new QLabel(QObject::tr("Dial string:"),mainW);
   ADJUSTEDIT(dialstr);
   l1->addWidget(label4, row, 1);
   l1->addWidget(dialstr, row++, 2);
 
   connectresp = new QLineEdit(mainW);
   label5 = new QLabel(QObject::tr("Connect response:"), mainW);
   ADJUSTEDIT(connectresp);
   l1->addWidget(label5, row, 1);
   l1->addWidget(connectresp, row++, 2);
 
   busyresp = new QLineEdit(mainW);
   label6 = new QLabel(QObject::tr("Busy response:"), mainW);
   ADJUSTEDIT(busyresp);
   l1->addWidget(label6, row, 1);
   l1->addWidget(busyresp, row++, 2);
 
   nocarrierresp = new QLineEdit(mainW);
   label7 = new QLabel(QObject::tr("No carrier response:"), mainW);
   ADJUSTEDIT(nocarrierresp);
   l1->addWidget(label7, row, 1);
   l1->addWidget(nocarrierresp, row++, 2);
 
   nodialtoneresp = new QLineEdit(mainW);
   label8 = new QLabel(QObject::tr("No dial tone response:"), mainW);
   ADJUSTEDIT(nodialtoneresp);
   l1->addWidget(label8, row, 1);
   l1->addWidget(nodialtoneresp, row++, 2);
 
   hangupstr = new QLineEdit(mainW);
   label9 = new QLabel(QObject::tr("Hangup string:"), mainW);
   ADJUSTEDIT(hangupstr);
   l1->addWidget(label9, row, 1);
   l1->addWidget(hangupstr, row++, 2);
 
   hangupresp = new QLineEdit(mainW);
   label10 = new QLabel(QObject::tr("Hangup response:"), mainW);
   ADJUSTEDIT(hangupresp);
   l1->addWidget(label10, row, 1);
   l1->addWidget(hangupresp, row++, 2);
 
   answerstr = new QLineEdit(mainW);
   label11 = new QLabel(QObject::tr("Answer string:"), mainW);
   ADJUSTEDIT(answerstr);
   l1->addWidget(label11, row, 1);
   l1->addWidget(answerstr, row++, 2);
 
   ringresp = new QLineEdit(mainW);
   label12 = new QLabel(QObject::tr("Ring response:"), mainW);
   ADJUSTEDIT(ringresp);
   l1->addWidget(label12, row, 1);
   l1->addWidget(ringresp, row++, 2);
 
   answerresp = new QLineEdit(mainW);
   label13 = new QLabel(QObject::tr("Answer response:"), mainW);
   ADJUSTEDIT(answerresp);
   l1->addWidget(label13, row, 1);
   l1->addWidget(answerresp, row++, 2);
 
   escapestr = new QLineEdit(mainW);
   label14 = new QLabel(QObject::tr("Escape string:"), mainW);
   ADJUSTEDIT(escapestr);
   l1->addWidget(label14, row, 1);
   l1->addWidget(escapestr, row++, 2);
 
   escaperesp = new QLineEdit(mainW);
   label15 = new QLabel(QObject::tr("Escape response:"), mainW);
   ADJUSTEDIT(escaperesp);
   l1->addWidget(label15, row, 1);
   l1->addWidget(escaperesp, row++, 2);
 
   QHBoxLayout *l5 = new QHBoxLayout;
   l1->addLayout(l5, row, 2);
   lslider = new QLabel("MMMM", mainW);
   FORMATSLIDERLABEL(lslider);
 
   QSlider *slider = new QSlider(0, 255, 1, 0,
 				QSlider::Horizontal, mainW);
 //  slider->setFixedHeight(slider->sizeHint().height());
   connect(slider, SIGNAL(valueChanged(int)),
 	  lslider, SLOT(setNum(int)));
   l5->addWidget(lslider, 0);
   l5->addWidget(slider, 1);
 
   label16 = new QLabel(QObject::tr("Guard time (sec/50):"), mainW);
   l1->addWidget(label16, row++, 1);
 
   QLabel *l = new QLabel(QObject::tr("Volume off/low/high:"), mainW);
   l1->addWidget(l, row, 1);
   QHBoxLayout *l6 = new QHBoxLayout;
   l1->addLayout(l6, row++, 2);
   volume_off = new QLineEdit(mainW);
 //  volume_off->setFixedHeight(volume_off->sizeHint().height());
   // volume_off->setMinimumWidth((int)(volume_off->sizeHint().width() / 2));
   volume_medium = new QLineEdit(mainW);
 //  volume_medium->setFixedHeight(volume_medium->sizeHint().height());
   // volume_medium->setMinimumWidth((int)(volume_medium->sizeHint().width() / 2));
   volume_high = new QLineEdit(mainW);
   // volume_high->setFixedHeight(volume_high->sizeHint().height());
   // volume_high->setMinimumWidth((int)(volume_high->sizeHint().width() / 2));
   l6->addWidget(volume_off);
   l6->addWidget(volume_medium);
   l6->addWidget(volume_high);
 
   initstr[0]->setFocus();
 
   l1->addColSpacing(0, 10);
   l1->addColSpacing(3, 10);
   l1->addRowSpacing(0, 5);
   l1->addRowSpacing(GRIDROWS, 5);
 
   //set stuff from gpppdata
   preinitslider->setValue(_pppdata->modemPreInitDelay());
   lpreinitslider->setNum(_pppdata->modemPreInitDelay());
   for(int i = 0; i < PPPData::NumInitStrings; i++)
       initstr[i]->setText(_pppdata->modemInitStr(i));
   initslider->setValue(_pppdata->modemInitDelay());
   linitslider->setNum(_pppdata->modemInitDelay());
   initresp->setText(_pppdata->modemInitResp());
 
   durationslider->setValue(_pppdata->modemToneDuration());
   ldurationslider->setNum(_pppdata->modemToneDuration());
 
   nodetectdialtone->setText(_pppdata->modemNoDialToneDetectionStr());
   dialstr->setText(_pppdata->modemDialStr());
   connectresp->setText(_pppdata->modemConnectResp());
   busyresp->setText(_pppdata->modemBusyResp());
   nocarrierresp->setText(_pppdata->modemNoCarrierResp());
   nodialtoneresp->setText(_pppdata->modemNoDialtoneResp());
 
   escapestr->setText(_pppdata->modemEscapeStr());
   escaperesp->setText(_pppdata->modemEscapeResp());
 
   hangupstr->setText(_pppdata->modemHangupStr());
   hangupresp->setText(_pppdata->modemHangupResp());
 
   answerstr->setText(_pppdata->modemAnswerStr());
   ringresp->setText(_pppdata->modemRingResp());
   answerresp->setText(_pppdata->modemAnswerResp());
 
   slider->setValue(_pppdata->modemEscapeGuardTime());
   lslider->setNum(_pppdata->modemEscapeGuardTime());
 
   volume_off->setText(_pppdata->volumeOff());
   volume_medium->setText(_pppdata->volumeMedium());
   volume_high->setText(_pppdata->volumeHigh());
 }
 
 
 void ModemCommands::slotOk() {
   _pppdata->setModemPreInitDelay(lpreinitslider->text().toInt());
   for(int i = 0; i < PPPData::NumInitStrings; i++)
       _pppdata->setModemInitStr(i, initstr[i]->text());
   _pppdata->setModemInitResp(initresp->text());
   _pppdata->setModemInitDelay(linitslider->text().toInt());
 
   _pppdata->setModemToneDuration(ldurationslider->text().toInt());
   _pppdata->setModemNoDialToneDetectionStr(nodetectdialtone->text());
   _pppdata->setModemDialStr(dialstr->text());
   _pppdata->setModemConnectResp(connectresp->text());
   _pppdata->setModemBusyResp(busyresp->text());
   _pppdata->setModemNoCarrierResp(nocarrierresp->text());
   _pppdata->setModemNoDialtoneResp(nodialtoneresp->text());
 
   _pppdata->setModemEscapeStr(escapestr->text());
   _pppdata->setModemEscapeResp(escaperesp->text());
   _pppdata->setModemEscapeGuardTime(lslider->text().toInt());
   _pppdata->setModemHangupStr(hangupstr->text());
   _pppdata->setModemHangupResp(hangupresp->text());
 
   _pppdata->setModemAnswerStr(answerstr->text());
   _pppdata->setModemRingResp(ringresp->text());
   _pppdata->setModemAnswerResp(answerresp->text());
 
   _pppdata->setVolumeHigh(volume_high->text());
   _pppdata->setVolumeMedium(volume_medium->text());
   _pppdata->setVolumeOff(volume_off->text());
 
   _pppdata->save();
   QDialog::accept();
 }
 
 void ModemCommands::accept()
 {
     slotOk();
 }
 
 
 void ModemCommands::slotCancel() {
   reject();
 }
 
 //#include "modemcmds.moc"