diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-01-16 16:28:19 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-01-16 16:28:19 +0000 |
| commit | 8a09c895c4cd0e9cc87c38181ae2913dba77c30b (patch) | |
| tree | 9b0315e07bdc53b8f35fd72cc441c3e30f47be36 | |
| parent | 06851f5c26bd24c742d13dbbac4c0b19064aba83 (diff) | |
Installer: ability to suppress message boxes in silent mode
git-svn-id: http://svn.miranda-ng.org/main/trunk@11865 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | tools/installer_ng/MirandaNG.iss | 4 | ||||
| -rw-r--r-- | tools/installer_ng_stable/MirandaNG.iss | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 611465b2de..f44898e940 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -969,7 +969,7 @@ begin if DirExists(WizardForm.DirEdit.Text) and (FileExists(WizardForm.DirEdit.Text+'\{#MirName}') or FileExists(WizardForm.DirEdit.Text+'\mir_core.dll')) then
begin
- MsgBox(ExpandConstant('{cm:FolderExists1}')+#10+#10+WizardForm.DirEdit.Text+#10+#10+ExpandConstant('{cm:FolderExists2}'), mbError, MB_OK);
+ SuppressibleMsgBox(ExpandConstant('{cm:FolderExists1}')+#10+#10+WizardForm.DirEdit.Text+#10+#10+ExpandConstant('{cm:FolderExists2}'), mbError, MB_OK, MB_OK);
Result := False;
exit;
end;
@@ -993,7 +993,7 @@ begin if CurUninstallStep=usPostUninstall then
begin
if DirExists(AddBackslash(ExpandConstant('{userappdata}\Miranda NG'))) then
- if MsgBox(ExpandConstant('{cm:ProfileUninst}'), mbError, MB_YESNO or MB_DEFBUTTON2) = IDYES then
+ if SuppressibleMsgBox(ExpandConstant('{cm:ProfileUninst}'), mbError, MB_YESNO or MB_DEFBUTTON2, IDNO) = IDYES then
begin
DelTree(AddBackslash(ExpandConstant('{userappdata}\Miranda NG')), True, True, True);
end;
diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index 777b071045..2df06dab35 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -969,7 +969,7 @@ begin if DirExists(WizardForm.DirEdit.Text) and (FileExists(WizardForm.DirEdit.Text+'\{#MirName}') or FileExists(WizardForm.DirEdit.Text+'\mir_core.dll')) then
begin
- MsgBox(ExpandConstant('{cm:FolderExists1}')+#10+#10+WizardForm.DirEdit.Text+#10+#10+ExpandConstant('{cm:FolderExists2}'), mbError, MB_OK);
+ SuppressibleMsgBox(ExpandConstant('{cm:FolderExists1}')+#10+#10+WizardForm.DirEdit.Text+#10+#10+ExpandConstant('{cm:FolderExists2}'), mbError, MB_OK, MB_OK);
Result := False;
exit;
end;
@@ -993,7 +993,7 @@ begin if CurUninstallStep=usPostUninstall then
begin
if DirExists(AddBackslash(ExpandConstant('{userappdata}\Miranda NG'))) then
- if MsgBox(ExpandConstant('{cm:ProfileUninst}'), mbError, MB_YESNO or MB_DEFBUTTON2) = IDYES then
+ if SuppressibleMsgBox(ExpandConstant('{cm:ProfileUninst}'), mbError, MB_YESNO or MB_DEFBUTTON2, IDNO) = IDYES then
begin
DelTree(AddBackslash(ExpandConstant('{userappdata}\Miranda NG')), True, True, True);
end;
|