Move the About dialog image embedded in the EXE file into the Resources folder and double the size of the image.

(cherry picked from commit b247f4d7478c474feb6b4178d8a4a52a67337fb3)

Author: sdottaka

BuildArc.cmd

@@ -73,7 +73,7 @@ if "%1" == "x64" (
 )
 
 rem Create folder structure
-for %%i in (ColorSchemes Languages\ShellExtension Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge WinWebDiff Merge7z\Lang Commands\Apache-Tika Commands\tidy-html5 Commands\jq Commands\q Commands\msys2 Commands\md4c) do (
+for %%i in (ColorSchemes Languages\ShellExtension Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge WinWebDiff Merge7z\Lang Commands\Apache-Tika Commands\tidy-html5 Commands\jq Commands\q Commands\msys2 Commands\md4c Resources) do (
   mkdir "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\%%i" 2> NUL
 )
 
@@ -202,6 +202,10 @@ copy Build\md4c\mingw32\share\licenses\md4c\LICENSE.md "%DISTDIR%\%PLATFORMH%zip
 rem Plugin.xml
 copy Plugins\Plugins.xml "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\MergePlugins\" > NUL
 
+rem Copy Resources...
+echo Copy Resources...
+copy Src\res\splash.png "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Resources\" > NUL
+
 echo.
 echo ------------------------------------------------------------
 echo Pack archive...

DownloadDeps.cmd

@@ -88,6 +88,7 @@ for %%i in (x86 x64 ARM ARM64) do (
     mkdir Build\%%i\%%j\Commands\tidy-html5 2> NUL
     mkdir Build\%%i\%%j\Commands\msys2\usr\bin 2> NUL
     mkdir Build\%%i\%%j\Commands\md4c 2> NUL
+    mkdir Build\%%i\%%j\Resources 2> NUL
     if not "Build\%%i\Release" == "Build\%%i\%%j" (
       echo ** Merge7z
       xcopy /s/y Build\%%i\Release\Merge7z Build\%%i\%%j\Merge7z\
@@ -123,6 +124,8 @@ for %%i in (x86 x64 ARM ARM64) do (
     copy Plugins\dlls\%%i\*.dll Build\%%i\%%j\MergePlugins\
     echo ** ShellExtension
     xcopy /s/y Build\ShellExtension\WinMergeContextMenuPackage.msix Build\%%i\%%j
+    echo ** Resources
+    copy Src\res\splash.png Build\%%i\%%j\Resources\
   )
 )
 

Installer/InnoSetup/WinMergeARM64.is6.iss

@@ -421,6 +421,8 @@ Source: ..\..\Build\{#ARCH}\Release\WinMergeU.exe; DestDir: {app}; Flags: prompt
 ; Visual Elements
 Source: ..\..\Build\{#ARCH}\Release\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core
 Source: ..\..\Build\{#ARCH}\Release\LogoImages\*.png; DestDir: {app}\LogoImages; Flags: promptifolder; Components: Core
+; Resources
+Source: ..\..\Build\{#ARCH}\Release\Resources\*.png; DestDir: {app}\Resources; Flags: promptifolder; Components: Core
 ; 32Bit Plugin Proxy
 Source: ..\..\Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe; DestDir: {app}; Flags: promptifolder; Components: Core
 

Installer/InnoSetup/WinMergeX64.is6.iss

@@ -420,6 +420,8 @@ Source: ..\..\Build\{#ARCH}\Release\WinMergeU.exe; DestDir: {app}; Flags: prompt
 ; Visual Elements
 Source: ..\..\Build\{#ARCH}\Release\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core
 Source: ..\..\Build\{#ARCH}\Release\LogoImages\*.png; DestDir: {app}\LogoImages; Flags: promptifolder; Components: Core
+; Resources
+Source: ..\..\Build\{#ARCH}\Release\Resources\*.png; DestDir: {app}\Resources; Flags: promptifolder; Components: Core
 ; 32Bit Plugin Proxy
 Source: ..\..\Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe; DestDir: {app}; Flags: promptifolder; Components: Core
 

Installer/InnoSetup/WinMergeX64.iss

@@ -412,6 +412,8 @@ Source: ..\..\Build\{#ARCH}\Release\WinMergeU.exe; DestDir: {app}; Flags: prompt
 ; Visual Elements
 Source: ..\..\Build\{#ARCH}\Release\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core
 Source: ..\..\Build\{#ARCH}\Release\LogoImages\*.png; DestDir: {app}\LogoImages; Flags: promptifolder; Components: Core
+; Resources
+Source: ..\..\Build\{#ARCH}\Release\Resources\*.png; DestDir: {app}\Resources; Flags: promptifolder; Components: Core
 ; 32Bit Plugin Proxy
 Source: ..\..\Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe; DestDir: {app}; Flags: promptifolder; Components: Core
 

Installer/InnoSetup/WinMergeX64NonAdmin.iss

@@ -411,6 +411,8 @@ Source: ..\..\Build\{#ARCH}\Release\WinMergeU.exe; DestDir: {app}; Flags: prompt
 ; Visual Elements
 Source: ..\..\Build\{#ARCH}\Release\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core
 Source: ..\..\Build\{#ARCH}\Release\LogoImages\*.png; DestDir: {app}\LogoImages; Flags: promptifolder; Components: Core
+; Resources
+Source: ..\..\Build\{#ARCH}\Release\Resources\*.png; DestDir: {app}\Resources; Flags: promptifolder; Components: Core
 ; 32Bit Plugin Proxy
 Source: ..\..\Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe; DestDir: {app}; Flags: promptifolder; Components: Core
 

Installer/InnoSetup/WinMergeX86.iss

@@ -436,6 +436,8 @@ Source: ..\..\Build\{#ARCH}\Release\WinMergeU.exe; DestDir: {app}; Flags: prompt
 ; Visual Elements
 Source: ..\..\Build\{#ARCH}\Release\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core
 Source: ..\..\Build\{#ARCH}\Release\LogoImages\*.png; DestDir: {app}\LogoImages; Flags: promptifolder; Components: Core
+; Resources
+Source: ..\..\Build\{#ARCH}\Release\Resources\*.png; DestDir: {app}\Resources; Flags: promptifolder; Components: Core
 
 ; Shell extension
 Source: ..\..\Build\ShellExtension\{#ShellExtension32bit}; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; \

Src/AboutDlg.cpp

@@ -9,7 +9,8 @@
 #include "stdafx.h"
 #include "AboutDlg.h"
 #include "TrDialogs.h"
-#include "Bitmap.h"
+#include "paths.h"
+#include "Environment.h"
 #include "resource.h" // IDD_ABOUTBOX
 
  // https://www.gnu.org/graphics/gnu-ascii.html
@@ -104,7 +105,7 @@ BOOL CAboutDlg::Impl::OnInitDialog()
 {
 	CTrDialog::OnInitDialog();
 
-	if (!LoadImageFromResource(m_image, MAKEINTRESOURCE(IDR_SPLASH), _T("IMAGE")))
+	if (!m_image.Load(paths::ConcatPath(env::GetProgPath(), _T("Resources\\splash.png")).c_str()))
 	{
 		// FIXME: LoadImageFromResource() seems to fail when running on Wine 5.0.
 	}

Src/Merge2.rc

@@ -109,7 +109,6 @@ END
 // Image
 //
 
-IDR_SPLASH              IMAGE                   "res\\splash.jpg"
 IDR_LOGO                IMAGE                   "res\\logo.jpg"
 IDR_MARGIN_ICONS_PNG    IMAGE                   "res\\mg_icons.png"
 

Src/res/splash.png

@@ -90,7 +90,6 @@
 #define IDD_PLUGINS_EDITPLUGIN          288
 #define IDI_ROTATE2                     302
 #define IDR_LOGO                        307
-#define IDR_SPLASH                      308
 #define IDR_MARGIN_ICONS_PNG            310
 #define IDB_EDIT_COPY                   316
 #define IDB_EDIT_CUT                    317