summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-10-31 20:05:57 (UTC)
committer benmeyer <benmeyer>2002-10-31 20:05:57 (UTC)
commit16d3fac9169e400f5542ca0e3aa993cc5c5db574 (patch) (side-by-side diff)
treeac8587cb0faed786bcb362e47949b0ade5d81ada
parent6f6bf05d544a579d513c476453483ef9bedad49f (diff)
downloadopie-16d3fac9169e400f5542ca0e3aa993cc5c5db574.zip
opie-16d3fac9169e400f5542ca0e3aa993cc5c5db574.tar.gz
opie-16d3fac9169e400f5542ca0e3aa993cc5c5db574.tar.bz2
Fixed error message and made window stay if error message doesn't go away.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaces/interfacesetupimp.cpp7
-rw-r--r--noncore/net/networksetup/interfaces/interfacesetupimp.h7
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp4
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp7
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.h7
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp4
6 files changed, 20 insertions, 16 deletions
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
index 550e909..a19aaeb 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
@@ -33,16 +33,17 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
}
}
/**
* Save the current settings, then write out the interfaces file and close.
*/
-void InterfaceSetupImp::saveChanges(){
+bool InterfaceSetupImp::saveChanges(){
if(!saveSettings())
- return;
+ return false;
interfaces->write();
+ return true;
}
/**
* Save the settings for the current Interface.
* @return bool true if successfull, false otherwise
*/
@@ -56,13 +57,13 @@ bool InterfaceSetupImp::saveSettings(){
if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
return true;
}
if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
- QMessageBox::information(this, "Not Saved.", "Please fill in address, subnet,\n and gateway entries.", "Ok");
+ QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", "Ok");
return false;
}
interfaces->removeAllInterfaceOptions();
// DHCP
if(dhcpCheckBox->isChecked()){
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.h b/noncore/net/networksetup/interfaces/interfacesetupimp.h
index 3bbf34e..a88e190 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.h
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.h
@@ -9,17 +9,18 @@ class Interfaces;
class InterfaceSetupImp : public InterfaceSetup {
Q_OBJECT
public:
InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, WFlags fl = 0);
- void saveChanges();
+ bool saveChanges();
public slots:
void setProfile(const QString &profile);
bool saveSettings();
+
private:
Interfaces *interfaces;
Interface *interface;
};
@@ -40,14 +41,14 @@ public:
private:
InterfaceSetupImp *interfaceSetup;
protected slots:
void accept(){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
};
};
#endif
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 74bf390..01d7e36 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -118,14 +118,14 @@ bool WLANImp::writeConfig()
/**
*/
void WLANImp::accept()
{
if ( writeConfig() ){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
}
}
bool WLANImp::writeWirelessOpts( QString scheme )
{
qWarning( "WLANImp::writeWirelessOpts entered." );
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 550e909..a19aaeb 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -33,16 +33,17 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
}
}
/**
* Save the current settings, then write out the interfaces file and close.
*/
-void InterfaceSetupImp::saveChanges(){
+bool InterfaceSetupImp::saveChanges(){
if(!saveSettings())
- return;
+ return false;
interfaces->write();
+ return true;
}
/**
* Save the settings for the current Interface.
* @return bool true if successfull, false otherwise
*/
@@ -56,13 +57,13 @@ bool InterfaceSetupImp::saveSettings(){
if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
return true;
}
if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
- QMessageBox::information(this, "Not Saved.", "Please fill in address, subnet,\n and gateway entries.", "Ok");
+ QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", "Ok");
return false;
}
interfaces->removeAllInterfaceOptions();
// DHCP
if(dhcpCheckBox->isChecked()){
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
index 3bbf34e..a88e190 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
@@ -9,17 +9,18 @@ class Interfaces;
class InterfaceSetupImp : public InterfaceSetup {
Q_OBJECT
public:
InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, WFlags fl = 0);
- void saveChanges();
+ bool saveChanges();
public slots:
void setProfile(const QString &profile);
bool saveSettings();
+
private:
Interfaces *interfaces;
Interface *interface;
};
@@ -40,14 +41,14 @@ public:
private:
InterfaceSetupImp *interfaceSetup;
protected slots:
void accept(){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
};
};
#endif
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 74bf390..01d7e36 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -118,14 +118,14 @@ bool WLANImp::writeConfig()
/**
*/
void WLANImp::accept()
{
if ( writeConfig() ){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
}
}
bool WLANImp::writeWirelessOpts( QString scheme )
{
qWarning( "WLANImp::writeWirelessOpts entered." );