Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
30 files changed, 1125 insertions, 981 deletions
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index 11d4739..3fa2f84 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp @@ -52,4 +52,4 @@ void parseargs(char* buf, char** args); -AccountWidget::AccountWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name ) + : QWidget( parent, name ), _pppdata(pd) { @@ -154,6 +154,6 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name ) //load up account list from gppdata to the list box - if(PPPData::data()->count() > 0) { - for(int i=0; i <= PPPData::data()->count()-1; i++) { - PPPData::data()->setAccountbyIndex(i); - accountlist_l->insertItem(PPPData::data()->accname()); + if(_pppdata->count() > 0) { + for(int i=0; i <= _pppdata->count()-1; i++) { + _pppdata->setAccountbyIndex(i); + accountlist_l->insertItem(_pppdata->accname()); } @@ -162,5 +162,5 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name ) // slotListBoxSelect(accountlist_l->currentItem()); - qDebug("setting listview index to %i",PPPData::data()->currentAccountID() ); - accountlist_l->setCurrentItem( PPPData::data()->currentAccountID() ); -// slotListBoxSelect( PPPData::data()->currentAccountID()); + qDebug("setting listview index to %i",_pppdata->currentAccountID() ); + accountlist_l->setCurrentItem( _pppdata->currentAccountID() ); +// slotListBoxSelect( _pppdata->currentAccountID()); @@ -177,5 +177,5 @@ void AccountWidget::slotListBoxSelect(int idx) { qDebug("setting account to %i", idx); - QString account = PPPData::data()->accname(); - PPPData::data()->setAccountbyIndex(accountlist_l->currentItem()); - // PPPData::data()->setAccount(account); + QString account = _pppdata->accname(); + _pppdata->setAccountbyIndex(accountlist_l->currentItem()); + // _pppdata->setAccount(account); } @@ -216,3 +216,3 @@ void AccountWidget::slotListBoxSelect(int idx) { void AccountWidget::editaccount() { - PPPData::data()->setAccount(accountlist_l->text(accountlist_l->currentItem())); + _pppdata->setAccount(accountlist_l->text(accountlist_l->currentItem())); @@ -221,5 +221,5 @@ void AccountWidget::editaccount() { if(result == QDialog::Accepted) { - accountlist_l->changeItem(PPPData::data()->accname(),accountlist_l->currentItem()); + accountlist_l->changeItem(_pppdata->accname(),accountlist_l->currentItem()); // emit resetaccounts(); - PPPData::data()->save(); + _pppdata->save(); } @@ -247,3 +247,3 @@ void AccountWidget::newaccount() { // { -// if (PPPData::data()->newaccount() == -1) +// if (_pppdata->newaccount() == -1) // return; @@ -254,4 +254,4 @@ void AccountWidget::newaccount() { // case QMessageBox::No: - if (PPPData::data()->newaccount() == -1){ - qDebug("PPPData::data()->newaccount() == -1"); + if (_pppdata->newaccount() == -1){ + qDebug("_pppdata->newaccount() == -1"); return; @@ -265,9 +265,9 @@ void AccountWidget::newaccount() { if(result == QDialog::Accepted) { - accountlist_l->insertItem(PPPData::data()->accname()); - accountlist_l->setSelected(accountlist_l->findItem(PPPData::data()->accname()), + accountlist_l->insertItem(_pppdata->accname()); + accountlist_l->setSelected(accountlist_l->findItem(_pppdata->accname()), true); // emit resetaccounts(); - PPPData::data()->save(); + _pppdata->save(); } else - PPPData::data()->deleteAccount(); + _pppdata->deleteAccount(); } @@ -286,7 +286,7 @@ void AccountWidget::copyaccount() { - PPPData::data()->copyaccount(accountlist_l->currentItem()); + _pppdata->copyaccount(accountlist_l->currentItem()); - accountlist_l->insertItem(PPPData::data()->accname()); + accountlist_l->insertItem(_pppdata->accname()); // emit resetaccounts(); - PPPData::data()->save(); + _pppdata->save(); } @@ -302,3 +302,3 @@ void AccountWidget::deleteaccount() { - if(PPPData::data()->deleteAccount(accountlist_l->text(accountlist_l->currentItem()))) + if(_pppdata->deleteAccount(accountlist_l->text(accountlist_l->currentItem()))) accountlist_l->removeItem(accountlist_l->currentItem()); @@ -306,3 +306,3 @@ void AccountWidget::deleteaccount() { emit resetaccounts(); - PPPData::data()->save(); + _pppdata->save(); @@ -324,3 +324,3 @@ int AccountWidget::doTab(){ - if(PPPData::data()->accname().isEmpty()) { + if(_pppdata->accname().isEmpty()) { dlg->setCaption(i18n("New Account")); @@ -329,3 +329,3 @@ int AccountWidget::doTab(){ QString tit = i18n("Edit Account: "); - tit += PPPData::data()->accname(); + tit += _pppdata->accname(); dlg->setCaption(tit); @@ -334,13 +334,13 @@ int AccountWidget::doTab(){ - dial_w = new DialWidget( tabWindow, isnewaccount, "Dial Setup"); + dial_w = new DialWidget( _pppdata, tabWindow, isnewaccount, "Dial Setup"); tabWindow->addTab( dial_w, i18n("Dial") ); - ip_w = new IPWidget( tabWindow, isnewaccount, i18n("IP Setup")); + ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, i18n("IP Setup")); tabWindow->addTab( ip_w, i18n("IP") ); - gateway_w = new GatewayWidget( tabWindow, isnewaccount, i18n("Gateway Setup")); + gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, i18n("Gateway Setup")); tabWindow->addTab( gateway_w, i18n("Gateway") ); - dns_w = new DNSWidget( tabWindow, isnewaccount, i18n("DNS Servers") ); + dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, i18n("DNS Servers") ); tabWindow->addTab( dns_w, i18n("DNS") ); - script_w = new ScriptWidget( tabWindow, isnewaccount, i18n("Edit Login Script")); + script_w = new ScriptWidget( _pppdata, tabWindow, isnewaccount, i18n("Edit Login Script")); tabWindow->addTab( script_w, i18n("Login Script") ); - ExecWidget *exec_w = new ExecWidget( tabWindow, isnewaccount, i18n("Execute Programs")); + ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, i18n("Execute Programs")); tabWindow->addTab( exec_w, i18n("Execute") ); diff --git a/noncore/settings/networksettings/ppp/accounts.h b/noncore/settings/networksettings/ppp/accounts.h index 751a414..5e8509d 100644 --- a/noncore/settings/networksettings/ppp/accounts.h +++ b/noncore/settings/networksettings/ppp/accounts.h @@ -44,2 +44,3 @@ class DNSWidget; class GatewayWidget; +class PPPData; @@ -48,3 +49,3 @@ class AccountWidget : public QWidget { public: - AccountWidget( QWidget *parent=0, const char *name=0 ); + AccountWidget( PPPData *pd, QWidget *parent=0, const char *name=0 ); ~AccountWidget() {} @@ -71,2 +72,3 @@ private: + PPPData *_pppdata; QTabWidget *tabWindow; diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp index a3eda9d..2615b60 100644 --- a/noncore/settings/networksettings/ppp/connect.cpp +++ b/noncore/settings/networksettings/ppp/connect.cpp @@ -67,3 +67,3 @@ //#include "docking.h" -//#include "main.h" +#include "interfaceppp.h" #include "modem.h" @@ -76,4 +76,2 @@ -extern KPPPWidget *p_kppp; - QString old_hostname; @@ -82,5 +80,4 @@ bool modified_hostname; -ConnectWidget::ConnectWidget(QWidget *parent, const char *name) +ConnectWidget::ConnectWidget(InterfacePPP *ifp, QWidget *parent, const char *name) : QWidget(parent, name), - // initialize some important variables myreadbuffer(""), @@ -98,5 +95,4 @@ ConnectWidget::ConnectWidget(QWidget *parent, const char *name) pausing(false), -// termwindow(0), -// stats(st), - dialnumber(0) + dialnumber(0), + _ifaceppp(ifp) { @@ -181,3 +177,3 @@ void ConnectWidget::preinit() { void ConnectWidget::init() { - PPPData::data()->setpppdError(0); + _ifaceppp->data()->setpppdError(0); inittimer->stop(); @@ -196,10 +192,10 @@ void ConnectWidget::init() { - p_kppp->con_speed = ""; +// p_kppp->con_speed = ""; -// p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || PPPData::data()->quit_on_disconnect()); +// p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || _ifaceppp->data()->quit_on_disconnect()); - comlist = &PPPData::data()->scriptType(); - arglist = &PPPData::data()->script(); + comlist = &_ifaceppp->data()->scriptType(); + arglist = &_ifaceppp->data()->script(); - QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname()); + QString tit = i18n("Connecting to: %1").arg(_ifaceppp->data()->accname()); setCaption(tit); @@ -209,3 +205,3 @@ void ConnectWidget::init() { // run the "before-connect" command - if (!PPPData::data()->command_before_connect().isEmpty()) { + if (!_ifaceppp->data()->command_before_connect().isEmpty()) { messg->setText(i18n("Running pre-startup command...")); @@ -215,3 +211,3 @@ void ConnectWidget::init() { QApplication::flushX(); - pid_t id = execute_command(PPPData::data()->command_before_connect()); + pid_t id = execute_command(_ifaceppp->data()->command_before_connect()); // int i, status; @@ -225,3 +221,3 @@ void ConnectWidget::init() { - int lock = Modem::modem->lockdevice(); + int lock = _ifaceppp->modem()->lockdevice(); @@ -239,6 +235,6 @@ void ConnectWidget::init() { - if(Modem::modem->opentty()) { - messg->setText(Modem::modem->modemMessage()); + if(_ifaceppp->modem()->opentty()) { + messg->setText(_ifaceppp->modem()->modemMessage()); qApp->processEvents(); - if(Modem::modem->hangup()) { + if(_ifaceppp->modem()->hangup()) { @@ -248,7 +244,7 @@ void ConnectWidget::init() { - Modem::modem->stop(); - Modem::modem->notify(this, SLOT(readChar(unsigned char))); + _ifaceppp->modem()->stop(); + _ifaceppp->modem()->notify(this, SLOT(readChar(unsigned char))); // if we are stuck anywhere we will time out - timeout_timer->start(PPPData::data()->modemTimeout()*1000); + timeout_timer->start(_ifaceppp->data()->modemTimeout()*1000); @@ -262,5 +258,5 @@ void ConnectWidget::init() { // initialization failed - messg->setText(Modem::modem->modemMessage()); + messg->setText(_ifaceppp->modem()->modemMessage()); vmain = 20; // wait until cancel is pressed - Modem::modem->unlockdevice(); + _ifaceppp->modem()->unlockdevice(); } @@ -286,3 +282,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - QString initStr = PPPData::data()->modemInitStr(substate); + QString initStr = _ifaceppp->data()->modemInitStr(substate); if (!initStr.isEmpty()) { @@ -290,10 +286,10 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // let us issue commands. - if(PPPData::data()->modemPreInitDelay() > 0) { - usleep(PPPData::data()->modemPreInitDelay() * 5000); + if(_ifaceppp->data()->modemPreInitDelay() > 0) { + usleep(_ifaceppp->data()->modemPreInitDelay() * 5000); writeline(""); - usleep(PPPData::data()->modemPreInitDelay() * 5000); + usleep(_ifaceppp->data()->modemPreInitDelay() * 5000); } - setExpect(PPPData::data()->modemInitResp()); + setExpect(_ifaceppp->data()->modemInitResp()); writeline(initStr); - usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec + usleep(_ifaceppp->data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec } @@ -308,3 +304,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { */ - if (MODEM_TONEDURATION != PPPData::data()->modemToneDuration()) + if (MODEM_TONEDURATION != _ifaceppp->data()->modemToneDuration()) vmain = 5; @@ -318,3 +314,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!expecting) { - QString sToneDuration = "ATS11=" + QString::number(PPPData::data()->modemToneDuration()); + QString sToneDuration = "ATS11=" + QString::number(_ifaceppp->data()->modemToneDuration()); QString msg = i18n("Setting ") + sToneDuration; @@ -322,3 +318,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { emit debugMessage(msg); - setExpect(PPPData::data()->modemInitResp()); + setExpect(_ifaceppp->data()->modemInitResp()); writeline(sToneDuration); @@ -338,3 +334,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // skip setting the volume if command is empty - if(PPPData::data()->volumeInitString().isEmpty()) { + if(_ifaceppp->data()->volumeInitString().isEmpty()) { vmain = 4; @@ -345,7 +341,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - setExpect(PPPData::data()->modemInitResp()); + setExpect(_ifaceppp->data()->modemInitResp()); QString vol("AT"); - vol += PPPData::data()->volumeInitString(); + vol += _ifaceppp->data()->volumeInitString(); writeline(vol); - usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec + usleep(_ifaceppp->data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec vmain = 4; @@ -357,3 +353,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!expecting) { - if(!PPPData::data()->waitForDialTone()) { + if(!_ifaceppp->data()->waitForDialTone()) { QString msg = i18n("Turning off dial tone waiting..."); @@ -361,4 +357,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { emit debugMessage(msg); - setExpect(PPPData::data()->modemInitResp()); - writeline(PPPData::data()->modemNoDialToneDetectionStr()); + setExpect(_ifaceppp->data()->modemInitResp()); + writeline(_ifaceppp->data()->modemNoDialToneDetectionStr()); } @@ -374,6 +370,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) { timeout_timer->stop(); - timeout_timer->start(PPPData::data()->modemTimeout()*1000); + timeout_timer->start(_ifaceppp->data()->modemTimeout()*1000); - QStringList &plist = PPPData::data()->phonenumbers(); - QString bmarg= PPPData::data()->dialPrefix(); + QStringList &plist = _ifaceppp->data()->phonenumbers(); + QString bmarg= _ifaceppp->data()->dialPrefix(); bmarg += *plist.at(dialnumber); @@ -383,4 +379,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - QString pn = PPPData::data()->modemDialStr(); - pn += PPPData::data()->dialPrefix(); + QString pn = _ifaceppp->data()->modemDialStr(); + pn += _ifaceppp->data()->dialPrefix(); pn += *plist.at(dialnumber); @@ -390,3 +386,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - setExpect(PPPData::data()->modemConnectResp()); + setExpect(_ifaceppp->data()->modemConnectResp()); vmain = 100; @@ -400,3 +396,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!expecting) { - myreadbuffer = PPPData::data()->modemConnectResp(); + myreadbuffer = _ifaceppp->data()->modemConnectResp(); setExpect("\n"); @@ -406,5 +402,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - if(readbuffer.contains(PPPData::data()->modemBusyResp())) { + if(readbuffer.contains(_ifaceppp->data()->modemBusyResp())) { timeout_timer->stop(); - timeout_timer->start(PPPData::data()->modemTimeout()*1000); + timeout_timer->start(_ifaceppp->data()->modemTimeout()*1000); @@ -412,6 +408,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) { emit debugPutChar('\n'); - Modem::modem->hangup(); + _ifaceppp->modem()->hangup(); - if(PPPData::data()->busyWait() > 0) { - QString bm = i18n("Line busy. Waiting: %1 seconds").arg(PPPData::data()->busyWait()); + if(_ifaceppp->data()->busyWait() > 0) { + QString bm = i18n("Line busy. Waiting: %1 seconds").arg(_ifaceppp->data()->busyWait()); messg->setText(bm); @@ -421,3 +417,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - pausetimer->start(PPPData::data()->busyWait()*1000, true); + pausetimer->start(_ifaceppp->data()->busyWait()*1000, true); timeout_timer->stop(); @@ -425,3 +421,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - Modem::modem->setDataMode(false); + _ifaceppp->modem()->setDataMode(false); vmain = 0; @@ -431,3 +427,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - if(readbuffer.contains(PPPData::data()->modemNoDialtoneResp())) { + if(readbuffer.contains(_ifaceppp->data()->modemNoDialtoneResp())) { timeout_timer->stop(); @@ -436,3 +432,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { vmain = 20; - Modem::modem->unlockdevice(); + _ifaceppp->modem()->unlockdevice(); return; @@ -440,3 +436,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - if(readbuffer.contains(PPPData::data()->modemNoCarrierResp())) { + if(readbuffer.contains(_ifaceppp->data()->modemNoCarrierResp())) { timeout_timer->stop(); @@ -445,3 +441,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { vmain = 20; - Modem::modem->unlockdevice(); + _ifaceppp->modem()->unlockdevice(); return; @@ -453,3 +449,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!expecting) { - Modem::modem->setDataMode(true); // modem will no longer respond to AT commands + _ifaceppp->modem()->setDataMode(true); // modem will no longer respond to AT commands @@ -459,3 +455,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { vmain = 2; - scriptTimeout=PPPData::data()->modemTimeout()*1000; + scriptTimeout=_ifaceppp->data()->modemTimeout()*1000; return; @@ -496,6 +492,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if (scriptArgument.lower() == "password") { - PPPData::data()->setPassword(scanvar); - p_kppp->setPW_Edit(scanvar); - if(PPPData::data()->storePassword()) - PPPData::data()->setStoredPassword(scanvar); + _ifaceppp->data()->setPassword(scanvar); +// p_kppp->setPW_Edit(scanvar); + if(_ifaceppp->data()->storePassword()) + _ifaceppp->data()->setStoredPassword(scanvar); firstrunPW = true; @@ -515,4 +511,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { QRegExp re2("%PASSWORD%"); - arg = arg.replace(re1, PPPData::data()->storedUsername()); - arg = arg.replace(re2, PPPData::data()->storedPassword()); + arg = arg.replace(re1, _ifaceppp->data()->storedUsername()); + arg = arg.replace(re2, _ifaceppp->data()->storedPassword()); @@ -580,4 +576,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - writeline(PPPData::data()->modemHangupStr()); - setExpect(PPPData::data()->modemHangupResp()); + writeline(_ifaceppp->data()->modemHangupStr()); + setExpect(_ifaceppp->data()->modemHangupResp()); @@ -594,3 +590,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - setExpect(PPPData::data()->modemRingResp()); + setExpect(_ifaceppp->data()->modemRingResp()); vmain = 150; @@ -604,3 +600,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - QString idstring = PPPData::data()->storedUsername(); + QString idstring = _ifaceppp->data()->storedUsername(); @@ -640,3 +636,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - QString pwstring = PPPData::data()->password(); + QString pwstring = _ifaceppp->data()->password(); @@ -661,3 +657,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!(prompt->isVisible())) { - p_kppp->setPW_Edit(prompt->text()); +// p_kppp->setPW_Edit(prompt->text()); writeline(prompt->text()); @@ -787,4 +783,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!expecting) { - writeline(PPPData::data()->modemAnswerStr()); - setExpect(PPPData::data()->modemAnswerResp()); + writeline(_ifaceppp->data()->modemAnswerStr()); + setExpect(_ifaceppp->data()->modemAnswerResp()); @@ -814,5 +810,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // stop reading of data - Modem::modem->stop(); + _ifaceppp->modem()->stop(); - if(PPPData::data()->authMethod() == AUTH_TERMINAL) { + if(_ifaceppp->data()->authMethod() == AUTH_TERMINAL) { // if (termwindow) { @@ -833,3 +829,3 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // The port is still held open by the helper process. - Modem::modem->closetty(); + _ifaceppp->modem()->closetty(); @@ -837,4 +833,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { - if_timeout_timer->start(PPPData::data()->pppdTimeout()*1000); - qDebug( "started if timeout timer with %i", PPPData::data()->pppdTimeout()*1000); + if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); + qDebug( "started if timeout timer with %i", _ifaceppp->data()->pppdTimeout()*1000); @@ -851,4 +847,4 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(result) { - if(!PPPData::data()->autoDNS()) - adddns(); + if(!_ifaceppp->data()->autoDNS()) + adddns( _ifaceppp ); @@ -865,10 +861,10 @@ void ConnectWidget::timerEvent(QTimerEvent *) { messg->setText(""); - p_kppp->quit_b->setFocus(); - p_kppp->show(); +// p_kppp->quit_b->setFocus(); +// p_kppp->show(); qApp->processEvents(); - Modem::modem->hangup(); + _ifaceppp->modem()->hangup(); emit stopAccounting(); // p_kppp->con_win->stopClock(); - Modem::modem->closetty(); - Modem::modem->unlockdevice(); + _ifaceppp->modem()->closetty(); + _ifaceppp->modem()->unlockdevice(); @@ -892,3 +888,3 @@ void ConnectWidget::set_con_speed_string() { // or whatever the modemConnectResp() is. - p_kppp->con_speed = Modem::modem->parseModemSpeed(myreadbuffer); +// p_kppp->con_speed = _ifaceppp->modem()->parseModemSpeed(myreadbuffer); } @@ -971,3 +967,3 @@ void ConnectWidget::pause() { void ConnectWidget::cancelbutton() { - Modem::modem->stop(); + _ifaceppp->modem()->stop(); killTimer(main_timer_ID); @@ -986,5 +982,5 @@ void ConnectWidget::cancelbutton() { // just to be sure - Modem::modem->removeSecret(AUTH_PAP); - Modem::modem->removeSecret(AUTH_CHAP); - removedns(); + _ifaceppp->modem()->removeSecret(AUTH_PAP); + _ifaceppp->modem()->removeSecret(AUTH_CHAP); + removedns(_ifaceppp); @@ -992,4 +988,4 @@ void ConnectWidget::cancelbutton() { - Modem::modem->killPPPDaemon(); - Modem::modem->hangup(); + _ifaceppp->modem()->killPPPDaemon(); + _ifaceppp->modem()->hangup(); @@ -997,8 +993,8 @@ void ConnectWidget::cancelbutton() { messg->setText(""); - p_kppp->quit_b->setFocus(); - p_kppp->show(); +// p_kppp->quit_b->setFocus(); +// p_kppp->show(); emit stopAccounting(); // just to be sure // p_kppp->con_win->stopClock(); - Modem::modem->closetty(); - Modem::modem->unlockdevice(); + _ifaceppp->modem()->closetty(); + _ifaceppp->modem()->unlockdevice(); @@ -1028,3 +1024,3 @@ void ConnectWidget::script_timed_out() { messg->setText(i18n("Script timed out!")); - Modem::modem->hangup(); + _ifaceppp->modem()->hangup(); emit stopAccounting(); @@ -1065,6 +1061,6 @@ void ConnectWidget::if_waiting_timed_out() { - PPPData::data()->setpppdError(E_IF_TIMEOUT); + _ifaceppp->data()->setpppdError(E_IF_TIMEOUT); // let's kill the stuck pppd - Modem::modem->killPPPDaemon(); + _ifaceppp->modem()->killPPPDaemon(); @@ -1090,3 +1086,3 @@ void ConnectWidget::if_waiting_slot() { -// if(PPPData::data()->pppdError() != 0) { +// if(_ifaceppp->data()->pppdError() != 0) { // // we are here if pppd died immediately after starting it. @@ -1107,4 +1103,4 @@ void ConnectWidget::if_waiting_slot() { - if(PPPData::data()->autoDNS()) - addpeerdns(); + if(_ifaceppp->data()->autoDNS()) + addpeerdns( _ifaceppp ); @@ -1114,5 +1110,5 @@ void ConnectWidget::if_waiting_slot() { // p_kppp->statdlg->take_stats(); // start taking ppp statistics - auto_hostname(); + auto_hostname(_ifaceppp); - if(!PPPData::data()->command_on_connect().isEmpty()) { + if(!_ifaceppp->data()->command_on_connect().isEmpty()) { messg->setText(i18n("Running startup command...")); @@ -1121,3 +1117,3 @@ void ConnectWidget::if_waiting_slot() { qApp->flushX(); - execute_command(PPPData::data()->command_on_connect()); + execute_command(_ifaceppp->data()->command_on_connect()); messg->setText(i18n("Done")); @@ -1126,4 +1122,4 @@ void ConnectWidget::if_waiting_slot() { // remove the authentication file - Modem::modem->removeSecret(AUTH_PAP); - Modem::modem->removeSecret(AUTH_CHAP); + _ifaceppp->modem()->removeSecret(AUTH_PAP); + _ifaceppp->modem()->removeSecret(AUTH_CHAP); @@ -1143,16 +1139,16 @@ void ConnectWidget::if_waiting_slot() { - if (PPPData::data()->get_dock_into_panel()) { -// DockWidget::dock_widget->show(); -// DockWidget::dock_widget->take_stats(); -// this->hide(); - } - else { -// p_kppp->con_win->show(); +// if (_ifaceppp->data()->get_dock_into_panel()) { +// // DockWidget::dock_widget->show(); +// // DockWidget::dock_widget->take_stats(); +// // this->hide(); +// } +// else { +// // p_kppp->con_win->show(); - if(PPPData::data()->get_iconify_on_connect()) { - // p_kppp->con_win->showMinimized(); - } - } +// if(_ifaceppp->data()->get_iconify_on_connect()) { +// // p_kppp->con_win->showMinimized(); +// } +// } - Modem::modem->closetty(); + _ifaceppp->modem()->closetty(); } @@ -1170,5 +1166,5 @@ bool ConnectWidget::execppp() { // command += " "; - // command += PPPData::data()->modemDevice(); + // command += _ifaceppp->data()->modemDevice(); - command += " " + PPPData::data()->speed(); + command += " " + _ifaceppp->data()->speed(); @@ -1176,7 +1172,7 @@ bool ConnectWidget::execppp() { - if(PPPData::data()->ipaddr() != "0.0.0.0" || - PPPData::data()->gateway() != "0.0.0.0") { - if(PPPData::data()->ipaddr() != "0.0.0.0") { + if(_ifaceppp->data()->ipaddr() != "0.0.0.0" || + _ifaceppp->data()->gateway() != "0.0.0.0") { + if(_ifaceppp->data()->ipaddr() != "0.0.0.0") { command += " "; - command += PPPData::data()->ipaddr(); + command += _ifaceppp->data()->ipaddr(); command += ":"; @@ -1188,11 +1184,11 @@ bool ConnectWidget::execppp() { - if(PPPData::data()->gateway() != "0.0.0.0") - command += PPPData::data()->gateway(); + if(_ifaceppp->data()->gateway() != "0.0.0.0") + command += _ifaceppp->data()->gateway(); } - if(PPPData::data()->subnetmask() != "0.0.0.0") - command += " netmask " + PPPData::data()->subnetmask(); + if(_ifaceppp->data()->subnetmask() != "0.0.0.0") + command += " netmask " + _ifaceppp->data()->subnetmask(); - if(PPPData::data()->flowcontrol() != "None") { - if(PPPData::data()->flowcontrol() == "CRTSCTS") + if(_ifaceppp->data()->flowcontrol() != "None") { + if(_ifaceppp->data()->flowcontrol() == "CRTSCTS") command += " crtscts"; @@ -1202,9 +1198,9 @@ bool ConnectWidget::execppp() { - if(PPPData::data()->defaultroute()) + if(_ifaceppp->data()->defaultroute()) command += " defaultroute"; - if(PPPData::data()->autoDNS()) + if(_ifaceppp->data()->autoDNS()) command += " usepeerdns"; - QStringList &arglist = PPPData::data()->pppdArgument(); + QStringList &arglist = _ifaceppp->data()->pppdArgument(); for ( QStringList::Iterator it = arglist.begin(); @@ -1217,5 +1213,5 @@ bool ConnectWidget::execppp() { // PAP settings - if(PPPData::data()->authMethod() == AUTH_PAP) { + if(_ifaceppp->data()->authMethod() == AUTH_PAP) { command += " -chap user "; - command = command + "\"" + PPPData::data()->storedUsername() + "\""; + command = command + "\"" + _ifaceppp->data()->storedUsername() + "\""; } @@ -1223,5 +1219,5 @@ bool ConnectWidget::execppp() { // CHAP settings - if(PPPData::data()->authMethod() == AUTH_CHAP) { + if(_ifaceppp->data()->authMethod() == AUTH_CHAP) { command += " -pap user "; - command = command + "\"" + PPPData::data()->storedUsername() + "\""; + command = command + "\"" + _ifaceppp->data()->storedUsername() + "\""; } @@ -1229,5 +1225,5 @@ bool ConnectWidget::execppp() { // PAP/CHAP settings - if(PPPData::data()->authMethod() == AUTH_PAPCHAP) { + if(_ifaceppp->data()->authMethod() == AUTH_PAPCHAP) { command += " user "; - command = command + "\"" + PPPData::data()->storedUsername() + "\""; + command = command + "\"" + _ifaceppp->data()->storedUsername() + "\""; } @@ -1235,3 +1231,3 @@ bool ConnectWidget::execppp() { // check for debug - if(PPPData::data()->getPPPDebug()) + if(_ifaceppp->data()->getPPPDebug()) command += " debug"; @@ -1249,3 +1245,3 @@ bool ConnectWidget::execppp() { - return Modem::modem->execPPPDaemon(command); + return _ifaceppp->modem()->execPPPDaemon(command); } @@ -1264,3 +1260,3 @@ void ConnectWidget::setMsg(const QString &msg) { void ConnectWidget::writeline(const QString &s) { - Modem::modem->writeLine(s.local8Bit()); + _ifaceppp->modem()->writeLine(s.local8Bit()); } @@ -1268,3 +1264,3 @@ void ConnectWidget::writeline(const QString &s) { // Set the hostname and domain from DNS Server -void auto_hostname() { +void auto_hostname(InterfacePPP *_ifaceppp) { struct in_addr local_ip; @@ -1279,4 +1275,4 @@ void auto_hostname() { - // if (!p_kppp->stats->local_ip_address.isEmpty() && PPPData::data()->autoname()) { - if ( PPPData::data()->autoname()) { + // if (!p_kppp->stats->local_ip_address.isEmpty() && _ifaceppp->data()->autoname()) { + if ( _ifaceppp->data()->autoname()) { // local_ip.s_addr=inet_addr(p_kppp->stats->local_ip_address.ascii()); @@ -1288,3 +1284,3 @@ void auto_hostname() { new_hostname=new_hostname.remove(dot,new_hostname.length()-dot); - Modem::modem->setHostname(new_hostname); + _ifaceppp->modem()->setHostname(new_hostname); modified_hostname = TRUE; @@ -1294,3 +1290,3 @@ void auto_hostname() { - add_domain(new_hostname); + add_domain(new_hostname, _ifaceppp); } @@ -1302,3 +1298,3 @@ void auto_hostname() { // disable the nameserver entries if option is enabled -void add_domain(const QString &domain) { +void add_domain(const QString &domain, InterfacePPP *_ifaceppp) { @@ -1311,3 +1307,3 @@ void add_domain(const QString &domain) { - if((fd = Modem::modem->openResolv(O_RDONLY)) >= 0) { + if((fd = _ifaceppp->modem()->openResolv(O_RDONLY)) >= 0) { @@ -1325,3 +1321,3 @@ void add_domain(const QString &domain) { - if((fd = Modem::modem->openResolv(O_WRONLY|O_TRUNC)) >= 0) { + if((fd = _ifaceppp->modem()->openResolv(O_WRONLY|O_TRUNC)) >= 0) { QCString tmp = "domain " + domain.local8Bit() + @@ -1334,3 +1330,3 @@ void add_domain(const QString &domain) { && !resolv[j].contains("#kppp temp entry") - && PPPData::data()->exDNSDisabled())) + && _ifaceppp->data()->exDNSDisabled())) && !resolv[j].contains("#entry disabled by kppp")) { @@ -1352,3 +1348,3 @@ void add_domain(const QString &domain) { // adds the DNS entries in the /etc/resolv.conf file -void adddns() +void adddns( InterfacePPP *_ifaceppp) { @@ -1356,4 +1352,4 @@ void adddns() - if ((fd = Modem::modem->openResolv(O_WRONLY|O_APPEND)) >= 0) { - QStringList &dnslist = PPPData::data()->dns(); + if ((fd = _ifaceppp->modem()->openResolv(O_WRONLY|O_APPEND)) >= 0) { + QStringList &dnslist = _ifaceppp->data()->dns(); for ( QStringList::Iterator it = dnslist.begin(); @@ -1368,9 +1364,9 @@ void adddns() } - add_domain(PPPData::data()->domain()); + add_domain(_ifaceppp->data()->domain(), _ifaceppp); } -void addpeerdns() { +void addpeerdns(InterfacePPP *_ifaceppp) { int fd, fd2; - if((fd = Modem::modem->openResolv(O_WRONLY|O_APPEND)) >= 0) { + if((fd = _ifaceppp->modem()->openResolv(O_WRONLY|O_APPEND)) >= 0) { if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) { @@ -1389,3 +1385,3 @@ void addpeerdns() { } - add_domain(PPPData::data()->domain()); + add_domain(_ifaceppp->data()->domain(), _ifaceppp); } @@ -1393,3 +1389,3 @@ void addpeerdns() { // remove the dns entries from the /etc/resolv.conf file -void removedns() { +void removedns(InterfacePPP *_ifaceppp) { @@ -1399,3 +1395,3 @@ void removedns() { - if((fd = Modem::modem->openResolv(O_RDONLY)) >= 0) { + if((fd = _ifaceppp->modem()->openResolv(O_RDONLY)) >= 0) { @@ -1412,3 +1408,3 @@ void removedns() { - if((fd = Modem::modem->openResolv(O_WRONLY|O_TRUNC)) >= 0) { + if((fd = _ifaceppp->modem()->openResolv(O_WRONLY|O_TRUNC)) >= 0) { for(int j=0; j < i; j++) { @@ -1431,3 +1427,3 @@ void removedns() { if ( modified_hostname ) { - Modem::modem->setHostname(old_hostname); + _ifaceppp->modem()->setHostname(old_hostname); modified_hostname = FALSE; diff --git a/noncore/settings/networksettings/ppp/connect.h b/noncore/settings/networksettings/ppp/connect.h index 3127236..e7ae5e0 100644 --- a/noncore/settings/networksettings/ppp/connect.h +++ b/noncore/settings/networksettings/ppp/connect.h @@ -38,4 +38,3 @@ #include "pwentry.h" -//#include "docking.h" -//#include "loginterm.h" + @@ -43,3 +42,4 @@ -class PPPStats; +class InterfacePPP; +class PPPData; @@ -48,3 +48,3 @@ class ConnectWidget : public QWidget { public: - ConnectWidget(QWidget *parent, const char *name); + ConnectWidget(InterfacePPP*, QWidget *parent, const char *name); ~ConnectWidget(); @@ -138,3 +138,3 @@ private: -// PPPStats *stats; + InterfacePPP *_ifaceppp; }; @@ -143,8 +143,8 @@ private: // non-member function to kill&wait on the pppd child process -extern void killppp(); -void adddns(); -void addpeerdns(); -void removedns(); -void add_domain(const QString & newdomain); -void auto_hostname(); +extern void killppp(PPPData*); +void adddns(InterfacePPP*); +void addpeerdns(InterfacePPP*); +void removedns(InterfacePPP*); +void add_domain(const QString & newdomain, InterfacePPP*); +void auto_hostname(InterfacePPP*); diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp index 20d705d..9136ca0 100644 --- a/noncore/settings/networksettings/ppp/conwindow.cpp +++ b/noncore/settings/networksettings/ppp/conwindow.cpp @@ -33,6 +33,5 @@ -extern PPPData gpppdata; -ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget ) -// PPPStats *st) +ConWindow::ConWindow(PPPData *pd, QWidget *parent, const char *name, + QDialog *mainwidget ) : QWidget(parent, name, 0), @@ -43,5 +42,3 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget ) tl1(0), -// stats(st), - accountingEnabled(false), - volumeAccountingEnabled(false) + _pppdata(pd) { @@ -117,118 +114,118 @@ QString ConWindow::prettyPrintVolume(unsigned int n) { -void ConWindow::accounting(bool on) { - // cache accounting settings - accountingEnabled = on; - volumeAccountingEnabled = PPPData::data()->VolAcctEnabled(); - - // delete old layout - if(tl1 != 0) - delete tl1; - - // add layout now - tl1 = new QVBoxLayout(this, 10, 10); - tl1->addSpacing(5); - QHBoxLayout *tl = new QHBoxLayout; - tl1->addLayout(tl); - tl->addSpacing(20); - QGridLayout *l1; - - int vol_lines = 0; - if(PPPData::data()->VolAcctEnabled()) - vol_lines = 1; - - if(accountingEnabled) - l1 = new QGridLayout(4 + vol_lines, 2, 5); - else - l1 = new QGridLayout(2 + vol_lines, 2, 5); - tl->addLayout(l1); - l1->setColStretch(0, 0); - l1->setColStretch(1, 1); - - info2->setAlignment(AlignRight|AlignVCenter); - timelabel2->setAlignment(AlignRight|AlignVCenter); - session_bill->setAlignment(AlignRight|AlignVCenter); - total_bill->setAlignment(AlignRight|AlignVCenter); - volinfo->setAlignment(AlignRight|AlignVCenter); - // make sure that there's enough space for the bills - QString s1 = session_bill->text(); - QString s2 = total_bill->text(); - QString s3 = volinfo->text(); - - session_bill->setText("888888.88 XXX"); - total_bill->setText("888888.88 XXX"); - volinfo->setText("8888.8 MB"); - session_bill->setFixedSize(session_bill->sizeHint()); - total_bill->setFixedSize(total_bill->sizeHint()); - volinfo->setFixedSize(volinfo->sizeHint()); - session_bill->setText(s1); - total_bill->setText(s2); - volinfo->setText(s3); - - l1->addWidget(info1, 0, 0); - l1->addWidget(info2, 0, 1); - l1->addWidget(timelabel1, 1, 0); - l1->addWidget(timelabel2, 1, 1); - if(accountingEnabled) { - session_bill_l->show(); - session_bill->show(); - total_bill_l->show(); - total_bill->show(); - l1->addWidget(session_bill_l, 2, 0); - l1->addWidget(session_bill, 2, 1); - l1->addWidget(total_bill_l, 3, 0); - l1->addWidget(total_bill, 3, 1); - - if(volumeAccountingEnabled) { - vollabel->show(); - volinfo->show(); - l1->addWidget(vollabel, 4, 0); - l1->addWidget(volinfo, 4, 1); - } else { - vollabel->hide(); - volinfo->hide(); - } - - } else { - session_bill_l->hide(); - session_bill->hide(); - total_bill_l->hide(); - total_bill->hide(); - - if(volumeAccountingEnabled) { - vollabel->show(); - volinfo->show(); - l1->addWidget(vollabel, 2, 0); - l1->addWidget(volinfo, 2, 1); - } else { - vollabel->hide(); - volinfo->hide(); - } - } +// void ConWindow::accounting(bool on) { +// // cache accounting settings +// accountingEnabled = on; +// // volumeAccountingEnabled = PPPData::data()->VolAcctEnabled(); - tl->addSpacing(10); - QVBoxLayout *l2 = new QVBoxLayout(5); - tl->addLayout(l2); - l2->addStretch(1); -// l2->addWidget(statsbutton); - l2->addWidget(cancelbutton); +// // delete old layout +// if(tl1 != 0) +// delete tl1; - l2->addStretch(1); +// // add layout now +// tl1 = new QVBoxLayout(this, 10, 10); +// tl1->addSpacing(5); +// QHBoxLayout *tl = new QHBoxLayout; +// tl1->addLayout(tl); +// tl->addSpacing(20); +// QGridLayout *l1; - tl1->addSpacing(5); +// int vol_lines = 0; +// // if(_pppdata->VolAcctEnabled()) +// // vol_lines = 1; - setFixedSize(sizeHint()); -/* - do not overwrite position read from config - setGeometry((QApplication::desktop()->width() - width()) / 2, - (QApplication::desktop()->height() - height())/2, - width(), - height()); -*/ -} +// if(accountingEnabled) +// l1 = new QGridLayout(4 + vol_lines, 2, 5); +// else +// l1 = new QGridLayout(2 + vol_lines, 2, 5); +// tl->addLayout(l1); +// l1->setColStretch(0, 0); +// l1->setColStretch(1, 1); + +// info2->setAlignment(AlignRight|AlignVCenter); +// timelabel2->setAlignment(AlignRight|AlignVCenter); +// session_bill->setAlignment(AlignRight|AlignVCenter); +// total_bill->setAlignment(AlignRight|AlignVCenter); +// volinfo->setAlignment(AlignRight|AlignVCenter); +// // make sure that there's enough space for the bills +// QString s1 = session_bill->text(); +// QString s2 = total_bill->text(); +// QString s3 = volinfo->text(); + +// session_bill->setText("888888.88 XXX"); +// total_bill->setText("888888.88 XXX"); +// volinfo->setText("8888.8 MB"); +// session_bill->setFixedSize(session_bill->sizeHint()); +// total_bill->setFixedSize(total_bill->sizeHint()); +// volinfo->setFixedSize(volinfo->sizeHint()); +// session_bill->setText(s1); +// total_bill->setText(s2); +// volinfo->setText(s3); + +// l1->addWidget(info1, 0, 0); +// l1->addWidget(info2, 0, 1); +// l1->addWidget(timelabel1, 1, 0); +// l1->addWidget(timelabel2, 1, 1); +// if(accountingEnabled) { +// session_bill_l->show(); +// session_bill->show(); +// total_bill_l->show(); +// total_bill->show(); +// l1->addWidget(session_bill_l, 2, 0); +// l1->addWidget(session_bill, 2, 1); +// l1->addWidget(total_bill_l, 3, 0); +// l1->addWidget(total_bill, 3, 1); + +// if(volumeAccountingEnabled) { +// vollabel->show(); +// volinfo->show(); +// l1->addWidget(vollabel, 4, 0); +// l1->addWidget(volinfo, 4, 1); +// } else { +// vollabel->hide(); +// volinfo->hide(); +// } + +// } else { +// session_bill_l->hide(); +// session_bill->hide(); +// total_bill_l->hide(); +// total_bill->hide(); + +// if(volumeAccountingEnabled) { +// vollabel->show(); +// volinfo->show(); +// l1->addWidget(vollabel, 2, 0); +// l1->addWidget(volinfo, 2, 1); +// } else { +// vollabel->hide(); +// volinfo->hide(); +// } +// } +// tl->addSpacing(10); +// QVBoxLayout *l2 = new QVBoxLayout(5); +// tl->addLayout(l2); +// l2->addStretch(1); +// // l2->addWidget(statsbutton); +// l2->addWidget(cancelbutton); -void ConWindow::dock() { -// DockWidget::dock_widget->show(); - this->hide(); -} +// l2->addStretch(1); + +// tl1->addSpacing(5); + +// setFixedSize(sizeHint()); +// /* +// do not overwrite position read from config +// setGeometry((QApplication::desktop()->width() - width()) / 2, +// (QApplication::desktop()->height() - height())/2, +// width(), +// height()); +// */ +// } + + +// void ConWindow::dock() { +// // DockWidget::dock_widget->show(); +// this->hide(); +// } @@ -241,5 +238,5 @@ void ConWindow::startClock() { - title = PPPData::data()->accname(); + title = _pppdata->accname(); - if(PPPData::data()->get_show_clock_on_caption()){ + if(_pppdata->get_show_clock_on_caption()){ title += " 00:00" ; @@ -267,3 +264,3 @@ void ConWindow::timeclick() { // "Time connected: %3") -// .arg(PPPData::data()->accname()).arg(info2->text()) +// .arg(_pppdata->accname()).arg(info2->text()) // .arg(time_string2); @@ -277,3 +274,3 @@ void ConWindow::timeclick() { // volinfo->setEnabled(TRUE); -// int bytes = PPPData::data()->totalBytes(); +// int bytes = _pppdata->totalBytes(); // volinfo->setText(prettyPrintVolume(bytes)); @@ -307,3 +304,3 @@ void ConWindow::timeclick() { -// caption_string = PPPData::data()->accname(); +// caption_string = _pppdata->accname(); // caption_string += " "; @@ -314,3 +311,3 @@ void ConWindow::timeclick() { -// if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){ +// if(_pppdata->get_show_clock_on_caption() && (seconds == 1)){ // // we update the Caption only once per minute not every second @@ -330,4 +327,4 @@ void ConWindow::closeEvent( QCloseEvent *e ){ - if(PPPData::data()->get_dock_into_panel()) - dock(); +// if(_pppdata->get_dock_into_panel()) +// dock(); } diff --git a/noncore/settings/networksettings/ppp/conwindow.h b/noncore/settings/networksettings/ppp/conwindow.h index 20d3579..42c6f35 100644 --- a/noncore/settings/networksettings/ppp/conwindow.h +++ b/noncore/settings/networksettings/ppp/conwindow.h @@ -36,3 +36,3 @@ -//class PPPStats; +class PPPData; @@ -42,3 +42,3 @@ Q_OBJECT public: - ConWindow(QWidget *parent, const char *name, QDialog* ); + ConWindow(PPPData*, QWidget *parent, const char *name, QDialog* ); ~ConWindow(); @@ -51,3 +51,3 @@ private slots: void timeclick(); - void dock(); +// void dock(); @@ -57,3 +57,3 @@ public: void stopClock(); - void accounting(bool); // show/ hide accounting info +// void accounting(bool); // show/ hide accounting info @@ -84,5 +84,3 @@ private: QLabel *volinfo; -// PPPStats *stats; - bool accountingEnabled; - bool volumeAccountingEnabled; + PPPData *_pppdata; }; diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index eee643d..8ae714e 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp @@ -47,4 +47,5 @@ -DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) - : QWidget(parent, name) +DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount + , const char *name ) + : QWidget(parent, name), _pppdata(pd) { @@ -156,6 +157,6 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) if(!isnewaccount) { - connectname_l->setText(PPPData::data()->accname()); + connectname_l->setText(_pppdata->accname()); // insert the phone numbers into the listbox - QString n = PPPData::data()->phonenumber(); + QString n = _pppdata->phonenumber(); QString tmp = ""; @@ -174,4 +175,4 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) - auth->setCurrentItem(PPPData::data()->authMethod()); - store_password->setChecked(PPPData::data()->storePassword()); + auth->setCurrentItem(_pppdata->authMethod()); + store_password->setChecked(_pppdata->storePassword()); } else { @@ -189,6 +190,6 @@ bool DialWidget::save() { if(connectname_l->text().isEmpty() || - !PPPData::data()->isUniqueAccname(connectname_l->text())) { + !_pppdata->isUniqueAccname(connectname_l->text())) { return false; } else { - PPPData::data()->setAccname(connectname_l->text()); + _pppdata->setAccname(connectname_l->text()); @@ -201,5 +202,5 @@ bool DialWidget::save() { - PPPData::data()->setPhonenumber(number); - PPPData::data()->setAuthMethod(auth->currentItem()); - PPPData::data()->setStorePassword(store_password->isChecked()); + _pppdata->setPhonenumber(number); + _pppdata->setAuthMethod(auth->currentItem()); + _pppdata->setStorePassword(store_password->isChecked()); return true; @@ -224,3 +225,3 @@ void DialWidget::selectionChanged(int) { void DialWidget::addNumber() { - PhoneNumberDialog dlg(this); + PhoneNumberDialog dlg(this); if(dlg.exec()) { @@ -265,3 +266,3 @@ void DialWidget::downNumber() { void DialWidget::pppdargsbutton() { - PPPdArguments pa(this); + PPPdArguments pa(_pppdata, this); pa.exec(); @@ -274,4 +275,4 @@ void DialWidget::pppdargsbutton() { ///////////////////////////////////////////////////////////////////////////// -ExecWidget::ExecWidget(QWidget *parent, bool isnewaccount, const char *name) : - QWidget(parent, name) +ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) : + QWidget(parent, name), _pppdata(pd) { @@ -362,6 +363,6 @@ i18n("Here you can select commands to run at certain stages of the\n" if(!isnewaccount) { - before_connect->setText(PPPData::data()->command_before_connect()); - command->setText(PPPData::data()->command_on_connect()); - discommand->setText(PPPData::data()->command_on_disconnect()); - predisconnect->setText(PPPData::data()->command_before_disconnect()); + before_connect->setText(_pppdata->command_before_connect()); + command->setText(_pppdata->command_on_connect()); + discommand->setText(_pppdata->command_on_disconnect()); + predisconnect->setText(_pppdata->command_before_disconnect()); } @@ -371,6 +372,6 @@ i18n("Here you can select commands to run at certain stages of the\n" bool ExecWidget::save() { - PPPData::data()->setCommand_before_connect(before_connect->text()); - PPPData::data()->setCommand_on_connect(command->text()); - PPPData::data()->setCommand_before_disconnect(predisconnect->text()); - PPPData::data()->setCommand_on_disconnect(discommand->text()); + _pppdata->setCommand_before_connect(before_connect->text()); + _pppdata->setCommand_on_connect(command->text()); + _pppdata->setCommand_before_disconnect(predisconnect->text()); + _pppdata->setCommand_on_disconnect(discommand->text()); return true; @@ -385,4 +386,4 @@ bool ExecWidget::save() { ///////////////////////////////////////////////////////////////////////////// -IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name ) - : QWidget(parent, name) +IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name ) + : QWidget(parent, name), _pppdata(pd) { @@ -451,3 +452,3 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name ) autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), this); - autoname->setChecked(PPPData::data()->autoname()); + autoname->setChecked(_pppdata->autoname()); connect(autoname,SIGNAL(toggled(bool)), @@ -471,11 +472,11 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name ) if(!isnewaccount) { - if(PPPData::data()->ipaddr() == "0.0.0.0" && - PPPData::data()->subnetmask() == "0.0.0.0") { + if(_pppdata->ipaddr() == "0.0.0.0" && + _pppdata->subnetmask() == "0.0.0.0") { dynamicadd_rb->setChecked(true); hitIPSelect(0); - autoname->setChecked(PPPData::data()->autoname()); + autoname->setChecked(_pppdata->autoname()); } else { - ipaddress_l->setText(PPPData::data()->ipaddr()); - subnetmask_l->setText(PPPData::data()->subnetmask()); + ipaddress_l->setText(_pppdata->ipaddr()); + subnetmask_l->setText(_pppdata->subnetmask()); staticadd_rb->setChecked(true); @@ -512,9 +513,9 @@ void IPWidget::save() { if(dynamicadd_rb->isChecked()) { - PPPData::data()->setIpaddr("0.0.0.0"); - PPPData::data()->setSubnetmask("0.0.0.0"); + _pppdata->setIpaddr("0.0.0.0"); + _pppdata->setSubnetmask("0.0.0.0"); } else { - PPPData::data()->setIpaddr(ipaddress_l->text()); - PPPData::data()->setSubnetmask(subnetmask_l->text()); + _pppdata->setIpaddr(ipaddress_l->text()); + _pppdata->setSubnetmask(subnetmask_l->text()); } - PPPData::data()->setAutoname(autoname->isChecked()); + _pppdata->setAutoname(autoname->isChecked()); } @@ -539,4 +540,4 @@ void IPWidget::hitIPSelect( int i ) { -DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) - : QWidget(parent, name) +DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name ) + : QWidget(parent, name), _pppdata(pd) { @@ -574,3 +575,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) // no automatic DNS detection for pppd < 2.3.7 - if(!PPPData::data()->pppdVersionMin(2, 3, 7)) + if(!_pppdata->pppdVersionMin(2, 3, 7)) autodns->setEnabled(false); @@ -647,3 +648,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) this); - exdnsdisabled_toggle->setChecked(PPPData::data()->exDNSDisabled()); + exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled()); tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter); @@ -663,7 +664,7 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) if(!isnewaccount) { - dnsservers->insertStringList(PPPData::data()->dns()); - dnsdomain->setText(PPPData::data()->domain()); + dnsservers->insertStringList(_pppdata->dns()); + dnsdomain->setText(_pppdata->domain()); } - int mode = PPPData::data()->autoDNS() ? 0 : 1; + int mode = _pppdata->autoDNS() ? 0 : 1; bg->setButton(mode); @@ -697,3 +698,3 @@ void DNSWidget::DNS_Mode_Selected(int mode) { void DNSWidget::save() { - PPPData::data()->setAutoDNS(bg->id(bg->selected()) == 0); + _pppdata->setAutoDNS(bg->id(bg->selected()) == 0); QStringList serverlist; @@ -701,3 +702,3 @@ void DNSWidget::save() { serverlist.append(dnsservers->text(i)); - PPPData::data()->setDns(serverlist); + _pppdata->setDns(serverlist); @@ -706,7 +707,7 @@ void DNSWidget::save() { if(s.left(1) == ".") - PPPData::data()->setDomain(s.mid(1)); + _pppdata->setDomain(s.mid(1)); else - PPPData::data()->setDomain(dnsdomain->text()); + _pppdata->setDomain(dnsdomain->text()); - PPPData::data()->setExDNSDisabled(exdnsdisabled_toggle->isChecked()); + _pppdata->setExDNSDisabled(exdnsdisabled_toggle->isChecked()); } @@ -734,4 +735,4 @@ void DNSWidget::removedns() { // -GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *name ) - : QWidget(parent, name) +GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name ) + : QWidget(parent, name), _pppdata(pd) { @@ -787,3 +788,3 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na if(!isnewaccount) { - if(PPPData::data()->gateway() == "0.0.0.0") { + if(_pppdata->gateway() == "0.0.0.0") { defaultgateway->setChecked(true); @@ -792,6 +793,6 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na else { - gatewayaddr->setText(PPPData::data()->gateway()); + gatewayaddr->setText(_pppdata->gateway()); staticgateway->setChecked(true); } - defaultroute->setChecked(PPPData::data()->defaultroute()); + defaultroute->setChecked(_pppdata->defaultroute()); } @@ -805,4 +806,4 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na void GatewayWidget::save() { - PPPData::data()->setGateway(gatewayaddr->text()); - PPPData::data()->setDefaultroute(defaultroute->isChecked()); + _pppdata->setGateway(gatewayaddr->text()); + _pppdata->setDefaultroute(defaultroute->isChecked()); } @@ -825,4 +826,4 @@ void GatewayWidget::hitGatewaySelect( int i ) { -ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name ) - : QWidget(parent, name) +ScriptWidget::ScriptWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name ) + : QWidget(parent, name),_pppdata(pd) { @@ -869,4 +870,4 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name if(!isnewaccount) { - QStringList &comlist = PPPData::data()->scriptType(); - QStringList &arglist = PPPData::data()->script(); + QStringList &comlist = _pppdata->scriptType(); + QStringList &arglist = _pppdata->script(); QStringList::Iterator itcom = comlist.begin(); @@ -916,4 +917,4 @@ void ScriptWidget::save() { } - PPPData::data()->setScriptType(typelist); - PPPData::data()->setScript(arglist); + _pppdata->setScriptType(typelist); + _pppdata->setScript(arglist); } diff --git a/noncore/settings/networksettings/ppp/edit.h b/noncore/settings/networksettings/ppp/edit.h index cd0161f..2cc0fed 100644 --- a/noncore/settings/networksettings/ppp/edit.h +++ b/noncore/settings/networksettings/ppp/edit.h @@ -49,2 +49,3 @@ class IPLineEdit; +class PPPData; @@ -53,3 +54,3 @@ class DialWidget : public QWidget { public: - DialWidget( QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); + DialWidget( PPPData*, QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~DialWidget() {} @@ -78,2 +79,3 @@ private: QListBox *numbers; + PPPData *_pppdata; }; @@ -89,3 +91,3 @@ class ExecWidget : public QWidget { public: - ExecWidget(QWidget *parent=0, bool isnewaccount=true, const char *name=0); + ExecWidget(PPPData*, QWidget *parent=0, bool isnewaccount=true, const char *name=0); @@ -106,2 +108,3 @@ private: QLabel *discommand_label; + PPPData *_pppdata; }; @@ -112,3 +115,3 @@ class IPWidget : public QWidget { public: - IPWidget( QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); + IPWidget(PPPData*, QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~IPWidget() {} @@ -136,2 +139,3 @@ private: QCheckBox *autoname; + PPPData *_pppdata; }; @@ -142,3 +146,3 @@ class DNSWidget : public QWidget { public: - DNSWidget( QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); + DNSWidget( PPPData*, QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~DNSWidget() {} @@ -168,2 +172,3 @@ private: QCheckBox *exdnsdisabled_toggle; + PPPData *_pppdata; }; @@ -174,3 +179,3 @@ class GatewayWidget : public QWidget { public: - GatewayWidget( QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); + GatewayWidget(PPPData*, QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~GatewayWidget() {} @@ -192,2 +197,3 @@ private: QCheckBox *defaultroute; + PPPData *_pppdata; }; @@ -198,3 +204,3 @@ class ScriptWidget : public QWidget { public: - ScriptWidget( QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); + ScriptWidget(PPPData*, QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~ScriptWidget() {} @@ -227,2 +233,3 @@ private: QScrollBar *slb; + PPPData *_pppdata; }; @@ -247,2 +254,3 @@ private: QLineEdit *le; + }; 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 @@ -41,3 +41,3 @@ #include "general.h" -//#include "version.h" +#include "interfaceppp.h" //#include "miniterm.h" @@ -52,4 +52,4 @@ -ModemWidget::ModemWidget( QWidget *parent, const char *name) - : QWidget(parent, name) +ModemWidget::ModemWidget( InterfacePPP *ifppp, QWidget *parent, const char *name ) + : QWidget(parent, name), _ifaceppp(ifppp) { @@ -174,3 +174,3 @@ 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); @@ -183,3 +183,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) - modemlockfile->setChecked(PPPData::data()->modemLockFile()); + modemlockfile->setChecked(_ifaceppp->data()->modemLockFile()); connect(modemlockfile, SIGNAL(toggled(bool)), @@ -203,3 +203,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) 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:")); @@ -207,2 +207,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) modemtimeout->setSuffix(i18n(" sec")); + modemtimeout->setValue( _ifaceppp->data()->modemTimeout() ); connect(modemtimeout, SIGNAL(valueChanged(int)), @@ -220,3 +221,3 @@ 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); @@ -225,3 +226,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) 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); @@ -230,3 +231,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) 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); @@ -236,3 +237,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) 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); @@ -244,3 +245,3 @@ 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())); } @@ -249,3 +250,3 @@ void ModemWidget::speed_selection(int) { void ModemWidget::setenter(int ) { - PPPData::data()->setEnter(enter->text(enter->currentItem())); + _ifaceppp->data()->setEnter(enter->text(enter->currentItem())); } @@ -254,3 +255,3 @@ void ModemWidget::setenter(int ) { void ModemWidget::setmodemdc(int i) { - PPPData::data()->setModemDevice(modemdevice->text(i)); + _ifaceppp->data()->setModemDevice(modemdevice->text(i)); } @@ -259,3 +260,3 @@ void ModemWidget::setmodemdc(int i) { void ModemWidget::setflowcontrol(int i) { - PPPData::data()->setFlowcontrol(flowcontrol->text(i)); + _ifaceppp->data()->setFlowcontrol(flowcontrol->text(i)); } @@ -264,3 +265,3 @@ void ModemWidget::setflowcontrol(int i) { void ModemWidget::modemlockfilechanged(bool set) { - PPPData::data()->setModemLockFile(set); + _ifaceppp->data()->setModemLockFile(set); } @@ -269,3 +270,3 @@ void ModemWidget::modemlockfilechanged(bool set) { void ModemWidget::modemtimeoutchanged(int n) { - PPPData::data()->setModemTimeout(n); + _ifaceppp->data()->setModemTimeout(n); } @@ -273,4 +274,5 @@ void ModemWidget::modemtimeoutchanged(int 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) { @@ -280,3 +282,3 @@ 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))); @@ -295,3 +297,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) 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:")); @@ -320,3 +322,4 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) 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); @@ -344,3 +347,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this); - chkbox1->setChecked(PPPData::data()->UseCDLine()); + chkbox1->setChecked(_ifaceppp->data()->UseCDLine()); connect(chkbox1,SIGNAL(toggled(bool)), @@ -401,3 +404,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) void ModemWidget2::modemcmdsbutton() { - ModemCommands mc(this); + ModemCommands mc(_ifaceppp->data(), this); mc.showMaximized(); @@ -408,3 +411,3 @@ void ModemWidget2::modemcmdsbutton() { void ModemWidget2::query_modem() { - ModemTransfer mt(this); + ModemTransfer mt(_ifaceppp->modem(), this); mt.exec(); @@ -421,3 +424,3 @@ void ModemWidget2::query_modem() { void ModemWidget2::use_cdline_toggled(bool on) { - PPPData::data()->setUseCDLine(on); + _ifaceppp->data()->setUseCDLine(on); } @@ -426,3 +429,3 @@ void ModemWidget2::use_cdline_toggled(bool on) { void ModemWidget2::waitfordtchanged(bool b) { - PPPData::data()->setWaitForDialTone((int)b); + _ifaceppp->data()->setWaitForDialTone((int)b); } @@ -430,3 +433,3 @@ void ModemWidget2::waitfordtchanged(bool b) { void ModemWidget2::busywaitchanged(int n) { - PPPData::data()->setbusyWait(n); + _ifaceppp->data()->setbusyWait(n); } @@ -435,3 +438,3 @@ void ModemWidget2::busywaitchanged(int n) { void ModemWidget2::volumeChanged(int v) { - PPPData::data()->setVolume(v); + _ifaceppp->data()->setVolume(v); } diff --git a/noncore/settings/networksettings/ppp/general.h b/noncore/settings/networksettings/ppp/general.h index 4869f6c..3e59b46 100644 --- a/noncore/settings/networksettings/ppp/general.h +++ b/noncore/settings/networksettings/ppp/general.h @@ -36,4 +36,4 @@ class QCheckBox; class QComboBox; - - +class PPPData; +class InterfacePPP; @@ -42,3 +42,3 @@ class ModemWidget : public QWidget { public: - ModemWidget( QWidget *parent=0, const char *name=0 ); + ModemWidget( InterfacePPP*, QWidget *parent=0, const char *name=0 ); @@ -66,2 +66,3 @@ private: QCheckBox *modemlockfile; + InterfacePPP *_ifaceppp; }; @@ -72,3 +73,3 @@ class ModemWidget2 : public QWidget { public: - ModemWidget2( QWidget *parent=0, const char *name=0 ); + ModemWidget2( InterfacePPP*, QWidget *parent=0, const char *name=0 ); @@ -93,2 +94,3 @@ private: QSlider *volume; + InterfacePPP *_ifaceppp; }; diff --git a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp new file mode 100644 index 0000000..a58858c --- a/dev/null +++ b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp @@ -0,0 +1,24 @@ +#include "interfaceinformationppp.h" + + +#include <qpushbutton.h> +#include <qlabel.h> +//#include <qgroupbox.h> +#include <qmessagebox.h> + +#ifdef QWS +#else + #define showMaximized show +#endif + +/** + * Constructor for the InterfaceInformationImp class. This class pretty much + * just display's information about the interface that is passed to it. + */ +InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) + :InterfaceInformationImp(parent, name, i, f) +{ +} + + + diff --git a/noncore/settings/networksettings/ppp/interfaceinformationppp.h b/noncore/settings/networksettings/ppp/interfaceinformationppp.h new file mode 100644 index 0000000..8c6fc0b --- a/dev/null +++ b/noncore/settings/networksettings/ppp/interfaceinformationppp.h @@ -0,0 +1,25 @@ +#ifndef INTERFACEINFORMATIONPPP_H +#define INTERFACEINFORMATIONPPP_H + +#include "interfaceinformationimp.h" +//#include "interface.h" + +class QWidget; +class Interface; + +class InterfaceInformationPPP : public InterfaceInformationImp { + +Q_OBJECT + +public: + + InterfaceInformationPPP(QWidget *parent=0, const char *name=0, Interface *i=0, WFlags f=0); + ~InterfaceInformationPPP(){}; + + +}; + +#endif + +// addserviceimp.h + diff --git a/noncore/settings/networksettings/ppp/interfaceppp.cpp b/noncore/settings/networksettings/ppp/interfaceppp.cpp new file mode 100644 index 0000000..d9ee3ff --- a/dev/null +++ b/noncore/settings/networksettings/ppp/interfaceppp.cpp @@ -0,0 +1,48 @@ +#include "interfaceppp.h" +#include "modem.h" +#include "pppdata.h" + +InterfacePPP::InterfacePPP(QObject *parent, const char *name, bool status) + : Interface(parent, name, status), + _modem(0), + _pppdata(0) +{ + qDebug("InterfacePPP::InterfacePPP("); +} + +PPPData* InterfacePPP::data() +{ + if (!_pppdata){ + _pppdata = new PPPData(); + _pppdata->setModemDevice( getInterfaceName() ); + _pppdata->setAccount( getHardwareName() ); + } + return _pppdata; +} + +Modem* InterfacePPP::modem() +{ + if (!_modem){ + _modem = new Modem( data() ); + } + return _modem; +} + +bool InterfacePPP::refresh() +{ + qDebug("InterfacePPP::refresh()"); + return false; +} + +void InterfacePPP::start() +{ + qDebug("InterfacePPP::start"); + +} + +void InterfacePPP::stop() +{ + qDebug("InterfacePPP::stop"); + +} + diff --git a/noncore/settings/networksettings/ppp/interfaceppp.h b/noncore/settings/networksettings/ppp/interfaceppp.h new file mode 100644 index 0000000..b7477c9 --- a/dev/null +++ b/noncore/settings/networksettings/ppp/interfaceppp.h @@ -0,0 +1,30 @@ +#ifndef INTERFACEPPP_H +#define INTERFACEPPP_H + +#include "interface.h" + +class PPPData; +class Modem; + +class InterfacePPP : public Interface +{ + Q_OBJECT + +public: + InterfacePPP(QObject *parent=0, const char *name="PPP", bool status=false); + + PPPData* data(); + Modem* modem(); + +public slots: + virtual bool refresh(); + virtual void start(); + virtual void stop(); + + private: + Modem *_modem; + PPPData *_pppdata; +}; + + +#endif diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp index f8a8dc3..289e9f5 100644 --- a/noncore/settings/networksettings/ppp/kpppwidget.cpp +++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp @@ -39,2 +39,3 @@ #include <qwhatsthis.h> +#include <qcheckbox.h> @@ -72,2 +73,3 @@ #include "general.h" +#include "interface.h" @@ -77,6 +79,4 @@ KPPPWidget *p_kppp = 0; -KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl ) - : QDialog(parent, name, modal, fl) -// , acct(0) -// , m_bCmdlAccount (false) +KPPPWidget::KPPPWidget(PPPData*pd, Interface *i, QWidget *parent, const char *name, bool modal, WFlags fl ) + : QDialog(parent, name, modal, fl), _pppdata(pd) { @@ -85,2 +85,11 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // before doing anything else, run a few tests + if (!_pppdata->setModemDevice( i->getInterfaceName() )) + _pppdata->setModemDevice("/dev/modem"); + qDebug("PPPConfigWidget::PPPConfigWidget"); + qDebug(" interface->getHardwareName >%s<", i->getHardwareName().latin1()); + if (!_pppdata->setAccount( i->getHardwareName() )) + _pppdata->setAccount( 0 ); + + qDebug(" _pppdata->accname >%s<",_pppdata->accname().latin1()); + qDebug(" _pppdata->currentAccountID() >%i<",_pppdata->currentAccountID()); @@ -92,105 +101,105 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl -// QVBoxLayout *tl = new QVBoxLayout(this, 10, 10); - -// QGridLayout *l1 = new QGridLayout(3, 4); -// tl->addLayout(l1); -// l1->addColSpacing(0, 10); -// l1->addColSpacing(3, 10); -// l1->setColStretch(1, 3); -// l1->setColStretch(2, 4); - -// label1 = new QLabel(i18n("C&onnect to: "), this); -// l1->addWidget(label1, 0, 1); - -// connectto_c = new QComboBox(false, this); -// label1->setBuddy(connectto_c); - -// connect(connectto_c, SIGNAL(activated(int)), -// SLOT(newdefaultaccount(int))); -// l1->addWidget(connectto_c, 0, 2); - -// ID_Label = new QLabel(i18n("&Login ID:"), this); -// l1->addWidget(ID_Label, 1, 1); - -// // the entry line for usernames -// ID_Edit = new QLineEdit(this); -// ID_Label->setBuddy(ID_Edit); -// l1->addWidget(ID_Edit, 1, 2); -// connect(ID_Edit, SIGNAL(returnPressed()), -// this, SLOT(enterPressedInID())); -// QString tmp = i18n("<p>Type in the username that you got from your\n" -// "ISP. This is especially important for PAP\n" -// "and CHAP. You may omit this when you use\n" -// "terminal-based or script-based authentication.\n" -// "\n" -// "<b>Important</b>: case is important here:\n" -// "<i>myusername</i> is not the same as <i>MyUserName</i>!"); - -// QWhatsThis::add(ID_Label,tmp); -// QWhatsThis::add(ID_Edit,tmp); - -// PW_Label = new QLabel(i18n("&Password:"), this); -// l1->addWidget(PW_Label, 2, 1); - -// PW_Edit= new QLineEdit(this); -// PW_Label->setBuddy(PW_Edit); -// PW_Edit->setEchoMode(QLineEdit::Password); -// l1->addWidget(PW_Edit, 2, 2); -// connect(PW_Edit, SIGNAL(returnPressed()), -// this, SLOT(enterPressedInPW())); - -// tmp = i18n("<p>Type in the password that you got from your\n" -// "ISP. This is especially important for PAP\n" -// "and CHAP. You may omit this when you use\n" -// "terminal-based or script-based authentication.\n" -// "\n" -// "<b>Important</b>: case is important here:\n" -// "<i>mypassword</i> is not the same as <i>MyPassword</i>!"); - -// QWhatsThis::add(PW_Label,tmp); -// QWhatsThis::add(PW_Edit,tmp); - -// QHBoxLayout *l3 = new QHBoxLayout; -// tl->addSpacing(5); -// tl->addLayout(l3); -// tl->addSpacing(5); -// l3->addSpacing(10); -// log = new QCheckBox(i18n("Show lo&g window"), this); -// connect(log, SIGNAL(toggled(bool)), -// this, SLOT(log_window_toggled(bool))); -// log->setChecked(PPPData::data()->get_show_log_window()); -// l3->addWidget(log); - -// QWhatsThis::add(log, -// i18n("<p>This controls whether a log window is shown.\n" -// "A log window shows the communication between\n" -// "<i>kppp</i> and your modem. This will help you\n" -// "in tracking down problems.\n" -// "\n" -// "Turn it off if <i>kppp</i> routinely connects without\n" -// "problems")); - -// // fline = new QSeparator( KSeparator::HLine, this); -// // tl->addWidget(fline); - -// QHBoxLayout *l2 = new QHBoxLayout(this); -// tl->addLayout(l2); - -// int minw = 0; -// quit_b = new QPushButton(i18n("&Quit"), this); -// // quit_b-> setGuiItem (KGuiItem(i18n("&Quit"), "exit" ) ); -// connect( quit_b, SIGNAL(clicked()), SLOT(quitbutton())); -// if(quit_b->sizeHint().width() > minw) -// minw = quit_b->sizeHint().width(); - -// setup_b = new QPushButton(i18n("&Setup..."), this); -// // setup_b->setGuiItem (KGuiItem(i18n("&Setup...")) ); -// connect( setup_b, SIGNAL(clicked()), SLOT(expandbutton())); -// if(setup_b->sizeHint().width() > minw) -// minw = setup_b->sizeHint().width(); - - - -// if(PPPData::data()->access() != KConfig::ReadWrite) -// setup_b->setEnabled(false); + QVBoxLayout *tl = new QVBoxLayout(this, 10, 10); + + QGridLayout *l1 = new QGridLayout(3, 4); + tl->addLayout(l1); + l1->addColSpacing(0, 10); + l1->addColSpacing(3, 10); + l1->setColStretch(1, 3); + l1->setColStretch(2, 4); + + label1 = new QLabel(i18n("C&onnect to: "), this); + l1->addWidget(label1, 0, 1); + + connectto_c = new QComboBox(false, this); + label1->setBuddy(connectto_c); + + connect(connectto_c, SIGNAL(activated(int)), + SLOT(newdefaultaccount(int))); + l1->addWidget(connectto_c, 0, 2); + + ID_Label = new QLabel(i18n("&Login ID:"), this); + l1->addWidget(ID_Label, 1, 1); + + // the entry line for usernames + ID_Edit = new QLineEdit(this); + ID_Label->setBuddy(ID_Edit); + l1->addWidget(ID_Edit, 1, 2); + connect(ID_Edit, SIGNAL(returnPressed()), + this, SLOT(enterPressedInID())); + QString tmp = i18n("<p>Type in the username that you got from your\n" + "ISP. This is especially important for PAP\n" + "and CHAP. You may omit this when you use\n" + "terminal-based or script-based authentication.\n" + "\n" + "<b>Important</b>: case is important here:\n" + "<i>myusername</i> is not the same as <i>MyUserName</i>!"); + + QWhatsThis::add(ID_Label,tmp); + QWhatsThis::add(ID_Edit,tmp); + + PW_Label = new QLabel(i18n("&Password:"), this); + l1->addWidget(PW_Label, 2, 1); + + PW_Edit= new QLineEdit(this); + PW_Label->setBuddy(PW_Edit); + PW_Edit->setEchoMode(QLineEdit::Password); + l1->addWidget(PW_Edit, 2, 2); + connect(PW_Edit, SIGNAL(returnPressed()), + this, SLOT(enterPressedInPW())); + + tmp = i18n("<p>Type in the password that you got from your\n" + "ISP. This is especially important for PAP\n" + "and CHAP. You may omit this when you use\n" + "terminal-based or script-based authentication.\n" + "\n" + "<b>Important</b>: case is important here:\n" + "<i>mypassword</i> is not the same as <i>MyPassword</i>!"); + + QWhatsThis::add(PW_Label,tmp); + QWhatsThis::add(PW_Edit,tmp); + + QHBoxLayout *l3 = new QHBoxLayout; + tl->addSpacing(5); + tl->addLayout(l3); + tl->addSpacing(5); + l3->addSpacing(10); + log = new QCheckBox(i18n("Show lo&g window"), this); + connect(log, SIGNAL(toggled(bool)), + this, SLOT(log_window_toggled(bool))); + log->setChecked(_pppdata->get_show_log_window()); + l3->addWidget(log); + + QWhatsThis::add(log, + i18n("<p>This controls whether a log window is shown.\n" + "A log window shows the communication between\n" + "<i>kppp</i> and your modem. This will help you\n" + "in tracking down problems.\n" + "\n" + "Turn it off if <i>kppp</i> routinely connects without\n" + "problems")); + +// fline = new QSeparator( KSeparator::HLine, this); +// tl->addWidget(fline); + + QHBoxLayout *l2 = new QHBoxLayout(this); + tl->addLayout(l2); + + int minw = 0; + quit_b = new QPushButton(i18n("&Quit"), this); + // quit_b-> setGuiItem (KGuiItem(i18n("&Quit"), "exit" ) ); + connect( quit_b, SIGNAL(clicked()), SLOT(quitbutton())); + if(quit_b->sizeHint().width() > minw) + minw = quit_b->sizeHint().width(); + + setup_b = new QPushButton(i18n("&Setup..."), this); +// setup_b->setGuiItem (KGuiItem(i18n("&Setup...")) ); + connect( setup_b, SIGNAL(clicked()), SLOT(expandbutton())); + if(setup_b->sizeHint().width() > minw) + minw = setup_b->sizeHint().width(); + + + +// if(_pppdata->access() != KConfig::ReadWrite) + // setup_b->setEnabled(false); @@ -206,19 +215,19 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl -// connect_b = new QPushButton(i18n("&Connect"), this); -// connect_b->setDefault(true); -// connect_b->setFocus(); -// connect(connect_b, SIGNAL(clicked()), SLOT(beginConnect())); -// if(connect_b->sizeHint().width() > minw) -// minw = connect_b->sizeHint().width(); + connect_b = new QPushButton(i18n("&Connect"), this); + connect_b->setDefault(true); + connect_b->setFocus(); + connect(connect_b, SIGNAL(clicked()), SLOT(beginConnect())); + if(connect_b->sizeHint().width() > minw) + minw = connect_b->sizeHint().width(); -// quit_b->setFixedWidth(minw); -// setup_b->setFixedWidth(minw); -// // help_b->setFixedWidth(help_b->sizeHint().width()); -// connect_b->setFixedWidth(minw); + quit_b->setFixedWidth(minw); + setup_b->setFixedWidth(minw); +// help_b->setFixedWidth(help_b->sizeHint().width()); + connect_b->setFixedWidth(minw); -// l2->addWidget(quit_b); -// l2->addWidget(setup_b); -// // l2->addWidget(help_b); -// l2->addSpacing(20); -// l2->addWidget(connect_b); + l2->addWidget(quit_b); + l2->addWidget(setup_b); +// l2->addWidget(help_b); + l2->addSpacing(20); + l2->addWidget(connect_b); @@ -226,3 +235,3 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl - (void)new Modem; + (void)new Modem(_pppdata); @@ -237,3 +246,3 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // constructor of con_win reads position from config file -// con_win = new ConWindow(0, "conw", this); + con_win = new ConWindow(_pppdata, 0, "conw", this); // KWin::setIcons(con_win->winId(), kapp->icon(), kapp->miniIcon()); @@ -246,5 +255,5 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // resetaccounts(); -// con = new ConnectWidget(0, "con"); + con = new ConnectWidget(_pppdata, 0, "con"); //KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() ); -// connect(this, SIGNAL(begin_connect()),con, SLOT(preinit())); + connect(this, SIGNAL(begin_connect()),con, SLOT(preinit())); // Is this the best we can do here? it's not right. @@ -255,10 +264,10 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // connect the ConnectWidgets various signals -// // connect(con, SIGNAL(startAccounting()), -// // this, SLOT(startAccounting())); -// // connect(con, SIGNAL(stopAccounting()), -// // this, SLOT(stopAccounting())); -// connect(qApp, SIGNAL(saveYourself()), -// this, SLOT(saveMyself())); -// connect(qApp, SIGNAL(shutDown()), -// this, SLOT(shutDown())); + connect(con, SIGNAL(startAccounting()), + this, SLOT(startAccounting())); + connect(con, SIGNAL(stopAccounting()), + this, SLOT(stopAccounting())); + connect(qApp, SIGNAL(saveYourself()), + this, SLOT(saveMyself())); + connect(qApp, SIGNAL(shutDown()), + this, SLOT(shutDown())); @@ -276,3 +285,3 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // if(m_bCmdlAccount){ -// bool result = PPPData::data()->setAccount(m_strCmdlAccount); +// bool result = _pppdata->setAccount(m_strCmdlAccount); // if (!result){ @@ -348,3 +357,3 @@ void KPPPWidget::enterPressedInPW() { void KPPPWidget::saveMyself() { - PPPData::data()->save(); + _pppdata->save(); } @@ -357,3 +366,3 @@ void KPPPWidget::shutDown() { void KPPPWidget::log_window_toggled(bool on) { - PPPData::data()->set_show_log_window(on); + _pppdata->set_show_log_window(on); } @@ -366,3 +375,3 @@ void KPPPWidget::log_window_toggled(bool on) { -// int count = PPPData::data()->count(); +// int count = _pppdata->count(); @@ -377,4 +386,4 @@ void KPPPWidget::log_window_toggled(bool on) { // for(int i=0; i < count; i++) { -// PPPData::data()->setAccountbyIndex(i); -// connectto_c->insertItem(PPPData::data()->accname()); +// _pppdata->setAccountbyIndex(i); +// connectto_c->insertItem(_pppdata->accname()); // } @@ -382,10 +391,10 @@ void KPPPWidget::log_window_toggled(bool on) { // //set the default account -// if(!PPPData::data()->defaultAccount().isEmpty()) { +// if(!_pppdata->defaultAccount().isEmpty()) { // for(int i=0; i < count; i++) -// if(PPPData::data()->defaultAccount() == connectto_c->text(i)) { +// if(_pppdata->defaultAccount() == connectto_c->text(i)) { // connectto_c->setCurrentItem(i); -// PPPData::data()->setAccountbyIndex(i); +// _pppdata->setAccountbyIndex(i); -// ID_Edit->setText(PPPData::data()->storedUsername()); -// PW_Edit->setText(PPPData::data()->storedPassword()); +// ID_Edit->setText(_pppdata->storedUsername()); +// PW_Edit->setText(_pppdata->storedPassword()); // } @@ -394,6 +403,6 @@ void KPPPWidget::log_window_toggled(bool on) { // if(count > 0) { -// PPPData::data()->setDefaultAccount(connectto_c->text(0)); -// PPPData::data()->save(); -// ID_Edit->setText(PPPData::data()->storedUsername()); -// PW_Edit->setText(PPPData::data()->storedPassword()); +// _pppdata->setDefaultAccount(connectto_c->text(0)); +// _pppdata->save(); +// ID_Edit->setText(_pppdata->storedUsername()); +// PW_Edit->setText(_pppdata->storedPassword()); // } @@ -415,7 +424,9 @@ void KPPPWidget::interruptConnection() { // interrupt dial up -// if (con->isVisible()) -// emit con->cancelbutton(); +// + + if (con->isVisible()) + emit con->cancelbutton(); // disconnect if online - if (PPPData::data()->pppdRunning()) + if (_pppdata->pppdRunning()) emit disconnect(); @@ -430,3 +441,3 @@ void KPPPWidget::sigPPPDDied() { // such as would be the case when the log file viewer exits. - if(PPPData::data()->pppdRunning() || PPPData::data()->pppdError()) { + if(_pppdata->pppdRunning() || _pppdata->pppdError()) { qDebug( "It was pppd that died" ); @@ -442,3 +453,3 @@ void KPPPWidget::sigPPPDDied() { - PPPData::data()->setpppdRunning(false); + _pppdata->setpppdRunning(false); @@ -446,3 +457,3 @@ void KPPPWidget::sigPPPDDied() { QApplication::flushX(); - execute_command(PPPData::data()->command_on_disconnect()); + execute_command(_pppdata->command_on_disconnect()); @@ -450,3 +461,3 @@ void KPPPWidget::sigPPPDDied() { -// con_win->stopClock(); + con_win->stopClock(); // DockWidget::dock_widget->stop_stats(); @@ -454,20 +465,21 @@ void KPPPWidget::sigPPPDDied() { - if(!PPPData::data()->pppdError()) - PPPData::data()->setpppdError(E_PPPD_DIED); + if(!_pppdata->pppdError()) + _pppdata->setpppdError(E_PPPD_DIED); removedns(); Modem::modem->unlockdevice(); - // con->pppdDied(); + // + con->pppdDied(); - if(!PPPData::data()->automatic_redial()) { + if(!_pppdata->automatic_redial()) { quit_b->setFocus(); show(); -// con_win->stopClock(); + con_win->stopClock(); // stopAccounting(); -// con_win->hide(); -// con->hide(); + con_win->hide(); + con->hide(); - PPPData::data()->setpppdRunning(false); + _pppdata->setpppdRunning(false); // // not in a signal handler !!! KNotifyClient::beep(); QString msg; - if (PPPData::data()->pppdError() == E_IF_TIMEOUT) + if (_pppdata->pppdError() == E_IF_TIMEOUT) msg = i18n("Timeout expired while waiting for the PPP interface " @@ -492,13 +504,13 @@ void KPPPWidget::sigPPPDDied() { - if(PPPData::data()->authMethod() == AUTH_PAP || - PPPData::data()->authMethod() == AUTH_CHAP || - PPPData::data()->authMethod() == AUTH_PAPCHAP) - Modem::modem->setSecret(PPPData::data()->authMethod(), - encodeWord(PPPData::data()->storedUsername()), - encodeWord(PPPData::data()->password())); + if(_pppdata->authMethod() == AUTH_PAP || + _pppdata->authMethod() == AUTH_CHAP || + _pppdata->authMethod() == AUTH_PAPCHAP) + Modem::modem->setSecret(_pppdata->authMethod(), + encodeWord(_pppdata->storedUsername()), + encodeWord(_pppdata->password())); -// con_win->hide(); - // con_win->stopClock(); + con_win->hide(); + con_win->stopClock(); // stopAccounting(); - PPPData::data()->setpppdRunning(false); + _pppdata->setpppdRunning(false); // not in a signal handler !!! KNotifyClient::beep(); @@ -507,3 +519,3 @@ void KPPPWidget::sigPPPDDied() { } - PPPData::data()->setpppdError(0); + _pppdata->setpppdError(0); } @@ -528,6 +540,6 @@ void KPPPWidget::sigPPPDDied() { void KPPPWidget::newdefaultaccount(int i) { - PPPData::data()->setDefaultAccount(connectto_c->text(i)); - PPPData::data()->save(); - ID_Edit->setText(PPPData::data()->storedUsername()); - PW_Edit->setText(PPPData::data()->storedPassword()); + _pppdata->setDefaultAccount(connectto_c->text(i)); + _pppdata->save(); + ID_Edit->setText(_pppdata->storedUsername()); + PW_Edit->setText(_pppdata->storedPassword()); } @@ -541,6 +553,6 @@ void KPPPWidget::beginConnect() { // if(!m_bCmdlAccount) { -// PPPData::data()->setAccount(connectto_c->currentText()); -// PPPData::data()->setPassword(PW_Edit->text()); +// _pppdata->setAccount(connectto_c->currentText()); +// _pppdata->setPassword(PW_Edit->text()); // } else { - PPPData::data()->setPassword(PPPData::data()->storedPassword()); + _pppdata->setPassword(_pppdata->storedPassword()); // } @@ -562,3 +574,3 @@ void KPPPWidget::beginConnect() { "setuid permission and that " - "pppd is executable.").arg(PPPData::data()->pppdPath()); + "pppd is executable.").arg(_pppdata->pppdPath()); KMessageBox::error(this, string); @@ -569,3 +581,3 @@ void KPPPWidget::beginConnect() { - QFileInfo info2(PPPData::data()->modemDevice()); + QFileInfo info2(_pppdata->modemDevice()); @@ -577,3 +589,3 @@ void KPPPWidget::beginConnect() { "the modem tab of " - "the setup dialog.").arg(PPPData::data()->modemDevice()); + "the setup dialog.").arg(_pppdata->modemDevice()); QMessageBox::warning(this, "error", string); @@ -584,16 +596,13 @@ void KPPPWidget::beginConnect() { // supplied - if(PPPData::data()->authMethod() == AUTH_PAP || - PPPData::data()->authMethod() == AUTH_CHAP || - PPPData::data()->authMethod() == AUTH_PAPCHAP ) { + if(_pppdata->authMethod() == AUTH_PAP || + _pppdata->authMethod() == AUTH_CHAP || + _pppdata->authMethod() == AUTH_PAPCHAP ) { if(ID_Edit->text().isEmpty()) { QMessageBox::warning(this,"error", - i18n( - "You have selected the authentication " - "method PAP or CHAP. This requires that you " - "supply a username and a password!")); - return; + i18n("You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!")); +// FIXME: return; } else { - if(!Modem::modem->setSecret(PPPData::data()->authMethod(), - encodeWord(PPPData::data()->storedUsername()), - encodeWord(PPPData::data()->password()))) { + if(!Modem::modem->setSecret(_pppdata->authMethod(), + encodeWord(_pppdata->storedUsername()), + encodeWord(_pppdata->password()))) { QString s; @@ -607,3 +616,3 @@ void KPPPWidget::beginConnect() { - if (PPPData::data()->phonenumber().isEmpty()) { + if (_pppdata->phonenumber().isEmpty()) { QString s = i18n("You must specify a telephone number!"); @@ -615,3 +624,3 @@ void KPPPWidget::beginConnect() { - QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname()); + QString tit = i18n("Connecting to: %1").arg(_pppdata->accname()); // con->setCaption(tit); @@ -626,7 +635,7 @@ void KPPPWidget::beginConnect() { void KPPPWidget::disconnect() { - if (!PPPData::data()->command_before_disconnect().isEmpty()) { -// con_win->hide(); -// con->show(); -// con->setCaption(i18n("Disconnecting...")); -// con->setMsg(i18n("Executing command before disconnection.")); + if (!_pppdata->command_before_disconnect().isEmpty()) { + con_win->hide(); + con->show(); + con->setCaption(i18n("Disconnecting...")); + con->setMsg(i18n("Executing command before disconnection.")); @@ -635,3 +644,3 @@ void KPPPWidget::disconnect() { // pid_t id = - execute_command(PPPData::data()->command_before_disconnect()); + execute_command(_pppdata->command_before_disconnect()); // int i, status; @@ -644,3 +653,3 @@ void KPPPWidget::disconnect() { -// con->hide(); + con->hide(); } @@ -653,3 +662,3 @@ void KPPPWidget::disconnect() { QApplication::flushX(); - execute_command(PPPData::data()->command_on_disconnect()); + execute_command(_pppdata->command_on_disconnect()); @@ -661,5 +670,5 @@ void KPPPWidget::disconnect() { -// con_win->stopClock(); + con_win->stopClock(); // p_kppp->stopAccounting(); -// con_win->hide(); + con_win->hide(); @@ -683,3 +692,3 @@ void KPPPWidget::disconnect() { void KPPPWidget::quitbutton() { - if(PPPData::data()->pppdRunning()) { + if(_pppdata->pppdRunning()) { int ok = QMessageBox::warning(this, @@ -690,3 +699,3 @@ void KPPPWidget::quitbutton() { QApplication::flushX(); - execute_command(PPPData::data()->command_on_disconnect()); + execute_command(_pppdata->command_on_disconnect()); removedns(); @@ -695,6 +704,6 @@ void KPPPWidget::quitbutton() { } else { - if (!PPPData::data()->accname().isEmpty() && !PPPData::data()->storePassword()) - PPPData::data()->setStoredPassword(""); + if (!_pppdata->accname().isEmpty() && !_pppdata->storePassword()) + _pppdata->setStoredPassword(""); } - PPPData::data()->save(); + _pppdata->save(); qApp->quit(); @@ -712,9 +721,9 @@ void KPPPWidget::quitbutton() { -// kdDebug() << "AcctEnabled: " << PPPData::data()->AcctEnabled() << endl; +// kdDebug() << "AcctEnabled: " << _pppdata->AcctEnabled() << endl; // // load the ruleset -// if(!PPPData::data()->AcctEnabled()) +// if(!_pppdata->AcctEnabled()) // return; -// QString d = AccountingBase::getAccountingFile(PPPData::data()->accountingFile()); +// QString d = AccountingBase::getAccountingFile(_pppdata->accountingFile()); // // if(::access(d.data(), X_OK) != 0) @@ -728,5 +737,5 @@ void KPPPWidget::quitbutton() { -// // if(!acct->loadRuleSet(PPPData::data()->accountingFile())) { +// // if(!acct->loadRuleSet(_pppdata->accountingFile())) { // // QString s= i18n("Can not load the accounting " -// // "ruleset \"%1\"!").arg(PPPData::data()->accountingFile()); +// // "ruleset \"%1\"!").arg(_pppdata->accountingFile()); @@ -745,5 +754,5 @@ void KPPPWidget::quitbutton() { // // if(stats->totalbytes != 0) -// // PPPData::data()->setTotalBytes(stats->totalbytes); +// // _pppdata->setTotalBytes(stats->totalbytes); -// if(!PPPData::data()->AcctEnabled()) +// if(!_pppdata->AcctEnabled()) // return; @@ -768,3 +777,3 @@ void KPPPWidget::usernameChanged(const QString &) { // store username for later use - PPPData::data()->setStoredUsername(ID_Edit->text()); + _pppdata->setStoredUsername(ID_Edit->text()); } @@ -774,6 +783,6 @@ void KPPPWidget::passwordChanged(const QString &) { // store the password if so requested - if(PPPData::data()->storePassword()) - PPPData::data()->setStoredPassword(PW_Edit->text()); + if(_pppdata->storePassword()) + _pppdata->setStoredPassword(PW_Edit->text()); else - PPPData::data()->setStoredPassword(""); + _pppdata->setStoredPassword(""); } @@ -817,3 +826,3 @@ void KPPPWidget::showNews() { #define QUICKHELP_HINT "Hint_QuickHelp" - if(PPPData::data()->readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) { + if(_pppdata->readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) { QDialog dlg(0, 0, true); @@ -869,4 +878,4 @@ void KPPPWidget::showNews() { if(cb->isChecked()) { - PPPData::data()->writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1); - PPPData::data()->save(); + _pppdata->writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1); + _pppdata->save(); } diff --git a/noncore/settings/networksettings/ppp/kpppwidget.h b/noncore/settings/networksettings/ppp/kpppwidget.h index d7e74af..b958862 100644 --- a/noncore/settings/networksettings/ppp/kpppwidget.h +++ b/noncore/settings/networksettings/ppp/kpppwidget.h @@ -36,3 +36,4 @@ class QPushButton; - +class Interface; +class PPPData; @@ -42,3 +43,3 @@ public: - KPPPWidget( QWidget *parent=0, const char *name=0, bool modal = false, WFlags fl = 0 ); + KPPPWidget(PPPData*, Interface*, QWidget *parent=0, const char *name=0, bool modal = false, WFlags fl = 0 ); ~KPPPWidget(); @@ -72,4 +73,4 @@ public: QString con_speed; - // ConnectWidget *con; - // ConWindow *con_win; + ConnectWidget *con; + ConWindow *con_win; // PPPStatsDlg *statdlg; @@ -88,3 +89,3 @@ private: QString ruleset_load_errmsg; - + PPPData *_pppdata; QPushButton *setup_b; diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp index 5139482..002c8e7 100644 --- a/noncore/settings/networksettings/ppp/modem.cpp +++ b/noncore/settings/networksettings/ppp/modem.cpp @@ -64,3 +64,3 @@ static sigjmp_buf jmp_buffer; -Modem *Modem::modem = 0; +//Modem *Modem::modem = 0; @@ -93,5 +93,5 @@ const char* pppdPath() { -Modem::Modem() +Modem::Modem( PPPData* pd ) { - if (Modem::modem != 0) return; //CORRECT? + _pppdata = pd; modemfd = -1; @@ -104,3 +104,2 @@ Modem::Modem() device = "/dev/modem"; - modem = this; } @@ -108,4 +107,4 @@ Modem::Modem() -Modem::~Modem() { - modem = 0; +Modem::~Modem() +{ } @@ -117,3 +116,3 @@ speed_t Modem::modemspeed() { // other systems may not have them - int i = PPPData::data()->speed().toInt()/100; + int i = _pppdata->speed().toInt()/100; @@ -167,3 +166,3 @@ bool Modem::opentty() { close(modemfd); - device = PPPData::data()->modemDevice(); + device = _pppdata->modemDevice(); if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) { @@ -177,3 +176,3 @@ bool Modem::opentty() { #if 0 - if(PPPData::data()->UseCDLine()) { + if(_pppdata->UseCDLine()) { if(ioctl(modemfd, TIOCMGET, &flags) == -1) { @@ -225,4 +224,4 @@ bool Modem::opentty() { - if(PPPData::data()->flowcontrol() != "None") { - if(PPPData::data()->flowcontrol() == "CRTSCTS") { + if(_pppdata->flowcontrol() != "None") { + if(_pppdata->flowcontrol() == "CRTSCTS") { tty.c_cflag |= CRTSCTS; @@ -355,3 +354,3 @@ bool Modem::writeLine(const char *buf) { // different modems seem to need different line terminations - QString term = PPPData::data()->enter(); + QString term = _pppdata->enter(); if(term == "LF") @@ -395,5 +394,5 @@ bool Modem::hangup() { // Then hangup command - writeLine(PPPData::data()->modemHangupStr().local8Bit()); + writeLine(_pppdata->modemHangupStr().local8Bit()); - usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec + usleep(_pppdata->modemInitDelay() * 10000); // 0.01 - 3.0 sec @@ -433,3 +432,3 @@ bool Modem::hangup() { - usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 secs + usleep(_pppdata->modemInitDelay() * 10000); // 0.01 - 3.0 secs @@ -456,7 +455,7 @@ void Modem::escape_to_command_mode() { // +3 because quiet time must be greater than guard time. - usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000); - QCString tmp = PPPData::data()->modemEscapeStr().local8Bit(); + usleep((_pppdata->modemEscapeGuardTime()+3)*20000); + QCString tmp = _pppdata->modemEscapeStr().local8Bit(); write(modemfd, tmp.data(), tmp.length()); tcflush(modemfd, TCIOFLUSH); - usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000); + usleep((_pppdata->modemEscapeGuardTime()+3)*20000); @@ -576,3 +575,3 @@ int Modem::lockdevice() { - if(!PPPData::data()->modemLockFile()) { + if(!_pppdata->modemLockFile()) { qDebug("The user doesn't want a lockfile."); @@ -585,3 +584,3 @@ int Modem::lockdevice() { QString lockfile = LOCK_DIR"/LCK.."; - lockfile += PPPData::data()->modemDevice().mid(5); // append everything after /dev/ + lockfile += _pppdata->modemDevice().mid(5); // append everything after /dev/ @@ -616,3 +615,3 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) { - fd = openLockfile(PPPData::data()->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT); + fd = openLockfile(_pppdata->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT); if(fd >= 0) { @@ -990,3 +989,3 @@ bool Modem::execPPPDaemon(const QString & arguments) if(execpppd(arguments)==0) { - PPPData::data()->setpppdRunning(true); + _pppdata->setpppdRunning(true); return true; @@ -998,3 +997,3 @@ void Modem::killPPPDaemon() { - PPPData::data()->setpppdRunning(false); + _pppdata->setpppdRunning(false); killpppd(); diff --git a/noncore/settings/networksettings/ppp/modem.h b/noncore/settings/networksettings/ppp/modem.h index b494977..103cbeb 100644 --- a/noncore/settings/networksettings/ppp/modem.h +++ b/noncore/settings/networksettings/ppp/modem.h @@ -37,3 +37,3 @@ -//#include <config.h> +class PPPData; @@ -45,3 +45,3 @@ class Modem : public QObject { public: - Modem(); + Modem(PPPData*); ~Modem(); @@ -78,3 +78,3 @@ public: enum Auth { PAP = 1, CHAP }; - static Modem *modem; + // static Modem *modem; int lastStatus; @@ -114,2 +114,3 @@ private: bool modem_is_locked; + PPPData *_pppdata; }; diff --git a/noncore/settings/networksettings/ppp/modemcmds.cpp b/noncore/settings/networksettings/ppp/modemcmds.cpp index 65032e8..1d9db6e 100644 --- a/noncore/settings/networksettings/ppp/modemcmds.cpp +++ b/noncore/settings/networksettings/ppp/modemcmds.cpp @@ -42,4 +42,4 @@ -ModemCommands::ModemCommands(QWidget *parent, const char *name) - : QDialog(parent, name, true ) //, i18n("Edit Modem Commands") , Ok|Cancel) +ModemCommands::ModemCommands(PPPData *pd, QWidget *parent, const char *name) + : QDialog(parent, name, true ), _pppdata(pd) { @@ -242,36 +242,36 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name) //set stuff from gpppdata - preinitslider->setValue(PPPData::data()->modemPreInitDelay()); - lpreinitslider->setNum(PPPData::data()->modemPreInitDelay()); + preinitslider->setValue(_pppdata->modemPreInitDelay()); + lpreinitslider->setNum(_pppdata->modemPreInitDelay()); for(int i = 0; i < PPPData::NumInitStrings; i++) - initstr[i]->setText(PPPData::data()->modemInitStr(i)); - initslider->setValue(PPPData::data()->modemInitDelay()); - linitslider->setNum(PPPData::data()->modemInitDelay()); - initresp->setText(PPPData::data()->modemInitResp()); + initstr[i]->setText(_pppdata->modemInitStr(i)); + initslider->setValue(_pppdata->modemInitDelay()); + linitslider->setNum(_pppdata->modemInitDelay()); + initresp->setText(_pppdata->modemInitResp()); - durationslider->setValue(PPPData::data()->modemToneDuration()); - ldurationslider->setNum(PPPData::data()->modemToneDuration()); + durationslider->setValue(_pppdata->modemToneDuration()); + ldurationslider->setNum(_pppdata->modemToneDuration()); - nodetectdialtone->setText(PPPData::data()->modemNoDialToneDetectionStr()); - dialstr->setText(PPPData::data()->modemDialStr()); - connectresp->setText(PPPData::data()->modemConnectResp()); - busyresp->setText(PPPData::data()->modemBusyResp()); - nocarrierresp->setText(PPPData::data()->modemNoCarrierResp()); - nodialtoneresp->setText(PPPData::data()->modemNoDialtoneResp()); + 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::data()->modemEscapeStr()); - escaperesp->setText(PPPData::data()->modemEscapeResp()); + escapestr->setText(_pppdata->modemEscapeStr()); + escaperesp->setText(_pppdata->modemEscapeResp()); - hangupstr->setText(PPPData::data()->modemHangupStr()); - hangupresp->setText(PPPData::data()->modemHangupResp()); + hangupstr->setText(_pppdata->modemHangupStr()); + hangupresp->setText(_pppdata->modemHangupResp()); - answerstr->setText(PPPData::data()->modemAnswerStr()); - ringresp->setText(PPPData::data()->modemRingResp()); - answerresp->setText(PPPData::data()->modemAnswerResp()); + answerstr->setText(_pppdata->modemAnswerStr()); + ringresp->setText(_pppdata->modemRingResp()); + answerresp->setText(_pppdata->modemAnswerResp()); - slider->setValue(PPPData::data()->modemEscapeGuardTime()); - lslider->setNum(PPPData::data()->modemEscapeGuardTime()); + slider->setValue(_pppdata->modemEscapeGuardTime()); + lslider->setNum(_pppdata->modemEscapeGuardTime()); - volume_off->setText(PPPData::data()->volumeOff()); - volume_medium->setText(PPPData::data()->volumeMedium()); - volume_high->setText(PPPData::data()->volumeHigh()); + volume_off->setText(_pppdata->volumeOff()); + volume_medium->setText(_pppdata->volumeMedium()); + volume_high->setText(_pppdata->volumeHigh()); } @@ -280,31 +280,31 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name) void ModemCommands::slotOk() { - PPPData::data()->setModemPreInitDelay(lpreinitslider->text().toInt()); + _pppdata->setModemPreInitDelay(lpreinitslider->text().toInt()); for(int i = 0; i < PPPData::NumInitStrings; i++) - PPPData::data()->setModemInitStr(i, initstr[i]->text()); - PPPData::data()->setModemInitResp(initresp->text()); - PPPData::data()->setModemInitDelay(linitslider->text().toInt()); - - PPPData::data()->setModemToneDuration(ldurationslider->text().toInt()); - PPPData::data()->setModemNoDialToneDetectionStr(nodetectdialtone->text()); - PPPData::data()->setModemDialStr(dialstr->text()); - PPPData::data()->setModemConnectResp(connectresp->text()); - PPPData::data()->setModemBusyResp(busyresp->text()); - PPPData::data()->setModemNoCarrierResp(nocarrierresp->text()); - PPPData::data()->setModemNoDialtoneResp(nodialtoneresp->text()); - - PPPData::data()->setModemEscapeStr(escapestr->text()); - PPPData::data()->setModemEscapeResp(escaperesp->text()); - PPPData::data()->setModemEscapeGuardTime(lslider->text().toInt()); - PPPData::data()->setModemHangupStr(hangupstr->text()); - PPPData::data()->setModemHangupResp(hangupresp->text()); - - PPPData::data()->setModemAnswerStr(answerstr->text()); - PPPData::data()->setModemRingResp(ringresp->text()); - PPPData::data()->setModemAnswerResp(answerresp->text()); - - PPPData::data()->setVolumeHigh(volume_high->text()); - PPPData::data()->setVolumeMedium(volume_medium->text()); - PPPData::data()->setVolumeOff(volume_off->text()); - - PPPData::data()->save(); + _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(); accept(); diff --git a/noncore/settings/networksettings/ppp/modemcmds.h b/noncore/settings/networksettings/ppp/modemcmds.h index 9d078ec..ef69fec 100644 --- a/noncore/settings/networksettings/ppp/modemcmds.h +++ b/noncore/settings/networksettings/ppp/modemcmds.h @@ -46,3 +46,3 @@ public: - ModemCommands(QWidget *parent=0, const char *name=0); + ModemCommands(PPPData*, QWidget *parent=0, const char *name=0); ~ModemCommands() {} @@ -54,2 +54,3 @@ private slots: private: + PPPData *_pppdata; 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 @@ -39,4 +39,5 @@ -ModemTransfer::ModemTransfer(QWidget *parent, const char *name) - : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) +ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name) + : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder), + _modem(mo) { @@ -99,4 +100,4 @@ void ModemTransfer::ati_done() { timeout_timer->stop(); - Modem::modem->closetty(); - Modem::modem->unlockdevice(); + _modem->closetty(); + _modem->unlockdevice(); hide(); @@ -128,3 +129,3 @@ void ModemTransfer::init() { - int lock = Modem::modem->lockdevice(); + int lock = _modem->lockdevice(); if (lock == 1) { @@ -142,6 +143,6 @@ void ModemTransfer::init() { - if(Modem::modem->opentty()) { - if(Modem::modem->hangup()) { + if(_modem->opentty()) { + if(_modem->hangup()) { usleep(100000); // wait 0.1 secs - Modem::modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... + _modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... @@ -154,5 +155,5 @@ void ModemTransfer::init() { // clear modem buffer - Modem::modem->flush(); + _modem->flush(); - Modem::modem->notify(this, SLOT(readChar(unsigned char))); + _modem->notify(this, SLOT(readChar(unsigned char))); return; @@ -162,5 +163,5 @@ void ModemTransfer::init() { // opentty() or hangup() failed - statusBar->setText(Modem::modem->modemMessage()); + statusBar->setText(_modem->modemMessage()); step = 99; // wait until cancel is pressed - Modem::modem->unlockdevice(); + _modem->unlockdevice(); } @@ -177,3 +178,3 @@ void ModemTransfer::do_script() { progressBar->setProgress( progressBar->progress() + 1); - Modem::modem->writeLine("ATI\n"); + _modem->writeLine("ATI\n"); break; @@ -192,3 +193,3 @@ void ModemTransfer::do_script() { progressBar->setProgress( progressBar->progress() + 1); - Modem::modem->writeLine(query.local8Bit()); + _modem->writeLine(query.local8Bit()); break; @@ -225,3 +226,3 @@ void ModemTransfer::cancelbutton() { scripttimer->stop(); - Modem::modem->stop(); + _modem->stop(); timeout_timer->stop(); @@ -231,6 +232,6 @@ void ModemTransfer::cancelbutton() { - Modem::modem->hangup(); + _modem->hangup(); - Modem::modem->closetty(); - Modem::modem->unlockdevice(); + _modem->closetty(); + _modem->unlockdevice(); reject(); diff --git a/noncore/settings/networksettings/ppp/modeminfo.h b/noncore/settings/networksettings/ppp/modeminfo.h index 7aa2cc0..dfcc841 100644 --- a/noncore/settings/networksettings/ppp/modeminfo.h +++ b/noncore/settings/networksettings/ppp/modeminfo.h @@ -39,2 +39,4 @@ +class Modem; + const int NUM_OF_ATI = 8; @@ -45,3 +47,3 @@ class ModemTransfer : public QDialog { public: - ModemTransfer(QWidget *parent=0, const char *name=0); + ModemTransfer(Modem*, QWidget *parent=0, const char *name=0); @@ -62,2 +64,3 @@ protected: private: + Modem *_modem; int step; diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro index ac438dd..483aa58 100644 --- a/noncore/settings/networksettings/ppp/ppp.pro +++ b/noncore/settings/networksettings/ppp/ppp.pro @@ -6,6 +6,6 @@ CONFIG += qt warn_on debug DESTDIR = $(OPIEDIR)/plugins/networksettings -HEADERS = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h kpppwidget.h conwindow.h accounts.h connect.h edit.h scriptedit.h pppdargs.h iplined.h pwentry.h pppconfig.h -# -SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp kpppwidget.cpp conwindow.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp -# +HEADERS = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h conwindow.h accounts.h connect.h edit.h scriptedit.h pppdargs.h iplined.h pwentry.h pppconfig.h interfaceinformationppp.h interfaceppp.h +# kpppwidget.h +SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp conwindow.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp interfaceinformationppp.cpp interfaceppp.cpp +# kpppwidget.cpp INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/ diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp index 4c5f7aa..63f9335 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.cpp +++ b/noncore/settings/networksettings/ppp/pppconfig.cpp @@ -7,3 +7,3 @@ #include "general.h" -#include "interface.h" +#include "interfaceppp.h" #include "modem.h" @@ -13,3 +13,3 @@ -PPPConfigWidget::PPPConfigWidget( Interface* iface, QWidget *parent, +PPPConfigWidget::PPPConfigWidget( InterfacePPP* iface, QWidget *parent, const char *name, @@ -26,12 +26,7 @@ PPPConfigWidget::PPPConfigWidget( Interface* iface, QWidget *parent, interface = iface; - if (!PPPData::data()->setModemDevice( interface->getInterfaceName() )) - PPPData::data()->setModemDevice("/dev/modem"); qDebug("PPPConfigWidget::PPPConfigWidget"); qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1()); - if (!PPPData::data()->setAccount( interface->getHardwareName() )) - PPPData::data()->setAccount( 0 ); - qDebug(" PPPData::data()->accname >%s<",PPPData::data()->accname().latin1()); - qDebug(" PPPData::data()->currentAccountID() >%i<",PPPData::data()->currentAccountID()); - (void)new Modem; + qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1()); + qDebug(" _pppdata->currentAccountID() >%i<",interface->data()->currentAccountID()); @@ -43,7 +38,7 @@ PPPConfigWidget::PPPConfigWidget( Interface* iface, QWidget *parent, - accounts = new AccountWidget( tabWindow, "accounts" ); + accounts = new AccountWidget( interface->data(), tabWindow, "accounts" ); tabWindow->addTab( accounts, tr("&Accounts") ); - modem1 = new ModemWidget( tabWindow, "modem1" ); + modem1 = new ModemWidget( interface, tabWindow, "modem1" ); tabWindow->addTab( modem1, tr("&Device") ); - modem2 = new ModemWidget2( tabWindow, "modem2" ); + modem2 = new ModemWidget2( interface, tabWindow, "modem2" ); tabWindow->addTab( modem2, tr("&Modem") ); @@ -63,7 +58,7 @@ void PPPConfigWidget::accept() qDebug("PPPConfigWidget::accept"); - qDebug(" PPPData::data()->accname >%s<",PPPData::data()->accname().latin1()); + qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1()); qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1()); - interface->setInterfaceName( PPPData::data()->modemDevice() ); - interface->setHardwareName( PPPData::data()->accname() ); - PPPData::data()->save(); + interface->setInterfaceName( interface->data()->modemDevice() ); + interface->setHardwareName( interface->data()->accname() ); + interface->data()->save(); QDialog::accept(); @@ -74,3 +69,3 @@ void PPPConfigWidget::reject() { - PPPData::data()->cancel(); + interface->data()->cancel(); QDialog::reject(); diff --git a/noncore/settings/networksettings/ppp/pppconfig.h b/noncore/settings/networksettings/ppp/pppconfig.h index b324b6d..9bab6fe 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.h +++ b/noncore/settings/networksettings/ppp/pppconfig.h @@ -6,3 +6,4 @@ class QTabWidget; -class Interface; +//class Interface; +class InterfacePPP; class AccountWidget; @@ -16,3 +17,3 @@ public: - PPPConfigWidget( Interface*, QWidget *parent=0, const char *name=0, + PPPConfigWidget( InterfacePPP*, QWidget *parent=0, const char *name=0, bool modal = false, WFlags fl = 0 ); @@ -26,3 +27,3 @@ protected slots: private: - Interface *interface; + InterfacePPP *interface; QTabWidget *tabWindow; diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp index 4039939..d1143cf 100644 --- a/noncore/settings/networksettings/ppp/pppdargs.cpp +++ b/noncore/settings/networksettings/ppp/pppdargs.cpp @@ -36,4 +36,4 @@ -PPPdArguments::PPPdArguments(QWidget *parent, const char *name) - : QDialog(parent, name, TRUE) +PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) + : QDialog(parent, name, TRUE), _pppdata(pd) { @@ -123,6 +123,6 @@ void PPPdArguments::defaultsbutton() { // save current list - QStringList arglist(PPPData::data()->pppdArgument()); + QStringList arglist(_pppdata->pppdArgument()); // get defaults - PPPData::data()->setpppdArgumentDefaults(); + _pppdata->setpppdArgumentDefaults(); init(); @@ -130,3 +130,3 @@ void PPPdArguments::defaultsbutton() { // restore old list - PPPData::data()->setpppdArgument(arglist); + _pppdata->setpppdArgument(arglist); } @@ -138,3 +138,3 @@ void PPPdArguments::closebutton() { arglist.append(arguments->text(i)); - PPPData::data()->setpppdArgument(arglist); + _pppdata->setpppdArgument(arglist); @@ -148,3 +148,3 @@ void PPPdArguments::init() { - QStringList &arglist = PPPData::data()->pppdArgument(); + QStringList &arglist = _pppdata->pppdArgument(); for ( QStringList::Iterator it = arglist.begin(); diff --git a/noncore/settings/networksettings/ppp/pppdargs.h b/noncore/settings/networksettings/ppp/pppdargs.h index c1cd28d..75f0c9d 100644 --- a/noncore/settings/networksettings/ppp/pppdargs.h +++ b/noncore/settings/networksettings/ppp/pppdargs.h @@ -35,2 +35,3 @@ #include <qlabel.h> +class PPPData; @@ -39,3 +40,3 @@ Q_OBJECT public: - PPPdArguments(QWidget *parent=0, const char *name=0); + PPPdArguments(PPPData*,QWidget *parent=0, const char *name=0); ~PPPdArguments() {} @@ -64,2 +65,3 @@ private: QPushButton *closebtn; + PPPData *_pppdata; }; diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp index 3f1675c..59d68c9 100644 --- a/noncore/settings/networksettings/ppp/pppdata.cpp +++ b/noncore/settings/networksettings/ppp/pppdata.cpp @@ -40,17 +40,4 @@ -PPPData *PPPData::_data = 0; -Config *PPPData::config = 0; - -PPPData* PPPData::data() -{ - if (!_data){ - qDebug("PPPData::data() creates new Instance"); - _data = new PPPData(); - } - if (!_data->config){ - qDebug("PPPData::data() opens conffile"); - _data->open(); - } - return _data; -} +#define SEPARATOR -sseepp- +#define SEP QString("%1SEPARATOR%1") @@ -64,13 +51,2 @@ PPPData::PPPData() { -} - - -// -// open configuration file -// -bool PPPData::open() { - qDebug("opening configfile NetworkSetupPPP"); - if (config) return true; - config = new Config("NetworkSetupPPP"); - highcount = readNumConfig(GENERAL_GRP, NUMACCOUNTS_KEY, 0) - 1; @@ -92,5 +68,8 @@ bool PPPData::open() { - return true; } +Config PPPData::config() +{ + return Config("NetworkSetupPPP"); +} @@ -99,15 +78,40 @@ bool PPPData::open() { // -void PPPData::save() { - - if (config) { +void PPPData::save() +{ + qDebug("PPPData saving data"); writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count()); - delete config; - config = 0; - qDebug("worte confi NetworkSetupPPP"); - } - if (_data){ - delete _data; - _data = 0; - } - + QString key; + QStringList keys; + Config cfg = config(); + for( QMap<QString,QString>::Iterator it = stringEntries.begin(); + it != stringEntries.end(); ++it ){ + QString val = it.data(); + key = it.key(); +// qDebug("saving %s -> %s", key.latin1(), val.latin1() ); + keys = QStringList::split( "SEPARATOR", key ); + qDebug("group >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() ); + cfg.setGroup(keys[0]); + cfg.writeEntry(keys[1], val); + } + for( QMap<QString,int>::Iterator it = intEntries.begin(); + it != intEntries.end(); ++it ){ + int val = it.data(); + key = it.key(); +// qDebug("saving %s -> %i", key.latin1(), val ); + keys = QStringList::split( "SEPARATOR", key ); + qDebug("group >%s< key >%s< val %i", keys[0].latin1(), keys[1].latin1(), val ); + cfg.setGroup(keys[0]); + cfg.writeEntry(keys[1], val); + } + for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); + it != listEntries.end(); ++it ){ + QStringList val = it.data(); + key = it.key(); + QChar sep = sepEntries[key]; +// qDebug("saving %s -> %s", key.latin1(), val.join(sep).latin1() ); + keys = QStringList::split( "SEPARATOR", key ); + qDebug("group >%s< key >%s<values >%s<", keys[0].latin1(), keys[1].latin1(), val.join(sep).latin1() ); + cfg.setGroup(keys[0]); + cfg.writeEntry(keys[1], val, sep); + } } @@ -119,18 +123,7 @@ void PPPData::save() { void PPPData::cancel() { - -// if (config) { -// config->rollback(); -// config->reparseConfiguration(); -// } - + stringEntries.clear(); + intEntries.clear(); + listEntries.clear(); } - -// // currently differentiates between READWRITE and NONE only -// int PPPData::access() const { - -// return 1;//config->getConfigState(); -// } - - // functions to read/write date to configuration file @@ -140,7 +133,8 @@ QString PPPData::readConfig(const QString &group, const QString &key, // qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1()); - if (config) { - config->setGroup(group); - return config->readEntry(key, defvalue); - } else - return defvalue; + QString idx = SEP.arg(group).arg(key); + if (stringEntries.find(idx) != stringEntries.end()) + return stringEntries[idx]; + Config cfg = config(); + cfg.setGroup(group); + return cfg.readEntry(key, defvalue); } @@ -149,8 +143,16 @@ QString PPPData::readConfig(const QString &group, const QString &key, int PPPData::readNumConfig(const QString &group, const QString &key, - int defvalue) { - if (config) { - config->setGroup(group); - return config->readNumEntry(key, defvalue); - } else - return defvalue; + int defvalue) +{ + QString idx = SEP.arg(group).arg(key); + if (intEntries.find(idx) != intEntries.end()) + return intEntries[idx]; + Config cfg = config(); + cfg.setGroup(group); + return cfg.readNumEntry(key, defvalue); + +// if (config) { +// config->setGroup(group); +// return config->readNumEntry(key, defvalue); +// } else +// return defvalue; @@ -162,8 +164,19 @@ bool PPPData::readListConfig(const QString &group, const QString &key, list.clear(); - if (config) { - config->setGroup(group); - list = config->readListEntry(key, sep); - return true; - } else - return false; + QString idx = SEP.arg(group).arg(key); + if (listEntries.find(idx) != listEntries.end()){ + list = listEntries[idx]; + return true; + } + Config cfg = config(); + cfg.setGroup(group); + list = cfg.readListEntry(key, sep); + if (list.count() > 0) return true; + return false; + +// if (config) { +// config->setGroup(group); +// list = config->readListEntry(key, sep); +// return true; +// } else +// return false; } @@ -173,6 +186,7 @@ void PPPData::writeConfig(const QString &group, const QString &key, const QString &value) { - if (config) { - config->setGroup(group); - config->writeEntry(key, value); - } + stringEntries.insert( SEP.arg(group).arg(key), value ); +// if (config) { +// config->setGroup(group); +// config->writeEntry(key, value); +// } } @@ -180,7 +194,9 @@ void PPPData::writeConfig(const QString &group, const QString &key, -void PPPData::writeConfig(const QString &group, const QString &key, int value) { - if (config) { - config->setGroup(group); - config->writeEntry(key, value); - } +void PPPData::writeConfig(const QString &group, const QString &key, int value) +{ + intEntries.insert( SEP.arg(group).arg(key), value ); +// if (config) { +// config->setGroup(group); +// config->writeEntry(key, value); +// } } @@ -189,7 +205,10 @@ void PPPData::writeConfig(const QString &group, const QString &key, int value) { void PPPData::writeListConfig(const QString &group, const QString &key, - QStringList &list, char sep) { - if (config) { - config->setGroup(group); - config->writeEntry(key, list, sep); - } + QStringList &list, char sep) +{ + listEntries.insert( SEP.arg(group).arg(key), list ); + sepEntries.insert( SEP.arg(group).arg(key), sep ); +// if (config) { +// config->setGroup(group); +// config->writeEntry(key, list, sep); +// } } @@ -283,20 +302,20 @@ void PPPData::set_automatic_redial(bool set) { -bool PPPData::get_iconify_on_connect() { - return (bool) readNumConfig(GENERAL_GRP, ICONIFY_ON_CONNECT_KEY, TRUE); -} +// bool PPPData::get_iconify_on_connect() { +// return (bool) readNumConfig(GENERAL_GRP, ICONIFY_ON_CONNECT_KEY, TRUE); +// } -void PPPData::set_iconify_on_connect(bool set) { - writeConfig(GENERAL_GRP, ICONIFY_ON_CONNECT_KEY, (int) set); -} +// void PPPData::set_iconify_on_connect(bool set) { +// writeConfig(GENERAL_GRP, ICONIFY_ON_CONNECT_KEY, (int) set); +// } -bool PPPData::get_dock_into_panel() { - return (bool) readNumConfig(GENERAL_GRP, DOCKING_KEY, false); -} +// bool PPPData::get_dock_into_panel() { +// return (bool) readNumConfig(GENERAL_GRP, DOCKING_KEY, false); +// } -void PPPData::set_dock_into_panel(bool set) { - writeConfig(GENERAL_GRP, DOCKING_KEY, (int) set); -} +// void PPPData::set_dock_into_panel(bool set) { +// writeConfig(GENERAL_GRP, DOCKING_KEY, (int) set); +// } @@ -792,3 +811,3 @@ int PPPData::newaccount() { qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS); - if(!config) open(); +// if(!config) open(); if (highcount >= MAX_ACCOUNTS) return -1; @@ -992,10 +1011,10 @@ void PPPData::setAcctEnabled(bool set) { -int PPPData::VolAcctEnabled() { - return readNumConfig(cgroup, VOLACCTENABLED_KEY, 0); -} +// int PPPData::VolAcctEnabled() { +// return readNumConfig(cgroup, VOLACCTENABLED_KEY, 0); +// } -void PPPData::setVolAcctEnabled(int set) { - writeConfig(cgroup, VOLACCTENABLED_KEY, set); -} +// void PPPData::setVolAcctEnabled(int set) { +// writeConfig(cgroup, VOLACCTENABLED_KEY, set); +// } @@ -1025,3 +1044,3 @@ bool PPPData::autoDNS() { bool set = (bool) readNumConfig(cgroup, AUTODNS_KEY, true); - return (set && PPPData::data()->pppdVersionMin(2, 3, 7)); + return (set && pppdVersionMin(2, 3, 7)); } @@ -1228,8 +1247,12 @@ QMap<QString,QString> PPPData::getConfiguredInterfaces() QMap<QString,QString> ifaces; - int count = readNumConfig( ACCLIST_GRP, ACCOUNTS_COUNT, -1 ); - QString accGrp; + Config config = PPPData::config(); + config.setGroup(ACCLIST_GRP); + int count = config.readNumEntry( ACCOUNTS_COUNT, -1 ); + QString accGrp, dev, acc; for (int i = 0; i < count; i++){ accGrp = QString("%1_%1").arg(ACCLIST_GRP).arg(i); - ifaces.insert( readConfig( accGrp, ACOUNTS_DEV, "error" ), - readConfig( accGrp, ACOUNTS_ACC, "error" ) ); + config.setGroup(accGrp); + dev = config.readEntry( ACOUNTS_DEV, "error" ); + acc = config.readEntry( ACOUNTS_ACC, "error" ); + ifaces.insert( dev, acc ); } @@ -1242,10 +1265,11 @@ void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces ) QMap<QString,QString>::Iterator it; - QString accGrp; int i = 0; + Config cfg = config(); for( it = ifaces.begin(); it != ifaces.end(); ++it, ++i ){ - accGrp = QString("%1_%1").arg(ACCLIST_GRP).arg(i); - writeConfig( accGrp, ACOUNTS_DEV, it.key() ); - writeConfig( accGrp, ACOUNTS_ACC, it.data() ); + cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i)); + cfg.writeEntry( ACOUNTS_DEV, it.key() ); + cfg.writeEntry( ACOUNTS_ACC, it.data() ); } - writeConfig( ACCLIST_GRP, ACCOUNTS_COUNT, i ); + cfg.setGroup( ACCLIST_GRP ); + cfg.writeEntry( ACCOUNTS_COUNT, i ); diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h index c1c7e69..af960c6 100644 --- a/noncore/settings/networksettings/ppp/pppdata.h +++ b/noncore/settings/networksettings/ppp/pppdata.h @@ -157,3 +157,2 @@ public: ~PPPData() {}; - static PPPData* data(); @@ -162,3 +161,2 @@ public: // general functions - bool open(); void save(); @@ -166,6 +164,7 @@ public: - QMap<QString,QString> getConfiguredInterfaces(); - void setConfiguredInterfaces( QMap<QString,QString> ); + static QMap<QString,QString> getConfiguredInterfaces(); + static void setConfiguredInterfaces( QMap<QString,QString> ); // function to read/write date to configuration file + static Config config(); QString readConfig(const QString &, const QString &, const QString &); @@ -209,7 +208,7 @@ public: - void set_iconify_on_connect(bool set); - bool get_iconify_on_connect(); +// void set_iconify_on_connect(bool set); +// bool get_iconify_on_connect(); - void set_dock_into_panel(bool set); - bool get_dock_into_panel(); +// void set_dock_into_panel(bool set); +// bool get_dock_into_panel(); @@ -313,7 +312,2 @@ public: -#if 0 - void setUseCDLine(const int n); - int UseCDLine(); -#endif - // functions to set/get account information @@ -376,4 +370,4 @@ public: - int VolAcctEnabled(); - void setVolAcctEnabled(int set); +// int VolAcctEnabled(); +// void setVolAcctEnabled(int set); @@ -417,37 +411,8 @@ public: - // functions to set/query the accounting info -// const QString accountingFile(); -// void setAccountingFile(const QString &); - -// const QString totalCosts(); -// void setTotalCosts(const QString &); - -// int totalBytes(); -// void setTotalBytes(int); - -// // graphing widget -// void setGraphingOptions(bool enabled, -// QColor bg, -// QColor text, -// QColor in, -// QColor out); -// void graphingOptions(bool &enabled, -// QColor &bg, -// QColor &text, -// QColor &in, -// QColor &out); -// bool graphingEnabled(); - -// // window positions -// void winPosConWin(int &, int &); -// void setWinPosConWin(int, int); -// void winPosStatWin(int &, int &); -// void setWinPosStatWin(int, int); - private: - static PPPData *_data; + //static PPPData *_data; int modemDeviceGroup; QString passwd; - static Config* config; // configuration object + // static Config* config; // configuration object int highcount; // index of highest account @@ -462,2 +427,7 @@ private: QStringList phonelist; + QMap<QString,QString> stringEntries; + QMap<QString,int> intEntries; + QMap<QString,QStringList> listEntries; + QMap<QString,QChar> sepEntries; + }; diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index 7cbccc2..95df068 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -1 +1,2 @@ + #include "pppconfig.h" @@ -3,5 +4,5 @@ #include "pppdata.h" -#include "kpppwidget.h" -#include "interfaceinformationimp.h" -//#include "devices.h" +#include "interfaceinformationppp.h" +#include "interfaceppp.h" + @@ -12,5 +13,5 @@ PPPModule::PPPModule() : Module() { - QMap<QString,QString> ifaces = PPPData::data()->getConfiguredInterfaces(); + QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces(); QMap<QString,QString>::Iterator it; - Interface *iface; + InterfacePPP *iface; qDebug("getting interfaces"); @@ -18,5 +19,5 @@ PPPModule::PPPModule() : Module() qDebug("ifaces %s", it.key().latin1()); - iface = new Interface( 0, it.key() ); + iface = new InterfacePPP( 0, it.key() ); iface->setHardwareName( it.data() ); - list.append( iface ); + list.append( (Interface*)iface ); } @@ -34,4 +35,3 @@ PPPModule::~PPPModule(){ } - PPPData::data()->setConfiguredInterfaces( ifaces ); - PPPData::data()->save(); + PPPData::setConfiguredInterfaces( ifaces ); } @@ -69,4 +69,4 @@ QWidget *PPPModule::configure(Interface *i){ qDebug("return ModemWidget"); - PPPConfigWidget *pppconfig = new PPPConfigWidget( i, 0, "PPPConfig", - false, + PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, + 0, "PPPConfig", false, Qt::WDestructiveClose ); @@ -83,3 +83,4 @@ QWidget *PPPModule::information(Interface *i){ qDebug("return PPPModule::information"); - InterfaceInformationImp *information = new InterfaceInformationImp( 0, "InterfaceSetupImp", i); +// InterfaceInformationImp *information = new InterfaceInformationImp( 0, "InterfaceSetupImp", i); + InterfaceInformationPPP *information = new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); return information; @@ -108,5 +109,6 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ + InterfacePPP *ifaceppp; Interface *iface; - iface = new Interface(); - PPPConfigWidget imp(iface, 0, "PPPConfigImp", true); + ifaceppp = new InterfacePPP(); + PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); imp.showMaximized(); @@ -114,2 +116,3 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ iface->setModuleOwner( this ); + iface = ifaceppp; list.append( iface ); |