fixed #1639 "Add success message to the bottom of the process log

for the installer".
This commit is contained in:
Vadim Kurland
2010-07-29 23:42:26 +00:00
parent 5efa16a76c
commit 24b2b690e1
3 changed files with 15 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 3170 #define BUILD_NUM 3172
+5
View File
@@ -1,5 +1,10 @@
2010-07-29 Vadim Kurland <vadim@vk.crocodile.org> 2010-07-29 Vadim Kurland <vadim@vk.crocodile.org>
* instDialog_installer.cpp (instDialog::installerSuccess):
fixed #1639 "Add success message to the bottom of the process log
for the installer". Added a message to the installer log to
display installation status.
* stop_action: "stop" action should reset ipv4 iptables * stop_action: "stop" action should reset ipv4 iptables
configuration only if firewall object configuration defines any configuration only if firewall object configuration defines any
ipv4 rules. This is how generated script works for ipv6; behavior ipv4 rules. This is how generated script works for ipv6; behavior
+9 -1
View File
@@ -138,6 +138,8 @@ bool instDialog::runInstaller(Firewall *fw, bool cancelAllVisible)
opListMapping[fw->getId()]->setText(1, tr("Failure")); opListMapping[fw->getId()]->setText(1, tr("Failure"));
setFailureState(opListMapping[fw->getId()]); setFailureState(opListMapping[fw->getId()]);
addToLog("Firewall policy installation failed\n");
QTimer::singleShot( 0, this, SLOT(mainLoopInstall())); QTimer::singleShot( 0, this, SLOT(mainLoopInstall()));
} }
return true; return true;
@@ -199,6 +201,9 @@ void instDialog::installerSuccess()
cnf.fwobj->getId())); cnf.fwobj->getId()));
currentProgressBar->setValue(currentProgressBar->maximum()); currentProgressBar->setValue(currentProgressBar->maximum());
addToLog("Firewall policy successfully installed\n");
QTimer::singleShot( 1000, this, SLOT(mainLoopInstall())); QTimer::singleShot( 1000, this, SLOT(mainLoopInstall()));
} }
@@ -206,7 +211,10 @@ void instDialog::installerError()
{ {
opError(cnf.fwobj); opError(cnf.fwobj);
currentProgressBar->setValue(currentProgressBar->maximum()); currentProgressBar->setValue(currentProgressBar->maximum());
QTimer::singleShot( 0, this, SLOT(mainLoopInstall()));
opListMapping[cnf.fwobj->getId()]->setText(1, tr("Failure")); opListMapping[cnf.fwobj->getId()]->setText(1, tr("Failure"));
addToLog("Firewall policy installation failed\n");
QTimer::singleShot( 0, this, SLOT(mainLoopInstall()));
} }