author | benmeyer <benmeyer> | 2002-12-16 16:21:51 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-12-16 16:21:51 (UTC) |
commit | dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f (patch) (unidiff) | |
tree | 2c9a68097931a6f603be4a62e4ea002dad560dcd /noncore/net/networksetup | |
parent | c7c8bf3d2fd133fa05ff7a5daed977c05429c4c1 (diff) | |
download | opie-dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f.zip opie-dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f.tar.gz opie-dabe9c5ee8c2d51fe13b4e3a8b160afacf0f539f.tar.bz2 |
Fixed icon bug, removed some extra uneeded code, fixed WEP config bug
-rw-r--r-- | noncore/net/networksetup/interfaces/interface.cpp | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 10 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 8 |
3 files changed, 9 insertions, 13 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 | |||
@@ -71,7 +71,7 @@ void Interface::start(){ | |||
71 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); | 71 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); |
72 | // See if it was successfull... | 72 | // See if it was successfull... |
73 | if(ret != 0){ | 73 | if(ret != 0){ |
74 | emit (updateMessage("Starting interface failed.")); | 74 | emit (updateMessage("Starting interface failed")); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
@@ -92,7 +92,7 @@ void Interface::stop(){ | |||
92 | 92 | ||
93 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); | 93 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); |
94 | if(ret != 0){ | 94 | if(ret != 0){ |
95 | emit (updateMessage("Stopping interface failed.")); | 95 | emit (updateMessage("Stopping interface failed")); |
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | 98 | ||
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(){ | |||
320 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); | 320 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); |
321 | if(moduleConfigure != NULL){ | 321 | if(moduleConfigure != NULL){ |
322 | moduleConfigure->showMaximized(); | 322 | moduleConfigure->showMaximized(); |
323 | moduleConfigure->show(); | ||
324 | return; | 323 | return; |
325 | } | 324 | } |
326 | } | 325 | } |
@@ -331,7 +330,6 @@ void MainWindowImp::configureClicked(){ | |||
331 | currentProfileText = ""; | 330 | currentProfileText = ""; |
332 | configure->setProfile(currentProfileText); | 331 | configure->setProfile(currentProfileText); |
333 | configure->showMaximized(); | 332 | configure->showMaximized(); |
334 | configure->show(); | ||
335 | } | 333 | } |
336 | 334 | ||
337 | /** | 335 | /** |
@@ -356,13 +354,11 @@ void MainWindowImp::informationClicked(){ | |||
356 | QWidget *moduleInformation = i->getModuleOwner()->information(i); | 354 | QWidget *moduleInformation = i->getModuleOwner()->information(i); |
357 | if(moduleInformation != NULL){ | 355 | if(moduleInformation != NULL){ |
358 | moduleInformation->showMaximized(); | 356 | moduleInformation->showMaximized(); |
359 | moduleInformation->show(); | ||
360 | return; | 357 | return; |
361 | } | 358 | } |
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 | } |
367 | 363 | ||
368 | /** | 364 | /** |
@@ -411,7 +407,7 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
411 | if(i->getModuleOwner() != NULL) | 407 | if(i->getModuleOwner() != NULL) |
412 | typeName = i->getModuleOwner()->getPixmapName(i); | 408 | typeName = i->getModuleOwner()->getPixmapName(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()); |
416 | item->setText(3, QString("(%1)").arg(i->getInterfaceName())); | 412 | item->setText(3, QString("(%1)").arg(i->getInterfaceName())); |
417 | item->setText(4, (i->getStatus()) ? i->getIp() : QString("")); | 413 | 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(){ | |||
99 | } | 99 | } |
100 | } | 100 | } |
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 | ||
110 | if(line.contains("KEY=")){ | 110 | if(line.contains("KEY=")){ |
111 | wepEnabled->setChecked(true); | 111 | wepEnabled->setChecked(true); |