icons for application and documents, including Vista 256x256 format

diff --git a/windows/build/graphviz.wxs.in b/windows/build/graphviz.wxs.in
index 2ad086cd26160a8637ced9d841a76dffb8a43aec..0ea3eb3297f75bfebf301c5dfbd4e505c87ca3c1 100755 (executable)
--- a/windows/build/graphviz.wxs.in
+++ b/windows/build/graphviz.wxs.in
@@ -62,16 +62,15 @@
                                                <!-- viewer application sourced from graphviz.csproj build directory, include shortcuts in the start menu and desktop -->
                                                <Component Id="Graphviz.exe" Guid="25FE550B-3D8B-435B-AB35-553D2628171D">
                                                        <File Id="Graphviz.exe" Name="Graphviz.exe" KeyPath="yes" Source="x86\Release\Graphviz.exe">
-                                                               <Shortcut Id="ApplicationProgramMenu" Name="Graphviz" Directory="ApplicationProgramMenuFolder" Advertise="yes" />
-                                                               <Shortcut Id="ApplicationDesktop" Name="Graphviz" Directory="DesktopFolder" Advertise="yes" />
+                                                               <Shortcut Id="ApplicationProgramMenu" Name="Graphviz" Directory="ApplicationProgramMenuFolder" Icon="Graphviz.ico" Advertise="yes" />
+                                                               <Shortcut Id="ApplicationDesktop" Name="Graphviz" Directory="DesktopFolder" Icon="Graphviz.ico" Advertise="yes" />
                                                        </File>
-                                                       <!-- register file associations so that graphs can open from the desktop -->
-                                                       <ProgId Id="Graphviz.Graph" Description="Graphviz Graph">
+                                                       <ProgId Id="Graphviz.Graph" Description="Graphviz Graph" Icon="Graphviz.exe" IconIndex="2">
                                                                <Extension Id="gv" ContentType="text/x-graphviz">
                                                                        <Verb Id="open" Argument="&quot;%1&quot;" Command="Open" TargetFile="Graphviz.exe" />
                                                                </Extension>
                                                        </ProgId>
-                                                       <ProgId Id="Graphviz.Dot" Description="Graphviz Graph">
+                                                       <ProgId Id="Graphviz.Dot" Description="Graphviz Graph" Icon="Graphviz.exe" IconIndex="1">
                                                                <Extension Id="dot">
                                                                        <Verb Id="open" Argument="&quot;%1&quot;" Command="Open" TargetFile="Graphviz.exe" />
                                                                </Extension>
@@ -94,6 +93,9 @@
                        <Directory Id="DesktopFolder" />
                </Directory>
 
+               <!-- icon for advertised shortcut, doesn't actually appear in installed file system -->
+               <Icon Id="Graphviz.ico" SourceFile="Graphviz.ico" />
+               
                <Feature Id="cli" Title="Command Line Tools and Libraries" Level="1">
                        <!-- refer to component groups in the heated wxs -->
                        <ComponentGroupRef Id="etc" />

diff --git a/windows/graphviz.csproj b/windows/graphviz.csproj
index 8f92755998c0e25b01318e51dc2904c7139b69c0..028439d8b0c2325946c1e02ec74221f00132bc49 100755 (executable)
--- a/windows/graphviz.csproj
+++ b/windows/graphviz.csproj
@@ -9,6 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>Graphviz</RootNamespace>\r
     <AssemblyName>Graphviz</AssemblyName>\r
+    <Win32Resource>Graphviz.res</Win32Resource>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -101,6 +102,7 @@
     <None Include="Resources\EdgeAttributes.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <None Include="Graphviz.res" />\r
     <None Include="Resources\GraphAttributes.png" />\r
   </ItemGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r