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 @@ -36,10 +36,11 @@ 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; } /** @@ -59,7 +60,7 @@ 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; } interfaces->removeAllInterfaceOptions(); 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 @@ -12,11 +12,12 @@ class InterfaceSetupImp : public InterfaceSetup { 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; @@ -43,8 +44,8 @@ private: 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 @@ -121,8 +121,8 @@ bool WLANImp::writeConfig() 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 @@ -36,10 +36,11 @@ 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; } /** @@ -59,7 +60,7 @@ 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; } interfaces->removeAllInterfaceOptions(); 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 @@ -12,11 +12,12 @@ class InterfaceSetupImp : public InterfaceSetup { 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; @@ -43,8 +44,8 @@ private: 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 @@ -121,8 +121,8 @@ bool WLANImp::writeConfig() void WLANImp::accept() { if ( writeConfig() ){ - interfaceSetup->saveChanges(); - QDialog::accept(); + if(interfaceSetup->saveChanges()) + QDialog::accept(); } } |