| -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 | ||||
| -rw-r--r-- | noncore/settings/networksettings/interfaces/interface.cpp | 4 | ||||
| -rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 10 | ||||
| -rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 8 |
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 @@ -72,5 +72,5 @@ void Interface::start(){ // See if it was successfull... if(ret != 0){ - emit (updateMessage("Starting interface failed.")); + emit (updateMessage("Starting interface failed")); return; } @@ -93,5 +93,5 @@ 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 @@ -321,5 +321,4 @@ void MainWindowImp::configureClicked(){ if(moduleConfigure != NULL){
moduleConfigure->showMaximized();
- moduleConfigure->show();
return;
}
@@ -332,5 +331,4 @@ void MainWindowImp::configureClicked(){ configure->setProfile(currentProfileText);
configure->showMaximized();
- configure->show();
}
@@ -357,11 +355,9 @@ void MainWindowImp::informationClicked(){ 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();
}
@@ -412,5 +408,5 @@ void MainWindowImp::updateInterface(Interface *i){ 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()));
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 @@ -100,11 +100,11 @@ 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=")){ 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 @@ -72,5 +72,5 @@ void Interface::start(){ // See if it was successfull... if(ret != 0){ - emit (updateMessage("Starting interface failed.")); + emit (updateMessage("Starting interface failed")); return; } @@ -93,5 +93,5 @@ 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 @@ -321,5 +321,4 @@ void MainWindowImp::configureClicked(){ if(moduleConfigure != NULL){
moduleConfigure->showMaximized();
- moduleConfigure->show();
return;
}
@@ -332,5 +331,4 @@ void MainWindowImp::configureClicked(){ configure->setProfile(currentProfileText);
configure->showMaximized();
- configure->show();
}
@@ -357,11 +355,9 @@ void MainWindowImp::informationClicked(){ 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();
}
@@ -412,5 +408,5 @@ void MainWindowImp::updateInterface(Interface *i){ 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()));
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 @@ -100,11 +100,11 @@ 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=")){ |