summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-12-16 16:21:51 (UTC)
committer benmeyer <benmeyer>2002-12-16 16:21:51 (UTC)
commitdabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f (patch) (unidiff)
tree2c9a68097931a6f603be4a62e4ea002dad560dcd
parentc7c8bf3d2fd133fa05ff7a5daed977c05429c4c1 (diff)
downloadopie-dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f.zip
opie-dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f.tar.gz
opie-dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f.tar.bz2
Fixed icon bug, removed some extra uneeded code, fixed WEP config bug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaces/interface.cpp4
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp10
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp8
-rw-r--r--noncore/settings/networksettings/interfaces/interface.cpp4
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp10
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp8
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(){
73 if(ret != 0){ 73 if(ret != 0){
74 emit (updateMessage("Starting interface failed.")); 74 emit (updateMessage("Starting interface failed"));
75 return; 75 return;
@@ -94,3 +94,3 @@ void Interface::stop(){
94 if(ret != 0){ 94 if(ret != 0){
95 emit (updateMessage("Stopping interface failed.")); 95 emit (updateMessage("Stopping interface failed"));
96 return; 96 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(){
322 moduleConfigure->showMaximized(); 322 moduleConfigure->showMaximized();
323 moduleConfigure->show();
324 return; 323 return;
@@ -333,3 +332,2 @@ void MainWindowImp::configureClicked(){
333 configure->showMaximized(); 332 configure->showMaximized();
334 configure->show();
335} 333}
@@ -358,3 +356,2 @@ void MainWindowImp::informationClicked(){
358 moduleInformation->showMaximized(); 356 moduleInformation->showMaximized();
359 moduleInformation->show();
360 return; 357 return;
@@ -362,5 +359,4 @@ void MainWindowImp::informationClicked(){
362 } 359 }
363 InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); 360 InterfaceInformationImp information(0, "InterfaceSetupImp", i);
364 information->showMaximized(); 361 information.showMaximized();
365 information->show();
366} 362}
@@ -413,3 +409,3 @@ void MainWindowImp::updateInterface(Interface *i){
413 409
414 item->setPixmap(1, (Resource::loadPixmap(typeName))); 410 item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));
415 item->setText(2, i->getHardwareName()); 411 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(){
101 if(line.contains("#KEY0=")) 101 if(line.contains("#KEY0="))
102 keyLineEdit0->setText(line.mid(5, line.length())); 102 keyLineEdit0->setText(line.mid(6, line.length()));
103 if(line.contains("#KEY1=")) 103 if(line.contains("#KEY1="))
104 keyLineEdit1->setText(line.mid(5, line.length())); 104 keyLineEdit1->setText(line.mid(6, line.length()));
105 if(line.contains("#KEY2=")) 105 if(line.contains("#KEY2="))
106 keyLineEdit2->setText(line.mid(5, line.length())); 106 keyLineEdit2->setText(line.mid(6, line.length()));
107 if(line.contains("#KEY3=")) 107 if(line.contains("#KEY3="))
108 keyLineEdit3->setText(line.mid(5, line.length())); 108 keyLineEdit3->setText(line.mid(6, line.length()));
109 109
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(){
73 if(ret != 0){ 73 if(ret != 0){
74 emit (updateMessage("Starting interface failed.")); 74 emit (updateMessage("Starting interface failed"));
75 return; 75 return;
@@ -94,3 +94,3 @@ void Interface::stop(){
94 if(ret != 0){ 94 if(ret != 0){
95 emit (updateMessage("Stopping interface failed.")); 95 emit (updateMessage("Stopping interface failed"));
96 return; 96 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(){
322 moduleConfigure->showMaximized(); 322 moduleConfigure->showMaximized();
323 moduleConfigure->show();
324 return; 323 return;
@@ -333,3 +332,2 @@ void MainWindowImp::configureClicked(){
333 configure->showMaximized(); 332 configure->showMaximized();
334 configure->show();
335} 333}
@@ -358,3 +356,2 @@ void MainWindowImp::informationClicked(){
358 moduleInformation->showMaximized(); 356 moduleInformation->showMaximized();
359 moduleInformation->show();
360 return; 357 return;
@@ -362,5 +359,4 @@ void MainWindowImp::informationClicked(){
362 } 359 }
363 InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); 360 InterfaceInformationImp information(0, "InterfaceSetupImp", i);
364 information->showMaximized(); 361 information.showMaximized();
365 information->show();
366} 362}
@@ -413,3 +409,3 @@ void MainWindowImp::updateInterface(Interface *i){
413 409
414 item->setPixmap(1, (Resource::loadPixmap(typeName))); 410 item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));
415 item->setText(2, i->getHardwareName()); 411 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(){
101 if(line.contains("#KEY0=")) 101 if(line.contains("#KEY0="))
102 keyLineEdit0->setText(line.mid(5, line.length())); 102 keyLineEdit0->setText(line.mid(6, line.length()));
103 if(line.contains("#KEY1=")) 103 if(line.contains("#KEY1="))
104 keyLineEdit1->setText(line.mid(5, line.length())); 104 keyLineEdit1->setText(line.mid(6, line.length()));
105 if(line.contains("#KEY2=")) 105 if(line.contains("#KEY2="))
106 keyLineEdit2->setText(line.mid(5, line.length())); 106 keyLineEdit2->setText(line.mid(6, line.length()));
107 if(line.contains("#KEY3=")) 107 if(line.contains("#KEY3="))
108 keyLineEdit3->setText(line.mid(5, line.length())); 108 keyLineEdit3->setText(line.mid(6, line.length()));
109 109