summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/accounts.cpp70
-rw-r--r--noncore/settings/networksettings/ppp/accounts.h4
-rw-r--r--noncore/settings/networksettings/ppp/connect.cpp326
-rw-r--r--noncore/settings/networksettings/ppp/connect.h22
-rw-r--r--noncore/settings/networksettings/ppp/conwindow.cpp245
-rw-r--r--noncore/settings/networksettings/ppp/conwindow.h12
-rw-r--r--noncore/settings/networksettings/ppp/edit.cpp123
-rw-r--r--noncore/settings/networksettings/ppp/edit.h20
-rw-r--r--noncore/settings/networksettings/ppp/general.cpp59
-rw-r--r--noncore/settings/networksettings/ppp/general.h10
-rw-r--r--noncore/settings/networksettings/ppp/interfaceinformationppp.cpp24
-rw-r--r--noncore/settings/networksettings/ppp/interfaceinformationppp.h25
-rw-r--r--noncore/settings/networksettings/ppp/interfaceppp.cpp48
-rw-r--r--noncore/settings/networksettings/ppp/interfaceppp.h30
-rw-r--r--noncore/settings/networksettings/ppp/kpppwidget.cpp463
-rw-r--r--noncore/settings/networksettings/ppp/kpppwidget.h11
-rw-r--r--noncore/settings/networksettings/ppp/modem.cpp45
-rw-r--r--noncore/settings/networksettings/ppp/modem.h7
-rw-r--r--noncore/settings/networksettings/ppp/modemcmds.cpp112
-rw-r--r--noncore/settings/networksettings/ppp/modemcmds.h3
-rw-r--r--noncore/settings/networksettings/ppp/modeminfo.cpp37
-rw-r--r--noncore/settings/networksettings/ppp/modeminfo.h5
-rw-r--r--noncore/settings/networksettings/ppp/ppp.pro8
-rw-r--r--noncore/settings/networksettings/ppp/pppconfig.cpp29
-rw-r--r--noncore/settings/networksettings/ppp/pppconfig.h7
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.cpp14
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.h4
-rw-r--r--noncore/settings/networksettings/ppp/pppdata.cpp250
-rw-r--r--noncore/settings/networksettings/ppp/pppdata.h62
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp31
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
@@ -51,6 +51,6 @@
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)
{
QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10);
@@ -153,15 +153,15 @@ 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());
}
}
// 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());
l1->activate();
@@ -176,7 +176,7 @@ void AccountWidget::slotListBoxSelect(int idx) {
if(idx!=-1) {
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);
}
}
@@ -215,12 +215,12 @@ 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()));
int result = doTab();
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();
}
}
@@ -246,5 +246,5 @@ void AccountWidget::newaccount() {
// case QMessageBox::Yes:
// {
-// if (PPPData::data()->newaccount() == -1)
+// if (_pppdata->newaccount() == -1)
// return;
// // ProviderDB pdb(this);
@@ -253,6 +253,6 @@ 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;
}
@@ -264,11 +264,11 @@ 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();
}
@@ -285,9 +285,9 @@ 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();
}
@@ -301,9 +301,9 @@ void AccountWidget::deleteaccount() {
return;
- 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());
emit resetaccounts();
- PPPData::data()->save();
+ _pppdata->save();
slotListBoxSelect(accountlist_l->currentItem());
@@ -323,25 +323,25 @@ int AccountWidget::doTab(){
bool isnewaccount;
- if(PPPData::data()->accname().isEmpty()) {
+ if(_pppdata->accname().isEmpty()) {
dlg->setCaption(i18n("New Account"));
isnewaccount = true;
} else {
QString tit = i18n("Edit Account: ");
- tit += PPPData::data()->accname();
+ tit += _pppdata->accname();
dlg->setCaption(tit);
isnewaccount = false;
}
- 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") );
// acct = new AccountingSelector( tabWindow, isnewaccount );
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
@@ -43,9 +43,10 @@ class IPWidget;
class DNSWidget;
class GatewayWidget;
+class PPPData;
class AccountWidget : public QWidget {
Q_OBJECT
public:
- AccountWidget( QWidget *parent=0, const char *name=0 );
+ AccountWidget( PPPData *pd, QWidget *parent=0, const char *name=0 );
~AccountWidget() {}
@@ -70,4 +71,5 @@ private:
QString prettyPrintVolume(unsigned int);
+ PPPData *_pppdata;
QTabWidget *tabWindow;
DialWidget *dial_w;
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
@@ -66,5 +66,5 @@
#include "connect.h"
//#include "docking.h"
-//#include "main.h"
+#include "interfaceppp.h"
#include "modem.h"
#include "kpppconfig.h"
@@ -75,13 +75,10 @@
#define execute_command system
-extern KPPPWidget *p_kppp;
-
QString old_hostname;
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(""),
main_timer_ID(0),
@@ -97,7 +94,6 @@ ConnectWidget::ConnectWidget(QWidget *parent, const char *name)
scanning(false),
pausing(false),
-// termwindow(0),
-// stats(st),
- dialnumber(0)
+ dialnumber(0),
+ _ifaceppp(ifp)
{
modified_hostname = false;
@@ -180,5 +176,5 @@ void ConnectWidget::preinit() {
void ConnectWidget::init() {
- PPPData::data()->setpppdError(0);
+ _ifaceppp->data()->setpppdError(0);
inittimer->stop();
vmain = 0;
@@ -195,12 +191,12 @@ void ConnectWidget::init() {
dialnumber = 0;
- 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);
@@ -208,5 +204,5 @@ 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..."));
emit debugMessage(i18n("Running pre-startup command..."));
@@ -214,5 +210,5 @@ void ConnectWidget::init() {
qApp->processEvents();
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;
@@ -224,5 +220,5 @@ void ConnectWidget::init() {
}
- int lock = Modem::modem->lockdevice();
+ int lock = _ifaceppp->modem()->lockdevice();
if (lock == 1) {
@@ -238,8 +234,8 @@ 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()) {
qApp->processEvents();
@@ -247,9 +243,9 @@ void ConnectWidget::init() {
semaphore = false;
- 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);
// this timer will run the script etc.
@@ -261,7 +257,7 @@ 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();
}
@@ -285,16 +281,16 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
}
- QString initStr = PPPData::data()->modemInitStr(substate);
+ QString initStr = _ifaceppp->data()->modemInitStr(substate);
if (!initStr.isEmpty()) {
// send a carriage return and then wait a bit so that the modem will
// 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
}
@@ -307,5 +303,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
* a "Modem Query"
*/
- if (MODEM_TONEDURATION != PPPData::data()->modemToneDuration())
+ if (MODEM_TONEDURATION != _ifaceppp->data()->modemToneDuration())
vmain = 5;
else
@@ -317,9 +313,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if (vmain == 5) {
if(!expecting) {
- QString sToneDuration = "ATS11=" + QString::number(PPPData::data()->modemToneDuration());
+ QString sToneDuration = "ATS11=" + QString::number(_ifaceppp->data()->modemToneDuration());
QString msg = i18n("Setting ") + sToneDuration;
messg->setText(msg);
emit debugMessage(msg);
- setExpect(PPPData::data()->modemInitResp());
+ setExpect(_ifaceppp->data()->modemInitResp());
writeline(sToneDuration);
}
@@ -337,5 +333,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
substate = -1;
// skip setting the volume if command is empty
- if(PPPData::data()->volumeInitString().isEmpty()) {
+ if(_ifaceppp->data()->volumeInitString().isEmpty()) {
vmain = 4;
return;
@@ -344,9 +340,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Setting speaker volume..."));
- 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;
return;
@@ -356,10 +352,10 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 4) {
if(!expecting) {
- if(!PPPData::data()->waitForDialTone()) {
+ if(!_ifaceppp->data()->waitForDialTone()) {
QString msg = i18n("Turning off dial tone waiting...");
messg->setText(msg);
emit debugMessage(msg);
- setExpect(PPPData::data()->modemInitResp());
- writeline(PPPData::data()->modemNoDialToneDetectionStr());
+ setExpect(_ifaceppp->data()->modemInitResp());
+ writeline(_ifaceppp->data()->modemNoDialToneDetectionStr());
}
vmain = 1;
@@ -373,8 +369,8 @@ 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);
QString bm = i18n("Dialing %1").arg(bmarg);
@@ -382,6 +378,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(bm);
- QString pn = PPPData::data()->modemDialStr();
- pn += PPPData::data()->dialPrefix();
+ QString pn = _ifaceppp->data()->modemDialStr();
+ pn += _ifaceppp->data()->dialPrefix();
pn += *plist.at(dialnumber);
if(++dialnumber >= plist.count())
@@ -389,5 +385,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
writeline(pn);
- setExpect(PPPData::data()->modemConnectResp());
+ setExpect(_ifaceppp->data()->modemConnectResp());
vmain = 100;
return;
@@ -399,5 +395,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 100) {
if(!expecting) {
- myreadbuffer = PPPData::data()->modemConnectResp();
+ myreadbuffer = _ifaceppp->data()->modemConnectResp();
setExpect("\n");
vmain = 101;
@@ -405,14 +401,14 @@ 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);
messg->setText(i18n("Line busy. Hanging up..."));
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);
emit debugMessage(bm);
@@ -420,9 +416,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
pausing = true;
- pausetimer->start(PPPData::data()->busyWait()*1000, true);
+ pausetimer->start(_ifaceppp->data()->busyWait()*1000, true);
timeout_timer->stop();
}
- Modem::modem->setDataMode(false);
+ _ifaceppp->modem()->setDataMode(false);
vmain = 0;
substate = -1;
@@ -430,19 +426,19 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
}
- if(readbuffer.contains(PPPData::data()->modemNoDialtoneResp())) {
+ if(readbuffer.contains(_ifaceppp->data()->modemNoDialtoneResp())) {
timeout_timer->stop();
messg->setText(i18n("No Dialtone"));
vmain = 20;
- Modem::modem->unlockdevice();
+ _ifaceppp->modem()->unlockdevice();
return;
}
- if(readbuffer.contains(PPPData::data()->modemNoCarrierResp())) {
+ if(readbuffer.contains(_ifaceppp->data()->modemNoCarrierResp())) {
timeout_timer->stop();
messg->setText(i18n("No Carrier"));
vmain = 20;
- Modem::modem->unlockdevice();
+ _ifaceppp->modem()->unlockdevice();
return;
}
@@ -452,5 +448,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 101) {
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
emit startAccounting();
@@ -458,5 +454,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
vmain = 2;
- scriptTimeout=PPPData::data()->modemTimeout()*1000;
+ scriptTimeout=_ifaceppp->data()->modemTimeout()*1000;
return;
}
@@ -495,8 +491,8 @@ 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;
}
@@ -514,6 +510,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
QRegExp re1("%USERNAME%");
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());
if (scriptCommand == "Send")
@@ -579,6 +575,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Hangup"));
- writeline(PPPData::data()->modemHangupStr());
- setExpect(PPPData::data()->modemHangupResp());
+ writeline(_ifaceppp->data()->modemHangupStr());
+ setExpect(_ifaceppp->data()->modemHangupResp());
scriptindex++;
@@ -593,5 +589,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Answer"));
- setExpect(PPPData::data()->modemRingResp());
+ setExpect(_ifaceppp->data()->modemRingResp());
vmain = 150;
return;
@@ -603,5 +599,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(bm);
- QString idstring = PPPData::data()->storedUsername();
+ QString idstring = _ifaceppp->data()->storedUsername();
if(!idstring.isEmpty() && firstrunID) {
@@ -639,5 +635,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(bm);
- QString pwstring = PPPData::data()->password();
+ QString pwstring = _ifaceppp->data()->password();
if(!pwstring.isEmpty() && firstrunPW) {
@@ -660,5 +656,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
/* if prompt withdrawn ... then, */
if(!(prompt->isVisible())) {
- p_kppp->setPW_Edit(prompt->text());
+// p_kppp->setPW_Edit(prompt->text());
writeline(prompt->text());
prompt->setConsumed();
@@ -786,6 +782,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 150) {
if(!expecting) {
- writeline(PPPData::data()->modemAnswerStr());
- setExpect(PPPData::data()->modemAnswerResp());
+ writeline(_ifaceppp->data()->modemAnswerStr());
+ setExpect(_ifaceppp->data()->modemAnswerResp());
vmain = 2;
@@ -813,7 +809,7 @@ 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) {
// delete termwindow;
@@ -832,10 +828,10 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
// Modem::readtty() from re-enabling the socket notifier.
// The port is still held open by the helper process.
- Modem::modem->closetty();
+ _ifaceppp->modem()->closetty();
killTimer( main_timer_ID );
- 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);
// find out PPP interface and notify the stats module
@@ -850,6 +846,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(result) {
- if(!PPPData::data()->autoDNS())
- adddns();
+ if(!_ifaceppp->data()->autoDNS())
+ adddns( _ifaceppp );
// O.K we are done here, let's change over to the if_waiting loop
@@ -864,12 +860,12 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
this->hide();
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();
}
@@ -891,5 +887,5 @@ void ConnectWidget::set_con_speed_string() {
// CONNECT 115200, so all we need to do is find the number after CONNECT
// or whatever the modemConnectResp() is.
- p_kppp->con_speed = Modem::modem->parseModemSpeed(myreadbuffer);
+// p_kppp->con_speed = _ifaceppp->modem()->parseModemSpeed(myreadbuffer);
}
@@ -970,5 +966,5 @@ void ConnectWidget::pause() {
void ConnectWidget::cancelbutton() {
- Modem::modem->stop();
+ _ifaceppp->modem()->stop();
killTimer(main_timer_ID);
timeout_timer->stop();
@@ -985,21 +981,21 @@ 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);
qApp->processEvents();
- Modem::modem->killPPPDaemon();
- Modem::modem->hangup();
+ _ifaceppp->modem()->killPPPDaemon();
+ _ifaceppp->modem()->hangup();
this->hide();
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();
//abort prompt window...
@@ -1027,5 +1023,5 @@ void ConnectWidget::script_timed_out() {
prompt->setConsumed();
messg->setText(i18n("Script timed out!"));
- Modem::modem->hangup();
+ _ifaceppp->modem()->hangup();
emit stopAccounting();
// p_kppp->con_win->stopClock();
@@ -1064,8 +1060,8 @@ void ConnectWidget::if_waiting_timed_out() {
qDebug("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();
emit stopAccounting();
@@ -1089,5 +1085,5 @@ void ConnectWidget::if_waiting_slot() {
// if(!stats->ifIsUp()) {
-// if(PPPData::data()->pppdError() != 0) {
+// if(_ifaceppp->data()->pppdError() != 0) {
// // we are here if pppd died immediately after starting it.
// pppdDied();
@@ -1106,6 +1102,6 @@ void ConnectWidget::if_waiting_slot() {
usleep(200000);
- if(PPPData::data()->autoDNS())
- addpeerdns();
+ if(_ifaceppp->data()->autoDNS())
+ addpeerdns( _ifaceppp );
// Close the debugging window. If we are connected, we
@@ -1113,18 +1109,18 @@ void ConnectWidget::if_waiting_slot() {
emit closeDebugWindow();
// 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..."));
// make sure that we don't get any async errors
qApp->flushX();
- execute_command(PPPData::data()->command_on_connect());
+ execute_command(_ifaceppp->data()->command_on_connect());
messg->setText(i18n("Done"));
}
// remove the authentication file
- Modem::modem->removeSecret(AUTH_PAP);
- Modem::modem->removeSecret(AUTH_CHAP);
+ _ifaceppp->modem()->removeSecret(AUTH_PAP);
+ _ifaceppp->modem()->removeSecret(AUTH_CHAP);
emit debugMessage(i18n("Done"));
@@ -1142,18 +1138,18 @@ void ConnectWidget::if_waiting_slot() {
// p_kppp->con_win->accounting(false);
- 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();
}
@@ -1169,15 +1165,15 @@ bool ConnectWidget::execppp() {
// which is the serial port we connected stdin/stdout to in opener.cpp.
// command += " ";
- // command += PPPData::data()->modemDevice();
+ // command += _ifaceppp->data()->modemDevice();
- command += " " + PPPData::data()->speed();
+ command += " " + _ifaceppp->data()->speed();
command += " -detach";
- 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 += ":";
}
@@ -1187,13 +1183,13 @@ 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";
else
@@ -1201,11 +1197,11 @@ 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();
it != arglist.end();
@@ -1216,23 +1212,23 @@ 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() + "\"";
}
// 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() + "\"";
}
// 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() + "\"";
}
// check for debug
- if(PPPData::data()->getPPPDebug())
+ if(_ifaceppp->data()->getPPPDebug())
command += " debug";
@@ -1248,5 +1244,5 @@ bool ConnectWidget::execppp() {
qApp->flushX();
- return Modem::modem->execPPPDaemon(command);
+ return _ifaceppp->modem()->execPPPDaemon(command);
}
@@ -1263,9 +1259,9 @@ void ConnectWidget::setMsg(const QString &msg) {
void ConnectWidget::writeline(const QString &s) {
- Modem::modem->writeLine(s.local8Bit());
+ _ifaceppp->modem()->writeLine(s.local8Bit());
}
// Set the hostname and domain from DNS Server
-void auto_hostname() {
+void auto_hostname(InterfacePPP *_ifaceppp) {
struct in_addr local_ip;
struct hostent *hostname_entry;
@@ -1278,6 +1274,6 @@ void auto_hostname() {
old_hostname=tmp_str; // copy to QString
- // 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());
hostname_entry=gethostbyaddr((const char *)&local_ip,sizeof(in_addr),AF_INET);
@@ -1287,5 +1283,5 @@ void auto_hostname() {
dot=new_hostname.find('.');
new_hostname=new_hostname.remove(dot,new_hostname.length()-dot);
- Modem::modem->setHostname(new_hostname);
+ _ifaceppp->modem()->setHostname(new_hostname);
modified_hostname = TRUE;
@@ -1293,5 +1289,5 @@ void auto_hostname() {
new_hostname.remove(0,dot+1);
- add_domain(new_hostname);
+ add_domain(new_hostname, _ifaceppp);
}
}
@@ -1301,5 +1297,5 @@ void auto_hostname() {
// Replace the DNS domain entry in the /etc/resolv.conf file and
// disable the nameserver entries if option is enabled
-void add_domain(const QString &domain) {
+void add_domain(const QString &domain, InterfacePPP *_ifaceppp) {
int fd;
@@ -1310,5 +1306,5 @@ void add_domain(const QString &domain) {
return;
- if((fd = Modem::modem->openResolv(O_RDONLY)) >= 0) {
+ if((fd = _ifaceppp->modem()->openResolv(O_RDONLY)) >= 0) {
int i=0;
@@ -1324,5 +1320,5 @@ void add_domain(const QString &domain) {
if ((c != '\n') && (i < MAX_RESOLVCONF_LINES)) i++;
- 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() +
" \t\t#kppp temp entry\n";
@@ -1333,5 +1329,5 @@ void add_domain(const QString &domain) {
( resolv[j].contains("nameserver")
&& !resolv[j].contains("#kppp temp entry")
- && PPPData::data()->exDNSDisabled()))
+ && _ifaceppp->data()->exDNSDisabled()))
&& !resolv[j].contains("#entry disabled by kppp")) {
QCString tmp = "# " + resolv[j].local8Bit() +
@@ -1351,10 +1347,10 @@ void add_domain(const QString &domain) {
// adds the DNS entries in the /etc/resolv.conf file
-void adddns()
+void adddns( InterfacePPP *_ifaceppp)
{
int fd;
- 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();
it != dnslist.end();
@@ -1367,11 +1363,11 @@ void adddns()
close(fd);
}
- 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) {
char c;
@@ -1388,9 +1384,9 @@ void addpeerdns() {
close(fd);
}
- add_domain(PPPData::data()->domain());
+ add_domain(_ifaceppp->data()->domain(), _ifaceppp);
}
// remove the dns entries from the /etc/resolv.conf file
-void removedns() {
+void removedns(InterfacePPP *_ifaceppp) {
int fd;
@@ -1398,5 +1394,5 @@ void removedns() {
QString resolv[MAX_RESOLVCONF_LINES];
- if((fd = Modem::modem->openResolv(O_RDONLY)) >= 0) {
+ if((fd = _ifaceppp->modem()->openResolv(O_RDONLY)) >= 0) {
int i=0;
@@ -1411,5 +1407,5 @@ void removedns() {
close(fd);
- 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++) {
if(resolv[j].contains("#kppp temp entry")) continue;
@@ -1430,5 +1426,5 @@ 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
@@ -37,15 +37,15 @@
#include "kpppconfig.h"
#include "pwentry.h"
-//#include "docking.h"
-//#include "loginterm.h"
+
#define MAXLOOPNEST (MAX_SCRIPT_ENTRIES/2)
-class PPPStats;
+class InterfacePPP;
+class PPPData;
class ConnectWidget : public QWidget {
Q_OBJECT
public:
- ConnectWidget(QWidget *parent, const char *name);
+ ConnectWidget(InterfacePPP*, QWidget *parent, const char *name);
~ConnectWidget();
@@ -137,15 +137,15 @@ private:
unsigned int dialnumber; // the current number to dial
-// PPPStats *stats;
+ InterfacePPP *_ifaceppp;
};
// 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*);
#endif
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
@@ -32,8 +32,7 @@
// #include <kglobal.h>
-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),
minutes(0),
@@ -42,7 +41,5 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget )
days(0),
tl1(0),
-// stats(st),
- accountingEnabled(false),
- volumeAccountingEnabled(false)
+ _pppdata(pd)
{
info1 = new QLabel(i18n("Connected at:"), this);
@@ -116,120 +113,120 @@ 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();
+// }
@@ -240,7 +237,7 @@ void ConWindow::startClock() {
QString title ;
- 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" ;
}
@@ -266,5 +263,5 @@ void ConWindow::timeclick() {
// "Connected at: %2\n"
// "Time connected: %3")
-// .arg(PPPData::data()->accname()).arg(info2->text())
+// .arg(_pppdata->accname()).arg(info2->text())
// .arg(time_string2);
@@ -276,5 +273,5 @@ void ConWindow::timeclick() {
// volinfo->setEnabled(TRUE);
-// int bytes = PPPData::data()->totalBytes();
+// int bytes = _pppdata->totalBytes();
// volinfo->setText(prettyPrintVolume(bytes));
// }
@@ -306,5 +303,5 @@ void ConWindow::timeclick() {
// time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds);
-// caption_string = PPPData::data()->accname();
+// caption_string = _pppdata->accname();
// caption_string += " ";
// caption_string += time_string;
@@ -313,5 +310,5 @@ void ConWindow::timeclick() {
// timelabel2->setText(time_string2);
-// 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
// // otherwise I get a flickering icon
@@ -329,6 +326,6 @@ void ConWindow::closeEvent( QCloseEvent *e ){
e->ignore();
- 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
@@ -35,5 +35,5 @@
#include <qlayout.h>
-//class PPPStats;
+class PPPData;
class ConWindow : public QWidget {
@@ -41,5 +41,5 @@ Q_OBJECT
public:
- ConWindow(QWidget *parent, const char *name, QDialog* );
+ ConWindow(PPPData*, QWidget *parent, const char *name, QDialog* );
~ConWindow();
@@ -50,5 +50,5 @@ protected:
private slots:
void timeclick();
- void dock();
+// void dock();
public:
@@ -56,5 +56,5 @@ public:
void startClock();
void stopClock();
- void accounting(bool); // show/ hide accounting info
+// void accounting(bool); // show/ hide accounting info
public slots:
@@ -83,7 +83,5 @@ private:
QLabel *vollabel;
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
@@ -46,6 +46,7 @@
#include "auth.h"
-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)
{
const int GRIDROWS = 6;
@@ -155,8 +156,8 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
// Set defaults if editing an existing connection
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 = "";
uint idx = 0;
@@ -173,6 +174,6 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
numbers->insertItem(tmp);
- auth->setCurrentItem(PPPData::data()->authMethod());
- store_password->setChecked(PPPData::data()->storePassword());
+ auth->setCurrentItem(_pppdata->authMethod());
+ store_password->setChecked(_pppdata->storePassword());
} else {
// select PAP/CHAP as default
@@ -188,8 +189,8 @@ bool DialWidget::save() {
//first check to make sure that the account name is unique!
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());
QString number = "";
@@ -200,7 +201,7 @@ 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;
}
@@ -223,5 +224,5 @@ void DialWidget::selectionChanged(int) {
void DialWidget::addNumber() {
- PhoneNumberDialog dlg(this);
+ PhoneNumberDialog dlg(this);
if(dlg.exec()) {
numbers->insertItem(dlg.phoneNumber());
@@ -264,5 +265,5 @@ void DialWidget::downNumber() {
void DialWidget::pppdargsbutton() {
- PPPdArguments pa(this);
+ PPPdArguments pa(_pppdata, this);
pa.exec();
}
@@ -273,6 +274,6 @@ void DialWidget::pppdargsbutton() {
// ExecWidget
/////////////////////////////////////////////////////////////////////////////
-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)
{
QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
@@ -361,8 +362,8 @@ i18n("Here you can select commands to run at certain stages of the\n"
// Set defaults if editing an existing connection
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());
}
}
@@ -370,8 +371,8 @@ 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;
}
@@ -384,6 +385,6 @@ 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)
{
QVBoxLayout *topLayout = new QVBoxLayout(this);
@@ -450,5 +451,5 @@ 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)),
this,SLOT(autoname_t(bool)));
@@ -470,13 +471,13 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
//load info from gpppdata
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);
autoname->setChecked(false);
@@ -511,11 +512,11 @@ void IPWidget::autoname_t(bool on) {
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());
}
@@ -538,6 +539,6 @@ 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)
{
// box = new QGroupBox(this);
@@ -573,5 +574,5 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
tl->addWidget(autodns, 1, 1);
// 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);
@@ -646,5 +647,5 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
"Disable existing DNS servers during connection"),
this);
- exdnsdisabled_toggle->setChecked(PPPData::data()->exDNSDisabled());
+ exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled());
tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
QWhatsThis::add(exdnsdisabled_toggle,
@@ -662,9 +663,9 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
// restore data if editing
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);
DNS_Mode_Selected(mode);
@@ -696,18 +697,18 @@ 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;
for(uint i=0; i < dnsservers->count(); i++)
serverlist.append(dnsservers->text(i));
- PPPData::data()->setDns(serverlist);
+ _pppdata->setDns(serverlist);
// strip leading dot
QString s(dnsdomain->text());
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());
}
@@ -733,6 +734,6 @@ void DNSWidget::removedns() {
// GatewayWidget
//
-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)
{
QVBoxLayout *topLayout = new QVBoxLayout(this);
@@ -786,13 +787,13 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
//load info from gpppdata
if(!isnewaccount) {
- if(PPPData::data()->gateway() == "0.0.0.0") {
+ if(_pppdata->gateway() == "0.0.0.0") {
defaultgateway->setChecked(true);
hitGatewaySelect(0);
}
else {
- gatewayaddr->setText(PPPData::data()->gateway());
+ gatewayaddr->setText(_pppdata->gateway());
staticgateway->setChecked(true);
}
- defaultroute->setChecked(PPPData::data()->defaultroute());
+ defaultroute->setChecked(_pppdata->defaultroute());
}
else {
@@ -804,6 +805,6 @@ 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());
}
@@ -824,6 +825,6 @@ 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)
{
@@ -868,6 +869,6 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
//load data from gpppdata
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();
QStringList::Iterator itarg = arglist.begin();
@@ -915,6 +916,6 @@ void ScriptWidget::save() {
arglist.append(sl->text(i));
}
- 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
@@ -48,9 +48,10 @@
class IPLineEdit;
+class PPPData;
class DialWidget : public QWidget {
Q_OBJECT
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() {}
@@ -77,4 +78,5 @@ private:
QPushButton *add, *del, *up, *down;
QListBox *numbers;
+ PPPData *_pppdata;
};
@@ -88,5 +90,5 @@ class ExecWidget : public QWidget {
Q_OBJECT
public:
- ExecWidget(QWidget *parent=0, bool isnewaccount=true, const char *name=0);
+ ExecWidget(PPPData*, QWidget *parent=0, bool isnewaccount=true, const char *name=0);
public slots:
@@ -105,4 +107,5 @@ private:
QLineEdit *discommand;
QLabel *discommand_label;
+ PPPData *_pppdata;
};
@@ -111,5 +114,5 @@ class IPWidget : public QWidget {
Q_OBJECT
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() {}
@@ -135,4 +138,5 @@ private:
QCheckBox *autoname;
+ PPPData *_pppdata;
};
@@ -141,5 +145,5 @@ class DNSWidget : public QWidget {
Q_OBJECT
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() {}
@@ -167,4 +171,5 @@ private:
QLabel *dnsdomain_label;
QCheckBox *exdnsdisabled_toggle;
+ PPPData *_pppdata;
};
@@ -173,5 +178,5 @@ class GatewayWidget : public QWidget {
Q_OBJECT
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() {}
@@ -191,4 +196,5 @@ private:
IPLineEdit *gatewayaddr;
QCheckBox *defaultroute;
+ PPPData *_pppdata;
};
@@ -197,5 +203,5 @@ class ScriptWidget : public QWidget {
Q_OBJECT
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() {}
@@ -226,4 +232,5 @@ private:
QScrollBar *slb;
+ PPPData *_pppdata;
};
@@ -246,4 +253,5 @@ private slots:
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
@@ -40,5 +40,5 @@
#include "general.h"
-//#include "version.h"
+#include "interfaceppp.h"
//#include "miniterm.h"
#include "modeminfo.h"
@@ -51,6 +51,6 @@
-ModemWidget::ModemWidget( QWidget *parent, const char *name)
- : QWidget(parent, name)
+ModemWidget::ModemWidget( InterfacePPP *ifppp, QWidget *parent, const char *name )
+ : QWidget(parent, name), _ifaceppp(ifppp)
{
int k;
@@ -173,5 +173,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
for(int i=0; i <= enter->count()-1; i++) {
- if(PPPData::data()->enter() == enter->text(i))
+ if(_ifaceppp->data()->enter() == enter->text(i))
enter->setCurrentItem(i);
}
@@ -182,5 +182,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
modemlockfile = new QCheckBox(i18n("&Use lock file"), this);
- modemlockfile->setChecked(PPPData::data()->modemLockFile());
+ modemlockfile->setChecked(_ifaceppp->data()->modemLockFile());
connect(modemlockfile, SIGNAL(toggled(bool)),
SLOT(modemlockfilechanged(bool)));
@@ -202,8 +202,9 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
QLabel *timeoutlabel = new QLabel( tr("Modem timeout:") ,this, "timeout" );
modemtimeout = new QSpinBox( 1, 120, 1, this, "modemTimeout" );
-// modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
+// modemtimeout = new KIntNumInput(_pppdata->modemTimeout(), this);
// modemtimeout->setLabel(i18n("Modem &timeout:"));
// modemtimeout->setRange(1, 120, 1);
modemtimeout->setSuffix(i18n(" sec"));
+ modemtimeout->setValue( _ifaceppp->data()->modemTimeout() );
connect(modemtimeout, SIGNAL(valueChanged(int)),
SLOT(modemtimeoutchanged(int)));
@@ -219,15 +220,15 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
//set stuff from gpppdata
for(int i=0; i <= enter->count()-1; i++) {
- if(PPPData::data()->enter() == enter->text(i))
+ if(_ifaceppp->data()->enter() == enter->text(i))
enter->setCurrentItem(i);
}
for(int i=0; i <= modemdevice->count()-1; i++) {
- if(PPPData::data()->modemDevice() == modemdevice->text(i))
+ if(_ifaceppp->data()->modemDevice() == modemdevice->text(i))
modemdevice->setCurrentItem(i);
}
for(int i=0; i <= flowcontrol->count()-1; i++) {
- if(PPPData::data()->flowcontrol() == flowcontrol->text(i))
+ if(_ifaceppp->data()->flowcontrol() == flowcontrol->text(i))
flowcontrol->setCurrentItem(i);
}
@@ -235,5 +236,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
//set the modem speed
for(int i=0; i < baud_c->count(); i++)
- if(baud_c->text(i) == PPPData::data()->speed())
+ if(baud_c->text(i) == _ifaceppp->data()->speed())
baud_c->setCurrentItem(i);
@@ -243,35 +244,36 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
void ModemWidget::speed_selection(int) {
- PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem()));
+ _ifaceppp->data()->setSpeed(baud_c->text(baud_c->currentItem()));
}
void ModemWidget::setenter(int ) {
- PPPData::data()->setEnter(enter->text(enter->currentItem()));
+ _ifaceppp->data()->setEnter(enter->text(enter->currentItem()));
}
void ModemWidget::setmodemdc(int i) {
- PPPData::data()->setModemDevice(modemdevice->text(i));
+ _ifaceppp->data()->setModemDevice(modemdevice->text(i));
}
void ModemWidget::setflowcontrol(int i) {
- PPPData::data()->setFlowcontrol(flowcontrol->text(i));
+ _ifaceppp->data()->setFlowcontrol(flowcontrol->text(i));
}
void ModemWidget::modemlockfilechanged(bool set) {
- PPPData::data()->setModemLockFile(set);
+ _ifaceppp->data()->setModemLockFile(set);
}
void ModemWidget::modemtimeoutchanged(int n) {
- PPPData::data()->setModemTimeout(n);
+ _ifaceppp->data()->setModemTimeout(n);
}
-ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
- : QWidget(parent, name)
+ModemWidget2::ModemWidget2( InterfacePPP* ifp, QWidget *parent,
+ const char *name)
+ : QWidget(parent, name), _ifaceppp(ifp)
{
QVBoxLayout *l1 = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
@@ -279,5 +281,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
waitfordt = new QCheckBox(i18n("&Wait for dial tone before dialing"), this);
- waitfordt->setChecked(PPPData::data()->waitForDialTone());
+ waitfordt->setChecked(_ifaceppp->data()->waitForDialTone());
connect(waitfordt, SIGNAL(toggled(bool)), SLOT(waitfordtchanged(bool)));
l1->addWidget(waitfordt);
@@ -294,5 +296,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
QLabel *waitLabel = new QLabel( tr("Busy wait:"), this, "busyWait" );
busywait = new QSpinBox( 0, 300, 5, this, "busyWait" );
-// busywait = new KIntNumInput(PPPData::data()->busyWait(), this);
+// busywait = new KIntNumInput(_pppdata->busyWait(), this);
// busywait->setLabel(i18n("B&usy wait:"));
// busywait->setRange(0, 300, 5, true);
@@ -319,5 +321,6 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
QLabel *volumeLabel = new QLabel(i18n("Modem &volume:"), this);
hbl->addWidget(volumeLabel);
- volume = new QSlider(0, 2, 1, PPPData::data()->volume(), QSlider::Horizontal, this);
+ volume = new QSlider(0, 2, 1, _ifaceppp->data()->volume(),
+ QSlider::Horizontal, this);
volumeLabel->setBuddy(volume);
volume->setTickmarks(QSlider::Below);
@@ -343,5 +346,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
#if 0
chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this);
- chkbox1->setChecked(PPPData::data()->UseCDLine());
+ chkbox1->setChecked(_ifaceppp->data()->UseCDLine());
connect(chkbox1,SIGNAL(toggled(bool)),
this,SLOT(use_cdline_toggled(bool)));
@@ -400,5 +403,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
void ModemWidget2::modemcmdsbutton() {
- ModemCommands mc(this);
+ ModemCommands mc(_ifaceppp->data(), this);
mc.showMaximized();
mc.exec();
@@ -407,5 +410,5 @@ void ModemWidget2::modemcmdsbutton() {
void ModemWidget2::query_modem() {
- ModemTransfer mt(this);
+ ModemTransfer mt(_ifaceppp->modem(), this);
mt.exec();
}
@@ -420,19 +423,19 @@ void ModemWidget2::query_modem() {
#if 0
void ModemWidget2::use_cdline_toggled(bool on) {
- PPPData::data()->setUseCDLine(on);
+ _ifaceppp->data()->setUseCDLine(on);
}
#endif
void ModemWidget2::waitfordtchanged(bool b) {
- PPPData::data()->setWaitForDialTone((int)b);
+ _ifaceppp->data()->setWaitForDialTone((int)b);
}
void ModemWidget2::busywaitchanged(int n) {
- PPPData::data()->setbusyWait(n);
+ _ifaceppp->data()->setbusyWait(n);
}
void ModemWidget2::volumeChanged(int v) {
- PPPData::data()->setVolume(v);
+ _ifaceppp->data()->setVolume(v);
}
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
@@ -35,11 +35,11 @@ class QLabel;
class QCheckBox;
class QComboBox;
-
-
+class PPPData;
+class InterfacePPP;
class ModemWidget : public QWidget {
Q_OBJECT
public:
- ModemWidget( QWidget *parent=0, const char *name=0 );
+ ModemWidget( InterfacePPP*, QWidget *parent=0, const char *name=0 );
private slots:
@@ -65,4 +65,5 @@ private:
QSpinBox *modemtimeout;
QCheckBox *modemlockfile;
+ InterfacePPP *_ifaceppp;
};
@@ -71,5 +72,5 @@ class ModemWidget2 : public QWidget {
Q_OBJECT
public:
- ModemWidget2( QWidget *parent=0, const char *name=0 );
+ ModemWidget2( InterfacePPP*, QWidget *parent=0, const char *name=0 );
private slots:
@@ -92,4 +93,5 @@ private:
QCheckBox *chkbox1;
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
@@ -38,4 +38,5 @@
#include <qdialog.h>
#include <qwhatsthis.h>
+#include <qcheckbox.h>
// #include <kaboutdata.h>
@@ -71,4 +72,5 @@
#include "pppdata.h"
#include "general.h"
+#include "interface.h"
#define execute_command system
@@ -76,12 +78,19 @@
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)
{
// tabWindow = 0;
p_kppp = this;
// 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());
int result = runTests();
@@ -91,107 +100,107 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
// installEventFilter(this);
-// 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);
// help_b = new QPushButton(i18n("&Help"), this);
@@ -205,25 +214,25 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
// minw = help_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();
+ 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);
setFixedSize(sizeHint());
- (void)new Modem;
+ (void)new Modem(_pppdata);
// we also connect cmld_start to the beginConnect so that I can run
@@ -236,5 +245,5 @@ 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());
@@ -245,7 +254,7 @@ 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.
// QRect desk = QApplication::desktop()->screenGeometry(
@@ -254,12 +263,12 @@ 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()));
@@ -275,5 +284,5 @@ 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){
// QString string;
@@ -347,5 +356,5 @@ void KPPPWidget::enterPressedInPW() {
// triggered by the session manager
void KPPPWidget::saveMyself() {
- PPPData::data()->save();
+ _pppdata->save();
}
@@ -356,5 +365,5 @@ void KPPPWidget::shutDown() {
void KPPPWidget::log_window_toggled(bool on) {
- PPPData::data()->set_show_log_window(on);
+ _pppdata->set_show_log_window(on);
}
@@ -365,5 +374,5 @@ void KPPPWidget::log_window_toggled(bool on) {
// connectto_c->clear();
-// int count = PPPData::data()->count();
+// int count = _pppdata->count();
// // enable/disable controls
@@ -376,25 +385,25 @@ void KPPPWidget::log_window_toggled(bool on) {
// //load the accounts
// 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());
// }
// //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());
// }
// }
// else
// 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());
// }
@@ -414,9 +423,11 @@ void KPPPWidget::log_window_toggled(bool on) {
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();
}
@@ -429,5 +440,5 @@ void KPPPWidget::sigPPPDDied() {
// in the followin line to make sure that we don't raise a false alarm
// 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" );
@@ -441,34 +452,35 @@ void KPPPWidget::sigPPPDDied() {
Modem::modem->removeSecret(AUTH_CHAP);
- PPPData::data()->setpppdRunning(false);
+ _pppdata->setpppdRunning(false);
qDebug( "Executing command on disconnect since pppd has died." );
QApplication::flushX();
- execute_command(PPPData::data()->command_on_disconnect());
+ execute_command(_pppdata->command_on_disconnect());
// stopAccounting();
-// con_win->stopClock();
+ con_win->stopClock();
// DockWidget::dock_widget->stop_stats();
// DockWidget::dock_widget->hide();
- 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 "
"to come up!");
@@ -491,20 +503,20 @@ void KPPPWidget::sigPPPDDied() {
qDebug( "Trying to reconnect... " );
- 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();
emit cmdl_start();
}
}
- PPPData::data()->setpppdError(0);
+ _pppdata->setpppdError(0);
}
}
@@ -527,8 +539,8 @@ 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());
}
@@ -540,8 +552,8 @@ void KPPPWidget::beginConnect() {
// (exeption: an account given by a command line argument)
// 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());
// }
@@ -561,5 +573,5 @@ void KPPPWidget::beginConnect() {
"Please make sure that you have given kppp "
"setuid permission and that "
- "pppd is executable.").arg(PPPData::data()->pppdPath());
+ "pppd is executable.").arg(_pppdata->pppdPath());
KMessageBox::error(this, string);
return;
@@ -568,5 +580,5 @@ void KPPPWidget::beginConnect() {
#endif
- QFileInfo info2(PPPData::data()->modemDevice());
+ QFileInfo info2(_pppdata->modemDevice());
if(!info2.exists()){
@@ -576,5 +588,5 @@ void KPPPWidget::beginConnect() {
"and/or adjust the location of the modem device on "
"the modem tab of "
- "the setup dialog.").arg(PPPData::data()->modemDevice());
+ "the setup dialog.").arg(_pppdata->modemDevice());
QMessageBox::warning(this, "error", string);
return;
@@ -583,18 +595,15 @@ void KPPPWidget::beginConnect() {
// if this is a PAP or CHAP account, ensure that username is
// 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;
s = i18n("Cannot create PAP/CHAP authentication\n"
@@ -606,5 +615,5 @@ void KPPPWidget::beginConnect() {
}
- if (PPPData::data()->phonenumber().isEmpty()) {
+ if (_pppdata->phonenumber().isEmpty()) {
QString s = i18n("You must specify a telephone number!");
QMessageBox::warning(this, "error", s);
@@ -614,5 +623,5 @@ void KPPPWidget::beginConnect() {
this->hide();
- QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname());
+ QString tit = i18n("Connecting to: %1").arg(_pppdata->accname());
// con->setCaption(tit);
@@ -625,14 +634,14 @@ 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."));
qApp->processEvents();
QApplication::flushX();
// pid_t id =
- execute_command(PPPData::data()->command_before_disconnect());
+ execute_command(_pppdata->command_before_disconnect());
// int i, status;
@@ -643,5 +652,5 @@ void KPPPWidget::disconnect() {
// } while (i == 0 && errno == 0);
-// con->hide();
+ con->hide();
}
@@ -652,5 +661,5 @@ void KPPPWidget::disconnect() {
QApplication::flushX();
- execute_command(PPPData::data()->command_on_disconnect());
+ execute_command(_pppdata->command_on_disconnect());
Modem::modem->removeSecret(AUTH_PAP);
@@ -660,7 +669,7 @@ void KPPPWidget::disconnect() {
Modem::modem->unlockdevice();
-// con_win->stopClock();
+ con_win->stopClock();
// p_kppp->stopAccounting();
-// con_win->hide();
+ con_win->hide();
// DockWidget::dock_widget->stop_stats();
@@ -682,5 +691,5 @@ void KPPPWidget::disconnect() {
void KPPPWidget::quitbutton() {
- if(PPPData::data()->pppdRunning()) {
+ if(_pppdata->pppdRunning()) {
int ok = QMessageBox::warning(this,
i18n("Exiting kPPP will close your PPP Session."),
@@ -689,13 +698,13 @@ void KPPPWidget::quitbutton() {
Modem::modem->killPPPDaemon();
QApplication::flushX();
- execute_command(PPPData::data()->command_on_disconnect());
+ execute_command(_pppdata->command_on_disconnect());
removedns();
Modem::modem->unlockdevice();
}
} 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();
}
@@ -711,11 +720,11 @@ void KPPPWidget::quitbutton() {
// stats->totalbytes = 0;
-// 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)
// acct = new Accounting(this, stats);
@@ -727,7 +736,7 @@ void KPPPWidget::quitbutton() {
// con_win, SLOT(slotAccounting(QString, QString)));
-// // 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());
// // starting the messagebox with a timer will prevent us
@@ -744,7 +753,7 @@ void KPPPWidget::quitbutton() {
// // store volume accounting
// // if(stats->totalbytes != 0)
-// // PPPData::data()->setTotalBytes(stats->totalbytes);
+// // _pppdata->setTotalBytes(stats->totalbytes);
-// if(!PPPData::data()->AcctEnabled())
+// if(!_pppdata->AcctEnabled())
// return;
@@ -767,5 +776,5 @@ void KPPPWidget::quitbutton() {
void KPPPWidget::usernameChanged(const QString &) {
// store username for later use
- PPPData::data()->setStoredUsername(ID_Edit->text());
+ _pppdata->setStoredUsername(ID_Edit->text());
}
@@ -773,8 +782,8 @@ void KPPPWidget::usernameChanged(const QString &) {
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("");
}
@@ -816,5 +825,5 @@ 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);
dlg.setCaption(i18n("Recent Changes in KPPP"));
@@ -868,6 +877,6 @@ void KPPPWidget::showNews() {
dlg.exec();
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
@@ -35,5 +35,6 @@
class QPushButton;
-
+class Interface;
+class PPPData;
class KPPPWidget : public QDialog {
@@ -41,5 +42,5 @@ class KPPPWidget : public QDialog {
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();
@@ -71,6 +72,6 @@ public:
bool connected;
QString con_speed;
- // ConnectWidget *con;
- // ConWindow *con_win;
+ ConnectWidget *con;
+ ConWindow *con_win;
// PPPStatsDlg *statdlg;
// AccountingBase *acct;
@@ -87,5 +88,5 @@ private:
QString ruleset_load_errmsg;
-
+ PPPData *_pppdata;
QPushButton *setup_b;
QFrame *fline;
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
@@ -63,5 +63,5 @@
static sigjmp_buf jmp_buffer;
-Modem *Modem::modem = 0;
+//Modem *Modem::modem = 0;
@@ -92,7 +92,7 @@ const char* pppdPath() {
-Modem::Modem()
+Modem::Modem( PPPData* pd )
{
- if (Modem::modem != 0) return; //CORRECT?
+ _pppdata = pd;
modemfd = -1;
_pppdExitStatus = -1;
@@ -103,10 +103,9 @@ Modem::Modem()
lockfile[0] = '\0';
device = "/dev/modem";
- modem = this;
}
-Modem::~Modem() {
- modem = 0;
+Modem::~Modem()
+{
}
@@ -116,5 +115,5 @@ speed_t Modem::modemspeed() {
// to set the modem. The constants here should all be ifdef'd because
// other systems may not have them
- int i = PPPData::data()->speed().toInt()/100;
+ int i = _pppdata->speed().toInt()/100;
switch(i) {
@@ -166,5 +165,5 @@ bool Modem::opentty() {
//begin if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) {
close(modemfd);
- device = PPPData::data()->modemDevice();
+ device = _pppdata->modemDevice();
if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) {
qDebug("error opening modem device !");
@@ -176,5 +175,5 @@ bool Modem::opentty() {
#if 0
- if(PPPData::data()->UseCDLine()) {
+ if(_pppdata->UseCDLine()) {
if(ioctl(modemfd, TIOCMGET, &flags) == -1) {
errmsg = i18n("Unable to detect state of CD line.");
@@ -224,6 +223,6 @@ 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;
}
@@ -354,5 +353,5 @@ bool Modem::writeLine(const char *buf) {
memcpy(b, buf, len);
// different modems seem to need different line terminations
- QString term = PPPData::data()->enter();
+ QString term = _pppdata->enter();
if(term == "LF")
b[len++]='\n';
@@ -394,7 +393,7 @@ 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
#ifndef DEBUG_WO_DIALING
@@ -432,5 +431,5 @@ bool Modem::hangup() {
#endif
- usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 secs
+ usleep(_pppdata->modemInitDelay() * 10000); // 0.01 - 3.0 secs
cfsetospeed(&temptty, modemspeed());
@@ -455,9 +454,9 @@ 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);
data_mode = false;
@@ -575,5 +574,5 @@ int Modem::lockdevice() {
char newlock[80]=""; // safe
- if(!PPPData::data()->modemLockFile()) {
+ if(!_pppdata->modemLockFile()) {
qDebug("The user doesn't want a lockfile.");
return 0;
@@ -584,5 +583,5 @@ 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/
if(access(QFile::encodeName(lockfile), F_OK) == 0) {
@@ -615,5 +614,5 @@ 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) {
sprintf(newlock,"%010d\n", getpid());
@@ -989,5 +988,5 @@ bool Modem::execPPPDaemon(const QString & arguments)
{
if(execpppd(arguments)==0) {
- PPPData::data()->setpppdRunning(true);
+ _pppdata->setpppdRunning(true);
return true;
} else
@@ -997,5 +996,5 @@ bool Modem::execPPPDaemon(const QString & arguments)
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
@@ -36,5 +36,5 @@
#include <qsocketnotifier.h>
-//#include <config.h>
+class PPPData;
void alarm_handler(int);
@@ -44,5 +44,5 @@ class Modem : public QObject {
Q_OBJECT
public:
- Modem();
+ Modem(PPPData*);
~Modem();
@@ -77,5 +77,5 @@ public:
public:
enum Auth { PAP = 1, CHAP };
- static Modem *modem;
+ // static Modem *modem;
int lastStatus;
@@ -113,4 +113,5 @@ private:
struct termios tty;
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
@@ -41,6 +41,6 @@
#define FORMATSLIDERLABEL(l) //l->setFixedWidth(l->sizeHint().width()); l->setFixedHeight(QLineEdit(dummyWidget).sizeHint().height()); l->setAlignment(AlignCenter); l->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); l->setLineWidth(2);
-ModemCommands::ModemCommands(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)
{
setCaption(i18n("Edit Modem Commands"));
@@ -241,71 +241,71 @@ 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());
}
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
@@ -45,5 +45,5 @@ Q_OBJECT
public:
- ModemCommands(QWidget *parent=0, const char *name=0);
+ ModemCommands(PPPData*, QWidget *parent=0, const char *name=0);
~ModemCommands() {}
@@ -53,4 +53,5 @@ private slots:
private:
+ PPPData *_pppdata;
QGroupBox *box;
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
@@ -38,6 +38,7 @@
#define i18n QObject::tr
-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)
{
setCaption(i18n("ATI Query"));
@@ -98,6 +99,6 @@ void ModemTransfer::ati_done() {
scripttimer->stop();
timeout_timer->stop();
- Modem::modem->closetty();
- Modem::modem->unlockdevice();
+ _modem->closetty();
+ _modem->unlockdevice();
hide();
@@ -127,5 +128,5 @@ void ModemTransfer::init() {
qApp->processEvents();
- int lock = Modem::modem->lockdevice();
+ int lock = _modem->lockdevice();
if (lock == 1) {
@@ -141,8 +142,8 @@ 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 ...
statusBar->setText(i18n("Modem Ready"));
@@ -153,7 +154,7 @@ 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;
}
@@ -161,7 +162,7 @@ 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();
}
@@ -176,5 +177,5 @@ void ModemTransfer::do_script() {
statusBar->setText("ATI...");
progressBar->setProgress( progressBar->progress() + 1);
- Modem::modem->writeLine("ATI\n");
+ _modem->writeLine("ATI\n");
break;
@@ -191,5 +192,5 @@ void ModemTransfer::do_script() {
statusBar->setText(msg);
progressBar->setProgress( progressBar->progress() + 1);
- Modem::modem->writeLine(query.local8Bit());
+ _modem->writeLine(query.local8Bit());
break;
@@ -224,5 +225,5 @@ void ModemTransfer::readtty() {
void ModemTransfer::cancelbutton() {
scripttimer->stop();
- Modem::modem->stop();
+ _modem->stop();
timeout_timer->stop();
@@ -230,8 +231,8 @@ void ModemTransfer::cancelbutton() {
qApp->processEvents();
- 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
@@ -38,4 +38,6 @@
#include <qprogressbar.h>
+class Modem;
+
const int NUM_OF_ATI = 8;
@@ -44,5 +46,5 @@ class ModemTransfer : public QDialog {
Q_OBJECT
public:
- ModemTransfer(QWidget *parent=0, const char *name=0);
+ ModemTransfer(Modem*, QWidget *parent=0, const char *name=0);
public slots:
@@ -61,4 +63,5 @@ protected:
private:
+ Modem *_modem;
int step;
QString readbuffer;
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
@@ -5,8 +5,8 @@ TEMPLATE = lib
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/
DEPENDPATH += $(OPIEDIR)/include
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
@@ -6,5 +6,5 @@
#include "accounts.h"
#include "general.h"
-#include "interface.h"
+#include "interfaceppp.h"
#include "modem.h"
#include "pppconfig.h"
@@ -12,5 +12,5 @@
#include "runtests.h"
-PPPConfigWidget::PPPConfigWidget( Interface* iface, QWidget *parent,
+PPPConfigWidget::PPPConfigWidget( InterfacePPP* iface, QWidget *parent,
const char *name,
bool modal, WFlags fl )
@@ -25,14 +25,9 @@ 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());
QVBoxLayout *layout = new QVBoxLayout( this );
@@ -42,9 +37,9 @@ PPPConfigWidget::PPPConfigWidget( Interface* iface, QWidget *parent,
layout->addWidget( tabWindow );
- 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") );
// graph = new GraphSetup( tabWindow->addPage( tr("&Graph"), tr("Throughput Graph" ) ) );
@@ -62,9 +57,9 @@ 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();
}
@@ -73,5 +68,5 @@ void PPPConfigWidget::accept()
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
@@ -5,5 +5,6 @@
class QTabWidget;
-class Interface;
+//class Interface;
+class InterfacePPP;
class AccountWidget;
class GeneralWidget;
@@ -15,5 +16,5 @@ class PPPConfigWidget : public QDialog {
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 );
~PPPConfigWidget();
@@ -25,5 +26,5 @@ protected slots:
private:
- Interface *interface;
+ InterfacePPP *interface;
QTabWidget *tabWindow;
AccountWidget *accounts;
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
@@ -35,6 +35,6 @@
#define i18n QObject::tr
-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)
{
setCaption(i18n("Customize pppd Arguments"));
@@ -122,12 +122,12 @@ void PPPdArguments::defaultsbutton() {
// all of this is a hack
// save current list
- QStringList arglist(PPPData::data()->pppdArgument());
+ QStringList arglist(_pppdata->pppdArgument());
// get defaults
- PPPData::data()->setpppdArgumentDefaults();
+ _pppdata->setpppdArgumentDefaults();
init();
// restore old list
- PPPData::data()->setpppdArgument(arglist);
+ _pppdata->setpppdArgument(arglist);
}
@@ -137,5 +137,5 @@ void PPPdArguments::closebutton() {
for(uint i=0; i < arguments->count(); i++)
arglist.append(arguments->text(i));
- PPPData::data()->setpppdArgument(arglist);
+ _pppdata->setpppdArgument(arglist);
done(0);
@@ -147,5 +147,5 @@ void PPPdArguments::init() {
arguments->removeItem(0);
- QStringList &arglist = PPPData::data()->pppdArgument();
+ QStringList &arglist = _pppdata->pppdArgument();
for ( QStringList::Iterator it = arglist.begin();
it != arglist.end();
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
@@ -34,9 +34,10 @@
#include <qlistbox.h>
#include <qlabel.h>
+class PPPData;
class PPPdArguments : public QDialog {
Q_OBJECT
public:
- PPPdArguments(QWidget *parent=0, const char *name=0);
+ PPPdArguments(PPPData*,QWidget *parent=0, const char *name=0);
~PPPdArguments() {}
@@ -63,4 +64,5 @@ private:
QPushButton *closebtn;
+ PPPData *_pppdata;
};
#endif
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
@@ -39,19 +39,6 @@
#include <assert.h>
-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")
PPPData::PPPData()
@@ -63,15 +50,4 @@ PPPData::PPPData()
pppderror(0)
{
-}
-
-
-//
-// 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;
@@ -91,24 +67,52 @@ bool PPPData::open() {
::pppdVersion(&pppdVer, &pppdMod, &pppdPatch);
- return true;
}
+Config PPPData::config()
+{
+ return Config("NetworkSetupPPP");
+}
//
// save configuration
//
-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);
+ }
}
@@ -118,20 +122,9 @@ 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
QString PPPData::readConfig(const QString &group, const QString &key,
@@ -139,19 +132,28 @@ 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);
}
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;
}
@@ -161,10 +163,21 @@ bool PPPData::readListConfig(const QString &group, const QString &key,
QStringList &list, char sep) {
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;
}
@@ -172,25 +185,31 @@ bool PPPData::readListConfig(const QString &group, const QString &key,
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);
+// }
}
-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);
+// }
}
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);
+// }
}
@@ -282,22 +301,22 @@ 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);
+// }
@@ -791,5 +810,5 @@ int PPPData::newaccount() {
qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS);
- if(!config) open();
+// if(!config) open();
if (highcount >= MAX_ACCOUNTS) return -1;
@@ -991,12 +1010,12 @@ 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);
+// }
@@ -1024,5 +1043,5 @@ void PPPData::setDefaultroute(bool set) {
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));
}
@@ -1227,10 +1246,14 @@ 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 );
}
@@ -1241,12 +1264,13 @@ 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
@@ -156,17 +156,16 @@ public:
PPPData();
~PPPData() {};
- static PPPData* data();
enum { NumInitStrings = 2 };
// general functions
- bool open();
void save();
void cancel();
- 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 &);
int readNumConfig(const QString &, const QString &, int);
@@ -208,9 +207,9 @@ public:
bool automatic_redial();
- 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();
const QString enter();
@@ -312,9 +311,4 @@ public:
void setVolumeHigh(const QString &);
-#if 0
- void setUseCDLine(const int n);
- int UseCDLine();
-#endif
-
// functions to set/get account information
int count() const;
@@ -375,6 +369,6 @@ public:
void setAcctEnabled(bool set);
- int VolAcctEnabled();
- void setVolAcctEnabled(int set);
+// int VolAcctEnabled();
+// void setVolAcctEnabled(int set);
bool autoDNS();
@@ -416,39 +410,10 @@ public:
void setpppdError(int err);
- // 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
int caccount; // index of the current account
@@ -461,4 +426,9 @@ 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,8 +1,9 @@
+
#include "pppconfig.h"
#include "pppmodule.h"
#include "pppdata.h"
-#include "kpppwidget.h"
-#include "interfaceinformationimp.h"
-//#include "devices.h"
+#include "interfaceinformationppp.h"
+#include "interfaceppp.h"
+
/**
@@ -11,13 +12,13 @@
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");
for( it = ifaces.begin(); it != ifaces.end(); ++it ){
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 );
}
}
@@ -33,6 +34,5 @@ PPPModule::~PPPModule(){
delete i;
}
- PPPData::data()->setConfiguredInterfaces( ifaces );
- PPPData::data()->save();
+ PPPData::setConfiguredInterfaces( ifaces );
}
@@ -68,6 +68,6 @@ bool PPPModule::isOwner(Interface *i){
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 );
return pppconfig;
@@ -82,5 +82,6 @@ QWidget *PPPModule::information(Interface *i){
// TODO ^
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;
}
@@ -107,10 +108,12 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
qDebug("try to add iface %s",newInterface.latin1());
+ InterfacePPP *ifaceppp;
Interface *iface;
- iface = new Interface();
- PPPConfigWidget imp(iface, 0, "PPPConfigImp", true);
+ ifaceppp = new InterfacePPP();
+ PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
imp.showMaximized();
if(imp.exec() == QDialog::Accepted ){
iface->setModuleOwner( this );
+ iface = ifaceppp;
list.append( iface );
return iface;