Fixed icon bug, removed some extra uneeded code, fixed WEP config bug

6 files changed, 18 insertions, 26 deletions

diff --git a/noncore/net/networksetup/interfaces/interface.cpp b/noncore/net/networksetup/interfaces/interface.cpp
index 7ffa76f..d964961 100644
--- a/noncore/net/networksetup/interfaces/interface.cpp
+++ b/noncore/net/networksetup/interfaces/interface.cpp
@@ -73,3 +73,3 @@ void Interface::start(){
   if(ret != 0){
-    emit (updateMessage("Starting interface failed."));
+    emit (updateMessage("Starting interface failed"));
     return;
@@ -94,3 +94,3 @@ void Interface::stop(){
   if(ret != 0){
-    emit (updateMessage("Stopping interface failed."));
+    emit (updateMessage("Stopping interface failed"));
     return;
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 7b93554..9a17743 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -322,3 +322,2 @@ void MainWindowImp::configureClicked(){
       moduleConfigure->showMaximized();

-      moduleConfigure->show();

       return;

@@ -333,3 +332,2 @@ void MainWindowImp::configureClicked(){
   configure->showMaximized();

-  configure->show();

 }

@@ -358,3 +356,2 @@ void MainWindowImp::informationClicked(){
       moduleInformation->showMaximized();

-      moduleInformation->show();

       return;

@@ -362,5 +359,4 @@ void MainWindowImp::informationClicked(){
   }  

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

-  information->showMaximized();

-  information->show();

+  InterfaceInformationImp information(0, "InterfaceSetupImp", i);

+  information.showMaximized();

 }

@@ -413,3 +409,3 @@ void MainWindowImp::updateInterface(Interface *i){
   

-  item->setPixmap(1, (Resource::loadPixmap(typeName)));

+  item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));

   item->setText(2, i->getHardwareName());

diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index cc18fba..648932f 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -101,9 +101,9 @@ void WLANImp::parseSettingFile(){
       if(line.contains("#KEY0="))
-        keyLineEdit0->setText(line.mid(5, line.length()));
+        keyLineEdit0->setText(line.mid(6, line.length()));
       if(line.contains("#KEY1="))
-        keyLineEdit1->setText(line.mid(5, line.length()));
+        keyLineEdit1->setText(line.mid(6, line.length()));
       if(line.contains("#KEY2="))
-        keyLineEdit2->setText(line.mid(5, line.length()));
+        keyLineEdit2->setText(line.mid(6, line.length()));
       if(line.contains("#KEY3="))
-        keyLineEdit3->setText(line.mid(5, line.length()));
+        keyLineEdit3->setText(line.mid(6, line.length()));
       
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp
index 7ffa76f..d964961 100644
--- a/noncore/settings/networksettings/interfaces/interface.cpp
+++ b/noncore/settings/networksettings/interfaces/interface.cpp
@@ -73,3 +73,3 @@ void Interface::start(){
   if(ret != 0){
-    emit (updateMessage("Starting interface failed."));
+    emit (updateMessage("Starting interface failed"));
     return;
@@ -94,3 +94,3 @@ void Interface::stop(){
   if(ret != 0){
-    emit (updateMessage("Stopping interface failed."));
+    emit (updateMessage("Stopping interface failed"));
     return;
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 7b93554..9a17743 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -322,3 +322,2 @@ void MainWindowImp::configureClicked(){
       moduleConfigure->showMaximized();

-      moduleConfigure->show();

       return;

@@ -333,3 +332,2 @@ void MainWindowImp::configureClicked(){
   configure->showMaximized();

-  configure->show();

 }

@@ -358,3 +356,2 @@ void MainWindowImp::informationClicked(){
       moduleInformation->showMaximized();

-      moduleInformation->show();

       return;

@@ -362,5 +359,4 @@ void MainWindowImp::informationClicked(){
   }  

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

-  information->showMaximized();

-  information->show();

+  InterfaceInformationImp information(0, "InterfaceSetupImp", i);

+  information.showMaximized();

 }

@@ -413,3 +409,3 @@ void MainWindowImp::updateInterface(Interface *i){
   

-  item->setPixmap(1, (Resource::loadPixmap(typeName)));

+  item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));

   item->setText(2, i->getHardwareName());

diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index cc18fba..648932f 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -101,9 +101,9 @@ void WLANImp::parseSettingFile(){
       if(line.contains("#KEY0="))
-        keyLineEdit0->setText(line.mid(5, line.length()));
+        keyLineEdit0->setText(line.mid(6, line.length()));
       if(line.contains("#KEY1="))
-        keyLineEdit1->setText(line.mid(5, line.length()));
+        keyLineEdit1->setText(line.mid(6, line.length()));
       if(line.contains("#KEY2="))
-        keyLineEdit2->setText(line.mid(5, line.length()));
+        keyLineEdit2->setText(line.mid(6, line.length()));
       if(line.contains("#KEY3="))
-        keyLineEdit3->setText(line.mid(5, line.length()));
+        keyLineEdit3->setText(line.mid(6, line.length()));