summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -38,6 +38,7 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
*/
-void InterfaceSetupImp::saveChanges(){
+bool InterfaceSetupImp::saveChanges(){
if(!saveSettings())
- return;
+ return false;
interfaces->write();
+ return true;
}
@@ -61,3 +62,3 @@ bool InterfaceSetupImp::saveSettings(){
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;
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
@@ -14,3 +14,3 @@ public:
InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, WFlags fl = 0);
- void saveChanges();
+ bool saveChanges();
@@ -19,2 +19,3 @@ public slots:
bool saveSettings();
+
private:
@@ -45,4 +46,4 @@ protected slots:
void accept(){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
};
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
@@ -123,4 +123,4 @@ void WLANImp::accept()
if ( writeConfig() ){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
}
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
@@ -38,6 +38,7 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
*/
-void InterfaceSetupImp::saveChanges(){
+bool InterfaceSetupImp::saveChanges(){
if(!saveSettings())
- return;
+ return false;
interfaces->write();
+ return true;
}
@@ -61,3 +62,3 @@ bool InterfaceSetupImp::saveSettings(){
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;
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
@@ -14,3 +14,3 @@ public:
InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, WFlags fl = 0);
- void saveChanges();
+ bool saveChanges();
@@ -19,2 +19,3 @@ public slots:
bool saveSettings();
+
private:
@@ -45,4 +46,4 @@ protected slots:
void accept(){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
};
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
@@ -123,4 +123,4 @@ void WLANImp::accept()
if ( writeConfig() ){
- interfaceSetup->saveChanges();
- QDialog::accept();
+ if(interfaceSetup->saveChanges())
+ QDialog::accept();
}