Add VisualElementsManifest for Windows 10 start menu

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 61a2298..c53d1a0 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -425,6 +425,9 @@ Name: {app}; Flags: uninsalwaysuninstall
 [Files]\r
 ; WinMerge itself\r
 Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; Components: Core\r
+; Visual Elements\r
+Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core\r
+Source: ..\..\Build\MergeUnicodeRelease\LogoImages\*.png; DestDir: {app}; Flags: promptifolder; Components: Core\r
 \r
 ; Shell extension\r
 Source: ..\..\Build\ShellExtension\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64\r

diff --git a/Installer/InnoSetup/WinMergeX64.is6.iss b/Installer/InnoSetup/WinMergeX64.is6.iss
index a762a39..6698376 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.is6.iss
+++ b/Installer/InnoSetup/WinMergeX64.is6.iss
@@ -404,6 +404,9 @@ Name: {app}; Flags: uninsalwaysuninstall
 [Files]\r
 ; WinMerge itself\r
 Source: ..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; Components: Core\r
+; Visual Elements\r
+Source: ..\..\Build\X64\MergeUnicodeRelease\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core\r
+Source: ..\..\Build\X64\MergeUnicodeRelease\LogoImages\*.png; DestDir: {app}; Flags: promptifolder; Components: Core\r
 ; 32Bit Plugin Proxy\r
 Source: ..\..\Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe; DestDir: {app}; Flags: promptifolder; Components: Core\r
 \r

diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index ba71f55..d52e644 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -402,6 +402,9 @@ Name: {app}; Flags: uninsalwaysuninstall
 [Files]\r
 ; WinMerge itself\r
 Source: ..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; Components: Core\r
+; Visual Elements\r
+Source: ..\..\Build\X64\MergeUnicodeRelease\WinMergeU.VisualElementsManifest.xml; DestDir: {app}; Flags: promptifolder; Components: Core\r
+Source: ..\..\Build\X64\MergeUnicodeRelease\LogoImages\*.png; DestDir: {app}; Flags: promptifolder; Components: Core\r
 ; 32Bit Plugin Proxy\r
 Source: ..\..\Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe; DestDir: {app}; Flags: promptifolder; Components: Core\r
 \r

diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 0d9d8b9..cced5de 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -1423,6 +1423,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</ExcludedFromBuild>\r
     </ResourceCompile>\r
   </ItemGroup>\r
+  <Target Name="CopyVisualElements" AfterTargets="Build">\r
+    <ItemGroup>\r
+      <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />\r
+      <LogoImages Include="res\LogoImages\*.png" />\r
+    </ItemGroup>\r
+    <Message Text="Copy visual elements to $(OutDir)" />\r
+    <Copy SourceFiles="@(VisualElementsManifest)" DestinationFolder="$(OutDir)" ContinueOnError="true" />\r
+    <Copy SourceFiles="@(LogoImages)" DestinationFolder="$(OutDir)\LogoImages" ContinueOnError="true" />\r
+  </Target>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/Src/Merge.vs2019.vcxproj b/Src/Merge.vs2019.vcxproj
index 2280a69..4d7906d 100644 (file)
--- a/Src/Merge.vs2019.vcxproj
+++ b/Src/Merge.vs2019.vcxproj
@@ -1422,6 +1422,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</ExcludedFromBuild>\r
     </ResourceCompile>\r
   </ItemGroup>\r
+  <Target Name="CopyVisualElements" AfterTargets="Build">\r
+    <ItemGroup>\r
+      <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />\r
+      <LogoImages Include="res\LogoImages\*.png" />\r
+    </ItemGroup>\r
+    <Message Text="Copy visual elements to $(OutDir)" />\r
+    <Copy SourceFiles="@(VisualElementsManifest)" DestinationFolder="$(OutDir)" ContinueOnError="true" />\r
+    <Copy SourceFiles="@(LogoImages)" DestinationFolder="$(OutDir)\LogoImages" ContinueOnError="true" />\r
+  </Target>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/Src/res/LogoImages/WinMergeLogo.png b/Src/res/LogoImages/WinMergeLogo.png
new file mode 100644 (file)
index 0000000..8b208af
Binary files /dev/null and b/Src/res/LogoImages/WinMergeLogo.png differ

diff --git a/Src/res/LogoImages/WinMergeLogoSmall.png b/Src/res/LogoImages/WinMergeLogoSmall.png
new file mode 100644 (file)
index 0000000..f0520ed
Binary files /dev/null and b/Src/res/LogoImages/WinMergeLogoSmall.png differ

diff --git a/Src/res/WinMergeU.VisualElementsManifest.xml b/Src/res/WinMergeU.VisualElementsManifest.xml
new file mode 100644 (file)
index 0000000..946d2cd
--- /dev/null
+++ b/Src/res/WinMergeU.VisualElementsManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <VisualElements ForegroundText="dark" BackgroundColor="#ffcc00" ShowNameOnSquare150x150Logo="on" Square150x150Logo="LogoImages\WinMergeLogo.png" Square70x70Logo="LogoImages\WinMergeLogoSmall.png"></VisualElements>\r
+</Application>
\ No newline at end of file