Re-added profile information which makes interfaces work again

19 files changed, 59 insertions, 47 deletions

diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO
index 0584f81..ec6d2c6 100644
--- a/noncore/net/networksetup/TODO
+++ b/noncore/net/networksetup/TODO
@@ -3,14 +3,14 @@ CLEAN UP
 Fix Profiles
 
 Write dns script
 
-
 WLAN needs to be re-written to not use Config
-WHERE Is DHCP info stored???
-
-PPP module needs to be written
 
 Write a class that parses /proc and not ifconfig
+udchcp needs to output the dhcp information
+
+Possible other modules to write: ppp, ipsec, bluetooth, ipchains
+
+PPP module needs to scan pppd.tdb to see what is currently active
 
-Possible other modules: ipsec, bluetooth, ipchains
 
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
index 97c05cc..d42b45d 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
@@ -92,8 +92,9 @@ bool InterfaceSetupImp::saveSettings(){
 void InterfaceSetupImp::setProfile(const QString &profile){
   QString newInterfaceName = interface->getInterfaceName();
   if(profile.length() > 0)
     newInterfaceName += "_" + profile;
+  qDebug("InterfaceSetupImp::setProfile");
   // See if we have to make a interface.
   if(!interfaces->setInterface(newInterfaceName)){
     // Add making for this new interface if need too
     if(profile != ""){
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.h b/noncore/net/networksetup/interfaces/interfacesetupimp.h
index 936f2be..3bbf34e 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.h
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.h
@@ -28,20 +28,26 @@ private:
 
 class InterfaceSetupImpDialog : public QDialog {
 Q_OBJECT
 	
-  public:
+public:
     InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){
     QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this );
     setCaption("Interface Setup");
     interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl);
     InterfaceSetupLayout->addWidget( interfaceSetup );
   };
+  void setProfile(QString &profile){ interfaceSetup->setProfile(profile);};
 
+private:
   InterfaceSetupImp *interfaceSetup;
 
-  protected slots:
-    void accept(){ interfaceSetup->saveChanges(); };
+protected slots:
+  void accept(){
+    interfaceSetup->saveChanges();
+    QDialog::accept();
+  };
+
 };
 
 #endif
 
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index b9fff56..6440bd4 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -229,16 +229,10 @@ void MainWindowImp::configureClicked(){
     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

-  QString currentProfile = currentProfileLabel->text();

-  if(profilesList->count() <= 1 || currentProfile == "All"){

-    currentProfile = "";

-  }

-  

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

-    i->getModuleOwner()->setProfile(currentProfile);

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);

     if(moduleConfigure != NULL){

       moduleConfigure->showMaximized();

       moduleConfigure->show();

@@ -246,9 +240,12 @@ void MainWindowImp::configureClicked(){
     }

   }

   

   InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);

-  //configure->setProfile(currentProfile);

+  QString currentProfileText = currentProfileLabel->text();

+  if(currentProfileText.upper() == "ALL");

+    currentProfileText = "";

+  configure->setProfile(currentProfileText);

   configure->showMaximized();

   configure->show();

 }

 

@@ -269,13 +266,8 @@ void MainWindowImp::informationClicked(){
     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);

     return;

   }

 

-  QStringList list;

-  for(uint i = 0; i < profilesList->count(); i++){

-    list.append(profilesList->text(i));

-  }

-	  

   if(i->getModuleOwner()){

     QWidget *moduleInformation = i->getModuleOwner()->information(i);

     if(moduleInformation != NULL){

       moduleInformation->showMaximized();

@@ -537,8 +529,9 @@ void MainWindowImp::changeProfile(){
           it.key()->restart();

       }

     }

   }

+  // TODO change the profile in the modules

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index 1719a35..5666a42 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -1,11 +1,11 @@
-DESTDIR   = $(OPIEDIR)/bin
+#DESTDIR   = $(OPIEDIR)/bin
 TEMPLATE  = app
 #CONFIG   = qt warn_on debug
 CONFIG    = qt warn_on release
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  kprocctrl.h module.h  kprocess.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kprocess.cpp
 INCLUDEPATH += $(OPIEDIR)/include interfaces/
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan
-LIBS            += -lqpe -L$(OPIEDIR)/plugins/networksetup -linterfaces
+LIBS            += -lqpe -L$(OPIEDIR)/plugins/networksetup -Linterfaces/ -linterfaces
 INTERFACES  = mainwindow.ui addconnection.ui
 TARGET    = networksetup
diff --git a/noncore/net/networksetup/opie-networksetup.control b/noncore/net/networksetup/opie-networksetup.control
index 35bac52..d14e2d1 100644
--- a/noncore/net/networksetup/opie-networksetup.control
+++ b/noncore/net/networksetup/opie-networksetup.control
@@ -1,5 +1,5 @@
-Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh 
 Priority: optional
 Section: opie/settings
 Maintainer: Ben Meyer <meyerb@sharpsec.com> 
 Architecture: arm
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index a466020..74bf390 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -32,8 +32,12 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
 WLANImp::~WLANImp( ){
   delete config;
 }
 
+void WLANImp::setProfile(QString &profile){
+  interfaceSetup->setProfile(profile);
+}
+
 void WLANImp::readConfig()
 {
     qWarning( "WLANImp::readConfig() called." );
     config->setGroup( "Properties" );
diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h
index 608d681..faa1674 100644
--- a/noncore/net/networksetup/wlan/wlanimp.h
+++ b/noncore/net/networksetup/wlan/wlanimp.h
@@ -12,8 +12,9 @@ class WLANImp : public WLAN {
 
 public:
   WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 );
   ~WLANImp( );
+  void setProfile(QString &profile);
 
 protected:
   void accept();
 
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index c8becb0..b14fc0a 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -59,8 +59,9 @@ bool WLANModule::isOwner(Interface *i){
  * @return QWidget* pointer to this modules configure.
  */ 
 QWidget *WLANModule::configure(Interface *i){
   WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false,  Qt::WDestructiveClose);
+  wlanconfig->setProfile(profile);
   return wlanconfig;
 }
 
 /**
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index 0584f81..ec6d2c6 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -3,14 +3,14 @@ CLEAN UP
 Fix Profiles
 
 Write dns script
 
-
 WLAN needs to be re-written to not use Config
-WHERE Is DHCP info stored???
-
-PPP module needs to be written
 
 Write a class that parses /proc and not ifconfig
+udchcp needs to output the dhcp information
+
+Possible other modules to write: ppp, ipsec, bluetooth, ipchains
+
+PPP module needs to scan pppd.tdb to see what is currently active
 
-Possible other modules: ipsec, bluetooth, ipchains
 
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 97c05cc..d42b45d 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -92,8 +92,9 @@ bool InterfaceSetupImp::saveSettings(){
 void InterfaceSetupImp::setProfile(const QString &profile){
   QString newInterfaceName = interface->getInterfaceName();
   if(profile.length() > 0)
     newInterfaceName += "_" + profile;
+  qDebug("InterfaceSetupImp::setProfile");
   // See if we have to make a interface.
   if(!interfaces->setInterface(newInterfaceName)){
     // Add making for this new interface if need too
     if(profile != ""){
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
index 936f2be..3bbf34e 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
@@ -28,20 +28,26 @@ private:
 
 class InterfaceSetupImpDialog : public QDialog {
 Q_OBJECT
 	
-  public:
+public:
     InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){
     QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this );
     setCaption("Interface Setup");
     interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl);
     InterfaceSetupLayout->addWidget( interfaceSetup );
   };
+  void setProfile(QString &profile){ interfaceSetup->setProfile(profile);};
 
+private:
   InterfaceSetupImp *interfaceSetup;
 
-  protected slots:
-    void accept(){ interfaceSetup->saveChanges(); };
+protected slots:
+  void accept(){
+    interfaceSetup->saveChanges();
+    QDialog::accept();
+  };
+
 };
 
 #endif
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index b9fff56..6440bd4 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -229,16 +229,10 @@ void MainWindowImp::configureClicked(){
     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

-  QString currentProfile = currentProfileLabel->text();

-  if(profilesList->count() <= 1 || currentProfile == "All"){

-    currentProfile = "";

-  }

-  

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

-    i->getModuleOwner()->setProfile(currentProfile);

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);

     if(moduleConfigure != NULL){

       moduleConfigure->showMaximized();

       moduleConfigure->show();

@@ -246,9 +240,12 @@ void MainWindowImp::configureClicked(){
     }

   }

   

   InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);

-  //configure->setProfile(currentProfile);

+  QString currentProfileText = currentProfileLabel->text();

+  if(currentProfileText.upper() == "ALL");

+    currentProfileText = "";

+  configure->setProfile(currentProfileText);

   configure->showMaximized();

   configure->show();

 }

 

@@ -269,13 +266,8 @@ void MainWindowImp::informationClicked(){
     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);

     return;

   }

 

-  QStringList list;

-  for(uint i = 0; i < profilesList->count(); i++){

-    list.append(profilesList->text(i));

-  }

-	  

   if(i->getModuleOwner()){

     QWidget *moduleInformation = i->getModuleOwner()->information(i);

     if(moduleInformation != NULL){

       moduleInformation->showMaximized();

@@ -537,8 +529,9 @@ void MainWindowImp::changeProfile(){
           it.key()->restart();

       }

     }

   }

+  // TODO change the profile in the modules

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index 1719a35..5666a42 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,11 +1,11 @@
-DESTDIR   = $(OPIEDIR)/bin
+#DESTDIR   = $(OPIEDIR)/bin
 TEMPLATE  = app
 #CONFIG   = qt warn_on debug
 CONFIG    = qt warn_on release
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  kprocctrl.h module.h  kprocess.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kprocess.cpp
 INCLUDEPATH += $(OPIEDIR)/include interfaces/
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan
-LIBS            += -lqpe -L$(OPIEDIR)/plugins/networksetup -linterfaces
+LIBS            += -lqpe -L$(OPIEDIR)/plugins/networksetup -Linterfaces/ -linterfaces
 INTERFACES  = mainwindow.ui addconnection.ui
 TARGET    = networksetup
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 35bac52..d14e2d1 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,5 +1,5 @@
-Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh 
 Priority: optional
 Section: opie/settings
 Maintainer: Ben Meyer <meyerb@sharpsec.com> 
 Architecture: arm
diff --git a/noncore/settings/networksettings/opie-networksetup.control b/noncore/settings/networksettings/opie-networksetup.control
index 35bac52..d14e2d1 100644
--- a/noncore/settings/networksettings/opie-networksetup.control
+++ b/noncore/settings/networksettings/opie-networksetup.control
@@ -1,5 +1,5 @@
-Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh 
 Priority: optional
 Section: opie/settings
 Maintainer: Ben Meyer <meyerb@sharpsec.com> 
 Architecture: arm
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index a466020..74bf390 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -32,8 +32,12 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
 WLANImp::~WLANImp( ){
   delete config;
 }
 
+void WLANImp::setProfile(QString &profile){
+  interfaceSetup->setProfile(profile);
+}
+
 void WLANImp::readConfig()
 {
     qWarning( "WLANImp::readConfig() called." );
     config->setGroup( "Properties" );
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h
index 608d681..faa1674 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.h
+++ b/noncore/settings/networksettings/wlan/wlanimp.h
@@ -12,8 +12,9 @@ class WLANImp : public WLAN {
 
 public:
   WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 );
   ~WLANImp( );
+  void setProfile(QString &profile);
 
 protected:
   void accept();
 
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index c8becb0..b14fc0a 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -59,8 +59,9 @@ bool WLANModule::isOwner(Interface *i){
  * @return QWidget* pointer to this modules configure.
  */ 
 QWidget *WLANModule::configure(Interface *i){
   WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false,  Qt::WDestructiveClose);
+  wlanconfig->setProfile(profile);
   return wlanconfig;
 }
 
 /**