From dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f Mon Sep 17 00:00:00 2001
From: benmeyer <benmeyer>
Date: Mon, 16 Dec 2002 16:21:51 +0000
Subject: Fixed icon bug, removed some extra uneeded code, fixed WEP config bug

---
(limited to 'noncore')

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
@@ -71,7 +71,7 @@ void Interface::start(){
   int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1());
   // See if it was successfull...
   if(ret != 0){
-    emit (updateMessage("Starting interface failed."));
+    emit (updateMessage("Starting interface failed"));
     return;
   }
 
@@ -92,7 +92,7 @@ void Interface::stop(){
 	  
   int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1());
   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
@@ -320,7 +320,6 @@ void MainWindowImp::configureClicked(){
     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
     if(moduleConfigure != NULL){
       moduleConfigure->showMaximized();
-      moduleConfigure->show();
       return;
     }
   }
@@ -331,7 +330,6 @@ void MainWindowImp::configureClicked(){
     currentProfileText = "";
   configure->setProfile(currentProfileText);
   configure->showMaximized();
-  configure->show();
 }
 
 /**
@@ -356,13 +354,11 @@ void MainWindowImp::informationClicked(){
     QWidget *moduleInformation = i->getModuleOwner()->information(i);
     if(moduleInformation != NULL){
       moduleInformation->showMaximized();
-      moduleInformation->show();
       return;
     }
   }  
-  InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);
-  information->showMaximized();
-  information->show();
+  InterfaceInformationImp information(0, "InterfaceSetupImp", i);
+  information.showMaximized();
 }
 
 /**
@@ -411,7 +407,7 @@ void MainWindowImp::updateInterface(Interface *i){
   if(i->getModuleOwner() != NULL)
     typeName = i->getModuleOwner()->getPixmapName(i);
   
-  item->setPixmap(1, (Resource::loadPixmap(typeName)));
+  item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));
   item->setText(2, i->getHardwareName());
   item->setText(3, QString("(%1)").arg(i->getInterfaceName()));
   item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));
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
@@ -99,13 +99,13 @@ 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()));
       
       if(line.contains("KEY=")){
         wepEnabled->setChecked(true);
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
@@ -71,7 +71,7 @@ void Interface::start(){
   int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1());
   // See if it was successfull...
   if(ret != 0){
-    emit (updateMessage("Starting interface failed."));
+    emit (updateMessage("Starting interface failed"));
     return;
   }
 
@@ -92,7 +92,7 @@ void Interface::stop(){
 	  
   int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1());
   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
@@ -320,7 +320,6 @@ void MainWindowImp::configureClicked(){
     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
     if(moduleConfigure != NULL){
       moduleConfigure->showMaximized();
-      moduleConfigure->show();
       return;
     }
   }
@@ -331,7 +330,6 @@ void MainWindowImp::configureClicked(){
     currentProfileText = "";
   configure->setProfile(currentProfileText);
   configure->showMaximized();
-  configure->show();
 }
 
 /**
@@ -356,13 +354,11 @@ void MainWindowImp::informationClicked(){
     QWidget *moduleInformation = i->getModuleOwner()->information(i);
     if(moduleInformation != NULL){
       moduleInformation->showMaximized();
-      moduleInformation->show();
       return;
     }
   }  
-  InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);
-  information->showMaximized();
-  information->show();
+  InterfaceInformationImp information(0, "InterfaceSetupImp", i);
+  information.showMaximized();
 }
 
 /**
@@ -411,7 +407,7 @@ void MainWindowImp::updateInterface(Interface *i){
   if(i->getModuleOwner() != NULL)
     typeName = i->getModuleOwner()->getPixmapName(i);
   
-  item->setPixmap(1, (Resource::loadPixmap(typeName)));
+  item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));
   item->setText(2, i->getHardwareName());
   item->setText(3, QString("(%1)").arg(i->getInterfaceName()));
   item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));
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
@@ -99,13 +99,13 @@ 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()));
       
       if(line.contains("KEY=")){
         wepEnabled->setChecked(true);
--
cgit v0.9.0.2