-rw-r--r-- | noncore/net/networksetup/interfaceinformation.ui | 12 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces.cpp | 10 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/module.h | 8 |
4 files changed, 17 insertions, 17 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 @@ | |||
53 | <name>text</name> | 53 | <name>text</name> |
54 | <string>Refresh</string> | 54 | <string>&Refresh</string> |
55 | </property> | 55 | </property> |
@@ -64,3 +64,3 @@ | |||
64 | <name>text</name> | 64 | <name>text</name> |
65 | <string>Stop</string> | 65 | <string>S&top</string> |
66 | </property> | 66 | </property> |
@@ -75,3 +75,3 @@ | |||
75 | <name>text</name> | 75 | <name>text</name> |
76 | <string>Restart</string> | 76 | <string>R&estart</string> |
77 | </property> | 77 | </property> |
@@ -86,3 +86,3 @@ | |||
86 | <name>text</name> | 86 | <name>text</name> |
87 | <string>Start</string> | 87 | <string>&Start</string> |
88 | </property> | 88 | </property> |
@@ -295,3 +295,3 @@ | |||
295 | <name>text</name> | 295 | <name>text</name> |
296 | <string>View Advanced Information</string> | 296 | <string>View &Advanced Information</string> |
297 | </property> | 297 | </property> |
@@ -335,4 +335,2 @@ | |||
335 | </images> | 335 | </images> |
336 | <connections> | ||
337 | </connections> | ||
338 | <tabstops> | 336 | <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(){ | |||
53 | QString line = (*it).simplifyWhiteSpace(); | 53 | QString line = (*it).simplifyWhiteSpace(); |
54 | if(line.contains(IFACE)){ | 54 | if(line.contains(IFACE) && line.at(0) != '#'){ |
55 | line = line.mid(QString(IFACE).length() +1, line.length()); | 55 | line = line.mid(QString(IFACE).length() +1, line.length()); |
@@ -459,3 +459,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
459 | QString line = (*it).simplifyWhiteSpace(); | 459 | QString line = (*it).simplifyWhiteSpace(); |
460 | if(line.contains(stanza) && line.contains(option)){ | 460 | if(line.contains(stanza) && line.contains(option) && line.at(0) != '#'){ |
461 | uint point = line.find(option); | 461 | uint point = line.find(option); |
@@ -505,3 +505,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
505 | } | 505 | } |
506 | if((*it).contains(option) && it != start){ | 506 | if((*it).contains(option) && it != start && (*it).at(0) != '#'){ |
507 | // Found it in stanza so replace it. | 507 | // Found it in stanza so replace it. |
@@ -536,3 +536,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
536 | } | 536 | } |
537 | if((*it).contains(option) && (*it).contains(value) &&it != start){ | 537 | if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){ |
538 | // Found it in stanza so replace it. | 538 | // Found it in stanza so replace it. |
@@ -589,3 +589,3 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool | |||
589 | } | 589 | } |
590 | if((*it).contains(option)){ | 590 | if((*it).contains(option) && (*it).at(0) != '#'){ |
591 | if(found) | 591 | 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(){ | |||
234 | QTabWidget *tabWidget = NULL; | 234 | QTabWidget *tabWidget = NULL; |
235 | QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget); | 235 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget); |
236 | if(moduleConfigure != NULL){ | 236 | if(moduleConfigure != NULL){ |
@@ -280,3 +280,3 @@ void MainWindowImp::informationClicked(){ | |||
280 | QTabWidget *tabWidget = NULL; | 280 | QTabWidget *tabWidget = NULL; |
281 | QWidget *moduleInformation = i->getModuleOwner()->information(&tabWidget); | 281 | QWidget *moduleInformation = i->getModuleOwner()->information(i, &tabWidget); |
282 | if(moduleInformation != NULL){ | 282 | 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: | |||
31 | */ | 31 | */ |
32 | virtual QString getPixmapName(Interface* i) = 0; | 32 | virtual QString getPixmapName(Interface *) = 0; |
33 | 33 | ||
@@ -42,2 +42,3 @@ public: | |||
42 | * Create, set tabWiget and return the WLANConfigure Module | 42 | * Create, set tabWiget and return the WLANConfigure Module |
43 | * @param Interface *i the interface to configure. | ||
43 | * @param tabWidget a pointer to the tab widget that this configure has. | 44 | * @param tabWidget a pointer to the tab widget that this configure has. |
@@ -45,3 +46,3 @@ public: | |||
45 | */ | 46 | */ |
46 | virtual QWidget *configure(QTabWidget **){ return NULL; } ; | 47 | virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ; |
47 | 48 | ||
@@ -49,2 +50,3 @@ public: | |||
49 | * Create, set tabWiget and return the Information Module | 50 | * Create, set tabWiget and return the Information Module |
51 | * @param Interface *i the interface to get info on. | ||
50 | * @param tabWidget a pointer to the tab widget that this information has. | 52 | * @param tabWidget a pointer to the tab widget that this information has. |
@@ -52,3 +54,3 @@ public: | |||
52 | */ | 54 | */ |
53 | virtual QWidget *information(QTabWidget **){ return NULL; }; | 55 | virtual QWidget *information(Interface *, QTabWidget **){ return NULL; }; |
54 | 56 | ||