WinGui: Switch the other installer files over to use capital B

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7354 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 53 insertions, 53 deletions

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index ad4da4c62..124994498 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -1,7 +1,7 @@
 /*  Resources.Designer.cs $

 

  	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

+ 	   Homepage: <http://HandBrake.fr/>.

  	   It may be used under the terms of the GNU General Public License. */

 

 ; Script generated by the HM NIS Edit Script Wizard.

@@ -10,7 +10,7 @@
 !define PRODUCT_NAME "HandBrake"

 !define PRODUCT_VERSION "1.0.0"

 !define PRODUCT_VERSION_NUMBER "1.0.0"

-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"

+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

 

@@ -27,8 +27,8 @@ SetCompressor lzma
 

 ; MUI Settings

 !define MUI_ABORTWARNING

-!define MUI_ICON "handbrakepineapple.ico"

-!define MUI_UNICON "handbrakepineapple.ico"

+!define MUI_ICON "HandBrakepineapple.ico"

+!define MUI_UNICON "HandBrakepineapple.ico"

 

 ; Welcome page

 !insertmacro MUI_PAGE_WELCOME

@@ -39,7 +39,7 @@ SetCompressor lzma
 ; Instfiles page

 !insertmacro MUI_PAGE_INSTFILES

 ; Finish page

-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"

+;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"

 !insertmacro MUI_PAGE_FINISH

 

 ; Uninstaller pages

@@ -57,7 +57,7 @@ OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
 !insertmacro VersionCompare

 !include LogicLib.nsh

 

-InstallDir "$PROGRAMFILES\Handbrake"

+InstallDir "$PROGRAMFILES\HandBrake"

 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""

 ShowInstDetails show

 ShowUnInstDetails show

@@ -101,7 +101,7 @@ Function .onInit
   done:

 FunctionEnd

 

-Section "Handbrake" SEC01

+Section "HandBrake" SEC01

   SetOutPath "$INSTDIR"

   SetOverwrite ifnewer

 

@@ -132,9 +132,9 @@ Section "Handbrake" SEC01
   

   ; Install Files

   File "*.exe"

-  CreateDirectory "$SMPROGRAMS\Handbrake"

-  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

+  CreateDirectory "$SMPROGRAMS\HandBrake"

+  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"

+  CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"

   File "*.dll"

   File "*.config"

   File "*.pdb"

@@ -151,15 +151,15 @@ Section "Handbrake" SEC01
 SectionEnd

 

 Section -AdditionalIcons

-  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"

+  CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"

 SectionEnd

 

 Section -Post

   WriteUninstaller "$INSTDIR\uninst.exe"

-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"

+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"

-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

 SectionEnd

 

@@ -186,10 +186,10 @@ Section Uninstall
   RMDIR  "$INSTDIR\fonts\conf.d"

   RMDIR  "$INSTDIR\fonts\conf.avail"

   RMDIR  "$INSTDIR\fonts"

-  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

-  Delete "$DESKTOP\Handbrake.lnk"

-  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"

-  RMDir  "$SMPROGRAMS\Handbrake"

+  Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"

+  Delete "$DESKTOP\HandBrake.lnk"

+  Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"

+  RMDir  "$SMPROGRAMS\HandBrake"

   RMDir  "$INSTDIR"

 

   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index d48a91ad6..46f129da5 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -1,7 +1,7 @@
 /*  Resources.Designer.cs $

 

  	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

+ 	   Homepage: <http://HandBrake.fr/>.

  	   It may be used under the terms of the GNU General Public License. */

 

 ; Script generated by the HM NIS Edit Script Wizard.

@@ -10,7 +10,7 @@
 !define PRODUCT_NAME "HandBrake"

 !define PRODUCT_VERSION "1.0.0"

 !define PRODUCT_VERSION_NUMBER "1.0.0"

-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"

+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

 

@@ -27,8 +27,8 @@ SetCompressor lzma
 

 ; MUI Settings

 !define MUI_ABORTWARNING

-!define MUI_ICON "handbrakepineapple.ico"

-!define MUI_UNICON "handbrakepineapple.ico"

+!define MUI_ICON "HandBrakepineapple.ico"

+!define MUI_UNICON "HandBrakepineapple.ico"

 

 ; Welcome page

 !insertmacro MUI_PAGE_WELCOME

@@ -39,7 +39,7 @@ SetCompressor lzma
 ; Instfiles page

 !insertmacro MUI_PAGE_INSTFILES

 ; Finish page

-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"

+;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"

 !insertmacro MUI_PAGE_FINISH

 

 ; Uninstaller pages

@@ -57,7 +57,7 @@ OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
 !insertmacro VersionCompare

 !include LogicLib.nsh

 

-InstallDir "$PROGRAMFILES64\Handbrake"

+InstallDir "$PROGRAMFILES64\HandBrake"

 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""

 ShowInstDetails show

 ShowUnInstDetails show

@@ -101,7 +101,7 @@ Function .onInit
   done:

 FunctionEnd

 

-Section "Handbrake" SEC01

+Section "HandBrake" SEC01

   SetOutPath "$INSTDIR"

   SetOverwrite ifnewer

 

@@ -131,10 +131,10 @@ Section "Handbrake" SEC01
   ${EndIf}

   

   ; Install Files

-  File "Handbrake.exe"

-  CreateDirectory "$SMPROGRAMS\Handbrake"

-  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

+  File "HandBrake.exe"

+  CreateDirectory "$SMPROGRAMS\HandBrake"

+  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"

+  CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"

   File "*.dll"

   File "*.config"

   File "*.pdb"

@@ -153,15 +153,15 @@ Section "Handbrake" SEC01
 SectionEnd

 

 Section -AdditionalIcons

-  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"

+  CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"

 SectionEnd

 

 Section -Post

   WriteUninstaller "$INSTDIR\uninst.exe"

-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"

+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"

-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

 SectionEnd

 

@@ -188,10 +188,10 @@ Section Uninstall
   RMDIR  "$INSTDIR\fonts\conf.d"

   RMDIR  "$INSTDIR\fonts\conf.avail"

   RMDIR  "$INSTDIR\fonts"

-  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

-  Delete "$DESKTOP\Handbrake.lnk"

-  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"

-  RMDir  "$SMPROGRAMS\Handbrake"

+  Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"

+  Delete "$DESKTOP\HandBrake.lnk"

+  Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"

+  RMDir  "$SMPROGRAMS\HandBrake"

   RMDir  "$INSTDIR"

 

   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
index 3ce3ce5fe..188c795d1 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
@@ -1,16 +1,16 @@
 /*  Resources.Designer.cs $

 

  	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

+ 	   Homepage: <http://HandBrake.fr/>.

  	   It may be used under the terms of the GNU General Public License. */

 

 ; Script generated by the HM NIS Edit Script Wizard.

 

 ; HM NIS Edit Wizard helper defines

-!define PRODUCT_NAME "Handbrake"

+!define PRODUCT_NAME "HandBrake"

 !define PRODUCT_VERSION "$WCREV$ Nightly"

 !define PRODUCT_VERSION_NUMBER "svn$WCREV$"

-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"

+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

 

@@ -27,8 +27,8 @@ SetCompressor lzma
 

 ; MUI Settings

 !define MUI_ABORTWARNING

-!define MUI_ICON "handbrakepineapple.ico"

-!define MUI_UNICON "handbrakepineapple.ico"

+!define MUI_ICON "HandBrakepineapple.ico"

+!define MUI_UNICON "HandBrakepineapple.ico"

 

 ; Welcome page

 !insertmacro MUI_PAGE_WELCOME

@@ -39,7 +39,7 @@ SetCompressor lzma
 ; Instfiles page

 !insertmacro MUI_PAGE_INSTFILES

 ; Finish page

-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"

+;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"

 !insertmacro MUI_PAGE_FINISH

 

 ; Uninstaller pages

@@ -57,7 +57,7 @@ OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe"
 !insertmacro VersionCompare

 !include LogicLib.nsh

 

-InstallDir "$PROGRAMFILES\Handbrake"

+InstallDir "$PROGRAMFILES\HandBrake"

 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""

 ShowInstDetails show

 ShowUnInstDetails show

@@ -101,7 +101,7 @@ Function .onInit
   done:

 FunctionEnd

 

-Section "Handbrake" SEC01

+Section "HandBrake" SEC01

   SetOutPath "$INSTDIR"

   SetOverwrite ifnewer

 

@@ -132,9 +132,9 @@ Section "Handbrake" SEC01
   

   ; Install Files

   File "*.exe"

-  CreateDirectory "$SMPROGRAMS\Handbrake"

-  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

+  CreateDirectory "$SMPROGRAMS\HandBrake"

+  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"

+  CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"

   File "*.dll"

   File "*.config"

   File "*.pdb"

@@ -151,15 +151,15 @@ Section "Handbrake" SEC01
 SectionEnd

 

 Section -AdditionalIcons

-  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"

+  CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"

 SectionEnd

 

 Section -Post

   WriteUninstaller "$INSTDIR\uninst.exe"

-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"

+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"

-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"

   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

 SectionEnd

 

@@ -186,10 +186,10 @@ Section Uninstall
   RMDIR  "$INSTDIR\fonts\conf.d"

   RMDIR  "$INSTDIR\fonts\conf.avail"

   RMDIR  "$INSTDIR\fonts"

-  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

-  Delete "$DESKTOP\Handbrake.lnk"

-  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"

-  RMDir  "$SMPROGRAMS\Handbrake"

+  Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"

+  Delete "$DESKTOP\HandBrake.lnk"

+  Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"

+  RMDir  "$SMPROGRAMS\HandBrake"

   RMDir  "$INSTDIR"

 

   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"