4 files changed, 26 insertions, 16 deletions

diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO
index c587f58..7a71142 100644
--- a/noncore/net/networksetup/TODO
+++ b/noncore/net/networksetup/TODO
@@ -1,6 +1,11 @@
-Write a class that parses /proc and not ifconfig
 WLAN needs to be re-written to not use Config
-remove WLAN Config item
+-remove WLAN Config item
+-sub class out the wlan info
+-check if an interface supports wireless extensions before config.
+
+PPP module needs to be written
+
+Write a class that parses /proc and not ifconfig
+
+Possible other modules: ipsec, bluetooth
 
-[ ] Wlanmodule needs to check if an interface supports wireless
-    extensions.
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 8e4e898..843f630 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -162,141 +162,141 @@ void MainWindowImp::addClicked(){
   // See if the list has anything that we can add.

   if(list.count() == 0){

     QMessageBox::information(this, "Sorry", "Nothing to add.", "Ok");

     return;

   }

   AddConnectionImp addNewConnection(this, "AddConnectionImp", true);

   addNewConnection.addConnections(list);

   addNewConnection.showMaximized();

   if(QDialog::Accepted == addNewConnection.exec()){

     QListViewItem *item = addNewConnection.registeredServicesList->currentItem();

     if(!item)

       return;

     

     for( it = libraries.begin(); it != libraries.end(); ++it ){

       if(it.key()){

         Interface *i = (it.key())->addNewInterface(item->text(0));

         if(i){

           interfaceNames.insert(i->getInterfaceName(), i);

           updateInterface(i);

         }

       }

     }

   }

 }

 

 /**

  * Prompt the user to see if they really want to do this.

  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item) {

-    QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+    QMessageBox::information(this, "Sorry","Please select an interface First.", "Ok");

     return; 

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner() == NULL){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

   else{

     if(!i->getModuleOwner()->remove(i))

       QMessageBox::information(this, "Error", "Unable to remove.", "Ok");

     else{

       QMessageBox::information(this, "Success", "Interface was removed.", "Ok");

       // TODO memory managment....

       // who deletes the interface?

     }

   }

 }

 

 /**

  * Pull up the configure about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

-    QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok);

+    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);

     QTabWidget *tabWidget = NULL;

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

     if(moduleConfigure != NULL){

       if(tabWidget != NULL){

         InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);

         configure->setProfile(currentProfile);

         tabWidget->insertTab(configure, "TCP/IP");

       

       }

       moduleConfigure->showMaximized();

       moduleConfigure->show();

       return;

     }

   }

   

   InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);

   configure->setProfile(currentProfile);

   configure->showMaximized();

   configure->show();

 }

 

 /**

  * Pull up the information about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

-    QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok);

+    QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);

     return;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

-    QMessageBox::information(this, "Error","No information about\na disconnected interface.", QMessageBox::Ok);

+    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()){

     QTabWidget *tabWidget = NULL;

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

     if(moduleInformation != NULL){

       if(tabWidget != NULL){

         InterfaceInformationImp *information = new InterfaceInformationImp(tabWidget, "InterfaceSetupImp", i, true);

         tabWidget->insertTab(information, "TCP/IP");

       }

       moduleInformation->showMaximized();

       moduleInformation->show();

       return;

     }

   }  

   

   InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);

   information->showMaximized();

   information->show();

 }

 

 /**

  * Aquire the list of active interfaces from ifconfig

  * Call ifconfig and ifconfig -a

  */ 

 void MainWindowImp::getInterfaceList(){

diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index c587f58..7a71142 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -1,6 +1,11 @@
-Write a class that parses /proc and not ifconfig
 WLAN needs to be re-written to not use Config
-remove WLAN Config item
+-remove WLAN Config item
+-sub class out the wlan info
+-check if an interface supports wireless extensions before config.
+
+PPP module needs to be written
+
+Write a class that parses /proc and not ifconfig
+
+Possible other modules: ipsec, bluetooth
 
-[ ] Wlanmodule needs to check if an interface supports wireless
-    extensions.
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 8e4e898..843f630 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -162,141 +162,141 @@ void MainWindowImp::addClicked(){
   // See if the list has anything that we can add.

   if(list.count() == 0){

     QMessageBox::information(this, "Sorry", "Nothing to add.", "Ok");

     return;

   }

   AddConnectionImp addNewConnection(this, "AddConnectionImp", true);

   addNewConnection.addConnections(list);

   addNewConnection.showMaximized();

   if(QDialog::Accepted == addNewConnection.exec()){

     QListViewItem *item = addNewConnection.registeredServicesList->currentItem();

     if(!item)

       return;

     

     for( it = libraries.begin(); it != libraries.end(); ++it ){

       if(it.key()){

         Interface *i = (it.key())->addNewInterface(item->text(0));

         if(i){

           interfaceNames.insert(i->getInterfaceName(), i);

           updateInterface(i);

         }

       }

     }

   }

 }

 

 /**

  * Prompt the user to see if they really want to do this.

  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item) {

-    QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+    QMessageBox::information(this, "Sorry","Please select an interface First.", "Ok");

     return; 

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner() == NULL){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

   else{

     if(!i->getModuleOwner()->remove(i))

       QMessageBox::information(this, "Error", "Unable to remove.", "Ok");

     else{

       QMessageBox::information(this, "Success", "Interface was removed.", "Ok");

       // TODO memory managment....

       // who deletes the interface?

     }

   }

 }

 

 /**

  * Pull up the configure about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

-    QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok);

+    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);

     QTabWidget *tabWidget = NULL;

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

     if(moduleConfigure != NULL){

       if(tabWidget != NULL){

         InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);

         configure->setProfile(currentProfile);

         tabWidget->insertTab(configure, "TCP/IP");

       

       }

       moduleConfigure->showMaximized();

       moduleConfigure->show();

       return;

     }

   }

   

   InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);

   configure->setProfile(currentProfile);

   configure->showMaximized();

   configure->show();

 }

 

 /**

  * Pull up the information about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

-    QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok);

+    QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);

     return;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

-    QMessageBox::information(this, "Error","No information about\na disconnected interface.", QMessageBox::Ok);

+    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()){

     QTabWidget *tabWidget = NULL;

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

     if(moduleInformation != NULL){

       if(tabWidget != NULL){

         InterfaceInformationImp *information = new InterfaceInformationImp(tabWidget, "InterfaceSetupImp", i, true);

         tabWidget->insertTab(information, "TCP/IP");

       }

       moduleInformation->showMaximized();

       moduleInformation->show();

       return;

     }

   }  

   

   InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);

   information->showMaximized();

   information->show();

 }

 

 /**

  * Aquire the list of active interfaces from ifconfig

  * Call ifconfig and ifconfig -a

  */ 

 void MainWindowImp::getInterfaceList(){