author | benmeyer <benmeyer> | 2002-10-31 20:15:07 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-31 20:15:07 (UTC) |
commit | a491aa2ba326826b7493caa83fc6050e11d53be5 (patch) (side-by-side diff) | |
tree | 4598d1770de61605dceafceafce3ad43b633f711 /noncore | |
parent | ab5a63544deead5206ca47ff8bf94123aa032281 (diff) | |
download | opie-a491aa2ba326826b7493caa83fc6050e11d53be5.zip opie-a491aa2ba326826b7493caa83fc6050e11d53be5.tar.gz opie-a491aa2ba326826b7493caa83fc6050e11d53be5.tar.bz2 |
Changed a number of "OK" to QMesageBox::OK
-rw-r--r-- | noncore/net/networksetup/TODO | 7 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces/interfacesetupimp.cpp | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 20 | ||||
-rw-r--r-- | noncore/settings/networksettings/TODO | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 20 |
6 files changed, 30 insertions, 28 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO index ec6d2c6..d6bfee1 100644 --- a/noncore/net/networksetup/TODO +++ b/noncore/net/networksetup/TODO @@ -3,10 +3,11 @@ CLEAN UP Fix Profiles -Write dns script - WLAN needs to be re-written to not use Config Write a class that parses /proc and not ifconfig -udchcp needs to output the dhcp information + +udchcp needs to output the dhcp information so interfaces can read it + +interfacesetupimp really doesn't need a interface* pointer Possible other modules to write: ppp, ipsec, bluetooth, ipchains diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp index a19aaeb..3b1a4de 100644 --- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp @@ -61,5 +61,5 @@ bool InterfaceSetupImp::saveSettings(){ if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ - QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", "Ok"); + QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok); return false; } diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 6440bd4..3b0b7e8 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp @@ -170,5 +170,5 @@ void MainWindowImp::addClicked(){ // See if the list has anything that we can add.
if(list.count() == 0){
- QMessageBox::information(this, "Sorry", "Nothing to add.", "Ok");
+ QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok);
return;
}
@@ -200,5 +200,5 @@ void MainWindowImp::removeClicked(){ QListViewItem *item = connectionList->currentItem();
if(!item) {
- QMessageBox::information(this, "Sorry","Please select an interface First.", "Ok");
+ QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
return;
}
@@ -206,11 +206,11 @@ void MainWindowImp::removeClicked(){ Interface *i = interfaceItems[item];
if(i->getModuleOwner() == NULL){
- QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
+ QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);
}
else{
if(!i->getModuleOwner()->remove(i))
- QMessageBox::information(this, "Error", "Unable to remove.", "Ok");
+ QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok);
else{
- QMessageBox::information(this, "Success", "Interface was removed.", "Ok");
+ QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);
// TODO memory managment....
// who deletes the interface?
@@ -445,5 +445,5 @@ void MainWindowImp::addProfile(){ QString newProfileName = newProfile->text();
if(profiles.grep(newProfileName).count() > 0){
- QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok");
+ QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok);
return;
}
@@ -458,15 +458,15 @@ void MainWindowImp::addProfile(){ void MainWindowImp::removeProfile(){
if(profilesList->count() <= 1){
- QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", "Ok");
+ QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok);
return;
}
QString profileToRemove = profilesList->currentText();
if(profileToRemove == "All"){
- QMessageBox::information(this, "Can't remove.","Can't remove default.", "Ok");
+ QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok);
return;
}
// Can't remove the curent profile
if(profileToRemove == currentProfileLabel->text()){
- QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), "Ok");
+ QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok);
return;
@@ -508,5 +508,5 @@ void MainWindowImp::removeProfile(){ void MainWindowImp::changeProfile(){
if(profilesList->currentItem() == -1){
- QMessageBox::information(this, "Can't Change.","Please select a profile.", "Ok");
+ QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok);
return;
}
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index ec6d2c6..d6bfee1 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO @@ -3,10 +3,11 @@ CLEAN UP Fix Profiles -Write dns script - WLAN needs to be re-written to not use Config Write a class that parses /proc and not ifconfig -udchcp needs to output the dhcp information + +udchcp needs to output the dhcp information so interfaces can read it + +interfacesetupimp really doesn't need a interface* pointer Possible other modules to write: ppp, ipsec, bluetooth, ipchains diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index a19aaeb..3b1a4de 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp @@ -61,5 +61,5 @@ bool InterfaceSetupImp::saveSettings(){ if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ - QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", "Ok"); + QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok); return false; } diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 6440bd4..3b0b7e8 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -170,5 +170,5 @@ void MainWindowImp::addClicked(){ // See if the list has anything that we can add.
if(list.count() == 0){
- QMessageBox::information(this, "Sorry", "Nothing to add.", "Ok");
+ QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok);
return;
}
@@ -200,5 +200,5 @@ void MainWindowImp::removeClicked(){ QListViewItem *item = connectionList->currentItem();
if(!item) {
- QMessageBox::information(this, "Sorry","Please select an interface First.", "Ok");
+ QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
return;
}
@@ -206,11 +206,11 @@ void MainWindowImp::removeClicked(){ Interface *i = interfaceItems[item];
if(i->getModuleOwner() == NULL){
- QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
+ QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);
}
else{
if(!i->getModuleOwner()->remove(i))
- QMessageBox::information(this, "Error", "Unable to remove.", "Ok");
+ QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok);
else{
- QMessageBox::information(this, "Success", "Interface was removed.", "Ok");
+ QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);
// TODO memory managment....
// who deletes the interface?
@@ -445,5 +445,5 @@ void MainWindowImp::addProfile(){ QString newProfileName = newProfile->text();
if(profiles.grep(newProfileName).count() > 0){
- QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok");
+ QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok);
return;
}
@@ -458,15 +458,15 @@ void MainWindowImp::addProfile(){ void MainWindowImp::removeProfile(){
if(profilesList->count() <= 1){
- QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", "Ok");
+ QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok);
return;
}
QString profileToRemove = profilesList->currentText();
if(profileToRemove == "All"){
- QMessageBox::information(this, "Can't remove.","Can't remove default.", "Ok");
+ QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok);
return;
}
// Can't remove the curent profile
if(profileToRemove == currentProfileLabel->text()){
- QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), "Ok");
+ QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok);
return;
@@ -508,5 +508,5 @@ void MainWindowImp::removeProfile(){ void MainWindowImp::changeProfile(){
if(profilesList->currentItem() == -1){
- QMessageBox::information(this, "Can't Change.","Please select a profile.", "Ok");
+ QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok);
return;
}
|