WinGui: Improvements to the installer. Fixed the issue where the uninstaller could appear behind the installer. Updated the Background Image on the installer to the project logo.

4 files changed, 12 insertions, 4 deletions

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 7563249e5..57714f3cf 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -33,6 +33,8 @@ SetCompressor lzma
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)

 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."

 

+!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"

+

 ; Welcome page

 !insertmacro MUI_PAGE_WELCOME

 ; License page

@@ -107,10 +109,11 @@ Function .onInit
 

  ;Run the uninstaller

   uninst:

+   CopyFiles /SILENT /FILESONLY "$INSTDIR\uninst.exe" "$TEMP\uninstallhb.exe"

    IfSilent +3

-   ExecWait $INSTDIR\uninst.exe

+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR'

    goto done

-   ExecWait '"$INSTDIR\uninst.exe" /S'

+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR /S'

   done:

 FunctionEnd

 

diff --git a/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp b/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp
new file mode 100644
index 000000000..7499d028a
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index b67757a95..ecd6d5b7f 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -33,6 +33,8 @@ SetCompressor lzma
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)

 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."

 

+!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"

+

 ; Welcome page

 !insertmacro MUI_PAGE_WELCOME

 ; License page

@@ -106,10 +108,11 @@ Function .onInit
 

  ;Run the uninstaller

   uninst:

+   CopyFiles /SILENT /FILESONLY "$INSTDIR\uninst.exe" "$TEMP\uninstallhb.exe"

    IfSilent +3

-   ExecWait $INSTDIR\uninst.exe

+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR'

    goto done

-   ExecWait '"$INSTDIR\uninst.exe" /S'

+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR /S'

   done:

 FunctionEnd

 

diff --git a/win/CS/build.xml b/win/CS/build.xml
index 92f199c29..716d17c2d 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -59,6 +59,7 @@
   <!-- Post Build Events -->

   <Target Name="NightlyPostBuild">

     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />

     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />

@@ -67,6 +68,7 @@
 

   <Target Name="ReleasePostBuild">

     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />

     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />

     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />