interfaces now watches for # in most cases

8 files changed, 34 insertions, 34 deletions

diff --git a/noncore/net/networksetup/interfaceinformation.ui b/noncore/net/networksetup/interfaceinformation.ui
index fc99fce..2838d19 100644
--- a/noncore/net/networksetup/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaceinformation.ui
@@ -30,82 +30,82 @@
         </property>
         <widget row="4"  column="0"  rowspan="1"  colspan="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout1</cstring>
             </property>
             <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget row="1"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>refreshButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Refresh</string>
+                        <string>&amp;Refresh</string>
                     </property>
                 </widget>
                 <widget row="0"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>stopButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Stop</string>
+                        <string>S&amp;top</string>
                     </property>
                 </widget>
                 <widget row="1"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>restartButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Restart</string>
+                        <string>R&amp;estart</string>
                     </property>
                 </widget>
                 <widget row="0"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>startButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Start</string>
+                        <string>&amp;Start</string>
                     </property>
                 </widget>
             </grid>
         </widget>
         <widget row="0"  column="0" >
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Line1</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel22</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>IP Address</string>
@@ -272,74 +272,72 @@
                     <property stdset="1">
                         <name>orientation</name>
                         <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
                         <name>sizeType</name>
                         <enum>Expanding</enum>
                     </property>
                     <property>
                         <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>advancedButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>View Advanced Information</string>
+                        <string>View &amp;Advanced Information</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Line5</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
         <class>QWidget</class>
         <header location="local">qwidget.h</header>
         <sizehint>
             <width>100</width>
             <height>100</height>
         </sizehint>
         <container>0</container>
         <sizepolicy>
             <hordata>7</hordata>
             <verdata>7</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
     </customwidget>
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
-<connections>
-</connections>
 <tabstops>
     <tabstop>startButton</tabstop>
     <tabstop>stopButton</tabstop>
     <tabstop>refreshButton</tabstop>
     <tabstop>restartButton</tabstop>
     <tabstop>advancedButton</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp
index 9155890..377a6db 100644
--- a/noncore/net/networksetup/interfaces.cpp
+++ b/noncore/net/networksetup/interfaces.cpp
@@ -30,49 +30,49 @@ Interfaces::Interfaces(QString useInterfacesFile){
   QTextStream stream( &file );
   QString line;
   while ( !stream.eof() ) {
     line += stream.readLine();
     line += "\n";
   }
   file.close();
   interfaces = QStringList::split("\n", line, true);
   
   currentIface = interfaces.end();
   currentMapping = interfaces.end();
 }
 
 
 /**
  * Get a list of all interfaces in the interface file.  Usefull for
  * hardware that is not currently connected such as an 802.11b card 
  * not plugged in, but configured for when it is plugged in.
  * @return Return string list of interfaces.
  **/ 
 QStringList Interfaces::getInterfaceList(){
   QStringList list;
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
-    if(line.contains(IFACE)){
+    if(line.contains(IFACE) && line.at(0) != '#'){
       line = line.mid(QString(IFACE).length() +1, line.length());
       line = line.simplifyWhiteSpace();
       int findSpace = line.find(" ");
       if( findSpace >= 0){
         line = line.mid(0, findSpace);
         list.append(line);
       }
     }
   }
   return list;
 }
 
 /**
  * Find out if interface is in an "auto" group or not.
  *  Report any duplicates such as eth0 being in two differnt auto's 
  * @param interface interface to check to see if it is on or not.
  * @return true is interface is in auto
  */ 
 bool Interfaces::isAuto(QString interface){
   QStringList autoLines = interfaces.grep(QRegExp(AUTO));
   QStringList awi = autoLines.grep(QRegExp(interface));
   if(awi.count() > 1)
     qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1());
   if(awi.count() < 1)
@@ -436,126 +436,126 @@ bool Interfaces::setScript(QString argument){
   return setOption(currentMapping, "script", argument);
 }
 
 /**
  * @param error true if could not retrieve the current script argument.
  * @return QString the argument of the script for the current mapping.
  */ 
 QString Interfaces::getScript(bool &error){
   return getOption(currentMapping, "script", error);
 }
 
 /**
  * Helper function used to parse through the QStringList and put pointers in 
  *  the correct place.
  * @param stanza The stanza (auto, iface, mapping) to look for.
  * @param option string that must be in the stanza's main line.
  * @param interator interator to place at location of stanza if successfull.
  * @return bool true if the stanza is found.
  */ 
 bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){
   bool found = false;
   iterator = interfaces.end();
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
-    if(line.contains(stanza) && line.contains(option)){
+    if(line.contains(stanza) && line.contains(option) && line.at(0) != '#'){
       uint point = line.find(option);
       bool valid = true;
       if(point > 0){
 	// There are more chars in the line. check +1
         if(line.at(point-1) != ' ')
 	  valid = false;
       }
       point += option.length();
       if(point < line.length()-1){
 	// There are more chars in the line. check -1
         if(line.at(point) != ' ')
 	  valid = false;
       }
       if(valid){
         if(found == true){
           qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
         }
         found = true;
         iterator = it;
       }
     }
   }
   return found;
 }
 
 /**
  * Sets a value of an option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when setting value.
  * @return bool true if successfull, false otherwise.
  */
 bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){
   if(start == interfaces.end())
     return false;
   
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       if(!found && value != ""){
         // Got to the end of the stanza without finding it, so append it.
         interfaces.insert(--it, QString("\t%1 %2").arg(option).arg(value));
       }
       found = true;
       break;
     }
-    if((*it).contains(option) && it != start){
+    if((*it).contains(option) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
       if(found)
         qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
       found = true;
         (*it) = QString("\t%1 %2").arg(option).arg(value);
     }
   }
   if(!found){
     QStringList::Iterator p = start;
     interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value));
     found = true;
   }
   return found;
 }
 /**
  * Removes a option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when setting value.
  * @return bool true if successfull, false otherwise.
  */
 bool Interfaces::removeOption(QStringList::Iterator start, QString option, QString value){
   if(start == interfaces.end())
     return false;
   
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       // got to the end without finding it
       break;
     }
-    if((*it).contains(option) && (*it).contains(value) &&it != start){
+    if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
       if(found)
         qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
       found = true;
       (*it) = "";
     }
   }
   return found;
 }
 
 /**
  * Removes all options in a stanza
  * @param start the start of the stanza
  * @return bool true if successfull, false otherwise.
  */
 bool Interfaces::removeAllOptions(QStringList::Iterator start){
   if(start == interfaces.end())
     return false;
   
   QStringList::Iterator it = start;
   it = ++it;
   for (it; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       break;
@@ -566,49 +566,49 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){
   // Leave a space between this interface and the next.
   interfaces.insert(it, QString(""));
   return true;
 }
 
 /**
  * Gets a value of an option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when getting the value.
  * @param bool true if errors false otherwise.
  * @return QString the value of option QString::null() if error == true.
  */
 QString Interfaces::getOption(QStringList::Iterator start, QString option, bool &error){
   if(start == interfaces.end()){
     error = false;
     return QString();
   }
   
   QString value;
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       break;
     }
-    if((*it).contains(option)){
+    if((*it).contains(option) && (*it).at(0) != '#'){
       if(found)
         qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
       found = true;
       QString line = (*it).simplifyWhiteSpace();
       int space = line.find(" ", option.length());
       if(space != -1)
         value = line.mid(space+1, line.length());
       else
         qDebug(QString("Interfaces: Option %1 with no value").arg(option).latin1());
     }
   }
   error = !found;
   return value;
 }
 
 /**
  * Write out the interfaces file to the file passed into the constructor.
  * Removes any excess blank lines over 1 line long.
  * @return bool true if successfull, false if not.
  */ 
 bool Interfaces::write(){
   QFile::remove(interfacesFile);
   QFile file(interfacesFile);
 
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 01063c2..8e4e898 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -211,95 +211,95 @@ void MainWindowImp::removeClicked(){
 }

 

 /**

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

     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(&tabWidget);

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

     return;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

     QMessageBox::information(this, "Error","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(&tabWidget);

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

   KShellProcess *processAll = new KShellProcess();

   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;

   connect(processAll, SIGNAL(processExited(KProcess *)),

diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index a30f492..96db5b3 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -8,70 +8,72 @@
 
 class QWidget;
 class QTabWidget;
 
 class Module : QObject{
 
 signals:
   void updateInterface(Interface *i);
 	
 public:
   Module(){};
 
   /**
    * The current profile has been changed and the module should do any
    * neccesary changes also.
    * @param newProfile what the profile should be changed to.
    */ 
   virtual void setProfile(QString newProfile) = 0;
   
   /**
    * get the icon name for this device.
    * @param Interface* can be used in determining the icon.
    * @return QString the icon name (minus .png, .gif etc) 
    */ 
-  virtual QString getPixmapName(Interface* i) = 0;
+  virtual QString getPixmapName(Interface *) = 0;
 
   /**
    * Check to see if the interface i is owned by this module.
    * @param Interface* interface to check against
    * @return bool true if i is owned by this module, false otherwise.
    */
   virtual bool isOwner(Interface *){ return false; };
   
   /**
    * Create, set tabWiget and return the WLANConfigure Module
+   * @param Interface *i the interface to configure.
    * @param tabWidget a pointer to the tab widget that this configure has.
    * @return QWidget* pointer to the tab widget in this modules configure.
    */
-  virtual QWidget *configure(QTabWidget **){ return NULL; } ;
+  virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ;
   
   /**
    * Create, set tabWiget and return the Information Module
+   * @param Interface *i the interface to get info on.
    * @param tabWidget a pointer to the tab widget that this information has.
    * @return QWidget* pointer to the tab widget in this modules info.
    */
-  virtual QWidget *information(QTabWidget **){ return NULL; };
+  virtual QWidget *information(Interface *, QTabWidget **){ return NULL; };
   
   /**
    * Get all active (up or down) interfaces
    * @return QList<Interface> A list of interfaces that exsist that havn't
    * been called by isOwner()
    */  
   virtual QList<Interface> getInterfaces() = 0;
   
   /**
    * Adds possible new interfaces to the list (Example: usb(ppp), ir(ppp),
    *  modem ppp)
    */
   virtual void possibleNewInterfaces(QMap<QString, QString> &list) = 0;
   
   /**
    * Attempts to create a new interface from name
    * @return Interface* NULL if it was unable to be created.
    * @param name the type of interface to create
    */  
   virtual Interface *addNewInterface(QString name) = 0;
   
   /**
    * Attempts to remove the interface, doesn't delete i
    * @return bool true if successfull, false otherwise.
diff --git a/noncore/settings/networksettings/interfaceinformation.ui b/noncore/settings/networksettings/interfaceinformation.ui
index fc99fce..2838d19 100644
--- a/noncore/settings/networksettings/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaceinformation.ui
@@ -30,82 +30,82 @@
         </property>
         <widget row="4"  column="0"  rowspan="1"  colspan="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout1</cstring>
             </property>
             <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget row="1"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>refreshButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Refresh</string>
+                        <string>&amp;Refresh</string>
                     </property>
                 </widget>
                 <widget row="0"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>stopButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Stop</string>
+                        <string>S&amp;top</string>
                     </property>
                 </widget>
                 <widget row="1"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>restartButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Restart</string>
+                        <string>R&amp;estart</string>
                     </property>
                 </widget>
                 <widget row="0"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>startButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Start</string>
+                        <string>&amp;Start</string>
                     </property>
                 </widget>
             </grid>
         </widget>
         <widget row="0"  column="0" >
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Line1</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel22</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>IP Address</string>
@@ -272,74 +272,72 @@
                     <property stdset="1">
                         <name>orientation</name>
                         <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
                         <name>sizeType</name>
                         <enum>Expanding</enum>
                     </property>
                     <property>
                         <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>advancedButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>View Advanced Information</string>
+                        <string>View &amp;Advanced Information</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Line5</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
         <class>QWidget</class>
         <header location="local">qwidget.h</header>
         <sizehint>
             <width>100</width>
             <height>100</height>
         </sizehint>
         <container>0</container>
         <sizepolicy>
             <hordata>7</hordata>
             <verdata>7</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
     </customwidget>
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
-<connections>
-</connections>
 <tabstops>
     <tabstop>startButton</tabstop>
     <tabstop>stopButton</tabstop>
     <tabstop>refreshButton</tabstop>
     <tabstop>restartButton</tabstop>
     <tabstop>advancedButton</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/settings/networksettings/interfaces.cpp b/noncore/settings/networksettings/interfaces.cpp
index 9155890..377a6db 100644
--- a/noncore/settings/networksettings/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces.cpp
@@ -30,49 +30,49 @@ Interfaces::Interfaces(QString useInterfacesFile){
   QTextStream stream( &file );
   QString line;
   while ( !stream.eof() ) {
     line += stream.readLine();
     line += "\n";
   }
   file.close();
   interfaces = QStringList::split("\n", line, true);
   
   currentIface = interfaces.end();
   currentMapping = interfaces.end();
 }
 
 
 /**
  * Get a list of all interfaces in the interface file.  Usefull for
  * hardware that is not currently connected such as an 802.11b card 
  * not plugged in, but configured for when it is plugged in.
  * @return Return string list of interfaces.
  **/ 
 QStringList Interfaces::getInterfaceList(){
   QStringList list;
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
-    if(line.contains(IFACE)){
+    if(line.contains(IFACE) && line.at(0) != '#'){
       line = line.mid(QString(IFACE).length() +1, line.length());
       line = line.simplifyWhiteSpace();
       int findSpace = line.find(" ");
       if( findSpace >= 0){
         line = line.mid(0, findSpace);
         list.append(line);
       }
     }
   }
   return list;
 }
 
 /**
  * Find out if interface is in an "auto" group or not.
  *  Report any duplicates such as eth0 being in two differnt auto's 
  * @param interface interface to check to see if it is on or not.
  * @return true is interface is in auto
  */ 
 bool Interfaces::isAuto(QString interface){
   QStringList autoLines = interfaces.grep(QRegExp(AUTO));
   QStringList awi = autoLines.grep(QRegExp(interface));
   if(awi.count() > 1)
     qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1());
   if(awi.count() < 1)
@@ -436,126 +436,126 @@ bool Interfaces::setScript(QString argument){
   return setOption(currentMapping, "script", argument);
 }
 
 /**
  * @param error true if could not retrieve the current script argument.
  * @return QString the argument of the script for the current mapping.
  */ 
 QString Interfaces::getScript(bool &error){
   return getOption(currentMapping, "script", error);
 }
 
 /**
  * Helper function used to parse through the QStringList and put pointers in 
  *  the correct place.
  * @param stanza The stanza (auto, iface, mapping) to look for.
  * @param option string that must be in the stanza's main line.
  * @param interator interator to place at location of stanza if successfull.
  * @return bool true if the stanza is found.
  */ 
 bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){
   bool found = false;
   iterator = interfaces.end();
   for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
-    if(line.contains(stanza) && line.contains(option)){
+    if(line.contains(stanza) && line.contains(option) && line.at(0) != '#'){
       uint point = line.find(option);
       bool valid = true;
       if(point > 0){
 	// There are more chars in the line. check +1
         if(line.at(point-1) != ' ')
 	  valid = false;
       }
       point += option.length();
       if(point < line.length()-1){
 	// There are more chars in the line. check -1
         if(line.at(point) != ' ')
 	  valid = false;
       }
       if(valid){
         if(found == true){
           qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
         }
         found = true;
         iterator = it;
       }
     }
   }
   return found;
 }
 
 /**
  * Sets a value of an option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when setting value.
  * @return bool true if successfull, false otherwise.
  */
 bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){
   if(start == interfaces.end())
     return false;
   
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       if(!found && value != ""){
         // Got to the end of the stanza without finding it, so append it.
         interfaces.insert(--it, QString("\t%1 %2").arg(option).arg(value));
       }
       found = true;
       break;
     }
-    if((*it).contains(option) && it != start){
+    if((*it).contains(option) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
       if(found)
         qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
       found = true;
         (*it) = QString("\t%1 %2").arg(option).arg(value);
     }
   }
   if(!found){
     QStringList::Iterator p = start;
     interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value));
     found = true;
   }
   return found;
 }
 /**
  * Removes a option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when setting value.
  * @return bool true if successfull, false otherwise.
  */
 bool Interfaces::removeOption(QStringList::Iterator start, QString option, QString value){
   if(start == interfaces.end())
     return false;
   
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       // got to the end without finding it
       break;
     }
-    if((*it).contains(option) && (*it).contains(value) &&it != start){
+    if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
       if(found)
         qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
       found = true;
       (*it) = "";
     }
   }
   return found;
 }
 
 /**
  * Removes all options in a stanza
  * @param start the start of the stanza
  * @return bool true if successfull, false otherwise.
  */
 bool Interfaces::removeAllOptions(QStringList::Iterator start){
   if(start == interfaces.end())
     return false;
   
   QStringList::Iterator it = start;
   it = ++it;
   for (it; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       break;
@@ -566,49 +566,49 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){
   // Leave a space between this interface and the next.
   interfaces.insert(it, QString(""));
   return true;
 }
 
 /**
  * Gets a value of an option in a stanza
  * @param start the start of the stanza
  * @param option the option to use when getting the value.
  * @param bool true if errors false otherwise.
  * @return QString the value of option QString::null() if error == true.
  */
 QString Interfaces::getOption(QStringList::Iterator start, QString option, bool &error){
   if(start == interfaces.end()){
     error = false;
     return QString();
   }
   
   QString value;
   bool found = false;
   for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
     if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))  && it != start){
       break;
     }
-    if((*it).contains(option)){
+    if((*it).contains(option) && (*it).at(0) != '#'){
       if(found)
         qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1());
       found = true;
       QString line = (*it).simplifyWhiteSpace();
       int space = line.find(" ", option.length());
       if(space != -1)
         value = line.mid(space+1, line.length());
       else
         qDebug(QString("Interfaces: Option %1 with no value").arg(option).latin1());
     }
   }
   error = !found;
   return value;
 }
 
 /**
  * Write out the interfaces file to the file passed into the constructor.
  * Removes any excess blank lines over 1 line long.
  * @return bool true if successfull, false if not.
  */ 
 bool Interfaces::write(){
   QFile::remove(interfacesFile);
   QFile file(interfacesFile);
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 01063c2..8e4e898 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -211,95 +211,95 @@ void MainWindowImp::removeClicked(){
 }

 

 /**

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

     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(&tabWidget);

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

     return;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

     QMessageBox::information(this, "Error","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(&tabWidget);

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

   KShellProcess *processAll = new KShellProcess();

   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;

   connect(processAll, SIGNAL(processExited(KProcess *)),

diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index a30f492..96db5b3 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -8,70 +8,72 @@
 
 class QWidget;
 class QTabWidget;
 
 class Module : QObject{
 
 signals:
   void updateInterface(Interface *i);
 	
 public:
   Module(){};
 
   /**
    * The current profile has been changed and the module should do any
    * neccesary changes also.
    * @param newProfile what the profile should be changed to.
    */ 
   virtual void setProfile(QString newProfile) = 0;
   
   /**
    * get the icon name for this device.
    * @param Interface* can be used in determining the icon.
    * @return QString the icon name (minus .png, .gif etc) 
    */ 
-  virtual QString getPixmapName(Interface* i) = 0;
+  virtual QString getPixmapName(Interface *) = 0;
 
   /**
    * Check to see if the interface i is owned by this module.
    * @param Interface* interface to check against
    * @return bool true if i is owned by this module, false otherwise.
    */
   virtual bool isOwner(Interface *){ return false; };
   
   /**
    * Create, set tabWiget and return the WLANConfigure Module
+   * @param Interface *i the interface to configure.
    * @param tabWidget a pointer to the tab widget that this configure has.
    * @return QWidget* pointer to the tab widget in this modules configure.
    */
-  virtual QWidget *configure(QTabWidget **){ return NULL; } ;
+  virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ;
   
   /**
    * Create, set tabWiget and return the Information Module
+   * @param Interface *i the interface to get info on.
    * @param tabWidget a pointer to the tab widget that this information has.
    * @return QWidget* pointer to the tab widget in this modules info.
    */
-  virtual QWidget *information(QTabWidget **){ return NULL; };
+  virtual QWidget *information(Interface *, QTabWidget **){ return NULL; };
   
   /**
    * Get all active (up or down) interfaces
    * @return QList<Interface> A list of interfaces that exsist that havn't
    * been called by isOwner()
    */  
   virtual QList<Interface> getInterfaces() = 0;
   
   /**
    * Adds possible new interfaces to the list (Example: usb(ppp), ir(ppp),
    *  modem ppp)
    */
   virtual void possibleNewInterfaces(QMap<QString, QString> &list) = 0;
   
   /**
    * Attempts to create a new interface from name
    * @return Interface* NULL if it was unable to be created.
    * @param name the type of interface to create
    */  
   virtual Interface *addNewInterface(QString name) = 0;
   
   /**
    * Attempts to remove the interface, doesn't delete i
    * @return bool true if successfull, false otherwise.