17 files changed, 587 insertions, 614 deletions
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index d902517..19db9ef 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp @@ -53,7 +53,7 @@ void parseargs(char* buf, char** args); AccountWidget::AccountWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) { - int min = 0; +// int min = 0; QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10); // add a hbox @@ -61,7 +61,7 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name ) // l1->addLayout(l11); accountlist_l = new QListBox(this); - accountlist_l->setMinimumSize(160, 128); +// accountlist_l->setMinimumSize(160, 128); connect(accountlist_l, SIGNAL(highlighted(int)), this, SLOT(slotListBoxSelect(int))); connect(accountlist_l, SIGNAL(selected(int)), @@ -74,9 +74,9 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name ) connect(edit_b, SIGNAL(clicked()), SLOT(editaccount())); QWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); - min = edit_b->sizeHint().width(); - min = QMAX(70,min); - edit_b->setMinimumWidth(min); +// min = edit_b->sizeHint().width(); +// min = QMAX(70,min); +// edit_b->setMinimumWidth(min); l1->addWidget(edit_b); @@ -165,10 +165,10 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name ) // l122->addStretch(1); //load up account list from gppdata to the list box - if(gpppdata.count() > 0) { - for(int i=0; i <= gpppdata.count()-1; i++) { - gpppdata.setAccountbyIndex(i); - accountlist_l->insertItem(gpppdata.accname()); + 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()); } } @@ -184,8 +184,8 @@ void AccountWidget::slotListBoxSelect(int idx) { edit_b->setEnabled((bool)(idx != -1)); copy_b->setEnabled((bool)(idx != -1)); if(idx!=-1) { - QString account = gpppdata.accname(); - gpppdata.setAccountbyIndex(accountlist_l->currentItem()); + QString account = PPPData::data()->accname(); + PPPData::data()->setAccountbyIndex(accountlist_l->currentItem()); // reset->setEnabled(TRUE); // costlabel->setEnabled(TRUE); // costedit->setEnabled(TRUE); @@ -193,9 +193,9 @@ void AccountWidget::slotListBoxSelect(int idx) { // vollabel->setEnabled(TRUE); // voledit->setEnabled(TRUE); - int bytes = gpppdata.totalBytes(); +// int bytes = PPPData::data()->totalBytes(); // voledit->setText(prettyPrintVolume(bytes)); - gpppdata.setAccount(account); + PPPData::data()->setAccount(account); } else{ // reset->setEnabled(FALSE); // costlabel->setEnabled(FALSE); @@ -240,14 +240,14 @@ void AccountWidget::slotListBoxSelect(int idx) { void AccountWidget::editaccount() { - gpppdata.setAccount(accountlist_l->text(accountlist_l->currentItem())); + PPPData::data()->setAccount(accountlist_l->text(accountlist_l->currentItem())); int result = doTab(); if(result == QDialog::Accepted) { - accountlist_l->changeItem(gpppdata.accname(),accountlist_l->currentItem()); + accountlist_l->changeItem(PPPData::data()->accname(),accountlist_l->currentItem()); // emit resetaccounts(); - gpppdata.save(); + PPPData::data()->save(); } } @@ -271,15 +271,15 @@ void AccountWidget::newaccount() { // switch(query) { // case QMessageBox::Yes: // { -// if (gpppdata.newaccount() == -1) +// if (PPPData::data()->newaccount() == -1) // return; // // ProviderDB pdb(this); // // result = pdb.exec(); // break; // } // case QMessageBox::No: - if (gpppdata.newaccount() == -1){ - qDebug("gpppdata.newaccount() == -1"); + if (PPPData::data()->newaccount() == -1){ + qDebug("PPPData::data()->newaccount() == -1"); return; } result = doTab(); @@ -289,13 +289,13 @@ void AccountWidget::newaccount() { // } if(result == QDialog::Accepted) { - accountlist_l->insertItem(gpppdata.accname()); - accountlist_l->setSelected(accountlist_l->findItem(gpppdata.accname()), + accountlist_l->insertItem(PPPData::data()->accname()); + accountlist_l->setSelected(accountlist_l->findItem(PPPData::data()->accname()), true); // emit resetaccounts(); - gpppdata.save(); + PPPData::data()->save(); } else - gpppdata.deleteAccount(); + PPPData::data()->deleteAccount(); } @@ -310,11 +310,11 @@ void AccountWidget::copyaccount() { return; } - gpppdata.copyaccount(accountlist_l->currentItem()); + PPPData::data()->copyaccount(accountlist_l->currentItem()); - accountlist_l->insertItem(gpppdata.accname()); + accountlist_l->insertItem(PPPData::data()->accname()); // emit resetaccounts(); - gpppdata.save(); + PPPData::data()->save(); } @@ -326,11 +326,11 @@ void AccountWidget::deleteaccount() { if(QMessageBox::warning(this, s, i18n("Confirm")) != QMessageBox::Yes) return; - if(gpppdata.deleteAccount(accountlist_l->text(accountlist_l->currentItem()))) + if(PPPData::data()->deleteAccount(accountlist_l->text(accountlist_l->currentItem()))) accountlist_l->removeItem(accountlist_l->currentItem()); emit resetaccounts(); - gpppdata.save(); + PPPData::data()->save(); slotListBoxSelect(accountlist_l->currentItem()); @@ -338,41 +338,45 @@ void AccountWidget::deleteaccount() { int AccountWidget::doTab(){ - QDialog *dlg = new QDialog( this ); - tabWindow = new QTabWidget( dlg ); - // tabWindow = new KDialogBase( KDialogBase::Tabbed, QString::null, -// KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, -// 0, 0, true); -// KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon()); + QDialog *dlg = new QDialog( this, "newAccount", true ); + QVBoxLayout *layout = new QVBoxLayout( dlg ); + layout->setSpacing( 0 ); + layout->setMargin( 1 ); + + tabWindow = new QTabWidget( dlg, "tabWindow" ); + layout->addWidget( tabWindow ); + bool isnewaccount; - if(gpppdata.accname().isEmpty()) { - tabWindow->setCaption(i18n("New Account")); + if(PPPData::data()->accname().isEmpty()) { + dlg->setCaption(i18n("New Account")); isnewaccount = true; } else { QString tit = i18n("Edit Account: "); - tit += gpppdata.accname(); - tabWindow->setCaption(tit); + tit += PPPData::data()->accname(); + dlg->setCaption(tit); isnewaccount = false; } - dial_w = new DialWidget( tabWindow ); - tabWindow->addTab( dial_w, i18n("Dial") );//, i18n("Dial Setup")), isnewaccount); - ip_w = new IPWidget( tabWindow ); - tabWindow->addTab( ip_w, i18n("IP") );//, i18n("IP Setup")), isnewaccount); - gateway_w = new GatewayWidget( tabWindow ); - tabWindow->addTab( gateway_w, i18n("Gateway") );//, i18n("Gateway Setup")), isnewaccount); - dns_w = new DNSWidget( tabWindow ); - tabWindow->addTab( dns_w, i18n("DNS") );//, i18n("DNS Servers")), isnewaccount); - script_w = new ScriptWidget( tabWindow ); - tabWindow->addTab( script_w, i18n("Login Script") ); //, i18n("Edit Login Script")), isnewaccount); - ExecWidget *exec_w = new ExecWidget( tabWindow ); - tabWindow->addTab( exec_w, i18n("Execute") );//, i18n("Execute Programs")), isnewaccount); + dial_w = new DialWidget( tabWindow, isnewaccount, "Dial Setup"); + tabWindow->addTab( dial_w, i18n("Dial") ); + ip_w = new IPWidget( tabWindow, isnewaccount, i18n("IP Setup")); + tabWindow->addTab( ip_w, i18n("IP") ); + gateway_w = new GatewayWidget( tabWindow, isnewaccount, i18n("Gateway Setup")); + tabWindow->addTab( gateway_w, i18n("Gateway") ); + dns_w = new DNSWidget( tabWindow, isnewaccount, i18n("DNS Servers") ); + tabWindow->addTab( dns_w, i18n("DNS") ); + script_w = new ScriptWidget( tabWindow, isnewaccount, i18n("Edit Login Script")); + tabWindow->addTab( script_w, i18n("Login Script") ); + ExecWidget *exec_w = new ExecWidget( tabWindow, isnewaccount, i18n("Execute Programs")); + tabWindow->addTab( exec_w, i18n("Execute") ); // acct = new AccountingSelector( tabWindow, isnewaccount ); // tabWindow->addTab( acct, i18n("Accounting")); int result = 0; bool ok = false; + qDebug("AccountWidget::doTab dlg->showMinimized"); + dlg->showMinimized(); while (!ok){ result = dlg->exec(); diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp index b7e229e..a3eda9d 100644 --- a/noncore/settings/networksettings/ppp/connect.cpp +++ b/noncore/settings/networksettings/ppp/connect.cpp @@ -179,7 +179,7 @@ void ConnectWidget::preinit() { void ConnectWidget::init() { - gpppdata.setpppdError(0); + PPPData::data()->setpppdError(0); inittimer->stop(); vmain = 0; substate = -1; @@ -196,24 +196,24 @@ void ConnectWidget::init() { p_kppp->con_speed = ""; -// p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || gpppdata.quit_on_disconnect()); +// p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || PPPData::data()->quit_on_disconnect()); - comlist = &gpppdata.scriptType(); - arglist = &gpppdata.script(); + comlist = &PPPData::data()->scriptType(); + arglist = &PPPData::data()->script(); - QString tit = i18n("Connecting to: %1").arg(gpppdata.accname()); + QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname()); setCaption(tit); qApp->processEvents(); // run the "before-connect" command - if (!gpppdata.command_before_connect().isEmpty()) { + if (!PPPData::data()->command_before_connect().isEmpty()) { messg->setText(i18n("Running pre-startup command...")); emit debugMessage(i18n("Running pre-startup command...")); qApp->processEvents(); QApplication::flushX(); - pid_t id = execute_command(gpppdata.command_before_connect()); + pid_t id = execute_command(PPPData::data()->command_before_connect()); // int i, status; // do { @@ -250,7 +250,7 @@ void ConnectWidget::init() { Modem::modem->notify(this, SLOT(readChar(unsigned char))); // if we are stuck anywhere we will time out - timeout_timer->start(gpppdata.modemTimeout()*1000); + timeout_timer->start(PPPData::data()->modemTimeout()*1000); // this timer will run the script etc. main_timer_ID = startTimer(10); @@ -284,18 +284,18 @@ void ConnectWidget::timerEvent(QTimerEvent *) { substate = 0; } - QString initStr = gpppdata.modemInitStr(substate); + QString initStr = PPPData::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(gpppdata.modemPreInitDelay() > 0) { - usleep(gpppdata.modemPreInitDelay() * 5000); + if(PPPData::data()->modemPreInitDelay() > 0) { + usleep(PPPData::data()->modemPreInitDelay() * 5000); writeline(""); - usleep(gpppdata.modemPreInitDelay() * 5000); + usleep(PPPData::data()->modemPreInitDelay() * 5000); } - setExpect(gpppdata.modemInitResp()); + setExpect(PPPData::data()->modemInitResp()); writeline(initStr); - usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec + usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec } substate++; @@ -306,7 +306,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { * Speed Dragon). Even better would be to detect this when doing * a "Modem Query" */ - if (MODEM_TONEDURATION != gpppdata.modemToneDuration()) + if (MODEM_TONEDURATION != PPPData::data()->modemToneDuration()) vmain = 5; else vmain = 3; @@ -316,11 +316,11 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if (vmain == 5) { if(!expecting) { - QString sToneDuration = "ATS11=" + QString::number(gpppdata.modemToneDuration()); + QString sToneDuration = "ATS11=" + QString::number(PPPData::data()->modemToneDuration()); QString msg = i18n("Setting ") + sToneDuration; messg->setText(msg); emit debugMessage(msg); - setExpect(gpppdata.modemInitResp()); + setExpect(PPPData::data()->modemInitResp()); writeline(sToneDuration); } vmain = 3; @@ -336,18 +336,18 @@ void ConnectWidget::timerEvent(QTimerEvent *) { } substate = -1; // skip setting the volume if command is empty - if(gpppdata.volumeInitString().isEmpty()) { + if(PPPData::data()->volumeInitString().isEmpty()) { vmain = 4; return; } messg->setText(i18n("Setting speaker volume...")); emit debugMessage(i18n("Setting speaker volume...")); - setExpect(gpppdata.modemInitResp()); + setExpect(PPPData::data()->modemInitResp()); QString vol("AT"); - vol += gpppdata.volumeInitString(); + vol += PPPData::data()->volumeInitString(); writeline(vol); - usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec + usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec vmain = 4; return; } @@ -355,12 +355,12 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(vmain == 4) { if(!expecting) { - if(!gpppdata.waitForDialTone()) { + if(!PPPData::data()->waitForDialTone()) { QString msg = i18n("Turning off dial tone waiting..."); messg->setText(msg); emit debugMessage(msg); - setExpect(gpppdata.modemInitResp()); - writeline(gpppdata.modemNoDialToneDetectionStr()); + setExpect(PPPData::data()->modemInitResp()); + writeline(PPPData::data()->modemNoDialToneDetectionStr()); } vmain = 1; return; @@ -372,23 +372,23 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(!expecting) { timeout_timer->stop(); - timeout_timer->start(gpppdata.modemTimeout()*1000); + timeout_timer->start(PPPData::data()->modemTimeout()*1000); - QStringList &plist = gpppdata.phonenumbers(); - QString bmarg= gpppdata.dialPrefix(); + QStringList &plist = PPPData::data()->phonenumbers(); + QString bmarg= PPPData::data()->dialPrefix(); bmarg += *plist.at(dialnumber); QString bm = i18n("Dialing %1").arg(bmarg); messg->setText(bm); emit debugMessage(bm); - QString pn = gpppdata.modemDialStr(); - pn += gpppdata.dialPrefix(); + QString pn = PPPData::data()->modemDialStr(); + pn += PPPData::data()->dialPrefix(); pn += *plist.at(dialnumber); if(++dialnumber >= plist.count()) dialnumber = 0; writeline(pn); - setExpect(gpppdata.modemConnectResp()); + setExpect(PPPData::data()->modemConnectResp()); vmain = 100; return; } @@ -398,28 +398,28 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // if NO CARRIER or NO DIALTONE if(vmain == 100) { if(!expecting) { - myreadbuffer = gpppdata.modemConnectResp(); + myreadbuffer = PPPData::data()->modemConnectResp(); setExpect("\n"); vmain = 101; return; } - if(readbuffer.contains(gpppdata.modemBusyResp())) { + if(readbuffer.contains(PPPData::data()->modemBusyResp())) { timeout_timer->stop(); - timeout_timer->start(gpppdata.modemTimeout()*1000); + timeout_timer->start(PPPData::data()->modemTimeout()*1000); messg->setText(i18n("Line busy. Hanging up...")); emit debugPutChar('\n'); Modem::modem->hangup(); - if(gpppdata.busyWait() > 0) { - QString bm = i18n("Line busy. Waiting: %1 seconds").arg(gpppdata.busyWait()); + if(PPPData::data()->busyWait() > 0) { + QString bm = i18n("Line busy. Waiting: %1 seconds").arg(PPPData::data()->busyWait()); messg->setText(bm); emit debugMessage(bm); pausing = true; - pausetimer->start(gpppdata.busyWait()*1000, true); + pausetimer->start(PPPData::data()->busyWait()*1000, true); timeout_timer->stop(); } @@ -429,7 +429,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { return; } - if(readbuffer.contains(gpppdata.modemNoDialtoneResp())) { + if(readbuffer.contains(PPPData::data()->modemNoDialtoneResp())) { timeout_timer->stop(); messg->setText(i18n("No Dialtone")); @@ -438,7 +438,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { return; } - if(readbuffer.contains(gpppdata.modemNoCarrierResp())) { + if(readbuffer.contains(PPPData::data()->modemNoCarrierResp())) { timeout_timer->stop(); messg->setText(i18n("No Carrier")); @@ -457,7 +457,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // p_kppp->con_win->startClock(); vmain = 2; - scriptTimeout=gpppdata.modemTimeout()*1000; + scriptTimeout=PPPData::data()->modemTimeout()*1000; return; } } @@ -494,10 +494,10 @@ void ConnectWidget::timerEvent(QTimerEvent *) { emit debugMessage(bm); if (scriptArgument.lower() == "password") { - gpppdata.setPassword(scanvar); + PPPData::data()->setPassword(scanvar); p_kppp->setPW_Edit(scanvar); - if(gpppdata.storePassword()) - gpppdata.setStoredPassword(scanvar); + if(PPPData::data()->storePassword()) + PPPData::data()->setStoredPassword(scanvar); firstrunPW = true; } @@ -513,8 +513,8 @@ void ConnectWidget::timerEvent(QTimerEvent *) { QString arg = scriptArgument; QRegExp re1("%USERNAME%"); QRegExp re2("%PASSWORD%"); - arg = arg.replace(re1, gpppdata.storedUsername()); - arg = arg.replace(re2, gpppdata.storedPassword()); + arg = arg.replace(re1, PPPData::data()->storedUsername()); + arg = arg.replace(re2, PPPData::data()->storedPassword()); if (scriptCommand == "Send") bm = bm.arg(scriptArgument); @@ -578,8 +578,8 @@ void ConnectWidget::timerEvent(QTimerEvent *) { messg->setText(i18n("Hangup")); emit debugMessage(i18n("Hangup")); - writeline(gpppdata.modemHangupStr()); - setExpect(gpppdata.modemHangupResp()); + writeline(PPPData::data()->modemHangupStr()); + setExpect(PPPData::data()->modemHangupResp()); scriptindex++; return; @@ -592,7 +592,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { messg->setText(i18n("Answer")); emit debugMessage(i18n("Answer")); - setExpect(gpppdata.modemRingResp()); + setExpect(PPPData::data()->modemRingResp()); vmain = 150; return; } @@ -602,7 +602,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { messg->setText(bm); emit debugMessage(bm); - QString idstring = gpppdata.storedUsername(); + QString idstring = PPPData::data()->storedUsername(); if(!idstring.isEmpty() && firstrunID) { // the user entered an Id on the main kppp dialog @@ -638,7 +638,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { messg->setText(bm); emit debugMessage(bm); - QString pwstring = gpppdata.password(); + QString pwstring = PPPData::data()->password(); if(!pwstring.isEmpty() && firstrunPW) { // the user entered a password on the main kppp dialog @@ -785,8 +785,8 @@ void ConnectWidget::timerEvent(QTimerEvent *) { if(vmain == 150) { if(!expecting) { - writeline(gpppdata.modemAnswerStr()); - setExpect(gpppdata.modemAnswerResp()); + writeline(PPPData::data()->modemAnswerStr()); + setExpect(PPPData::data()->modemAnswerResp()); vmain = 2; scriptindex++; @@ -814,7 +814,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { // stop reading of data Modem::modem->stop(); - if(gpppdata.authMethod() == AUTH_TERMINAL) { + if(PPPData::data()->authMethod() == AUTH_TERMINAL) { // if (termwindow) { // delete termwindow; // termwindow = 0L; @@ -835,8 +835,8 @@ void ConnectWidget::timerEvent(QTimerEvent *) { killTimer( main_timer_ID ); - if_timeout_timer->start(gpppdata.pppdTimeout()*1000); - qDebug( "started if timeout timer with %i", gpppdata.pppdTimeout()*1000); + if_timeout_timer->start(PPPData::data()->pppdTimeout()*1000); + qDebug( "started if timeout timer with %i", PPPData::data()->pppdTimeout()*1000); // find out PPP interface and notify the stats module // stats->setUnit(pppInterfaceNumber()); @@ -849,7 +849,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) { qDebug("execppp() returned with return-code %i", result ); if(result) { - if(!gpppdata.autoDNS()) + if(!PPPData::data()->autoDNS()) adddns(); // O.K we are done here, let's change over to the if_waiting loop @@ -1063,7 +1063,7 @@ void ConnectWidget::if_waiting_timed_out() { if_timeout_timer->stop(); qDebug("if_waiting_timed_out()"); - gpppdata.setpppdError(E_IF_TIMEOUT); + PPPData::data()->setpppdError(E_IF_TIMEOUT); // let's kill the stuck pppd Modem::modem->killPPPDaemon(); @@ -1088,7 +1088,7 @@ void ConnectWidget::if_waiting_slot() { // if(!stats->ifIsUp()) { -// if(gpppdata.pppdError() != 0) { +// if(PPPData::data()->pppdError() != 0) { // // we are here if pppd died immediately after starting it. // pppdDied(); // // error message handled in main.cpp: sigPPPDDied() @@ -1105,7 +1105,7 @@ void ConnectWidget::if_waiting_slot() { if_timer->stop(); usleep(200000); - if(gpppdata.autoDNS()) + if(PPPData::data()->autoDNS()) addpeerdns(); // Close the debugging window. If we are connected, we @@ -1114,12 +1114,12 @@ void ConnectWidget::if_waiting_slot() { // p_kppp->statdlg->take_stats(); // start taking ppp statistics auto_hostname(); - if(!gpppdata.command_on_connect().isEmpty()) { + if(!PPPData::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(gpppdata.command_on_connect()); + execute_command(PPPData::data()->command_on_connect()); messg->setText(i18n("Done")); } @@ -1141,7 +1141,7 @@ void ConnectWidget::if_waiting_slot() { // else // p_kppp->con_win->accounting(false); - if (gpppdata.get_dock_into_panel()) { + if (PPPData::data()->get_dock_into_panel()) { // DockWidget::dock_widget->show(); // DockWidget::dock_widget->take_stats(); // this->hide(); @@ -1149,7 +1149,7 @@ void ConnectWidget::if_waiting_slot() { else { // p_kppp->con_win->show(); - if(gpppdata.get_iconify_on_connect()) { + if(PPPData::data()->get_iconify_on_connect()) { // p_kppp->con_win->showMinimized(); } } @@ -1168,17 +1168,17 @@ bool ConnectWidget::execppp() { // we'll simply leave this argument away. pppd will then use the default tty // which is the serial port we connected stdin/stdout to in opener.cpp. // command += " "; - // command += gpppdata.modemDevice(); + // command += PPPData::data()->modemDevice(); - command += " " + gpppdata.speed(); + command += " " + PPPData::data()->speed(); command += " -detach"; - if(gpppdata.ipaddr() != "0.0.0.0" || - gpppdata.gateway() != "0.0.0.0") { - if(gpppdata.ipaddr() != "0.0.0.0") { + if(PPPData::data()->ipaddr() != "0.0.0.0" || + PPPData::data()->gateway() != "0.0.0.0") { + if(PPPData::data()->ipaddr() != "0.0.0.0") { command += " "; - command += gpppdata.ipaddr(); + command += PPPData::data()->ipaddr(); command += ":"; } else { @@ -1186,27 +1186,27 @@ bool ConnectWidget::execppp() { command += ":"; } - if(gpppdata.gateway() != "0.0.0.0") - command += gpppdata.gateway(); + if(PPPData::data()->gateway() != "0.0.0.0") + command += PPPData::data()->gateway(); } - if(gpppdata.subnetmask() != "0.0.0.0") - command += " netmask " + gpppdata.subnetmask(); + if(PPPData::data()->subnetmask() != "0.0.0.0") + command += " netmask " + PPPData::data()->subnetmask(); - if(gpppdata.flowcontrol() != "None") { - if(gpppdata.flowcontrol() == "CRTSCTS") + if(PPPData::data()->flowcontrol() != "None") { + if(PPPData::data()->flowcontrol() == "CRTSCTS") command += " crtscts"; else command += " xonxoff"; } - if(gpppdata.defaultroute()) + if(PPPData::data()->defaultroute()) command += " defaultroute"; - if(gpppdata.autoDNS()) + if(PPPData::data()->autoDNS()) command += " usepeerdns"; - QStringList &arglist = gpppdata.pppdArgument(); + QStringList &arglist = PPPData::data()->pppdArgument(); for ( QStringList::Iterator it = arglist.begin(); it != arglist.end(); ++it ) @@ -1215,25 +1215,25 @@ bool ConnectWidget::execppp() { } // PAP settings - if(gpppdata.authMethod() == AUTH_PAP) { + if(PPPData::data()->authMethod() == AUTH_PAP) { command += " -chap user "; - command = command + "\"" + gpppdata.storedUsername() + "\""; + command = command + "\"" + PPPData::data()->storedUsername() + "\""; } // CHAP settings - if(gpppdata.authMethod() == AUTH_CHAP) { + if(PPPData::data()->authMethod() == AUTH_CHAP) { command += " -pap user "; - command = command + "\"" + gpppdata.storedUsername() + "\""; + command = command + "\"" + PPPData::data()->storedUsername() + "\""; } // PAP/CHAP settings - if(gpppdata.authMethod() == AUTH_PAPCHAP) { + if(PPPData::data()->authMethod() == AUTH_PAPCHAP) { command += " user "; - command = command + "\"" + gpppdata.storedUsername() + "\""; + command = command + "\"" + PPPData::data()->storedUsername() + "\""; } // check for debug - if(gpppdata.getPPPDebug()) + if(PPPData::data()->getPPPDebug()) command += " debug"; if (command.length() > MAX_CMDLEN) { @@ -1277,8 +1277,8 @@ void auto_hostname() { tmp_str[sizeof(tmp_str)-1]=0; // panic old_hostname=tmp_str; // copy to QString - // if (!p_kppp->stats->local_ip_address.isEmpty() && gpppdata.autoname()) { - if ( gpppdata.autoname()) { + // if (!p_kppp->stats->local_ip_address.isEmpty() && PPPData::data()->autoname()) { + if ( PPPData::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); @@ -1332,7 +1332,7 @@ void add_domain(const QString &domain) { if((resolv[j].contains("domain") || ( resolv[j].contains("nameserver") && !resolv[j].contains("#kppp temp entry") - && gpppdata.exDNSDisabled())) + && PPPData::data()->exDNSDisabled())) && !resolv[j].contains("#entry disabled by kppp")) { QCString tmp = "# " + resolv[j].local8Bit() + " \t#entry disabled by kppp\n"; @@ -1355,7 +1355,7 @@ void adddns() int fd; if ((fd = Modem::modem->openResolv(O_WRONLY|O_APPEND)) >= 0) { - QStringList &dnslist = gpppdata.dns(); + QStringList &dnslist = PPPData::data()->dns(); for ( QStringList::Iterator it = dnslist.begin(); it != dnslist.end(); ++it ) @@ -1366,7 +1366,7 @@ void adddns() } close(fd); } - add_domain(gpppdata.domain()); + add_domain(PPPData::data()->domain()); } void addpeerdns() { @@ -1387,7 +1387,7 @@ void addpeerdns() { fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n"); close(fd); } - add_domain(gpppdata.domain()); + add_domain(PPPData::data()->domain()); } // remove the dns entries from the /etc/resolv.conf file diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp index d6b3fbe..ad89005 100644 --- a/noncore/settings/networksettings/ppp/conwindow.cpp +++ b/noncore/settings/networksettings/ppp/conwindow.cpp @@ -75,9 +75,9 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget ) connect(clocktimer, SIGNAL(timeout()), SLOT(timeclick())); // read window position from config file - int p_x, p_y; - gpppdata.winPosConWin(p_x, p_y); - setGeometry(p_x, p_y, 320, 110); +// int p_x, p_y; +// PPPData::data()->winPosConWin(p_x, p_y); +// setGeometry(p_x, p_y, 320, 110); } ConWindow::~ConWindow() { @@ -88,7 +88,7 @@ ConWindow::~ConWindow() { bool ConWindow::event(QEvent *e) { if (e->type() == QEvent::Hide) { - gpppdata.setWinPosConWin(x(), y()); +// PPPData::data()->setWinPosConWin(x(), y()); return true; } else @@ -118,7 +118,7 @@ QString ConWindow::prettyPrintVolume(unsigned int n) { void ConWindow::accounting(bool on) { // cache accounting settings accountingEnabled = on; - volumeAccountingEnabled = gpppdata.VolAcctEnabled(); + volumeAccountingEnabled = PPPData::data()->VolAcctEnabled(); // delete old layout if(tl1 != 0) @@ -133,7 +133,7 @@ void ConWindow::accounting(bool on) { QGridLayout *l1; int vol_lines = 0; - if(gpppdata.VolAcctEnabled()) + if(PPPData::data()->VolAcctEnabled()) vol_lines = 1; if(accountingEnabled) @@ -239,9 +239,9 @@ void ConWindow::startClock() { hours = 0; QString title ; - title = gpppdata.accname(); + title = PPPData::data()->accname(); - if(gpppdata.get_show_clock_on_caption()){ + if(PPPData::data()->get_show_clock_on_caption()){ title += " 00:00" ; } this->setCaption(title); @@ -265,7 +265,7 @@ void ConWindow::timeclick() { QString tooltip = i18n("Connection: %1\n" "Connected at: %2\n" "Time connected: %3") - .arg(gpppdata.accname()).arg(info2->text()) + .arg(PPPData::data()->accname()).arg(info2->text()) .arg(time_string2); if(accountingEnabled) @@ -275,7 +275,7 @@ void ConWindow::timeclick() { if(volumeAccountingEnabled) { volinfo->setEnabled(TRUE); - int bytes = gpppdata.totalBytes(); + int bytes = PPPData::data()->totalBytes(); volinfo->setText(prettyPrintVolume(bytes)); } @@ -305,14 +305,14 @@ void ConWindow::timeclick() { else time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds); - caption_string = gpppdata.accname(); + caption_string = PPPData::data()->accname(); caption_string += " "; caption_string += time_string; timelabel2->setText(time_string2); - if(gpppdata.get_show_clock_on_caption() && (seconds == 1)){ + if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){ // we update the Caption only once per minute not every second // otherwise I get a flickering icon this->setCaption(caption_string); @@ -328,7 +328,7 @@ void ConWindow::closeEvent( QCloseEvent *e ){ // if we lost it we could only kill the program by hand to get on with life. e->ignore(); - if(gpppdata.get_dock_into_panel()) + if(PPPData::data()->get_dock_into_panel()) dock(); } diff --git a/noncore/settings/networksettings/ppp/debug.cpp b/noncore/settings/networksettings/ppp/debug.cpp index 8652931..447ccf2 100644 --- a/noncore/settings/networksettings/ppp/debug.cpp +++ b/noncore/settings/networksettings/ppp/debug.cpp @@ -133,7 +133,7 @@ void DebugWidget::toggleVisibility() { show(); bool showlog = isVisible(); - gpppdata.set_show_log_window(showlog); + PPPData::data()->set_show_log_window(showlog); } diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 961047b..6132b80 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp @@ -41,7 +41,7 @@ #include "edit.h" #include "pppdata.h" -#include "newwidget.h" +//#include "newwidget.h" #include "iplined.h" #include "auth.h" @@ -50,13 +50,13 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) { const int GRIDROWS = 6; - QGridLayout *tl = new QGridLayout(parent, GRIDROWS, 2, 0 );//, KDialog::spacingHint()); + QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint()); - connect_label = new QLabel(i18n("Connection name:"), parent); + connect_label = new QLabel(i18n("Connection name:"), this); tl->addWidget(connect_label, 0, 0); - connectname_l = new QLineEdit(parent); - connectname_l->setMaxLength(ACCNAME_SIZE); + connectname_l = new QLineEdit(this); +// connectname_l->setMaxLength(ACCNAME_SIZE); tl->addWidget(connectname_l, 0, 1); QString tmp = i18n("Type in a unique name for this connection"); @@ -64,24 +64,24 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) QWhatsThis::add(connectname_l,tmp); - number_label = new QLabel(i18n("Phone number:"), parent); + number_label = new QLabel(i18n("Phone number:"), this); number_label->setAlignment(AlignTop|AlignLeft); tl->addWidget(number_label, 1, 0); QHBoxLayout *lpn = new QHBoxLayout(5); tl->addLayout(lpn, 1, 1); - numbers = new QListBox(parent); + numbers = new QListBox(this); numbers->setMinimumSize(120, 70); lpn->addWidget(numbers); QVBoxLayout *lpn1 = new QVBoxLayout; lpn->addLayout(lpn1); - add = new QPushButton(i18n("&Add..."), parent); - del = new QPushButton(i18n("&Remove"), parent); + add = new QPushButton(i18n("&Add..."), this); + del = new QPushButton(i18n("&Remove"), this); - up = new QPushButton(parent); + up = new QPushButton(this); //FIXME: QPixmap pm = BarIcon("up"); // up->setPixmap(pm); - down = new QPushButton(parent); + down = new QPushButton(this); //FIXME: pm = BarIcon("down"); // down->setPixmap(pm); lpn1->addWidget(add); @@ -112,10 +112,10 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) QWhatsThis::add(number_label,tmp); QWhatsThis::add(numbers,tmp); - auth_l = new QLabel(i18n("Authentication:"), parent); + auth_l = new QLabel(i18n("Authentication:"), this); tl->addWidget(auth_l, 3, 0); - auth = new QComboBox(parent); + auth = new QComboBox(this); auth->insertItem(i18n("Script-based")); auth->insertItem(i18n("PAP")); auth->insertItem(i18n("Terminal-based")); @@ -135,7 +135,7 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) QWhatsThis::add(auth_l,tmp); QWhatsThis::add(auth,tmp); - store_password = new QCheckBox(i18n("Store password"), parent); + store_password = new QCheckBox(i18n("Store password"), this); store_password->setChecked(true); tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight); QWhatsThis::add(store_password, @@ -148,16 +148,16 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) "readable only to you. Make sure nobody\n" "gains access to this file!")); - pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), parent); + pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), this); connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton())); tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter); // Set defaults if editing an existing connection if(!isnewaccount) { - connectname_l->setText(gpppdata.accname()); + connectname_l->setText(PPPData::data()->accname()); // insert the phone numbers into the listbox - QString n = gpppdata.phonenumber(); + QString n = PPPData::data()->phonenumber(); QString tmp = ""; uint idx = 0; while(idx != n.length()) { @@ -172,8 +172,8 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) if(tmp.length() > 0) numbers->insertItem(tmp); - auth->setCurrentItem(gpppdata.authMethod()); - store_password->setChecked(gpppdata.storePassword()); + auth->setCurrentItem(PPPData::data()->authMethod()); + store_password->setChecked(PPPData::data()->storePassword()); } else { // select PAP/CHAP as default auth->setCurrentItem(AUTH_PAPCHAP); @@ -187,10 +187,10 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) bool DialWidget::save() { //first check to make sure that the account name is unique! if(connectname_l->text().isEmpty() || - !gpppdata.isUniqueAccname(connectname_l->text())) { + !PPPData::data()->isUniqueAccname(connectname_l->text())) { return false; } else { - gpppdata.setAccname(connectname_l->text()); + PPPData::data()->setAccname(connectname_l->text()); QString number = ""; for(uint i = 0; i < numbers->count(); i++) { @@ -199,9 +199,9 @@ bool DialWidget::save() { number += numbers->text(i); } - gpppdata.setPhonenumber(number); - gpppdata.setAuthMethod(auth->currentItem()); - gpppdata.setStorePassword(store_password->isChecked()); + PPPData::data()->setPhonenumber(number); + PPPData::data()->setAuthMethod(auth->currentItem()); + PPPData::data()->setStorePassword(store_password->isChecked()); return true; } } @@ -275,7 +275,7 @@ void DialWidget::pppdargsbutton() { ExecWidget::ExecWidget(QWidget *parent, bool isnewaccount, const char *name) : QWidget(parent, name) { - QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint()); + QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint()); QLabel *l = new QLabel(\ i18n("Here you can select commands to run at certain stages of the\n" @@ -283,8 +283,8 @@ i18n("Here you can select commands to run at certain stages of the\n" "you cannot run any commands here requiring root permissions\n" "(unless, of course, you are root).\n\n" "Be sure to supply the whole path to the program otherwise\n" - "kppp might be unable to find it."), parent); - l->setMinimumHeight(l->sizeHint().height()); + "kppp might be unable to find it."), this); +// l->setMinimumHeight(l->sizeHint().height()); tl->addWidget(l); tl->addStretch(1); @@ -293,11 +293,11 @@ i18n("Here you can select commands to run at certain stages of the\n" l1->setColStretch(0, 0); l1->setColStretch(1, 1); - before_connect_l = new QLabel(i18n("Before connect:"), parent); + before_connect_l = new QLabel(i18n("Before connect:"), this); before_connect_l->setAlignment(AlignVCenter); l1->addWidget(before_connect_l, 0, 0); - before_connect = new QLineEdit(parent); - before_connect->setMaxLength(COMMAND_SIZE); + before_connect = new QLineEdit(this); +// before_connect->setMaxLength(COMMAND_SIZE); l1->addWidget(before_connect, 0, 1); QString tmp = i18n("Allows you to run a program <b>before</b> a connection\n" "is established. It is called immediately before\n" @@ -308,11 +308,11 @@ i18n("Here you can select commands to run at certain stages of the\n" QWhatsThis::add(before_connect_l,tmp); QWhatsThis::add(before_connect,tmp); - command_label = new QLabel(i18n("Upon connect:"), parent); + command_label = new QLabel(i18n("Upon connect:"), this); command_label->setAlignment(AlignVCenter); l1->addWidget(command_label, 1, 0); - command = new QLineEdit(parent); - command->setMaxLength(COMMAND_SIZE); + command = new QLineEdit(this); +// command->setMaxLength(COMMAND_SIZE); l1->addWidget(command, 1, 1); tmp = i18n("Allows you to run a program <b>after</b> a connection\n" "is established. When your program is called, all\n" @@ -324,11 +324,11 @@ i18n("Here you can select commands to run at certain stages of the\n" QWhatsThis::add(command,tmp); predisconnect_label = new QLabel(i18n("Before disconnect:"), - parent); + this); predisconnect_label->setAlignment(AlignVCenter); l1->addWidget(predisconnect_label, 2, 0); - predisconnect = new QLineEdit(parent); - predisconnect->setMaxLength(COMMAND_SIZE); + predisconnect = new QLineEdit(this); +// predisconnect->setMaxLength(COMMAND_SIZE); l1->addWidget(predisconnect, 2, 1); tmp = i18n("Allows you to run a program <b>before</b> a connection\n" "is closed. The connection will stay open until\n" @@ -338,12 +338,12 @@ i18n("Here you can select commands to run at certain stages of the\n" QWhatsThis::add(predisconnect,tmp); discommand_label = new QLabel(i18n("Upon disconnect:"), - parent); + this); discommand_label->setAlignment(AlignVCenter); l1->addWidget(discommand_label, 3, 0); - discommand = new QLineEdit(parent); - discommand->setMaxLength(COMMAND_SIZE); + discommand = new QLineEdit(this); +// discommand->setMaxLength(COMMAND_SIZE); l1->addWidget(discommand, 3, 1); tmp = i18n("Allows you to run a program <b>after</b> a connection\n" "has been closed."); @@ -360,19 +360,19 @@ 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(gpppdata.command_before_connect()); - command->setText(gpppdata.command_on_connect()); - discommand->setText(gpppdata.command_on_disconnect()); - predisconnect->setText(gpppdata.command_before_disconnect()); + 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()); } } bool ExecWidget::save() { - gpppdata.setCommand_before_connect(before_connect->text()); - gpppdata.setCommand_on_connect(command->text()); - gpppdata.setCommand_before_disconnect(predisconnect->text()); - gpppdata.setCommand_on_disconnect(discommand->text()); + 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()); return true; } @@ -386,13 +386,13 @@ bool ExecWidget::save() { IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name ) : QWidget(parent, name) { - QVBoxLayout *topLayout = new QVBoxLayout(parent); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setSpacing( 3 );//KDialog::spacingHint()); - box = new QVGroupBox(i18n("Configuration"), parent); + box = new QVGroupBox(i18n("Configuration"), this); // box->setInsideSpacing( 1 );//KDialog::spacingHint()); - rb = new QButtonGroup(parent); + rb = new QButtonGroup(this); rb->hide(); connect(rb, SIGNAL(clicked(int)), SLOT(hitIPSelect(int))); @@ -448,8 +448,8 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name ) QWhatsThis::add(sub_label,tmp); QWhatsThis::add(subnetmask_l,tmp); - autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), parent); - autoname->setChecked(gpppdata.autoname()); + autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), this); + autoname->setChecked(PPPData::data()->autoname()); connect(autoname,SIGNAL(toggled(bool)), this,SLOT(autoname_t(bool))); @@ -469,15 +469,15 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name ) //load info from gpppdata if(!isnewaccount) { - if(gpppdata.ipaddr() == "0.0.0.0" && - gpppdata.subnetmask() == "0.0.0.0") { + if(PPPData::data()->ipaddr() == "0.0.0.0" && + PPPData::data()->subnetmask() == "0.0.0.0") { dynamicadd_rb->setChecked(true); hitIPSelect(0); - autoname->setChecked(gpppdata.autoname()); + autoname->setChecked(PPPData::data()->autoname()); } else { - ipaddress_l->setText(gpppdata.ipaddr()); - subnetmask_l->setText(gpppdata.subnetmask()); + ipaddress_l->setText(PPPData::data()->ipaddr()); + subnetmask_l->setText(PPPData::data()->subnetmask()); staticadd_rb->setChecked(true); autoname->setChecked(false); } @@ -510,13 +510,13 @@ void IPWidget::autoname_t(bool on) { void IPWidget::save() { if(dynamicadd_rb->isChecked()) { - gpppdata.setIpaddr("0.0.0.0"); - gpppdata.setSubnetmask("0.0.0.0"); + PPPData::data()->setIpaddr("0.0.0.0"); + PPPData::data()->setSubnetmask("0.0.0.0"); } else { - gpppdata.setIpaddr(ipaddress_l->text()); - gpppdata.setSubnetmask(subnetmask_l->text()); + PPPData::data()->setIpaddr(ipaddress_l->text()); + PPPData::data()->setSubnetmask(subnetmask_l->text()); } - gpppdata.setAutoname(autoname->isChecked()); + PPPData::data()->setAutoname(autoname->isChecked()); } @@ -540,14 +540,14 @@ void IPWidget::hitIPSelect( int i ) { DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) : QWidget(parent, name) { - // box = new QGroupBox(parent); - QGridLayout *tl = new QGridLayout(parent, 7, 2, 0 );//, KDialog::spacingHint()); + // box = new QGroupBox(this); + QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );//, KDialog::spacingHint()); - dnsdomain_label = new QLabel(i18n("Domain name:"), parent); + dnsdomain_label = new QLabel(i18n("Domain name:"), this); tl->addWidget(dnsdomain_label, 0, 0); - dnsdomain = new QLineEdit(parent); - dnsdomain->setMaxLength(DOMAIN_SIZE); + dnsdomain = new QLineEdit(this); +// dnsdomain->setMaxLength(DOMAIN_SIZE); tl->addWidget(dnsdomain, 0, 1); QString tmp = i18n("If you enter a domain name here, this domain\n" "name is used for your computer while you are\n" @@ -561,30 +561,30 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) QWhatsThis::add(dnsdomain_label,tmp); QWhatsThis::add(dnsdomain,tmp); - conf_label = new QLabel(i18n("Configuration:"), parent); + conf_label = new QLabel(i18n("Configuration:"), this); tl->addWidget(conf_label, 1, 0); bg = new QButtonGroup("Group", this); connect(bg, SIGNAL(clicked(int)), SLOT(DNS_Mode_Selected(int))); bg->hide(); - autodns = new QRadioButton(i18n("Automatic"), parent); + autodns = new QRadioButton(i18n("Automatic"), this); bg->insert(autodns, 0); tl->addWidget(autodns, 1, 1); // no automatic DNS detection for pppd < 2.3.7 - if(!gpppdata.pppdVersionMin(2, 3, 7)) + if(!PPPData::data()->pppdVersionMin(2, 3, 7)) autodns->setEnabled(false); - mandns = new QRadioButton(i18n("Manual"), parent); + mandns = new QRadioButton(i18n("Manual"), this); bg->insert(mandns, 1); tl->addWidget(mandns, 2, 1); - dns_label = new QLabel(i18n("DNS IP address:"), parent); + dns_label = new QLabel(i18n("DNS IP address:"), this); tl->addWidget(dns_label, 3, 0); QHBoxLayout *l2 = new QHBoxLayout; tl->addLayout(l2, 3, 1); - dnsipaddr = new IPLineEdit(parent); + dnsipaddr = new IPLineEdit(this); connect(dnsipaddr, SIGNAL(returnPressed()), SLOT(adddns())); connect(dnsipaddr, SIGNAL(textChanged(const QString &)), @@ -604,11 +604,11 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) QHBoxLayout *l1 = new QHBoxLayout; tl->addLayout(l1, 4, 1); - add = new QPushButton(i18n("Add"), parent); + add = new QPushButton(i18n("Add"), this); connect(add, SIGNAL(clicked()), SLOT(adddns())); - int width = add->sizeHint().width(); - width = QMAX(width,60); - add->setMinimumWidth(width); +// int width = add->sizeHint().width(); +// width = QMAX(width,60); +// add->setMinimumWidth(width); l1->addWidget(add); l1->addStretch(1); QWhatsThis::add(add, @@ -616,21 +616,21 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) "specified in the field above. The entry\n" "will then be added to the list below")); - remove = new QPushButton(i18n("Remove"), parent); + remove = new QPushButton(i18n("Remove"), this); connect(remove, SIGNAL(clicked()), SLOT(removedns())); - width = remove->sizeHint().width(); - width = QMAX(width,60); - remove->setMinimumWidth(width); +// width = remove->sizeHint().width(); +// width = QMAX(width,60); +// remove->setMinimumWidth(width); l1->addWidget(remove); QWhatsThis::add(remove, i18n("Click this button to remove the selected DNS\n" "server entry from the list below")); - servers_label = new QLabel(i18n("DNS address list:"), parent); + servers_label = new QLabel(i18n("DNS address list:"), this); servers_label->setAlignment(AlignTop|AlignLeft); tl->addWidget(servers_label, 5, 0); - dnsservers = new QListBox(parent); + dnsservers = new QListBox(this); dnsservers->setMinimumSize(150, 80); connect(dnsservers, SIGNAL(highlighted(int)), SLOT(DNS_Entry_Selected(int))); @@ -644,8 +644,8 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) exdnsdisabled_toggle = new QCheckBox(i18n( \ "Disable existing DNS servers during connection"), - parent); - exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled()); + this); + exdnsdisabled_toggle->setChecked(PPPData::data()->exDNSDisabled()); tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter); QWhatsThis::add(exdnsdisabled_toggle, i18n("<p>When this option is selected, all DNS\n" @@ -661,11 +661,11 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name ) // restore data if editing if(!isnewaccount) { - dnsservers->insertStringList(gpppdata.dns()); - dnsdomain->setText(gpppdata.domain()); + dnsservers->insertStringList(PPPData::data()->dns()); + dnsdomain->setText(PPPData::data()->domain()); } - int mode = gpppdata.autoDNS() ? 0 : 1; + int mode = PPPData::data()->autoDNS() ? 0 : 1; bg->setButton(mode); DNS_Mode_Selected(mode); @@ -695,20 +695,20 @@ void DNSWidget::DNS_Mode_Selected(int mode) { } void DNSWidget::save() { - gpppdata.setAutoDNS(bg->id(bg->selected()) == 0); + PPPData::data()->setAutoDNS(bg->id(bg->selected()) == 0); QStringList serverlist; for(uint i=0; i < dnsservers->count(); i++) serverlist.append(dnsservers->text(i)); - gpppdata.setDns(serverlist); + PPPData::data()->setDns(serverlist); // strip leading dot QString s(dnsdomain->text()); if(s.left(1) == ".") - gpppdata.setDomain(s.mid(1)); + PPPData::data()->setDomain(s.mid(1)); else - gpppdata.setDomain(dnsdomain->text()); + PPPData::data()->setDomain(dnsdomain->text()); - gpppdata.setExDNSDisabled(exdnsdisabled_toggle->isChecked()); + PPPData::data()->setExDNSDisabled(exdnsdisabled_toggle->isChecked()); } @@ -735,13 +735,13 @@ void DNSWidget::removedns() { GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *name ) : QWidget(parent, name) { - QVBoxLayout *topLayout = new QVBoxLayout(parent); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setSpacing( 2 );//KDialog::spacingHint()); - box = new QVGroupBox(i18n("Configuration"), parent); + box = new QVGroupBox(i18n("Configuration"), this); // box->setInsideSpacing( 2 );//KDialog::spacingHint()); - rb = new QButtonGroup(parent); + rb = new QButtonGroup(this); rb->hide(); connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int))); @@ -771,7 +771,7 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na gatewayaddr = new IPLineEdit(gateBox); defaultroute = new QCheckBox(i18n("Assign the default route to this gateway"), - parent); + this); QWhatsThis::add(defaultroute, i18n("If this option is enabled, all packets not\n" "going to the local net are routed through\n" @@ -785,15 +785,15 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na //load info from gpppdata if(!isnewaccount) { - if(gpppdata.gateway() == "0.0.0.0") { + if(PPPData::data()->gateway() == "0.0.0.0") { defaultgateway->setChecked(true); hitGatewaySelect(0); } else { - gatewayaddr->setText(gpppdata.gateway()); + gatewayaddr->setText(PPPData::data()->gateway()); staticgateway->setChecked(true); } - defaultroute->setChecked(gpppdata.defaultroute()); + defaultroute->setChecked(PPPData::data()->defaultroute()); } else { defaultgateway->setChecked(true); @@ -803,8 +803,8 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na } void GatewayWidget::save() { - gpppdata.setGateway(gatewayaddr->text()); - gpppdata.setDefaultroute(defaultroute->isChecked()); + PPPData::data()->setGateway(gatewayaddr->text()); + PPPData::data()->setDefaultroute(defaultroute->isChecked()); } @@ -826,13 +826,13 @@ void GatewayWidget::hitGatewaySelect( int i ) { ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name ) : QWidget(parent, name) { - QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint()); - se = new ScriptEdit(parent); + QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint()); + se = new ScriptEdit(this); connect(se, SIGNAL(returnPressed()), SLOT(addButton())); tl->addWidget(se); // insert equal-sized buttons - QButtonGroup *bbox = new QButtonGroup(parent); + QButtonGroup *bbox = new QButtonGroup(this); add = new QPushButton( bbox, i18n("Add") ); bbox->insert(add); connect(add, SIGNAL(clicked()), SLOT(addButton())); @@ -849,18 +849,18 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name QHBoxLayout *l12 = new QHBoxLayout(0); tl->addLayout(l12); - stl = new QListBox(parent); + stl = new QListBox(this); stl->setVScrollBarMode( QScrollView::AlwaysOff ); connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int))); stl->setMinimumSize(QSize(70, 140)); - sl = new QListBox(parent); + sl = new QListBox(this); sl->setVScrollBarMode( QScrollView::AlwaysOff ); connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int))); sl->setMinimumSize(QSize(150, 140)); - slb = new QScrollBar(parent); - slb->setFixedWidth(slb->sizeHint().width()); + slb = new QScrollBar(this); +// slb->setFixedWidth(slb->sizeHint().width()); connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int))); l12->addWidget(stl, 1); @@ -869,8 +869,8 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name //load data from gpppdata if(!isnewaccount) { - QStringList &comlist = gpppdata.scriptType(); - QStringList &arglist = gpppdata.script(); + QStringList &comlist = PPPData::data()->scriptType(); + QStringList &arglist = PPPData::data()->script(); QStringList::Iterator itcom = comlist.begin(); QStringList::Iterator itarg = arglist.begin(); @@ -916,8 +916,8 @@ void ScriptWidget::save() { typelist.append(stl->text(i)); arglist.append(sl->text(i)); } - gpppdata.setScriptType(typelist); - gpppdata.setScript(arglist); + PPPData::data()->setScriptType(typelist); + PPPData::data()->setScript(arglist); } @@ -1154,7 +1154,7 @@ void ScriptWidget::removeButton() { // ///////////////////////////////////////////////////////////////////////////// PhoneNumberDialog::PhoneNumberDialog(QWidget *parent) - : QDialog(parent, 0, true ) { + : QDialog(parent,"PhoneNumberDialog",true) { setCaption( i18n("Add Phone Number") ); // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); @@ -1165,8 +1165,8 @@ PhoneNumberDialog::PhoneNumberDialog(QWidget *parent) new QLabel(i18n("Enter a phone number:"), hbox); - le = newLineEdit(14, hbox); - le->setMinimumWidth(125); + le = new QLineEdit(hbox); +// le->setMinimumWidth(125); connect(le, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp index f803628..a02ee35 100644 --- a/noncore/settings/networksettings/ppp/general.cpp +++ b/noncore/settings/networksettings/ppp/general.cpp @@ -164,7 +164,7 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) QWhatsThis::add(baud_c,tmp); for(int i=0; i <= enter->count()-1; i++) { - if(gpppdata.enter() == enter->text(i)) + if(PPPData::data()->enter() == enter->text(i)) enter->setCurrentItem(i); } @@ -173,7 +173,7 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) //Modem Lock File modemlockfile = new QCheckBox(i18n("&Use lock file"), this); - modemlockfile->setChecked(gpppdata.modemLockFile()); + modemlockfile->setChecked(PPPData::data()->modemLockFile()); connect(modemlockfile, SIGNAL(toggled(bool)), SLOT(modemlockfilechanged(bool))); tl->addMultiCellWidget(modemlockfile, 5, 5, 0, 1); @@ -191,7 +191,7 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) // Modem Timeout Line Edit Box - modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), this); + modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this); modemtimeout->setLabel(i18n("Modem &timeout:")); modemtimeout->setRange(1, 120, 1); modemtimeout->setSuffix(i18n(" sec")); @@ -206,23 +206,23 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) //set stuff from gpppdata for(int i=0; i <= enter->count()-1; i++) { - if(gpppdata.enter() == enter->text(i)) + if(PPPData::data()->enter() == enter->text(i)) enter->setCurrentItem(i); } for(int i=0; i <= modemdevice->count()-1; i++) { - if(gpppdata.modemDevice() == modemdevice->text(i)) + if(PPPData::data()->modemDevice() == modemdevice->text(i)) modemdevice->setCurrentItem(i); } for(int i=0; i <= flowcontrol->count()-1; i++) { - if(gpppdata.flowcontrol() == flowcontrol->text(i)) + if(PPPData::data()->flowcontrol() == flowcontrol->text(i)) flowcontrol->setCurrentItem(i); } //set the modem speed for(int i=0; i < baud_c->count(); i++) - if(baud_c->text(i) == gpppdata.speed()) + if(baud_c->text(i) == PPPData::data()->speed()) baud_c->setCurrentItem(i); tl->setRowStretch(7, 1); @@ -230,32 +230,32 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) void ModemWidget::speed_selection(int) { - gpppdata.setSpeed(baud_c->text(baud_c->currentItem())); + PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem())); } void ModemWidget::setenter(int ) { - gpppdata.setEnter(enter->text(enter->currentItem())); + PPPData::data()->setEnter(enter->text(enter->currentItem())); } void ModemWidget::setmodemdc(int i) { - gpppdata.setModemDevice(modemdevice->text(i)); + PPPData::data()->setModemDevice(modemdevice->text(i)); } void ModemWidget::setflowcontrol(int i) { - gpppdata.setFlowcontrol(flowcontrol->text(i)); + PPPData::data()->setFlowcontrol(flowcontrol->text(i)); } void ModemWidget::modemlockfilechanged(bool set) { - gpppdata.setModemLockFile(set); + PPPData::data()->setModemLockFile(set); } void ModemWidget::modemtimeoutchanged(int n) { - gpppdata.setModemTimeout(n); + PPPData::data()->setModemTimeout(n); } @@ -266,7 +266,7 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) waitfordt = new QCheckBox(i18n("&Wait for dial tone before dialing"), this); - waitfordt->setChecked(gpppdata.waitForDialTone()); + waitfordt->setChecked(PPPData::data()->waitForDialTone()); connect(waitfordt, SIGNAL(toggled(bool)), SLOT(waitfordtchanged(bool))); l1->addWidget(waitfordt); QWhatsThis::add(waitfordt, @@ -278,7 +278,7 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) "\n" "<b>Default:</b>: On")); - busywait = new KIntNumInput(gpppdata.busyWait(), this); + busywait = new KIntNumInput(PPPData::data()->busyWait(), this); busywait->setLabel(i18n("B&usy wait:")); busywait->setRange(0, 300, 5, true); busywait->setSuffix(i18n(" sec")); @@ -301,7 +301,7 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) QLabel *volumeLabel = new QLabel(i18n("Modem &volume:"), this); hbl->addWidget(volumeLabel); - volume = new QSlider(0, 2, 1, gpppdata.volume(), QSlider::Horizontal, this); + volume = new QSlider(0, 2, 1, PPPData::data()->volume(), QSlider::Horizontal, this); volumeLabel->setBuddy(volume); volume->setTickmarks(QSlider::Below); hbl->addWidget(volume); @@ -325,7 +325,7 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) #if 0 chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this); - chkbox1->setChecked(gpppdata.UseCDLine()); + chkbox1->setChecked(PPPData::data()->UseCDLine()); connect(chkbox1,SIGNAL(toggled(bool)), this,SLOT(use_cdline_toggled(bool))); l12->addWidget(chkbox1); @@ -402,20 +402,20 @@ void ModemWidget2::query_modem() { #if 0 void ModemWidget2::use_cdline_toggled(bool on) { - gpppdata.setUseCDLine(on); + PPPData::data()->setUseCDLine(on); } #endif void ModemWidget2::waitfordtchanged(bool b) { - gpppdata.setWaitForDialTone((int)b); + PPPData::data()->setWaitForDialTone((int)b); } void ModemWidget2::busywaitchanged(int n) { - gpppdata.setbusyWait(n); + PPPData::data()->setbusyWait(n); } void ModemWidget2::volumeChanged(int v) { - gpppdata.setVolume(v); + PPPData::data()->setVolume(v); } diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp index 2f9feda..8d70cd4 100644 --- a/noncore/settings/networksettings/ppp/kpppwidget.cpp +++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp @@ -158,7 +158,7 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // log = new QCheckBox(i18n("Show lo&g window"), this); // connect(log, SIGNAL(toggled(bool)), // this, SLOT(log_window_toggled(bool))); -// log->setChecked(gpppdata.get_show_log_window()); +// log->setChecked(PPPData::data()->get_show_log_window()); // l3->addWidget(log); // QWhatsThis::add(log, @@ -191,7 +191,7 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl -// if(gpppdata.access() != KConfig::ReadWrite) +// if(PPPData::data()->access() != KConfig::ReadWrite) // setup_b->setEnabled(false); // help_b = new QPushButton(i18n("&Help"), this); @@ -291,7 +291,7 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl // } // if(m_bCmdlAccount){ -// bool result = gpppdata.setAccount(m_strCmdlAccount); +// bool result = PPPData::data()->setAccount(m_strCmdlAccount); // if (!result){ // QString string; // string = i18n("No such Account:\n%1").arg(m_strCmdlAccount); @@ -363,7 +363,7 @@ void KPPPWidget::enterPressedInPW() { // triggered by the session manager void KPPPWidget::saveMyself() { - gpppdata.save(); + PPPData::data()->save(); } void KPPPWidget::shutDown() { @@ -372,7 +372,7 @@ void KPPPWidget::shutDown() { } void KPPPWidget::log_window_toggled(bool on) { - gpppdata.set_show_log_window(on); + PPPData::data()->set_show_log_window(on); } @@ -381,7 +381,7 @@ void KPPPWidget::log_window_toggled(bool on) { // void KPPPWidget::resetaccounts() { // connectto_c->clear(); -// int count = gpppdata.count(); +// int count = PPPData::data()->count(); // // enable/disable controls // connectto_c->setEnabled(count > 0); @@ -392,27 +392,27 @@ void KPPPWidget::log_window_toggled(bool on) { // //load the accounts // for(int i=0; i < count; i++) { -// gpppdata.setAccountbyIndex(i); -// connectto_c->insertItem(gpppdata.accname()); +// PPPData::data()->setAccountbyIndex(i); +// connectto_c->insertItem(PPPData::data()->accname()); // } // //set the default account -// if(!gpppdata.defaultAccount().isEmpty()) { +// if(!PPPData::data()->defaultAccount().isEmpty()) { // for(int i=0; i < count; i++) -// if(gpppdata.defaultAccount() == connectto_c->text(i)) { +// if(PPPData::data()->defaultAccount() == connectto_c->text(i)) { // connectto_c->setCurrentItem(i); -// gpppdata.setAccountbyIndex(i); +// PPPData::data()->setAccountbyIndex(i); -// ID_Edit->setText(gpppdata.storedUsername()); -// PW_Edit->setText(gpppdata.storedPassword()); +// ID_Edit->setText(PPPData::data()->storedUsername()); +// PW_Edit->setText(PPPData::data()->storedPassword()); // } // } // else // if(count > 0) { -// gpppdata.setDefaultAccount(connectto_c->text(0)); -// gpppdata.save(); -// ID_Edit->setText(gpppdata.storedUsername()); -// PW_Edit->setText(gpppdata.storedPassword()); +// PPPData::data()->setDefaultAccount(connectto_c->text(0)); +// PPPData::data()->save(); +// ID_Edit->setText(PPPData::data()->storedUsername()); +// PW_Edit->setText(PPPData::data()->storedPassword()); // } // connect(ID_Edit, SIGNAL(textChanged(const QString &)), @@ -434,7 +434,7 @@ void KPPPWidget::interruptConnection() { // emit con->cancelbutton(); // disconnect if online - if (gpppdata.pppdRunning()) + if (PPPData::data()->pppdRunning()) emit disconnect(); } @@ -445,7 +445,7 @@ void KPPPWidget::sigPPPDDied() { // if we are not connected pppdpid is -1 so have have to check for that // 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(gpppdata.pppdRunning() || gpppdata.pppdError()) { + if(PPPData::data()->pppdRunning() || PPPData::data()->pppdError()) { qDebug( "It was pppd that died" ); // when we killpppd() on Cancel in ConnectWidget @@ -457,11 +457,11 @@ void KPPPWidget::sigPPPDDied() { Modem::modem->removeSecret(AUTH_PAP); Modem::modem->removeSecret(AUTH_CHAP); - gpppdata.setpppdRunning(false); + PPPData::data()->setpppdRunning(false); qDebug( "Executing command on disconnect since pppd has died." ); QApplication::flushX(); - execute_command(gpppdata.command_on_disconnect()); + execute_command(PPPData::data()->command_on_disconnect()); // stopAccounting(); @@ -469,13 +469,13 @@ void KPPPWidget::sigPPPDDied() { // DockWidget::dock_widget->stop_stats(); // DockWidget::dock_widget->hide(); - if(!gpppdata.pppdError()) - gpppdata.setpppdError(E_PPPD_DIED); + if(!PPPData::data()->pppdError()) + PPPData::data()->setpppdError(E_PPPD_DIED); removedns(); Modem::modem->unlockdevice(); // con->pppdDied(); - if(!gpppdata.automatic_redial()) { + if(!PPPData::data()->automatic_redial()) { quit_b->setFocus(); show(); // con_win->stopClock(); @@ -483,10 +483,10 @@ void KPPPWidget::sigPPPDDied() { // con_win->hide(); // con->hide(); - gpppdata.setpppdRunning(false); + PPPData::data()->setpppdRunning(false); // // not in a signal handler !!! KNotifyClient::beep(); QString msg; - if (gpppdata.pppdError() == E_IF_TIMEOUT) + if (PPPData::data()->pppdError() == E_IF_TIMEOUT) msg = i18n("Timeout expired while waiting for the PPP interface " "to come up!"); else { @@ -507,22 +507,22 @@ void KPPPWidget::sigPPPDDied() { if (false){ qDebug( "Trying to reconnect... " ); - if(gpppdata.authMethod() == AUTH_PAP || - gpppdata.authMethod() == AUTH_CHAP || - gpppdata.authMethod() == AUTH_PAPCHAP) - Modem::modem->setSecret(gpppdata.authMethod(), - encodeWord(gpppdata.storedUsername()), - encodeWord(gpppdata.password())); + 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())); // con_win->hide(); // con_win->stopClock(); // stopAccounting(); - gpppdata.setpppdRunning(false); + PPPData::data()->setpppdRunning(false); // not in a signal handler !!! KNotifyClient::beep(); emit cmdl_start(); } } - gpppdata.setpppdError(0); + PPPData::data()->setpppdError(0); } } @@ -543,10 +543,10 @@ void KPPPWidget::sigPPPDDied() { void KPPPWidget::newdefaultaccount(int i) { - gpppdata.setDefaultAccount(connectto_c->text(i)); - gpppdata.save(); - ID_Edit->setText(gpppdata.storedUsername()); - PW_Edit->setText(gpppdata.storedPassword()); + PPPData::data()->setDefaultAccount(connectto_c->text(i)); + PPPData::data()->save(); + ID_Edit->setText(PPPData::data()->storedUsername()); + PW_Edit->setText(PPPData::data()->storedPassword()); } @@ -556,10 +556,10 @@ void KPPPWidget::beginConnect() { // make sure to connect to the account that is selected in the combo box // (exeption: an account given by a command line argument) // if(!m_bCmdlAccount) { -// gpppdata.setAccount(connectto_c->currentText()); -// gpppdata.setPassword(PW_Edit->text()); +// PPPData::data()->setAccount(connectto_c->currentText()); +// PPPData::data()->setPassword(PW_Edit->text()); // } else { - gpppdata.setPassword(gpppdata.storedPassword()); + PPPData::data()->setPassword(PPPData::data()->storedPassword()); // } QFileInfo info(pppdPath()); @@ -577,14 +577,14 @@ void KPPPWidget::beginConnect() { string = i18n("kppp cannot execute:\n %1\n" "Please make sure that you have given kppp " "setuid permission and that " - "pppd is executable.").arg(gpppdata.pppdPath()); + "pppd is executable.").arg(PPPData::data()->pppdPath()); KMessageBox::error(this, string); return; } #endif - QFileInfo info2(gpppdata.modemDevice()); + QFileInfo info2(PPPData::data()->modemDevice()); if(!info2.exists()){ QString string; @@ -592,16 +592,16 @@ void KPPPWidget::beginConnect() { "your modem device properly " "and/or adjust the location of the modem device on " "the modem tab of " - "the setup dialog.").arg(gpppdata.modemDevice()); + "the setup dialog.").arg(PPPData::data()->modemDevice()); QMessageBox::warning(this, "error", string); return; } // if this is a PAP or CHAP account, ensure that username is // supplied - if(gpppdata.authMethod() == AUTH_PAP || - gpppdata.authMethod() == AUTH_CHAP || - gpppdata.authMethod() == AUTH_PAPCHAP ) { + if(PPPData::data()->authMethod() == AUTH_PAP || + PPPData::data()->authMethod() == AUTH_CHAP || + PPPData::data()->authMethod() == AUTH_PAPCHAP ) { if(ID_Edit->text().isEmpty()) { QMessageBox::warning(this,"error", i18n( @@ -610,9 +610,9 @@ void KPPPWidget::beginConnect() { "supply a username and a password!")); return; } else { - if(!Modem::modem->setSecret(gpppdata.authMethod(), - encodeWord(gpppdata.storedUsername()), - encodeWord(gpppdata.password()))) { + if(!Modem::modem->setSecret(PPPData::data()->authMethod(), + encodeWord(PPPData::data()->storedUsername()), + encodeWord(PPPData::data()->password()))) { QString s; s = i18n("Cannot create PAP/CHAP authentication\n" "file \"%1\"").arg(PAP_AUTH_FILE); @@ -622,7 +622,7 @@ void KPPPWidget::beginConnect() { } } - if (gpppdata.phonenumber().isEmpty()) { + if (PPPData::data()->phonenumber().isEmpty()) { QString s = i18n("You must specify a telephone number!"); QMessageBox::warning(this, "error", s); return; @@ -630,12 +630,12 @@ void KPPPWidget::beginConnect() { this->hide(); - QString tit = i18n("Connecting to: %1").arg(gpppdata.accname()); + QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname()); // con->setCaption(tit); // con->show(); - bool show_debug = gpppdata.get_show_log_window(); + bool show_debug = PPPData::data()->get_show_log_window(); // con->debug->setOn(show_debug); // toggle button debugwindow->clear(); if (!show_debug) @@ -650,7 +650,7 @@ void KPPPWidget::beginConnect() { void KPPPWidget::disconnect() { - if (!gpppdata.command_before_disconnect().isEmpty()) { + if (!PPPData::data()->command_before_disconnect().isEmpty()) { // con_win->hide(); // con->show(); // con->setCaption(i18n("Disconnecting...")); @@ -659,7 +659,7 @@ void KPPPWidget::disconnect() { qApp->processEvents(); QApplication::flushX(); // pid_t id = - execute_command(gpppdata.command_before_disconnect()); + execute_command(PPPData::data()->command_before_disconnect()); // int i, status; // do { @@ -677,7 +677,7 @@ void KPPPWidget::disconnect() { Modem::modem->killPPPDaemon(); QApplication::flushX(); - execute_command(gpppdata.command_on_disconnect()); + execute_command(PPPData::data()->command_on_disconnect()); Modem::modem->removeSecret(AUTH_PAP); Modem::modem->removeSecret(AUTH_CHAP); @@ -707,22 +707,22 @@ void KPPPWidget::disconnect() { void KPPPWidget::quitbutton() { - if(gpppdata.pppdRunning()) { + if(PPPData::data()->pppdRunning()) { int ok = QMessageBox::warning(this, i18n("Exiting kPPP will close your PPP Session."), i18n("Quit kPPP?")); if(ok == QMessageBox::Yes) { Modem::modem->killPPPDaemon(); QApplication::flushX(); - execute_command(gpppdata.command_on_disconnect()); + execute_command(PPPData::data()->command_on_disconnect()); removedns(); Modem::modem->unlockdevice(); } } else { - if (!gpppdata.accname().isEmpty() && !gpppdata.storePassword()) - gpppdata.setStoredPassword(""); + if (!PPPData::data()->accname().isEmpty() && !PPPData::data()->storePassword()) + PPPData::data()->setStoredPassword(""); } - gpppdata.save(); + PPPData::data()->save(); qApp->quit(); } @@ -736,13 +736,13 @@ void KPPPWidget::quitbutton() { // // volume accounting // stats->totalbytes = 0; -// kdDebug() << "AcctEnabled: " << gpppdata.AcctEnabled() << endl; +// kdDebug() << "AcctEnabled: " << PPPData::data()->AcctEnabled() << endl; // // load the ruleset -// if(!gpppdata.AcctEnabled()) +// if(!PPPData::data()->AcctEnabled()) // return; -// QString d = AccountingBase::getAccountingFile(gpppdata.accountingFile()); +// QString d = AccountingBase::getAccountingFile(PPPData::data()->accountingFile()); // // if(::access(d.data(), X_OK) != 0) // acct = new Accounting(this, stats); // // else @@ -752,9 +752,9 @@ void KPPPWidget::quitbutton() { // connect(acct, SIGNAL(changed(QString, QString)), // con_win, SLOT(slotAccounting(QString, QString))); -// // if(!acct->loadRuleSet(gpppdata.accountingFile())) { +// // if(!acct->loadRuleSet(PPPData::data()->accountingFile())) { // // QString s= i18n("Can not load the accounting " -// // "ruleset \"%1\"!").arg(gpppdata.accountingFile()); +// // "ruleset \"%1\"!").arg(PPPData::data()->accountingFile()); // // starting the messagebox with a timer will prevent us // // from blocking the calling function ConnectWidget::timerEvent @@ -769,9 +769,9 @@ void KPPPWidget::quitbutton() { // void KPPPWidget::stopAccounting() { // // store volume accounting // // if(stats->totalbytes != 0) -// // gpppdata.setTotalBytes(stats->totalbytes); +// // PPPData::data()->setTotalBytes(stats->totalbytes); -// if(!gpppdata.AcctEnabled()) +// if(!PPPData::data()->AcctEnabled()) // return; // // if(acct != 0) { @@ -792,16 +792,16 @@ void KPPPWidget::quitbutton() { void KPPPWidget::usernameChanged(const QString &) { // store username for later use - gpppdata.setStoredUsername(ID_Edit->text()); + PPPData::data()->setStoredUsername(ID_Edit->text()); } void KPPPWidget::passwordChanged(const QString &) { // store the password if so requested - if(gpppdata.storePassword()) - gpppdata.setStoredPassword(PW_Edit->text()); + if(PPPData::data()->storePassword()) + PPPData::data()->setStoredPassword(PW_Edit->text()); else - gpppdata.setStoredPassword(""); + PPPData::data()->setStoredPassword(""); } @@ -841,7 +841,7 @@ void KPPPWidget::showNews() { * Introduce the QuickHelp feature to new users of this version */ #define QUICKHELP_HINT "Hint_QuickHelp" - if(gpppdata.readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) { + if(PPPData::data()->readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) { QDialog dlg(0, 0, true); dlg.setCaption(i18n("Recent Changes in KPPP")); @@ -893,8 +893,8 @@ void KPPPWidget::showNews() { dlg.exec(); if(cb->isChecked()) { - gpppdata.writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1); - gpppdata.save(); + PPPData::data()->writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1); + PPPData::data()->save(); } } #endif diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp index a2f77c5..cd5d21c 100644 --- a/noncore/settings/networksettings/ppp/modem.cpp +++ b/noncore/settings/networksettings/ppp/modem.cpp @@ -101,7 +101,7 @@ speed_t Modem::modemspeed() { // convert the string modem speed int the gpppdata object to a t_speed type // to set the modem. The constants here should all be ifdef'd because // other systems may not have them - int i = gpppdata.speed().toInt()/100; + int i = PPPData::data()->speed().toInt()/100; switch(i) { case 24: @@ -151,7 +151,7 @@ bool Modem::opentty() { //begin if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) { close(modemfd); -// device = "/dev/modem";//deviceByIndex(request.modem.deviceNum); + device = PPPData::data()->modemDevice(); if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) { qDebug("error opening modem device !"); errmsg = i18n("Unable to open modem."); @@ -161,7 +161,7 @@ bool Modem::opentty() { //} #if 0 - if(gpppdata.UseCDLine()) { + if(PPPData::data()->UseCDLine()) { if(ioctl(modemfd, TIOCMGET, &flags) == -1) { errmsg = i18n("Unable to detect state of CD line."); ::close(modemfd); @@ -209,8 +209,8 @@ bool Modem::opentty() { tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHOKE); - if(gpppdata.flowcontrol() != "None") { - if(gpppdata.flowcontrol() == "CRTSCTS") { + if(PPPData::data()->flowcontrol() != "None") { + if(PPPData::data()->flowcontrol() == "CRTSCTS") { tty.c_cflag |= CRTSCTS; } else { @@ -339,7 +339,7 @@ bool Modem::writeLine(const char *buf) { char *b = new char[len+2]; memcpy(b, buf, len); // different modems seem to need different line terminations - QString term = gpppdata.enter(); + QString term = PPPData::data()->enter(); if(term == "LF") b[len++]='\n'; else if(term == "CR") @@ -379,9 +379,9 @@ bool Modem::hangup() { if (data_mode) escape_to_command_mode(); // Then hangup command - writeLine(gpppdata.modemHangupStr().local8Bit()); + writeLine(PPPData::data()->modemHangupStr().local8Bit()); - usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec + usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec #ifndef DEBUG_WO_DIALING if (sigsetjmp(jmp_buffer, 1) == 0) { @@ -417,7 +417,7 @@ bool Modem::hangup() { ioctl(modemfd, TIOCMSET, &modemstat); #endif - usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 secs + usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 secs cfsetospeed(&temptty, modemspeed()); cfsetispeed(&temptty, modemspeed()); @@ -440,11 +440,11 @@ void Modem::escape_to_command_mode() { tcflush(modemfd, TCIOFLUSH); // +3 because quiet time must be greater than guard time. - usleep((gpppdata.modemEscapeGuardTime()+3)*20000); - QCString tmp = gpppdata.modemEscapeStr().local8Bit(); + usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000); + QCString tmp = PPPData::data()->modemEscapeStr().local8Bit(); write(modemfd, tmp.data(), tmp.length()); tcflush(modemfd, TCIOFLUSH); - usleep((gpppdata.modemEscapeGuardTime()+3)*20000); + usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000); data_mode = false; } @@ -560,7 +560,7 @@ int Modem::lockdevice() { int fd; char newlock[80]=""; // safe - if(!gpppdata.modemLockFile()) { + if(!PPPData::data()->modemLockFile()) { qDebug("The user doesn't want a lockfile."); return 0; } @@ -569,7 +569,7 @@ int Modem::lockdevice() { return 1; QString lockfile = LOCK_DIR"/LCK.."; - lockfile += gpppdata.modemDevice().mid(5); // append everything after /dev/ + lockfile += PPPData::data()->modemDevice().mid(5); // append everything after /dev/ if(access(QFile::encodeName(lockfile), F_OK) == 0) { // if ((fd = Requester::rq-> @@ -600,7 +600,7 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) { } } - fd = openLockfile(gpppdata.modemDevice(),O_WRONLY|O_TRUNC|O_CREAT); + fd = openLockfile(PPPData::data()->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT); if(fd >= 0) { sprintf(newlock,"%010d\n", getpid()); qDebug("Locking Device: %s", newlock); diff --git a/noncore/settings/networksettings/ppp/modemcmds.cpp b/noncore/settings/networksettings/ppp/modemcmds.cpp index 766ba0f..65032e8 100644 --- a/noncore/settings/networksettings/ppp/modemcmds.cpp +++ b/noncore/settings/networksettings/ppp/modemcmds.cpp @@ -44,9 +44,6 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name) : QDialog(parent, name, true ) //, i18n("Edit Modem Commands") , Ok|Cancel) { setCaption(i18n("Edit Modem Commands")); -// KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); - QWidget *dummyWidget = new QWidget(this); -// setMainWidget(dummyWidget); const int GRIDROWS = 22; int row = 0; @@ -243,73 +240,73 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name) l1->addRowSpacing(GRIDROWS, 5); //set stuff from gpppdata - preinitslider->setValue(gpppdata.modemPreInitDelay()); - lpreinitslider->setNum(gpppdata.modemPreInitDelay()); + preinitslider->setValue(PPPData::data()->modemPreInitDelay()); + lpreinitslider->setNum(PPPData::data()->modemPreInitDelay()); for(int i = 0; i < PPPData::NumInitStrings; i++) - initstr[i]->setText(gpppdata.modemInitStr(i)); - initslider->setValue(gpppdata.modemInitDelay()); - linitslider->setNum(gpppdata.modemInitDelay()); - initresp->setText(gpppdata.modemInitResp()); + initstr[i]->setText(PPPData::data()->modemInitStr(i)); + initslider->setValue(PPPData::data()->modemInitDelay()); + linitslider->setNum(PPPData::data()->modemInitDelay()); + initresp->setText(PPPData::data()->modemInitResp()); - durationslider->setValue(gpppdata.modemToneDuration()); - ldurationslider->setNum(gpppdata.modemToneDuration()); + durationslider->setValue(PPPData::data()->modemToneDuration()); + ldurationslider->setNum(PPPData::data()->modemToneDuration()); - nodetectdialtone->setText(gpppdata.modemNoDialToneDetectionStr()); - dialstr->setText(gpppdata.modemDialStr()); - connectresp->setText(gpppdata.modemConnectResp()); - busyresp->setText(gpppdata.modemBusyResp()); - nocarrierresp->setText(gpppdata.modemNoCarrierResp()); - nodialtoneresp->setText(gpppdata.modemNoDialtoneResp()); + 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()); - escapestr->setText(gpppdata.modemEscapeStr()); - escaperesp->setText(gpppdata.modemEscapeResp()); + escapestr->setText(PPPData::data()->modemEscapeStr()); + escaperesp->setText(PPPData::data()->modemEscapeResp()); - hangupstr->setText(gpppdata.modemHangupStr()); - hangupresp->setText(gpppdata.modemHangupResp()); + hangupstr->setText(PPPData::data()->modemHangupStr()); + hangupresp->setText(PPPData::data()->modemHangupResp()); - answerstr->setText(gpppdata.modemAnswerStr()); - ringresp->setText(gpppdata.modemRingResp()); - answerresp->setText(gpppdata.modemAnswerResp()); + answerstr->setText(PPPData::data()->modemAnswerStr()); + ringresp->setText(PPPData::data()->modemRingResp()); + answerresp->setText(PPPData::data()->modemAnswerResp()); - slider->setValue(gpppdata.modemEscapeGuardTime()); - lslider->setNum(gpppdata.modemEscapeGuardTime()); + slider->setValue(PPPData::data()->modemEscapeGuardTime()); + lslider->setNum(PPPData::data()->modemEscapeGuardTime()); - volume_off->setText(gpppdata.volumeOff()); - volume_medium->setText(gpppdata.volumeMedium()); - volume_high->setText(gpppdata.volumeHigh()); + volume_off->setText(PPPData::data()->volumeOff()); + volume_medium->setText(PPPData::data()->volumeMedium()); + volume_high->setText(PPPData::data()->volumeHigh()); } void ModemCommands::slotOk() { - gpppdata.setModemPreInitDelay(lpreinitslider->text().toInt()); + PPPData::data()->setModemPreInitDelay(lpreinitslider->text().toInt()); for(int i = 0; i < PPPData::NumInitStrings; i++) - gpppdata.setModemInitStr(i, initstr[i]->text()); - gpppdata.setModemInitResp(initresp->text()); - gpppdata.setModemInitDelay(linitslider->text().toInt()); - - gpppdata.setModemToneDuration(ldurationslider->text().toInt()); - gpppdata.setModemNoDialToneDetectionStr(nodetectdialtone->text()); - gpppdata.setModemDialStr(dialstr->text()); - gpppdata.setModemConnectResp(connectresp->text()); - gpppdata.setModemBusyResp(busyresp->text()); - gpppdata.setModemNoCarrierResp(nocarrierresp->text()); - gpppdata.setModemNoDialtoneResp(nodialtoneresp->text()); - - gpppdata.setModemEscapeStr(escapestr->text()); - gpppdata.setModemEscapeResp(escaperesp->text()); - gpppdata.setModemEscapeGuardTime(lslider->text().toInt()); - gpppdata.setModemHangupStr(hangupstr->text()); - gpppdata.setModemHangupResp(hangupresp->text()); - - gpppdata.setModemAnswerStr(answerstr->text()); - gpppdata.setModemRingResp(ringresp->text()); - gpppdata.setModemAnswerResp(answerresp->text()); - - gpppdata.setVolumeHigh(volume_high->text()); - gpppdata.setVolumeMedium(volume_medium->text()); - gpppdata.setVolumeOff(volume_off->text()); - - gpppdata.save(); + 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(); accept(); } diff --git a/noncore/settings/networksettings/ppp/newwidget.cpp b/noncore/settings/networksettings/ppp/newwidget.cpp deleted file mode 100644 index d2182fb..0000000 --- a/noncore/settings/networksettings/ppp/newwidget.cpp +++ b/dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// functions generating layout-aware widgets -// -///////////////////////////////////////////////////////////////////////////// - -#include "newwidget.h" - -QLineEdit *newLineEdit(int visiblewidth, QWidget *parent) { - QLineEdit *l = new QLineEdit(parent); - if(visiblewidth == 0) - l->setMinimumWidth(l->sizeHint().width()); - else - l->setFixedWidth(l->fontMetrics().width('H') * visiblewidth); - - return l; -} diff --git a/noncore/settings/networksettings/ppp/newwidget.h b/noncore/settings/networksettings/ppp/newwidget.h deleted file mode 100644 index 52f2ec7..0000000 --- a/noncore/settings/networksettings/ppp/newwidget.h +++ b/dev/null @@ -1,19 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// functions generating layout-aware widgets -// -///////////////////////////////////////////////////////////////////////////// - -#ifndef __NEWWIDGET__H__ -#define __NEWWIDGET__H__ - -#include <qwidget.h> -#include <qlineedit.h> - -#define L_FIXEDW 1 -#define L_FIXEDH 2 -#define L_FIXED (L_FIXEDW | L_FIXEDH) - -QLineEdit *newLineEdit(int visiblewidth, QWidget *parent); - -#endif diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro index a456427..ebfc713 100644 --- a/noncore/settings/networksettings/ppp/ppp.pro +++ b/noncore/settings/networksettings/ppp/ppp.pro @@ -4,8 +4,8 @@ TEMPLATE = lib #CONFIG += qt warn_on release 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 knuminput.h knumvalidator.h kpppwidget.h conwindow.h debug.h accounts.h connect.h edit.h scriptedit.h pppdargs.h newwidget.h iplined.h pwentry.h pppconfig.h -SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp knuminput.cpp knumvalidator.cpp kpppwidget.cpp conwindow.cpp debug.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp newwidget.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 knuminput.h knumvalidator.h kpppwidget.h conwindow.h debug.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 knuminput.cpp knumvalidator.cpp kpppwidget.cpp conwindow.cpp debug.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -L../interfaces/ -linterfaces diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp index 7b2b21b..c0f1fef 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.cpp +++ b/noncore/settings/networksettings/ppp/pppconfig.cpp @@ -50,13 +50,13 @@ PPPConfigWidget::~PPPConfigWidget() void PPPConfigWidget::accept() { - gpppdata.save(); + PPPData::data()->save(); QDialog::accept(); } void PPPConfigWidget::reject() { - gpppdata.cancel(); + PPPData::data()->cancel(); QDialog::reject(); } diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp index 04d0dd0..b7fca3f 100644 --- a/noncore/settings/networksettings/ppp/pppdargs.cpp +++ b/noncore/settings/networksettings/ppp/pppdargs.cpp @@ -121,14 +121,14 @@ void PPPdArguments::removebutton() { void PPPdArguments::defaultsbutton() { // all of this is a hack // save current list - QStringList arglist(gpppdata.pppdArgument()); + QStringList arglist(PPPData::data()->pppdArgument()); // get defaults - gpppdata.setpppdArgumentDefaults(); + PPPData::data()->setpppdArgumentDefaults(); init(); // restore old list - gpppdata.setpppdArgument(arglist); + PPPData::data()->setpppdArgument(arglist); } @@ -136,7 +136,7 @@ void PPPdArguments::closebutton() { QStringList arglist; for(uint i=0; i < arguments->count(); i++) arglist.append(arguments->text(i)); - gpppdata.setpppdArgument(arglist); + PPPData::data()->setpppdArgument(arglist); done(0); } @@ -146,7 +146,7 @@ void PPPdArguments::init() { while(arguments->count()) arguments->removeItem(0); - QStringList &arglist = gpppdata.pppdArgument(); + QStringList &arglist = PPPData::data()->pppdArgument(); for ( QStringList::Iterator it = arglist.begin(); it != arglist.end(); ++it ) diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp index f2386fc..646facd 100644 --- a/noncore/settings/networksettings/ppp/pppdata.cpp +++ b/noncore/settings/networksettings/ppp/pppdata.cpp @@ -38,11 +38,24 @@ // #include <kapplication.h> #include <assert.h> -PPPData gpppdata; +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; +} PPPData::PPPData() - : config(0L), + : //config(0L), highcount(-1), // start out with no entries caccount(-1), // set the current account index also suidprocessid(-1), // process ID of setuid child @@ -56,25 +69,9 @@ PPPData::PPPData() // open configuration file // bool PPPData::open() { - - config = new Config("NetworkSetup"); - /* - config = kapp->config(); - - if (config->getConfigState() == KConfig::NoAccess) { - KMessageBox::error(0L, - i18n("The application-specific config file could not " - "be opened in either read-write or read-only mode.\n" - "The superuser might have to change its ownership " - "by issuing the following command in your home directory:\n" - "chown {YourUsername} .kde/share/config/kppprc"), - kapp->name()); - return false; - } - - // don't expand shell variables - config->setDollarExpansion(false); - */ + qDebug("opening configfile NetworkSetupPPP"); + if (config) return true; + config = new Config("NetworkSetupPPP"); highcount = readNumConfig(GENERAL_GRP, NUMACCOUNTS_KEY, 0) - 1; @@ -104,7 +101,13 @@ void PPPData::save() { if (config) { writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count()); -// config->sync(); + delete config; + config = 0; + qDebug("worte confi NetworkSetupPPP"); + } + if (_data){ + delete _data; + _data = 0; } } @@ -123,17 +126,18 @@ void PPPData::cancel() { } -// currently differentiates between READWRITE and NONE only -int PPPData::access() const { +// // currently differentiates between READWRITE and NONE only +// int PPPData::access() const { - return 0;//config->getConfigState(); -} +// return 1;//config->getConfigState(); +// } // functions to read/write date to configuration file QString PPPData::readConfig(const QString &group, const QString &key, const QString &defvalue = "") { +// qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1()); if (config) { config->setGroup(group); return config->readEntry(key, defvalue); @@ -718,14 +722,14 @@ bool PPPData::isUniqueAccname(const QString &n) { bool PPPData::deleteAccount() { - if(caccount < 0) + //FIXME: +// if(caccount < 0) return false; // QMap <QString, QString> map; // QMap <QString, QString>::Iterator it; - // set all entries of the current account to "" -// tille: do not handle the accounts here... (?) +// // set all entries of the current account to "" // map = config->entryMap(cgroup); // it = map.begin(); // while (it != map.end()) { @@ -756,13 +760,13 @@ bool PPPData::deleteAccount() { // it++; // } - highcount--; - if(caccount > highcount) - caccount = highcount; +// highcount--; +// if(caccount > highcount) +// caccount = highcount; - setAccountbyIndex(caccount); +// setAccountbyIndex(caccount); - return true; +// return true; } @@ -778,39 +782,40 @@ bool PPPData::deleteAccount(const QString &aname) { int PPPData::newaccount() { - if(!config || highcount >= MAX_ACCOUNTS) - return -1; + qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS); + if(!config) open(); + if (highcount >= MAX_ACCOUNTS) return -1; highcount++; setAccountbyIndex(highcount); setpppdArgumentDefaults(); - + qDebug("PPPData::newaccount -> %i",caccount); return caccount; } int PPPData::copyaccount(int i) { - if(highcount >= MAX_ACCOUNTS) +// if(highcount >= MAX_ACCOUNTS) return -1; - setAccountbyIndex(i); +// setAccountbyIndex(i); // QMap <QString, QString> map = config->entryMap(cgroup); // QMap <QString, QString>::ConstIterator it = map.begin(); - QString newname = i18n("%1_copy").arg(accname()); +// QString newname = i18n("%1_copy").arg(accname()); - newaccount(); +// newaccount(); // while (it != map.end()) { // config->writeEntry(it.key(), *it); // it++; // } - setAccname(newname); +// setAccname(newname); - return caccount; +// return caccount; } @@ -829,7 +834,7 @@ void PPPData::setAccname(const QString &n) { } -#define SEPARATOR_CHAR ':' +#define SEPARATOR_CHAR '&' QStringList &PPPData::phonenumbers() { readListConfig(cgroup, PHONENUMBER_KEY, phonelist, SEPARATOR_CHAR); @@ -1011,7 +1016,7 @@ void PPPData::setDefaultroute(bool set) { bool PPPData::autoDNS() { bool set = (bool) readNumConfig(cgroup, AUTODNS_KEY, true); - return (set && gpppdata.pppdVersionMin(2, 3, 7)); + return (set && PPPData::data()->pppdVersionMin(2, 3, 7)); } @@ -1139,49 +1144,49 @@ void PPPData::setpppdArgumentDefaults() { } -// graphing widget -void PPPData::setGraphingOptions(bool enable, - QColor bg, - QColor text, - QColor in, - QColor out) -{ - if(config) { - config->setGroup(GRAPH_GRP); - config->writeEntry(GENABLED, enable); -// config->writeEntry(GCOLOR_BG, bg); -// config->writeEntry(GCOLOR_TEXT, text); -// config->writeEntry(GCOLOR_IN, in); -// config->writeEntry(GCOLOR_OUT, out); - } -} +// // graphing widget +// void PPPData::setGraphingOptions(bool enable, +// QColor bg, +// QColor text, +// QColor in, +// QColor out) +// { +// if(config) { +// config->setGroup(GRAPH_GRP); +// config->writeEntry(GENABLED, enable); +// // config->writeEntry(GCOLOR_BG, bg); +// // config->writeEntry(GCOLOR_TEXT, text); +// // config->writeEntry(GCOLOR_IN, in); +// // config->writeEntry(GCOLOR_OUT, out); +// } +// } -void PPPData::graphingOptions(bool &enable, - QColor &bg, - QColor &text, - QColor &in, - QColor &out) -{ - QColor c; +// void PPPData::graphingOptions(bool &enable, +// QColor &bg, +// QColor &text, +// QColor &in, +// QColor &out) +// { +// QColor c; - if(config) { - config->setGroup(GRAPH_GRP); - enable = config->readBoolEntry(GENABLED, true); - bg = Qt::white; - //bg = config->readColorEntry(GCOLOR_BG, &c); - text = Qt::black; - //text = config->readColorEntry(GCOLOR_TEXT, &c); - in = Qt::blue; - //in = config->readColorEntry(GCOLOR_IN, &c); - out = Qt::red; - //out = config->readColorEntry(GCOLOR_OUT, &c); - } -} +// if(config) { +// config->setGroup(GRAPH_GRP); +// enable = config->readBoolEntry(GENABLED, true); +// bg = Qt::white; +// //bg = config->readColorEntry(GCOLOR_BG, &c); +// text = Qt::black; +// //text = config->readColorEntry(GCOLOR_TEXT, &c); +// in = Qt::blue; +// //in = config->readColorEntry(GCOLOR_IN, &c); +// out = Qt::red; +// //out = config->readColorEntry(GCOLOR_OUT, &c); +// } +// } -bool PPPData::graphingEnabled() { - return (bool) readNumConfig(GRAPH_GRP, GENABLED, true); -} +// bool PPPData::graphingEnabled() { +// return (bool) readNumConfig(GRAPH_GRP, GENABLED, true); +// } @@ -1205,25 +1210,25 @@ void PPPData::setpppdError(int err) { } -// -// window position -// -void PPPData::winPosConWin(int& p_x, int& p_y) { - p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, QApplication::desktop()->width()/2-160); - p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, QApplication::desktop()->height()/2-55); -} +// // +// // window position +// // +// void PPPData::winPosConWin(int& p_x, int& p_y) { +// p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, QApplication::desktop()->width()/2-160); +// p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, QApplication::desktop()->height()/2-55); +// } -void PPPData::setWinPosConWin(int p_x, int p_y) { - writeConfig(WINPOS_GRP, WINPOS_CONWIN_X, p_x); - writeConfig(WINPOS_GRP, WINPOS_CONWIN_Y, p_y); -} +// void PPPData::setWinPosConWin(int p_x, int p_y) { +// writeConfig(WINPOS_GRP, WINPOS_CONWIN_X, p_x); +// writeConfig(WINPOS_GRP, WINPOS_CONWIN_Y, p_y); +// } -void PPPData::winPosStatWin(int& p_x, int& p_y) { - p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, QApplication::desktop()->width()/2-160); - p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, QApplication::desktop()->height()/2-55); -} +// void PPPData::winPosStatWin(int& p_x, int& p_y) { +// p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, QApplication::desktop()->width()/2-160); +// p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, QApplication::desktop()->height()/2-55); +// } -void PPPData::setWinPosStatWin(int p_x, int p_y) { - writeConfig(WINPOS_GRP, WINPOS_STATWIN_X, p_x); - writeConfig(WINPOS_GRP, WINPOS_STATWIN_Y, p_y); -} +// void PPPData::setWinPosStatWin(int p_x, int p_y) { +// writeConfig(WINPOS_GRP, WINPOS_STATWIN_X, p_x); +// writeConfig(WINPOS_GRP, WINPOS_STATWIN_Y, p_y); +// } diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h index e286b70..57ce2fd 100644 --- a/noncore/settings/networksettings/ppp/pppdata.h +++ b/noncore/settings/networksettings/ppp/pppdata.h @@ -55,11 +55,11 @@ class Config; // // groups -#define GENERAL_GRP "General" -#define MODEM_GRP "Modem" -#define ACCOUNT_GRP "Account" -#define GRAPH_GRP "Graph" -#define WINPOS_GRP "WindowPosition" +#define GENERAL_GRP "PPP_General" +#define MODEM_GRP "PPP_Modem" +#define ACCOUNT_GRP "PPP_Account" +//#define GRAPH_GRP "Graph" +//#define WINPOS_GRP "WindowPosition" // general #define DEFAULTACCOUNT_KEY "DefaultAccount" @@ -161,6 +161,7 @@ class PPPData { public: PPPData(); ~PPPData() {}; + static PPPData* data(); enum { NumInitStrings = 2 }; @@ -168,7 +169,7 @@ public: bool open(); void save(); void cancel(); - int access() const; // read/write access +// int access() const; // read/write access // function to read/write date to configuration file QString readConfig(const QString &, const QString &, const QString &); @@ -426,28 +427,31 @@ public: 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); +// // 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; + QString passwd; - Config* config; // configuration object + static Config* config; // configuration object int highcount; // index of highest account int caccount; // index of the current account QString cgroup; // name of current config group @@ -460,6 +464,4 @@ private: QStringList phonelist; }; -extern PPPData gpppdata; - #endif diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index d6ca88a..da17e26 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -1,6 +1,6 @@ #include "pppconfig.h" #include "pppmodule.h" -//#include "pppimp.h" +#include "pppdata.h" #include "kpppwidget.h" #include "interfaceinformationimp.h" //#include "devices.h" @@ -98,6 +98,7 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ if(imp.exec() == QDialog::Accepted ){ qDebug("ACCEPTED"); return new Interface( 0, newInterface ); + PPPData::data()->save(); } return NULL; } |