Diffstat (limited to 'noncore/settings/networksettings/ppp/general.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/general.cpp | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp index 98e035b..f735e49 100644 --- a/noncore/settings/networksettings/ppp/general.cpp +++ b/noncore/settings/networksettings/ppp/general.cpp @@ -40,5 +40,5 @@ #include "general.h" -//#include "version.h" +#include "interfaceppp.h" //#include "miniterm.h" #include "modeminfo.h" @@ -51,6 +51,6 @@ -ModemWidget::ModemWidget( QWidget *parent, const char *name) - : QWidget(parent, name) +ModemWidget::ModemWidget( InterfacePPP *ifppp, QWidget *parent, const char *name ) + : QWidget(parent, name), _ifaceppp(ifppp) { int k; @@ -173,5 +173,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) for(int i=0; i <= enter->count()-1; i++) { - if(PPPData::data()->enter() == enter->text(i)) + if(_ifaceppp->data()->enter() == enter->text(i)) enter->setCurrentItem(i); } @@ -182,5 +182,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) modemlockfile = new QCheckBox(i18n("&Use lock file"), this); - modemlockfile->setChecked(PPPData::data()->modemLockFile()); + modemlockfile->setChecked(_ifaceppp->data()->modemLockFile()); connect(modemlockfile, SIGNAL(toggled(bool)), SLOT(modemlockfilechanged(bool))); @@ -202,8 +202,9 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) QLabel *timeoutlabel = new QLabel( tr("Modem timeout:") ,this, "timeout" ); modemtimeout = new QSpinBox( 1, 120, 1, this, "modemTimeout" ); -// modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this); +// modemtimeout = new KIntNumInput(_pppdata->modemTimeout(), this); // modemtimeout->setLabel(i18n("Modem &timeout:")); // modemtimeout->setRange(1, 120, 1); modemtimeout->setSuffix(i18n(" sec")); + modemtimeout->setValue( _ifaceppp->data()->modemTimeout() ); connect(modemtimeout, SIGNAL(valueChanged(int)), SLOT(modemtimeoutchanged(int))); @@ -219,15 +220,15 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) //set stuff from gpppdata for(int i=0; i <= enter->count()-1; i++) { - if(PPPData::data()->enter() == enter->text(i)) + if(_ifaceppp->data()->enter() == enter->text(i)) enter->setCurrentItem(i); } for(int i=0; i <= modemdevice->count()-1; i++) { - if(PPPData::data()->modemDevice() == modemdevice->text(i)) + if(_ifaceppp->data()->modemDevice() == modemdevice->text(i)) modemdevice->setCurrentItem(i); } for(int i=0; i <= flowcontrol->count()-1; i++) { - if(PPPData::data()->flowcontrol() == flowcontrol->text(i)) + if(_ifaceppp->data()->flowcontrol() == flowcontrol->text(i)) flowcontrol->setCurrentItem(i); } @@ -235,5 +236,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) //set the modem speed for(int i=0; i < baud_c->count(); i++) - if(baud_c->text(i) == PPPData::data()->speed()) + if(baud_c->text(i) == _ifaceppp->data()->speed()) baud_c->setCurrentItem(i); @@ -243,35 +244,36 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) void ModemWidget::speed_selection(int) { - PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem())); + _ifaceppp->data()->setSpeed(baud_c->text(baud_c->currentItem())); } void ModemWidget::setenter(int ) { - PPPData::data()->setEnter(enter->text(enter->currentItem())); + _ifaceppp->data()->setEnter(enter->text(enter->currentItem())); } void ModemWidget::setmodemdc(int i) { - PPPData::data()->setModemDevice(modemdevice->text(i)); + _ifaceppp->data()->setModemDevice(modemdevice->text(i)); } void ModemWidget::setflowcontrol(int i) { - PPPData::data()->setFlowcontrol(flowcontrol->text(i)); + _ifaceppp->data()->setFlowcontrol(flowcontrol->text(i)); } void ModemWidget::modemlockfilechanged(bool set) { - PPPData::data()->setModemLockFile(set); + _ifaceppp->data()->setModemLockFile(set); } void ModemWidget::modemtimeoutchanged(int n) { - PPPData::data()->setModemTimeout(n); + _ifaceppp->data()->setModemTimeout(n); } -ModemWidget2::ModemWidget2( QWidget *parent, const char *name) - : QWidget(parent, name) +ModemWidget2::ModemWidget2( InterfacePPP* ifp, QWidget *parent, + const char *name) + : QWidget(parent, name), _ifaceppp(ifp) { QVBoxLayout *l1 = new QVBoxLayout(this, 0 );//, KDialog::spacingHint()); @@ -279,5 +281,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) waitfordt = new QCheckBox(i18n("&Wait for dial tone before dialing"), this); - waitfordt->setChecked(PPPData::data()->waitForDialTone()); + waitfordt->setChecked(_ifaceppp->data()->waitForDialTone()); connect(waitfordt, SIGNAL(toggled(bool)), SLOT(waitfordtchanged(bool))); l1->addWidget(waitfordt); @@ -294,5 +296,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) QLabel *waitLabel = new QLabel( tr("Busy wait:"), this, "busyWait" ); busywait = new QSpinBox( 0, 300, 5, this, "busyWait" ); -// busywait = new KIntNumInput(PPPData::data()->busyWait(), this); +// busywait = new KIntNumInput(_pppdata->busyWait(), this); // busywait->setLabel(i18n("B&usy wait:")); // busywait->setRange(0, 300, 5, true); @@ -319,5 +321,6 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) QLabel *volumeLabel = new QLabel(i18n("Modem &volume:"), this); hbl->addWidget(volumeLabel); - volume = new QSlider(0, 2, 1, PPPData::data()->volume(), QSlider::Horizontal, this); + volume = new QSlider(0, 2, 1, _ifaceppp->data()->volume(), + QSlider::Horizontal, this); volumeLabel->setBuddy(volume); volume->setTickmarks(QSlider::Below); @@ -343,5 +346,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) #if 0 chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this); - chkbox1->setChecked(PPPData::data()->UseCDLine()); + chkbox1->setChecked(_ifaceppp->data()->UseCDLine()); connect(chkbox1,SIGNAL(toggled(bool)), this,SLOT(use_cdline_toggled(bool))); @@ -400,5 +403,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) void ModemWidget2::modemcmdsbutton() { - ModemCommands mc(this); + ModemCommands mc(_ifaceppp->data(), this); mc.showMaximized(); mc.exec(); @@ -407,5 +410,5 @@ void ModemWidget2::modemcmdsbutton() { void ModemWidget2::query_modem() { - ModemTransfer mt(this); + ModemTransfer mt(_ifaceppp->modem(), this); mt.exec(); } @@ -420,19 +423,19 @@ void ModemWidget2::query_modem() { #if 0 void ModemWidget2::use_cdline_toggled(bool on) { - PPPData::data()->setUseCDLine(on); + _ifaceppp->data()->setUseCDLine(on); } #endif void ModemWidget2::waitfordtchanged(bool b) { - PPPData::data()->setWaitForDialTone((int)b); + _ifaceppp->data()->setWaitForDialTone((int)b); } void ModemWidget2::busywaitchanged(int n) { - PPPData::data()->setbusyWait(n); + _ifaceppp->data()->setbusyWait(n); } void ModemWidget2::volumeChanged(int v) { - PPPData::data()->setVolume(v); + _ifaceppp->data()->setVolume(v); } |