Update installer UI

FarGroup · May 16, 2021 · 388cb47 · 388cb47
1 parent 8d82f3f
commit 388cb47
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 9 deletions.
diff --git a/misc/msi-installer/installer.wxs b/misc/msi-installer/installer.wxs
@@ -18,12 +18,7 @@
     <Property Id="ARPURLINFOABOUT" Value="https://farmanager.com/" />
     <Property Id="ARPURLUPDATEINFO" Value="https://farmanager.com/download.php" />
     <Media Id="1" Cabinet="far.cab" EmbedCab="yes" />
-    <Property Id="KERNEL32VERSION">
-        <DirectorySearch Id="Kernel32Version" Path="[SystemFolder]">
-            <FileSearch Name="kernel32.dll" MinVersion="5.0.2195.6740"/>
-        </DirectorySearch>
-    </Property>
-    <Condition Message="!(loc.LaunchCondition)"><![CDATA[NOT Version9X AND (VersionNT >= 501 OR (VersionNT = 500 AND ServicePackLevel >= 4 AND KERNEL32VERSION))]]></Condition>
+    <Condition Message="!(loc.LaunchCondition)"><![CDATA[NOT Version9X AND VersionNT >= 500)]]></Condition>
     <Binary Id="CustomActions.dll" SourceFile="customact.dll" />
     <CustomAction Id="UpdateFeatureState" BinaryKey="CustomActions.dll" DllEntry="UpdateFeatureState" />
     <CustomAction Id="SaveShortcutProps" BinaryKey="CustomActions.dll" DllEntry="SaveShortcutProps" Return="ignore" Impersonate="no" />
@@ -97,6 +92,6 @@
       <Custom Action="SetALLUSERS2" Before="ExecuteAction"><![CDATA[NOT ALLUSERS AND VersionMsi >= "5.00"]]></Custom>
     </InstallUISequence>
     <UIRef Id="WixUI_Mod" />
-    <Icon Id="Far.ico" SourceFile="rsrc\far.ico" />
+    <Icon Id="Far.ico" SourceFile="..\..\far\Far.ico" />
   </Product>
 </Wix>
diff --git a/misc/msi-installer/rsrc/banner.jpg b/misc/msi-installer/rsrc/banner.jpg
diff --git a/misc/msi-installer/rsrc/banner.png b/misc/msi-installer/rsrc/banner.png
diff --git a/misc/msi-installer/rsrc/dialog.jpg b/misc/msi-installer/rsrc/dialog.jpg
diff --git a/misc/msi-installer/rsrc/dialog.png b/misc/msi-installer/rsrc/dialog.png
diff --git a/misc/msi-installer/rsrc/far.ico b/misc/msi-installer/rsrc/far.ico
diff --git a/misc/msi-installer/rsrc/license.rtf b/misc/msi-installer/rsrc/license.rtf
diff --git a/misc/msi-installer/ui.wxs b/misc/msi-installer/ui.wxs
@@ -2,8 +2,8 @@
 <?include defines.wxi ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
-    <Binary Id="WixUI_Bmp_Banner" SourceFile="rsrc\banner.jpg" />
-    <Binary Id="WixUI_Bmp_Dialog" SourceFile="rsrc\dialog.jpg" />
+    <Binary Id="WixUI_Bmp_Banner" SourceFile="rsrc\banner.png" />
+    <Binary Id="WixUI_Bmp_Dialog" SourceFile="rsrc\dialog.png" />
     <Binary Id="WixUI_Ico_Exclam" SourceFile="rsrc\exclam.ico" />
     <Binary Id="WixUI_Ico_Info" SourceFile="rsrc\info.ico" />
     <Binary Id="WixUI_Bmp_New" SourceFile="rsrc\new.ico" />