From d8a75f9c10fe0a9fb14589479625ae094fb28123 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 29 Nov 2008 18:01:29 +0000
Subject: [PATCH] accidentally committed the wrong version this new version
 uses macros to make the script nicer

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5804 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/nsDialogs/timer.nsi | 85 +++++++++++++++----------------------
 1 file changed, 35 insertions(+), 50 deletions(-)

diff --git a/Contrib/nsDialogs/timer.nsi b/Contrib/nsDialogs/timer.nsi
index 8ca00032..8e386c91 100644
--- a/Contrib/nsDialogs/timer.nsi
+++ b/Contrib/nsDialogs/timer.nsi
@@ -1,14 +1,9 @@
+!include LogicLib.nsh
 !include nsDialogs.nsh
 
-!define PBM_SETPOS     0x0402
-!define PBM_DELTAPOS   0x0403
-!define PBM_GETPOS     1032
-
-!addplugindir "."
-
-Name "nsDialogs Example"
-OutFile "nsDialogs Example.exe"
-XpStyle on
+Name "nsDialogs Timer Example"
+OutFile "nsDialogs Timer Example.exe"
+XPStyle on
 
 Var DIALOG
 Var TEXT
@@ -17,56 +12,56 @@ Var PROGBAR2
 Var PROGBAR3
 Var BUTTON
 Var BUTTON2
-Var TIMERID
-Var TIMERID2
 
 Page custom nsDialogsPage
 
 Function OnTimer
-	Pop $0 ; Timer id
 
   	SendMessage $PROGBAR ${PBM_GETPOS} 0 0 $1
-	StrCmp $1 100 0 +3
-	SendMessage $PROGBAR ${PBM_SETPOS} 0 0
-	Goto +2
-	SendMessage $PROGBAR ${PBM_DELTAPOS} 10 0
+	${If} $1 = 100
+		SendMessage $PROGBAR ${PBM_SETPOS} 0 0
+	${Else}
+		SendMessage $PROGBAR ${PBM_DELTAPOS} 10 0
+	${EndIf}
 
 FunctionEnd
 
 Function OnTimer2
-	Pop $0 ; Timer id
 
   	SendMessage $PROGBAR2 ${PBM_GETPOS} 0 0 $1
-	StrCmp $1 100 0 +3
-	SendMessage $PROGBAR2 ${PBM_SETPOS} 0 0
-	Goto +2
-	SendMessage $PROGBAR2 ${PBM_DELTAPOS} 5 0
+	${If} $1 = 100
+		SendMessage $PROGBAR2 ${PBM_SETPOS} 0 0
+	${Else}
+		SendMessage $PROGBAR2 ${PBM_DELTAPOS} 5 0
+	${EndIf}
 
 FunctionEnd
 
 Function OnTimer3
-	Pop $0 ; Timer id
 
   	SendMessage $PROGBAR3 ${PBM_GETPOS} 0 0 $1
-	IntCmp $1 85 0 +4 0
- 	nsDialogs::DestroyTimer /NOUNLOAD $0
- 	MessageBox MB_OK "Timer 3 killed"
-	Goto +2
-	SendMessage $PROGBAR3 ${PBM_DELTAPOS} 2 0
+	${If} $1 >= 100
+		${NSD_KillTimer} OnTimer3
+ 		MessageBox MB_OK "Timer 3 killed"
+	${Else}
+		SendMessage $PROGBAR3 ${PBM_DELTAPOS} 2 0
+	${EndIf}
 
 FunctionEnd
 
 Function OnClick
+
 	Pop $0
 
- 	nsDialogs::DestroyTimer /NOUNLOAD $TIMERID
+	${NSD_KillTimer} OnTimer
 
 FunctionEnd
 
 Function OnClick2
+
 	Pop $0
 
- 	nsDialogs::DestroyTimer /NOUNLOAD $TIMERID2
+	${NSD_KillTimer} OnTimer2
 
 FunctionEnd
 
@@ -75,39 +70,29 @@ Function nsDialogsPage
 	nsDialogs::Create /NOUNLOAD 1018
 	Pop $DIALOG
 
-	nsDialogs::CreateControl /NOUNLOAD "STATIC" ${DEFAULT_STYLES} ${WS_EX_TRANSPARENT} 0u 0u 100% 9u "nsDialogs timer example"
+	${NSD_CreateLabel} 0u 0u 100% 9u "nsDialogs timer example"
 	Pop $TEXT
 
-	nsDialogs::CreateControl /NOUNLOAD "msctls_progress32" ${DEFAULT_STYLES} "" 0u 10u 100% 12u ""
+	${NSD_CreateProgressBar} 0u 10u 100% 12u ""
 	Pop $PROGBAR
 
-	nsDialogs::CreateControl /NOUNLOAD "BUTTON" ${DEFAULT_STYLES}|${WS_TABSTOP} "" 0u 25u 100u 14u "Kill Timer 1"
+	${NSD_CreateButton} 0u 25u 100u 14u "Kill Timer 1"
 	Pop $BUTTON
-	GetFunctionAddress $0 OnClick
-	nsDialogs::OnClick /NOUNLOAD $BUTTON $0
+	${NSD_OnClick} $BUTTON OnClick
 
-	nsDialogs::CreateControl /NOUNLOAD "msctls_progress32" ${DEFAULT_STYLES} "" 0u 52u 100% 12u ""
+	${NSD_CreateProgressBar} 0u 52u 100% 12u ""
 	Pop $PROGBAR2
 
-	nsDialogs::CreateControl /NOUNLOAD "BUTTON" ${DEFAULT_STYLES}|${WS_TABSTOP} "" 0u 67u 100u 14u "Kill Timer 2"
+	${NSD_CreateButton} 0u 67u 100u 14u "Kill Timer 2"
 	Pop $BUTTON2
-	GetFunctionAddress $0 OnClick2
-	nsDialogs::OnClick /NOUNLOAD $BUTTON2 $0
+	${NSD_OnClick} $BUTTON2 OnClick2
 
-	nsDialogs::CreateControl /NOUNLOAD "msctls_progress32" ${DEFAULT_STYLES} "" 0u 114u 100% 12u ""
+	${NSD_CreateProgressBar} 0u 114u 100% 12u ""
 	Pop $PROGBAR3
 
-	GetFunctionAddress $0 OnTimer
-	nsDialogs::CreateTimer /NOUNLOAD 1000 $0
-	Pop $TIMERID
-
-	GetFunctionAddress $0 OnTimer2
-	nsDialogs::CreateTimer /NOUNLOAD 100 $0
-	Pop $TIMERID2
-	
-	GetFunctionAddress $0 OnTimer3
-	nsDialogs::CreateTimer /NOUNLOAD 200 $0
-	Pop $0
+	${NSD_CreateTimer} OnTimer 1000
+	${NSD_CreateTimer} OnTimer2 100
+	${NSD_CreateTimer} OnTimer3 200
 
 	nsDialogs::Show