author | tille <tille> | 2003-05-25 14:25:23 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-25 14:25:23 (UTC) |
commit | 61c6231cdcde59f8a3ecff31b9fab37f7e9d8852 (patch) (side-by-side diff) | |
tree | 4724031209e2263c872ad6160ea61a793f09ed1e /noncore/settings | |
parent | efa6dfa3428746451dd5a9b5e1ba57806ae96dba (diff) | |
download | opie-61c6231cdcde59f8a3ecff31b9fab37f7e9d8852.zip opie-61c6231cdcde59f8a3ecff31b9fab37f7e9d8852.tar.gz opie-61c6231cdcde59f8a3ecff31b9fab37f7e9d8852.tar.bz2 |
save device specific settings
-rw-r--r-- | noncore/settings/networksettings/ppp/conwindow.cpp | 110 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/ppp.pro | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppconfig.cpp | 27 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppconfig.h | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdata.cpp | 54 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdata.h | 16 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppmodule.cpp | 24 |
7 files changed, 130 insertions, 109 deletions
diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp index ad89005..20d705d 100644 --- a/noncore/settings/networksettings/ppp/conwindow.cpp +++ b/noncore/settings/networksettings/ppp/conwindow.cpp @@ -259,67 +259,67 @@ void ConWindow::setConnectionSpeed(const QString &speed) { void ConWindow::stopClock() { clocktimer->stop(); } void ConWindow::timeclick() { - QString tooltip = i18n("Connection: %1\n" - "Connected at: %2\n" - "Time connected: %3") - .arg(PPPData::data()->accname()).arg(info2->text()) - .arg(time_string2); - - if(accountingEnabled) - tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2") - .arg(session_bill->text()).arg(total_bill->text()); - // volume accounting - if(volumeAccountingEnabled) { - - volinfo->setEnabled(TRUE); - int bytes = PPPData::data()->totalBytes(); - volinfo->setText(prettyPrintVolume(bytes)); - } - - seconds++; - - if(seconds >= 60 ) { - minutes ++; - seconds = 0; - } - - if (minutes >= 60){ - minutes = 0; - hours ++; - } - - if( hours >= 24){ - days ++; - hours = 0; - } - - time_string.sprintf("%02d:%02d",hours,minutes); - time_string2 = ""; - if (days) - time_string2.sprintf("%d d %02d:%02d:%02d", - days,hours,minutes,seconds); - - else - time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds); - - caption_string = PPPData::data()->accname(); - caption_string += " "; - caption_string += time_string; - - - timelabel2->setText(time_string2); - - 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); - } +// QString tooltip = i18n("Connection: %1\n" +// "Connected at: %2\n" +// "Time connected: %3") +// .arg(PPPData::data()->accname()).arg(info2->text()) +// .arg(time_string2); + +// if(accountingEnabled) +// tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2") +// .arg(session_bill->text()).arg(total_bill->text()); +// // volume accounting +// if(volumeAccountingEnabled) { + +// volinfo->setEnabled(TRUE); +// int bytes = PPPData::data()->totalBytes(); +// volinfo->setText(prettyPrintVolume(bytes)); +// } + +// seconds++; + +// if(seconds >= 60 ) { +// minutes ++; +// seconds = 0; +// } + +// if (minutes >= 60){ +// minutes = 0; +// hours ++; +// } + +// if( hours >= 24){ +// days ++; +// hours = 0; +// } + +// time_string.sprintf("%02d:%02d",hours,minutes); +// time_string2 = ""; +// if (days) +// time_string2.sprintf("%d d %02d:%02d:%02d", +// days,hours,minutes,seconds); + +// else +// time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds); + +// caption_string = PPPData::data()->accname(); +// caption_string += " "; +// caption_string += time_string; + + +// timelabel2->setText(time_string2); + +// 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); +// } // QToolTip::add(DockWidget::dock_widget, tooltip); } void ConWindow::closeEvent( QCloseEvent *e ){ diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro index e3c58d6..ac438dd 100644 --- a/noncore/settings/networksettings/ppp/ppp.pro +++ b/noncore/settings/networksettings/ppp/ppp.pro @@ -2,15 +2,15 @@ # 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 kpppwidget.h conwindow.h accounts.h connect.h edit.h scriptedit.h pppdargs.h iplined.h pwentry.h pppconfig.h -# knuminput.h knumvalidator.h +# SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp kpppwidget.cpp conwindow.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp -#knuminput.cpp knumvalidator.cpp +# INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -L../interfaces/ -linterfaces INTERFACES = TARGET = pppplugin VERSION = 1.0.0 diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp index c0f1fef..e2521a6 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.cpp +++ b/noncore/settings/networksettings/ppp/pppconfig.cpp @@ -2,31 +2,36 @@ #include <qlayout.h> #include <qmessagebox.h> #include <qtabwidget.h> #include "accounts.h" #include "general.h" +#include "interface.h" +#include "modem.h" #include "pppconfig.h" #include "pppdata.h" #include "runtests.h" -#include "modem.h" -PPPConfigWidget::PPPConfigWidget( QWidget *parent, const char *name, +PPPConfigWidget::PPPConfigWidget( Interface* iface, QWidget *parent, + const char *name, bool modal, WFlags fl ) : QDialog(parent, name, modal, fl) { setCaption(tr("Configure Modem")); - int result = runTests(); - if(result == TEST_CRITICAL){ - QMessageBox::critical(0, tr("Modem failure"), tr("A critical failure appeard while testing the modem") ); - return; - } - -// setFixedSize(sizeHint()); + int result = runTests(); + if(result == TEST_CRITICAL){ + QMessageBox::critical(0, tr("Modem failure"), tr("A critical failure appeard while testing the modem") ); + return; + } - (void)new Modem; + interface = iface; + if (!PPPData::data()->setModemDevice( interface->getInterfaceName() )) + PPPData::data()->setModemDevice("/dev/modem"); + if (!PPPData::data()->setAccount( interface->getHardwareName() )) + PPPData::data()->setAccount( 0 ); + (void)new Modem; QVBoxLayout *layout = new QVBoxLayout( this ); layout->setSpacing( 0 ); layout->setMargin( 1 ); tabWindow = new QTabWidget( this, "tabWidget" ); layout->addWidget( tabWindow ); @@ -47,12 +52,14 @@ PPPConfigWidget::~PPPConfigWidget() { } void PPPConfigWidget::accept() { + interface->setInterfaceName( PPPData::data()->modemDevice() ); + interface->setHardwareName( PPPData::data()->accname() ); PPPData::data()->save(); QDialog::accept(); } void PPPConfigWidget::reject() diff --git a/noncore/settings/networksettings/ppp/pppconfig.h b/noncore/settings/networksettings/ppp/pppconfig.h index ec64878..b324b6d 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.h +++ b/noncore/settings/networksettings/ppp/pppconfig.h @@ -1,31 +1,33 @@ #ifndef _PPPCONFIG_H_ #define _PPPCONFIG_H_ #include <qdialog.h> class QTabWidget; +class Interface; class AccountWidget; class GeneralWidget; class ModemWidget; class ModemWidget2; class PPPConfigWidget : public QDialog { Q_OBJECT public: - PPPConfigWidget( QWidget *parent=0, const char *name=0, + PPPConfigWidget( Interface*, QWidget *parent=0, const char *name=0, bool modal = false, WFlags fl = 0 ); ~PPPConfigWidget(); protected slots: virtual void accept(); virtual void reject(); private: + Interface *interface; QTabWidget *tabWindow; AccountWidget *accounts; GeneralWidget *general; ModemWidget *modem1; ModemWidget2 *modem2; }; diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp index bb1c8ed..109e3b7 100644 --- a/noncore/settings/networksettings/ppp/pppdata.cpp +++ b/noncore/settings/networksettings/ppp/pppdata.cpp @@ -57,13 +57,14 @@ PPPData* PPPData::data() PPPData::PPPData() : //config(0L), highcount(-1), // start out with no entries caccount(-1), // set the current account index also suidprocessid(-1), // process ID of setuid child pppdisrunning(false), - pppderror(0) + pppderror(0), + modemDeviceGroup(-1) { } // // open configuration file @@ -324,14 +325,22 @@ void PPPData::setpppdTimeout(int n) { const QString PPPData::modemDevice() { return readConfig (modemGroup(), MODEMDEV_KEY, devices[DEV_DEFAULT]); } -void PPPData::setModemDevice(const QString &n) { - writeConfig(modemGroup(), MODEMDEV_KEY, n); +bool PPPData::setModemDevice(const QString &n) { + //FIXME: change modem group + bool ret = false; + for (int i = 0; devices[i]; i++) + if (devices[i] == n){ + modemDeviceGroup = i; + writeConfig(modemGroup(), MODEMDEV_KEY, n); + ret = true; + } + return ret; } const QString PPPData::flowcontrol() { return readConfig(modemGroup(), FLOWCONTROL_KEY, "CRTSCTS"); } @@ -1090,39 +1099,39 @@ QStringList &PPPData::script() { void PPPData::setScript(QStringList &list) { writeListConfig(cgroup, SCRIPTARG_KEY, list); } -const QString PPPData::accountingFile() { - return readConfig(cgroup, ACCTFILE_KEY); -} +// const QString PPPData::accountingFile() { +// return readConfig(cgroup, ACCTFILE_KEY); +// } -void PPPData::setAccountingFile(const QString &n) { - writeConfig(cgroup, ACCTFILE_KEY, n); -} +// void PPPData::setAccountingFile(const QString &n) { +// writeConfig(cgroup, ACCTFILE_KEY, n); +// } -const QString PPPData::totalCosts() { - return readConfig(cgroup, TOTALCOSTS_KEY); -} +// const QString PPPData::totalCosts() { +// return readConfig(cgroup, TOTALCOSTS_KEY); +// } -void PPPData::setTotalCosts(const QString &n) { - writeConfig(cgroup, TOTALCOSTS_KEY, n); -} +// void PPPData::setTotalCosts(const QString &n) { +// writeConfig(cgroup, TOTALCOSTS_KEY, n); +// } -int PPPData::totalBytes() { - return readNumConfig(cgroup, TOTALBYTES_KEY, 0); -} +// int PPPData::totalBytes() { +// return readNumConfig(cgroup, TOTALBYTES_KEY, 0); +// } -void PPPData::setTotalBytes(int n) { - writeConfig(cgroup, TOTALBYTES_KEY, n); -} +// void PPPData::setTotalBytes(int n) { +// writeConfig(cgroup, TOTALBYTES_KEY, n); +// } QStringList &PPPData::pppdArgument() { static QStringList arglist; while(arglist.count() > MAX_PPPD_ARGUMENTS) @@ -1208,13 +1217,14 @@ int PPPData::pppdError() const { void PPPData::setpppdError(int err) { pppderror = err; } QString PPPData::modemGroup() { - return MODEM_GRP; + if (modemDeviceGroup<0)qFatal("wrong modem %i",modemDeviceGroup); + return QString("MODEM_GRP_%1").arg(modemDeviceGroup); } // // // // window position // // // void PPPData::winPosConWin(int& p_x, int& p_y) { diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h index c4d7bc3..41dfbd8 100644 --- a/noncore/settings/networksettings/ppp/pppdata.h +++ b/noncore/settings/networksettings/ppp/pppdata.h @@ -238,13 +238,13 @@ public: const QString modemEscapeStr(); void setModemEscapeResp(const QString &); const QString modemEscapeResp(); const QString modemDevice(); - void setModemDevice(const QString &); + bool setModemDevice(const QString &); const QString flowcontrol(); void setFlowcontrol(const QString &); int modemTimeout(); void setModemTimeout(int); @@ -416,20 +416,20 @@ public: void setpppdRunning(bool set); int pppdError() const; void setpppdError(int err); // functions to set/query the accounting info - const QString accountingFile(); - void setAccountingFile(const QString &); +// const QString accountingFile(); +// void setAccountingFile(const QString &); - const QString totalCosts(); - void setTotalCosts(const QString &); +// const QString totalCosts(); +// void setTotalCosts(const QString &); - int totalBytes(); - void setTotalBytes(int); +// int totalBytes(); +// void setTotalBytes(int); // // graphing widget // void setGraphingOptions(bool enabled, // QColor bg, // QColor text, // QColor in, @@ -447,13 +447,13 @@ public: // void winPosStatWin(int &, int &); // void setWinPosStatWin(int, int); private: static PPPData *_data; - + int modemDeviceGroup; QString passwd; 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 pid_t suidprocessid; // process ID of setuid child diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index fb2f3e5..3a97535 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -53,26 +53,27 @@ bool PPPModule::isOwner(Interface *i){ /** * Create, and return the WLANConfigure Module * @return QWidget* pointer to this modules configure. */ QWidget *PPPModule::configure(Interface *i){ qDebug("return ModemWidget"); - PPPConfigWidget *pppconfig = new PPPConfigWidget( 0, "PPPConfig", false, + PPPConfigWidget *pppconfig = new PPPConfigWidget( i, 0, "PPPConfig", + false, Qt::WDestructiveClose ); return pppconfig; } /** * Create, and return the Information Module * @return QWidget* pointer to this modules info. */ QWidget *PPPModule::information(Interface *i){ // We don't have any advanced pppd information widget yet :-D // TODO ^ qDebug("return PPPModule::information"); - InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i); + InterfaceInformationImp *information = new InterfaceInformationImp( 0, "InterfaceSetupImp", i); return information; } /** * Get all active (up or down) interfaces * @return QList<Interface> A list of interfaces that exsist that havn't @@ -91,24 +92,25 @@ QList<Interface> PPPModule::getInterfaces(){ * @return Interface* NULL if it was unable to be created. */ Interface *PPPModule::addNewInterface(const QString &newInterface){ qDebug("try to add iface %s",newInterface.latin1()); - PPPConfigWidget imp(0, "PPPConfigImp", true); + Interface *iface; + iface = new Interface(); + PPPConfigWidget imp(iface, 0, "PPPConfigImp", true); imp.showMaximized(); if(imp.exec() == QDialog::Accepted ){ - qDebug("ACCEPTED"); - PPPData::data()->save(); - Interface *iface; - iface = new Interface( 0, PPPData::data()->modemDevice() ); - iface->setHardwareName( PPPData::data()->accname() ); - list.append( iface ); - return iface; + iface->setModuleOwner( this ); + list.append( iface ); + return iface; + }else { + delete iface; + iface = NULL; } - return NULL; + return iface; } /** * Attempts to remove the interface, doesn't delete i * @return bool true if successfull, false otherwise. */ |