+ Added showcase app icon

+ Misc tweaks to templates
panthernet · Apr 13, 2015 · 0fd3ea8 · 0fd3ea8
1 parent b55b90f
commit 0fd3ea8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Documents/CHANGELOG.txt b/Documents/CHANGELOG.txt
@@ -32,7 +32,7 @@
 + Edge rotation now needs additional modification for all custom EdgeLabelControl templates. Please add: <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />[WPF, METRO]
 + Due to new calc cancelation feature the following has been changed:
 	- IExternalEdgeRouting, IExternalLayout, IExternalOverlapRemoval interfaces and different algorithm base classes now implement Compute(CancellationToken cancellationToken) method with an additional param
-	- METRO now works only in async mode. Added GraphArea graph generation methods postfix Async.
+	- METRO now works only in async mode. Postfix Async has been added for GraphArea graph generation and relayout methods.
 
 RELEASE 2.1.7
 + Added new ShowcaseApp.WPF with mostly the same functionality as before but in a new nutshell and with refactored code. Expect new showcases soon.

diff --git a/Examples/ShowcaseApp.WPF/ShowcaseApp.WPF.csproj b/Examples/ShowcaseApp.WPF/ShowcaseApp.WPF.csproj
@@ -35,6 +35,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>app.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accordion">
       <HintPath>..\..\packages\Accordion.1.0.0\lib\Accordion.dll</HintPath>
@@ -317,6 +320,9 @@
   <ItemGroup>
     <Resource Include="Assets\tr_red.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml b/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml
@@ -60,11 +60,11 @@
                           StrokeThickness="3" MinWidth="1" MinHeight="1"
                           ToolTip="{TemplateBinding ToolTip}" 
                             x:Name="PART_edgePath"/>
-                        <Path Stroke="{TemplateBinding Foreground}"
+                        <!--<Path Stroke="{TemplateBinding Foreground}"
                           StrokeThickness="2" MinWidth="1" MinHeight="1" 
                             x:Name="PART_edgeArrowPath"
                               >
-                        </Path>
+                        </Path>-->
 
                         <gxl:EdgePointerImage NeedRotation="true" x:Name="PART_EdgePointerForSource" Source="/Assets/tr_red.png" Width="15" Height="15" />
                         <gxl:EdgePointerImage NeedRotation="true" x:Name="PART_EdgePointerForTarget" Source="/Assets/tr_grren.png" Width="15" Height="15" />

diff --git a/Examples/ShowcaseApp.WPF/app.ico b/Examples/ShowcaseApp.WPF/app.ico