Make the windows installer look pretty thanks to Seb

bundle/win/Bundle.wxs

@@ -12,6 +12,7 @@
           HelpUrl="https://www.plex.tv/"
           Copyright="Plex"
           AboutUrl="https://www.plex.tv/"
+          Tag="$(var.FullVersion)"
           >
     <util:RegistrySearch Variable="KB2919355_amd64"
                          Root="HKLM"
@@ -47,14 +48,15 @@
                      Result="exists"
                      Condition="NOT Found_ucrtbase_dll"
                      />
-
+                     
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
       <bal:WixStandardBootstrapperApplication
         LicenseUrl=""
         ThemeFile="pmstheme.xml"
         LocalizationFile="HyperlinkTheme.wxl"
         />
-      <Payload SourceFile="pms64x64.png" />
+      <Payload SourceFile="plex-chevron-85.png" />
+      <Payload SourceFile="progress-bar.png" />
     </BootstrapperApplicationRef>
 
     <Variable Name="autolaunch" bal:Overridable="yes" Type="numeric" Value="0" />

bundle/win/HyperlinkTheme.wxl

@@ -4,7 +4,7 @@
   <String Id="Title">[WixBundleName]</String>
   <String Id="InstallHeader">Welcome</String>
   <String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click Install to continue, Options to set the install directory or Close to exit.</String>
-  <String Id="InstallVersion">Version [WixBundleVersion]</String>
+  <String Id="InstallVersion">Version [WixBundleTag]</String>
   <String Id="ModifyMessage">Setup will repair or uninstall [WixBundleName] from your computer.</String>
   <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
   <String Id="HelpHeader">Setup Help</String>

bundle/win/PMP.wxs

@@ -28,6 +28,10 @@
 
     <!-- Only allow all-users installations, to defeat bugs in XP with per-user installations -->
     <Property Id="ALLUSERS" Value="1" />
+    
+    <!-- allow for reinstall, this is needed to force installation when the version match -->
+    <Property Id="REINSTALLMODE" Value="amus"/>
+    
     <Condition Message="?(var.LaunchCondition_PerUser)">ALLUSERS</Condition>
     
     <!-- Embedded, compressed cab file -->

bundle/win/Version.wxi.in

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
   <?define Version=@VERSION_STRING_SHORT@ ?>
+  <?define FullVersion=@VERSION_STRING@ ?>
   <?define DeployPath=@CMAKE_INSTALL_PREFIX@ ?>
 </Include>

bundle/win/pmstheme.xml

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
   <Window Width="485" Height="390" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
-  <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-  <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
+  <Font Id="0" Height="-12" Weight="500" Foreground="FFFFFF" Background="1F1F1F">Segoe UI</Font>
+  <Font Id="1" Height="-24" Weight="500" Foreground="FFFFFF">Segoe UI</Font>
   <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
-  <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-  <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
-
-  <Text X="150" Y="26" Width="-11" Height="64" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
-  <Image X="11" Y="11" Width="120" Height="64" ImageFile="pms64x64.png" Visible="yes" />
+  <Font Id="3" Height="-12" Weight="500" Foreground="FFFFFF" Background="1F1F1F">Segoe UI</Font>
+  <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="1F1F1F" Underline="yes">Segoe UI</Font>
+  <Font Id="5" Height="-24" Weight="500" Foreground="197BCC">Segoe UI</Font>
+  
+  <Text X="11" Y="26" Width="-11" Height="30" FontId="5" Visible="yes" DisablePrefix="yes" Center="yes">#(loc.Title)</Text>
+  <Image X="200" Y="75" Width="85" Height="85" ImageFile="plex-chevron-85.png" Visible="yes" />
 
   <Page Name="Help">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
-    <Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
+    <Text X="65" Y="180" Width="-65" Center="yes" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
+    <Text X="65" Y="220" Width="-65" Center="yes" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
     <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
   </Page>
   <Page Name="Install">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Text>
-    <Text X="11" Y="121" Width="-11" Height="-129" FontId="3" DisablePrefix="yes">#(loc.InstallMessage)</Text>
+    <Text X="11" Y="170" Width="-11" Height="30" FontId="1" DisablePrefix="yes" Center="yes">#(loc.InstallHeader)</Text>
+    <Text X="65" Y="215" Width="-65" Height="-100" FontId="3" DisablePrefix="yes" Center="yes">#(loc.InstallMessage)</Text>
     <!-- HexStyle="0x800000" -->
-    <Hypertext Name="EulaHyperlink" X="11" Y="-107" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
-    <Text X="11" Y="-73" Width="246" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallVersion)</Text>
-    <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
+    <Hypertext Name="EulaHyperlink" X="11" Y="-107" Width="-11" Height="17" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
+    <Text X="11" Y="-73" Width="-11" Height="17" FontId="3" DisablePrefix="yes" Center="yes">#(loc.InstallVersion)</Text>
+    <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
     <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
     <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
     <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
   </Page>
   <Page Name="Options">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
-    <Text X="11" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
-    <Editbox Name="FolderEditbox" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
-    <Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
+    <Text X="11" Y="170" Width="-11" Height="30" FontId="2" DisablePrefix="yes" Center="yes">#(loc.OptionsHeader)</Text>
+    <Text X="11" Y="205" Width="-11" Height="17" FontId="3" DisablePrefix="yes" Center="yes">#(loc.OptionsLocationLabel)</Text>
+    <Editbox Name="FolderEditbox" X="70" Y="240" Width="-145" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
+    <Button Name="BrowseButton" X="-65" Y="240" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
     <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
     <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
   </Page>
   <Page Name="Progress">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
-    <Text X="11" Y="121" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-    <Text Name="OverallProgressPackageText" X="85" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
-    <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
+    <Text X="65" Y="180" Width="-65" Center="yes" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
+    <Text X="65" Y="220" Width="-65" Center="yes" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
+    <Text Name="OverallProgressPackageText" X="65" Y="280" Width="-65" Center="yes" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
+    <Progressbar Name="OverallCalculatedProgressbar" X="65" Y="250" Width="-65 " Height="15" ImageFile="progress-bar.png" />
     <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
   </Page>
   <Page Name="Modify">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
-    <Text X="11" Y="121" Width="-11" Height="-129" FontId="3" DisablePrefix="yes">#(loc.ModifyMessage)</Text>
+    <Text X="65" Y="180" Width="-65" Center="yes" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
+    <Text X="65" Y="220" Width="-65" Center="yes" Height="-100" FontId="3" DisablePrefix="yes">#(loc.ModifyMessage)</Text>
     <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
     <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
     <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
   </Page>
   <Page Name="Success">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-    <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-    <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
+    <Text X="64" Y="180" Width="-64" Height="30" FontId="2" DisablePrefix="yes" Center="yes">#(loc.SuccessHeader)</Text>
+    <Button Name="LaunchButton" X="200" Y="225" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
+    <Text Name="SuccessRestartText" X="65" Y="-51" Width="-65" Center="yes" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
     <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
     <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
   </Page>
   <Page Name="Failure">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
-    <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-    <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-    <Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
+    <Text X="65" Y="180" Width="-65" Center="yes" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+    <Hypertext Name="FailureLogFileLink" X="100" Y="220" Width="-65" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</Hypertext>
+    <Text Name="FailureRestartText" X="65" Y="-65" Width="-65" Center="yes" Height="23" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
     <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
     <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
   </Page>