Merge pull request #1082 from vktr/feature/new-application-and-file-icon

Add new application and file type icon
picotorrent · Dec 27, 2020 · 6ac0b78 · 6ac0b78
2 parents 858ccc0 + 058b53c
commit 6ac0b78
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 4 deletions.
diff --git a/packaging/WiX/PicoTorrent.Components.wxs b/packaging/WiX/PicoTorrent.Components.wxs
@@ -92,7 +92,7 @@
                             <RegistryValue Type="string" Value="PicoTorrent BitTorrent file" />
 
                             <RegistryKey Key="DefaultIcon">
-                                <RegistryValue Type="string" Value="[INSTALLDIR]PicoTorrent.exe,0" />
+                                <RegistryValue Type="string" Value="[INSTALLDIR]PicoTorrent.exe,1" />
                             </RegistryKey>
 
                             <RegistryKey Key="shell\open\command">

diff --git a/res/app.ico b/res/app.ico
diff --git a/res/app.png b/res/app.png
diff --git a/res/file.ico b/res/file.ico
diff --git a/res/logo150.png b/res/logo150.png
diff --git a/res/logo44.png b/res/logo44.png
diff --git a/src/installer/PicoTorrentBootstrapper.csproj b/src/installer/PicoTorrentBootstrapper.csproj
@@ -166,12 +166,12 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\logo.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\discord.png" />
     <Resource Include="Resources\github.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\logo.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/installer/Resources/logo.png b/src/installer/Resources/logo.png
diff --git a/src/picotorrent/resources.rc b/src/picotorrent/resources.rc
@@ -1,6 +1,7 @@
 #include "version.h"
 
 AppIcon ICON "..\\..\\res\\app.ico"
+FileIcon ICON "..\\..\\res\\file.ico"
 
 // Icons
 ICO_TERMINAL ICON "..\\..\\res\\terminal.ico"