save device specific settings

7 files changed, 120 insertions, 99 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
@@ -263,59 +263,59 @@ void ConWindow::stopClock() {
 
 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);
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
@@ -6,7 +6,7 @@ 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
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
@@ -6,10 +6,12 @@
 #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)
@@ -22,6 +24,9 @@ PPPConfigWidget::PPPConfigWidget( QWidget *parent, const char *name,
   }
 
-//  setFixedSize(sizeHint());
-
+    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;
 
@@ -51,4 +56,6 @@ PPPConfigWidget::~PPPConfigWidget()
 void PPPConfigWidget::accept()
 {
+    interface->setInterfaceName( PPPData::data()->modemDevice() );
+    interface->setHardwareName( PPPData::data()->accname() );
     PPPData::data()->save();
     QDialog::accept();
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
@@ -5,4 +5,5 @@
 
 class QTabWidget;
+class Interface;
 class AccountWidget;
 class GeneralWidget;
@@ -14,5 +15,5 @@ class PPPConfigWidget : public QDialog {
 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();	
@@ -24,4 +25,5 @@ protected slots:
 
  private:
+    Interface *interface;
   QTabWidget *tabWindow;
   AccountWidget *accounts;
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
@@ -61,5 +61,6 @@ PPPData::PPPData()
      suidprocessid(-1),    // process ID of setuid child
      pppdisrunning(false),
-     pppderror(0)
+     pppderror(0),
+     modemDeviceGroup(-1)
 {
 }
@@ -328,6 +329,14 @@ const QString PPPData::modemDevice() {
 
 
-void PPPData::setModemDevice(const QString &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;
 }
 
@@ -1094,31 +1103,31 @@ void PPPData::setScript(QStringList &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);
+// }
 
 
@@ -1212,5 +1221,6 @@ void PPPData::setpppdError(int err) {
 QString PPPData::modemGroup()
 {
-    return MODEM_GRP;
+    if (modemDeviceGroup<0)qFatal("wrong modem %i",modemDeviceGroup);
+    return QString("MODEM_GRP_%1").arg(modemDeviceGroup);
 }
 
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
@@ -242,5 +242,5 @@ public:
 
   const QString modemDevice();
-  void setModemDevice(const QString &);
+  bool setModemDevice(const QString &);
 
   const QString flowcontrol();
@@ -420,12 +420,12 @@ public:
 
   // 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
@@ -451,5 +451,5 @@ private:
 
     static PPPData *_data;
-
+    int modemDeviceGroup;
     QString passwd;
     static Config* config;                       // configuration object
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
@@ -57,5 +57,6 @@ bool PPPModule::isOwner(Interface *i){
 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;
@@ -95,16 +96,17 @@ 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() );
+      iface->setModuleOwner( this );
               list.append( iface );
               return iface;
+  }else {
+      delete iface;
+      iface = NULL;
   }
-  return NULL;
+  return iface;
 }