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
@@ -53,3 +53,3 @@
                         <name>text</name>
-                        <string>Refresh</string>
+                        <string>&amp;Refresh</string>
                     </property>
@@ -64,3 +64,3 @@
                         <name>text</name>
-                        <string>Stop</string>
+                        <string>S&amp;top</string>
                     </property>
@@ -75,3 +75,3 @@
                         <name>text</name>
-                        <string>Restart</string>
+                        <string>R&amp;estart</string>
                     </property>
@@ -86,3 +86,3 @@
                         <name>text</name>
-                        <string>Start</string>
+                        <string>&amp;Start</string>
                     </property>
@@ -295,3 +295,3 @@
                         <name>text</name>
-                        <string>View Advanced Information</string>
+                        <string>View &amp;Advanced Information</string>
                     </property>
@@ -335,4 +335,2 @@
 </images>
-<connections>
-</connections>
 <tabstops>
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
@@ -53,3 +53,3 @@ QStringList Interfaces::getInterfaceList(){
     QString line = (*it).simplifyWhiteSpace();
-    if(line.contains(IFACE)){
+    if(line.contains(IFACE) && line.at(0) != '#'){
       line = line.mid(QString(IFACE).length() +1, line.length());
@@ -459,3 +459,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
     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);
@@ -505,3 +505,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
     }
-    if((*it).contains(option) && it != start){
+    if((*it).contains(option) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
@@ -536,3 +536,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
     }
-    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.
@@ -589,3 +589,3 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool
     }
-    if((*it).contains(option)){
+    if((*it).contains(option) && (*it).at(0) != '#'){
       if(found)
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
@@ -234,3 +234,3 @@ void MainWindowImp::configureClicked(){
     QTabWidget *tabWidget = NULL;

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

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

     if(moduleConfigure != NULL){

@@ -280,3 +280,3 @@ void MainWindowImp::informationClicked(){
     QTabWidget *tabWidget = NULL;

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

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

     if(moduleInformation != NULL){

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
@@ -31,3 +31,3 @@ public:
    */ 
-  virtual QString getPixmapName(Interface* i) = 0;
+  virtual QString getPixmapName(Interface *) = 0;
 
@@ -42,2 +42,3 @@ public:
    * 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.
@@ -45,3 +46,3 @@ public:
    */
-  virtual QWidget *configure(QTabWidget **){ return NULL; } ;
+  virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ;
   
@@ -49,2 +50,3 @@ public:
    * 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.
@@ -52,3 +54,3 @@ public:
    */
-  virtual QWidget *information(QTabWidget **){ return NULL; };
+  virtual QWidget *information(Interface *, QTabWidget **){ return NULL; };
   
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
@@ -53,3 +53,3 @@
                         <name>text</name>
-                        <string>Refresh</string>
+                        <string>&amp;Refresh</string>
                     </property>
@@ -64,3 +64,3 @@
                         <name>text</name>
-                        <string>Stop</string>
+                        <string>S&amp;top</string>
                     </property>
@@ -75,3 +75,3 @@
                         <name>text</name>
-                        <string>Restart</string>
+                        <string>R&amp;estart</string>
                     </property>
@@ -86,3 +86,3 @@
                         <name>text</name>
-                        <string>Start</string>
+                        <string>&amp;Start</string>
                     </property>
@@ -295,3 +295,3 @@
                         <name>text</name>
-                        <string>View Advanced Information</string>
+                        <string>View &amp;Advanced Information</string>
                     </property>
@@ -335,4 +335,2 @@
 </images>
-<connections>
-</connections>
 <tabstops>
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
@@ -53,3 +53,3 @@ QStringList Interfaces::getInterfaceList(){
     QString line = (*it).simplifyWhiteSpace();
-    if(line.contains(IFACE)){
+    if(line.contains(IFACE) && line.at(0) != '#'){
       line = line.mid(QString(IFACE).length() +1, line.length());
@@ -459,3 +459,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
     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);
@@ -505,3 +505,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
     }
-    if((*it).contains(option) && it != start){
+    if((*it).contains(option) && it != start && (*it).at(0) != '#'){
       // Found it in stanza so replace it.
@@ -536,3 +536,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
     }
-    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.
@@ -589,3 +589,3 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool
     }
-    if((*it).contains(option)){
+    if((*it).contains(option) && (*it).at(0) != '#'){
       if(found)
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
@@ -234,3 +234,3 @@ void MainWindowImp::configureClicked(){
     QTabWidget *tabWidget = NULL;

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

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

     if(moduleConfigure != NULL){

@@ -280,3 +280,3 @@ void MainWindowImp::informationClicked(){
     QTabWidget *tabWidget = NULL;

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

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

     if(moduleInformation != NULL){

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
@@ -31,3 +31,3 @@ public:
    */ 
-  virtual QString getPixmapName(Interface* i) = 0;
+  virtual QString getPixmapName(Interface *) = 0;
 
@@ -42,2 +42,3 @@ public:
    * 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.
@@ -45,3 +46,3 @@ public:
    */
-  virtual QWidget *configure(QTabWidget **){ return NULL; } ;
+  virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ;
   
@@ -49,2 +50,3 @@ public:
    * 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.
@@ -52,3 +54,3 @@ public:
    */
-  virtual QWidget *information(QTabWidget **){ return NULL; };
+  virtual QWidget *information(Interface *, QTabWidget **){ return NULL; };