# HG changeset patch
# User Dan
# Date 1249350252 14400
# Node ID 2ae1abe546fd5d4838878efc0eacef7a4d901995
# Parent  e1e0fe6c578e2c3d6cc095b4939a144062acc23c
Updated all examples for detached installation compatibility

diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/Basic.nsi
--- a/Examples/ExperienceUI/Basic.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/Basic.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -31,7 +31,7 @@
 ;Pages
 
   ${Page} Welcome
-  ${LicensePage} "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+  ${LicensePage} "${XPUI_SYSDIR}\License.rtf"
   ${Page} Components
   ${Page} Directory
   ${Page} InstFiles
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/HeaderBitmap.nsi
--- a/Examples/ExperienceUI/HeaderBitmap.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/HeaderBitmap.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -25,7 +25,7 @@
 ;--------------------------------
 ;Interface Configuration
 
-  !define XPUI_HEADERIMAGE "${NSISDIR}\Contrib\ExperienceUI\Skins\Windows XP\Header.bmp"
+  !define XPUI_HEADERIMAGE "${XPUI_SYSDIR}\Skins\Windows XP\Header.bmp"
   ; might as well do a bottom image as well...
   !define XPUI_BOTTOMIMAGE ;we don't have to define a custom bottom image, the default is fine.
   !define XPUI_ABORTWARNING
@@ -33,7 +33,7 @@
 ;--------------------------------
 ;Pages
 
-  !insertmacro XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+  !insertmacro XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
   !insertmacro XPUI_PAGE_COMPONENTS
   !insertmacro XPUI_PAGE_DIRECTORY
   !insertmacro XPUI_PAGE_INSTFILES
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/InstallOptions.nsi
--- a/Examples/ExperienceUI/InstallOptions.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/InstallOptions.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -30,7 +30,7 @@
 ;--------------------------------
 ;Pages
 
-  !insertmacro XPUI_PAGE_LICENSE "${NSISDIR}\Docs\ExperienceUI\Index.htm"
+  !insertmacro XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\..\..\Docs\ExperienceUI\Index.htm"
   Page custom CustomPageA
   !insertmacro XPUI_PAGE_COMPONENTS
   Page custom CustomPageB
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/MultiLang.nsi
--- a/Examples/ExperienceUI/MultiLang.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/MultiLang.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -23,7 +23,7 @@
 
 !insertmacro XPUI_PAGE_WELCOME
 !insertmacro XPUI_PAGE_WELCOME2
-!insertmacro XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !insertmacro XPUI_PAGE_COMPONENTS
 !insertmacro XPUI_PAGE_DIRECTORY
 !insertmacro XPUI_PAGE_INSTCONFIRM
@@ -35,7 +35,7 @@
 !insertmacro XPUI_PAGEMODE_UNINST
 !insertmacro XPUI_PAGE_WELCOME
 !insertmacro XPUI_PAGE_WELCOME2
-!insertmacro XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !insertmacro XPUI_PAGE_COMPONENTS
 !insertmacro XPUI_PAGE_DIRECTORY
 !insertmacro XPUI_PAGE_UNINSTCONFIRM_NSIS
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/Realworld.nsi
--- a/Examples/ExperienceUI/Realworld.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/Realworld.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -97,7 +97,7 @@
 !define XPUI_PAGE_CUSTOMFUNCTION_SHOW WelSetTime
 !insertmacro XPUI_PAGE_WELCOME
 !define XPUI_PAGE_CUSTOMFUNCTION_SHOW LicSetTime
-!insertmacro XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !define XPUI_PAGE_CUSTOMFUNCTION_SHOW CmpSetTime
 !insertmacro XPUI_PAGE_COMPONENTS
 !define XPUI_PAGE_CUSTOMFUNCTION_SHOW DirSetTime
@@ -225,7 +225,7 @@
 !macro INSTALL_BASEFILES
 StrCpy $INSTALLING_README 0
 SetOutPath "$INSTDIR"
-File Data\Notepad.exe
+File "$%SystemRoot%\System32\Notepad.exe"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString "$INSTDIR\Uninst.exe"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" ModifyPath "$INSTDIR\Setup.exe"
@@ -325,7 +325,7 @@
 ReadRegStr $0 HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name) DisplayName
 StrCmp $0 "" "" +2
 Abort
-!insertmacro XPUI_INSTALLOPTIONS_EXTRACT_AS "${NSISDIR}\Contrib\ExperienceUI\INI\Repair.ini" "Repair.ini"
+!insertmacro XPUI_INSTALLOPTIONS_EXTRACT_AS "${XPUI_SYSDIR}\INI\Repair.ini" "Repair.ini"
 !insertmacro XPUI_HEADER_TEXT `Welcome to the $(^Name) Setup Wizard` `Select which maintenance action you wish to perform.`
 !insertmacro XPUI_INSTALLOPTIONS_INITDIALOG "Repair.ini"
 Pop $1
@@ -403,7 +403,7 @@
 Banner::destroy
 Quit
 Repair:
-!insertmacro XPUI_INSTALLOPTIONS_EXTRACT_AS "${NSISDIR}\Contrib\ExperienceUI\INI\confirm_rep.ini" "confirm_rep.ini"
+!insertmacro XPUI_INSTALLOPTIONS_EXTRACT_AS "${XPUI_SYSDIR}\INI\confirm_rep.ini" "confirm_rep.ini"
 !insertmacro XPUI_INSTALLOPTIONS_WRITE Confirm_rep.ini "Settings" NextButtonText "Next"
 !insertmacro XPUI_INSTALLOPTIONS_WRITE Confirm_Rep.ini "Settings" BackEnabled 1
 !insertmacro XPUI_INSTALLOPTIONS_WRITE Confirm_Rep.ini "Field 2" Text "Setup is ready to repair $(^Name)."
@@ -482,7 +482,7 @@
 !insertmacro XPUI_SET_BG
 !endif
 SetOutPath $PLUGINSDIR
-File "${NSISDIR}\Contrib\ExperienceUI\INI\Confirm.ini"
+File "${XPUI_SYSDIR}\INI\Confirm.ini"
 !insertmacro XPUI_HEADER_TEXT `Repair Complete` `Setup has successfully repaired your installation of $(^Name).`
 WriteINIStr $PLUGINSDIR\Confirm.ini "Settings" NextButtonText "Finish"
 WriteINIStr $PLUGINSDIR\Confirm.ini "Settings" BackEnabled 0
@@ -515,7 +515,7 @@
 Function un.unsuccess
 StrCmp $6 1 "" UninstGood
 SetOutPath $PLUGINSDIR
-File "${NSISDIR}\Contrib\ExperienceUI\INI\confirm.ini"
+File "${XPUI_SYSDIR}\INI\confirm.ini"
 !insertmacro XPUI_HEADER_TEXT `Uninstall Incomplete` `Setup encountered a problem while uninstalling $(^Name).`
 WriteINIStr $PLUGINSDIR\Confirm.ini "Settings" NextButtonText "Close"
 WriteINIStr $PLUGINSDIR\Confirm.ini "Field 2" Text "An error occured while uninstalling $(^Name)."
@@ -534,7 +534,7 @@
 Return
 UninstGood:
 SetOutPath $PLUGINSDIR
-File "${NSISDIR}\Contrib\ExperienceUI\INI\confirm.ini"
+File "${XPUI_SYSDIR}\INI\confirm.ini"
 !insertmacro XPUI_HEADER_TEXT `Uninstall Complete` `Setup has successfully uninstalled $(^Name) from your computer.`
 WriteINIStr $PLUGINSDIR\Confirm.ini "Settings" NextButtonText "Close"
 WriteINIStr $PLUGINSDIR\Confirm.ini "Field 1" Text "$(^Name) has been successfully uninstalled."
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/StartMenu.nsi
--- a/Examples/ExperienceUI/StartMenu.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/StartMenu.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -38,7 +38,7 @@
 ;--------------------------------
 ;Pages
 
-  !insertmacro XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+  !insertmacro XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
   !insertmacro XPUI_PAGE_COMPONENTS
   !insertmacro XPUI_PAGE_DIRECTORY
   
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/UmuiImport.nsi
--- a/Examples/ExperienceUI/UmuiImport.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/UmuiImport.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -35,7 +35,7 @@
 ;Pages
 
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+  !insertmacro MUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/WAnsis.nsi
--- a/Examples/ExperienceUI/WAnsis.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/WAnsis.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -24,7 +24,7 @@
 !define       XPUI_PAGE_CUSTOMFUNCTION_PRE SetTime
 !insertmacro  XPUI_PAGE_WELCOME
 !insertmacro  XPUI_PAGE_WELCOME2
-!insertmacro  XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro  XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !insertmacro  XPUI_PAGE_COMPONENTS
 !insertmacro  XPUI_PAGE_DIRECTORY
 !insertmacro  XPUI_PAGE_STARTMENU App $0
@@ -36,7 +36,7 @@
 !insertmacro  XPUI_PAGEMODE_UNINST
 !insertmacro  XPUI_PAGE_WELCOME
 !insertmacro  XPUI_PAGE_WELCOME2
-!insertmacro  XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro  XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !insertmacro  XPUI_PAGE_COMPONENTS
 !insertmacro  XPUI_PAGE_DIRECTORY
 !insertmacro  XPUI_PAGE_STARTMENU UninstApp $0
@@ -45,9 +45,6 @@
 !insertmacro  XPUI_PAGE_FINISH
 !insertmacro  XPUI_PAGE_ABORT
 
-Icon D:\Nullsoft\NSIS2\Contrib\Graphics\Icons\modern-install-colorful.ico
-UninstallIcon D:\Nullsoft\NSIS2\Contrib\Graphics\Icons\modern-uninstall-colorful.ico
-
 Name "ExperienceUI $\"Bryce$\" Milestone One WAnsis Test"
 OutFile WAnsis.exe
 InstallDir $PROGRAMFILES\$(^Name)
@@ -78,7 +75,7 @@
 !define       XPUI_PAGE_CUSTOMFUNCTION_PRE ChangeSkin
 !insertmacro  XPUI_PAGE_WELCOME
 !insertmacro  XPUI_PAGE_WELCOME2
-!insertmacro  XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro  XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !insertmacro  XPUI_PAGE_COMPONENTS
 !insertmacro  XPUI_PAGE_DIRECTORY
 !insertmacro  XPUI_PAGE_INSTCONFIRM
@@ -94,7 +91,7 @@
 !define       XPUI_UNPAGE_CUSTOMFUNCTION_PRE un.ChangeSkin
 !insertmacro  XPUI_PAGE_WELCOME
 !insertmacro  XPUI_PAGE_WELCOME2
-!insertmacro  XPUI_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+!insertmacro  XPUI_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
 !insertmacro  XPUI_PAGE_COMPONENTS
 !insertmacro  XPUI_PAGE_DIRECTORY
 !insertmacro  XPUI_PAGE_INSTCONFIRM
@@ -111,7 +108,7 @@
 Function ChangeSkin
 LockWindow on
 SetOutPath $PLUGINSDIR
-File "${NSISDIR}\Contrib\ExperienceUI\Skins\LCD\*.bmp"
+File "${XPUI_SYSDIR}\Skins\LCD\*.bmp"
 SetBrandingImage /IMGID=1302 /RESIZETOFIT $PLUGINSDIR\LeftLogo.bmp
 SetBrandingImage /IMGID=1039 /RESIZETOFIT $PLUGINSDIR\bottom.bmp
 SetBrandingImage /IMGID=1046 /RESIZETOFIT $PLUGINSDIR\Header.bmp
@@ -123,7 +120,7 @@
 Function un.ChangeSkin
 LockWindow on
 SetOutPath $PLUGINSDIR
-File "${NSISDIR}\Contrib\ExperienceUI\Skins\LCD\*.bmp"
+File "${XPUI_SYSDIR}\Skins\LCD\*.bmp"
 SetBrandingImage /IMGID=1302 /RESIZETOFIT $PLUGINSDIR\LeftLogo.bmp
 SetBrandingImage /IMGID=1039 /RESIZETOFIT $PLUGINSDIR\bottom.bmp
 SetBrandingImage /IMGID=1046 /RESIZETOFIT $PLUGINSDIR\Header.bmp
@@ -144,7 +141,7 @@
 Function .onInit
   InitPluginsDir
   SetOutPath $PLUGINSDIR
-  File /oname=splash.gif "${NSISDIR}\Contrib\ExperienceUI\LargeLogo.gif"
+  File /oname=splash.gif "${XPUI_SYSDIR}\LargeLogo.gif"
   newAdvSplash::show 5000 1000 1000 -1 "$PLUGINSDIR\splash.gif"
 FunctionEnd
 
diff -r e1e0fe6c578e -r 2ae1abe546fd Examples/ExperienceUI/WelcomeFinish.nsi
--- a/Examples/ExperienceUI/WelcomeFinish.nsi	Mon Aug 03 21:43:50 2009 -0400
+++ b/Examples/ExperienceUI/WelcomeFinish.nsi	Mon Aug 03 21:44:12 2009 -0400
@@ -39,7 +39,7 @@
 ;Pages
 
   !insertmacro ${UI}_PAGE_WELCOME
-  !insertmacro ${UI}_PAGE_LICENSE "${NSISDIR}\Contrib\ExperienceUI\License.rtf"
+  !insertmacro ${UI}_PAGE_LICENSE "${XPUI_SYSDIR}\License.rtf"
   !ifdef XPUI_INCLUDED
   !define ${UI}_FINISHPAGE_RUN        "$SYSDIR\Write.exe"
   !define ${UI}_FINISHPAGE_RUN_FILE   "$SYSDIR\Write.exe"