-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 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaceinformation.ui | 12 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/module.h | 8 |
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 | |||
@@ -52,5 +52,5 @@ | |||
52 | <property stdset="1"> | 52 | <property stdset="1"> |
53 | <name>text</name> | 53 | <name>text</name> |
54 | <string>Refresh</string> | 54 | <string>&Refresh</string> |
55 | </property> | 55 | </property> |
56 | </widget> | 56 | </widget> |
@@ -63,5 +63,5 @@ | |||
63 | <property stdset="1"> | 63 | <property stdset="1"> |
64 | <name>text</name> | 64 | <name>text</name> |
65 | <string>Stop</string> | 65 | <string>S&top</string> |
66 | </property> | 66 | </property> |
67 | </widget> | 67 | </widget> |
@@ -74,5 +74,5 @@ | |||
74 | <property stdset="1"> | 74 | <property stdset="1"> |
75 | <name>text</name> | 75 | <name>text</name> |
76 | <string>Restart</string> | 76 | <string>R&estart</string> |
77 | </property> | 77 | </property> |
78 | </widget> | 78 | </widget> |
@@ -85,5 +85,5 @@ | |||
85 | <property stdset="1"> | 85 | <property stdset="1"> |
86 | <name>text</name> | 86 | <name>text</name> |
87 | <string>Start</string> | 87 | <string>&Start</string> |
88 | </property> | 88 | </property> |
89 | </widget> | 89 | </widget> |
@@ -294,5 +294,5 @@ | |||
294 | <property stdset="1"> | 294 | <property stdset="1"> |
295 | <name>text</name> | 295 | <name>text</name> |
296 | <string>View Advanced Information</string> | 296 | <string>View &Advanced Information</string> |
297 | </property> | 297 | </property> |
298 | </widget> | 298 | </widget> |
@@ -334,6 +334,4 @@ | |||
334 | </image> | 334 | </image> |
335 | </images> | 335 | </images> |
336 | <connections> | ||
337 | </connections> | ||
338 | <tabstops> | 336 | <tabstops> |
339 | <tabstop>startButton</tabstop> | 337 | <tabstop>startButton</tabstop> |
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 | |||
@@ -52,5 +52,5 @@ QStringList Interfaces::getInterfaceList(){ | |||
52 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | 52 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { |
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()); |
56 | line = line.simplifyWhiteSpace(); | 56 | line = line.simplifyWhiteSpace(); |
@@ -458,5 +458,5 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
458 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | 458 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { |
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); |
462 | bool valid = true; | 462 | bool valid = true; |
@@ -504,5 +504,5 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
504 | break; | 504 | break; |
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. |
508 | if(found) | 508 | if(found) |
@@ -535,5 +535,5 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
535 | break; | 535 | break; |
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. |
539 | if(found) | 539 | if(found) |
@@ -588,5 +588,5 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool | |||
588 | break; | 588 | break; |
589 | } | 589 | } |
590 | if((*it).contains(option)){ | 590 | if((*it).contains(option) && (*it).at(0) != '#'){ |
591 | if(found) | 591 | if(found) |
592 | qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); | 592 | qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); |
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 | |||
@@ -233,5 +233,5 @@ void MainWindowImp::configureClicked(){ | |||
233 | i->getModuleOwner()->setProfile(currentProfile); | 233 | i->getModuleOwner()->setProfile(currentProfile); |
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){ |
237 | if(tabWidget != NULL){ | 237 | if(tabWidget != NULL){ |
@@ -279,5 +279,5 @@ void MainWindowImp::informationClicked(){ | |||
279 | if(i->getModuleOwner()){ | 279 | if(i->getModuleOwner()){ |
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){ |
283 | if(tabWidget != NULL){ | 283 | if(tabWidget != 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 | |||
@@ -30,5 +30,5 @@ public: | |||
30 | * @return QString the icon name (minus .png, .gif etc) | 30 | * @return QString the icon name (minus .png, .gif etc) |
31 | */ | 31 | */ |
32 | virtual QString getPixmapName(Interface* i) = 0; | 32 | virtual QString getPixmapName(Interface *) = 0; |
33 | 33 | ||
34 | /** | 34 | /** |
@@ -41,15 +41,17 @@ public: | |||
41 | /** | 41 | /** |
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. |
44 | * @return QWidget* pointer to the tab widget in this modules configure. | 45 | * @return QWidget* pointer to the tab widget in this modules configure. |
45 | */ | 46 | */ |
46 | virtual QWidget *configure(QTabWidget **){ return NULL; } ; | 47 | virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ; |
47 | 48 | ||
48 | /** | 49 | /** |
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. |
51 | * @return QWidget* pointer to the tab widget in this modules info. | 53 | * @return QWidget* pointer to the tab widget in this modules info. |
52 | */ | 54 | */ |
53 | virtual QWidget *information(QTabWidget **){ return NULL; }; | 55 | virtual QWidget *information(Interface *, QTabWidget **){ return NULL; }; |
54 | 56 | ||
55 | /** | 57 | /** |
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 | |||
@@ -52,5 +52,5 @@ | |||
52 | <property stdset="1"> | 52 | <property stdset="1"> |
53 | <name>text</name> | 53 | <name>text</name> |
54 | <string>Refresh</string> | 54 | <string>&Refresh</string> |
55 | </property> | 55 | </property> |
56 | </widget> | 56 | </widget> |
@@ -63,5 +63,5 @@ | |||
63 | <property stdset="1"> | 63 | <property stdset="1"> |
64 | <name>text</name> | 64 | <name>text</name> |
65 | <string>Stop</string> | 65 | <string>S&top</string> |
66 | </property> | 66 | </property> |
67 | </widget> | 67 | </widget> |
@@ -74,5 +74,5 @@ | |||
74 | <property stdset="1"> | 74 | <property stdset="1"> |
75 | <name>text</name> | 75 | <name>text</name> |
76 | <string>Restart</string> | 76 | <string>R&estart</string> |
77 | </property> | 77 | </property> |
78 | </widget> | 78 | </widget> |
@@ -85,5 +85,5 @@ | |||
85 | <property stdset="1"> | 85 | <property stdset="1"> |
86 | <name>text</name> | 86 | <name>text</name> |
87 | <string>Start</string> | 87 | <string>&Start</string> |
88 | </property> | 88 | </property> |
89 | </widget> | 89 | </widget> |
@@ -294,5 +294,5 @@ | |||
294 | <property stdset="1"> | 294 | <property stdset="1"> |
295 | <name>text</name> | 295 | <name>text</name> |
296 | <string>View Advanced Information</string> | 296 | <string>View &Advanced Information</string> |
297 | </property> | 297 | </property> |
298 | </widget> | 298 | </widget> |
@@ -334,6 +334,4 @@ | |||
334 | </image> | 334 | </image> |
335 | </images> | 335 | </images> |
336 | <connections> | ||
337 | </connections> | ||
338 | <tabstops> | 336 | <tabstops> |
339 | <tabstop>startButton</tabstop> | 337 | <tabstop>startButton</tabstop> |
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 | |||
@@ -52,5 +52,5 @@ QStringList Interfaces::getInterfaceList(){ | |||
52 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | 52 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { |
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()); |
56 | line = line.simplifyWhiteSpace(); | 56 | line = line.simplifyWhiteSpace(); |
@@ -458,5 +458,5 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
458 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | 458 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { |
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); |
462 | bool valid = true; | 462 | bool valid = true; |
@@ -504,5 +504,5 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
504 | break; | 504 | break; |
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. |
508 | if(found) | 508 | if(found) |
@@ -535,5 +535,5 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
535 | break; | 535 | break; |
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. |
539 | if(found) | 539 | if(found) |
@@ -588,5 +588,5 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool | |||
588 | break; | 588 | break; |
589 | } | 589 | } |
590 | if((*it).contains(option)){ | 590 | if((*it).contains(option) && (*it).at(0) != '#'){ |
591 | if(found) | 591 | if(found) |
592 | qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); | 592 | qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); |
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 | |||
@@ -233,5 +233,5 @@ void MainWindowImp::configureClicked(){ | |||
233 | i->getModuleOwner()->setProfile(currentProfile); | 233 | i->getModuleOwner()->setProfile(currentProfile); |
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){ |
237 | if(tabWidget != NULL){ | 237 | if(tabWidget != NULL){ |
@@ -279,5 +279,5 @@ void MainWindowImp::informationClicked(){ | |||
279 | if(i->getModuleOwner()){ | 279 | if(i->getModuleOwner()){ |
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){ |
283 | if(tabWidget != NULL){ | 283 | if(tabWidget != 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 | |||
@@ -30,5 +30,5 @@ public: | |||
30 | * @return QString the icon name (minus .png, .gif etc) | 30 | * @return QString the icon name (minus .png, .gif etc) |
31 | */ | 31 | */ |
32 | virtual QString getPixmapName(Interface* i) = 0; | 32 | virtual QString getPixmapName(Interface *) = 0; |
33 | 33 | ||
34 | /** | 34 | /** |
@@ -41,15 +41,17 @@ public: | |||
41 | /** | 41 | /** |
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. |
44 | * @return QWidget* pointer to the tab widget in this modules configure. | 45 | * @return QWidget* pointer to the tab widget in this modules configure. |
45 | */ | 46 | */ |
46 | virtual QWidget *configure(QTabWidget **){ return NULL; } ; | 47 | virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ; |
47 | 48 | ||
48 | /** | 49 | /** |
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. |
51 | * @return QWidget* pointer to the tab widget in this modules info. | 53 | * @return QWidget* pointer to the tab widget in this modules info. |
52 | */ | 54 | */ |
53 | virtual QWidget *information(QTabWidget **){ return NULL; }; | 55 | virtual QWidget *information(Interface *, QTabWidget **){ return NULL; }; |
54 | 56 | ||
55 | /** | 57 | /** |