From 0fd3ea83ac006a740f951240cfc91724b18b0391 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 14 Apr 2015 02:02:34 +0300 Subject: [PATCH] + Added showcase app icon + Misc tweaks to templates --- Documents/CHANGELOG.txt | 2 +- Examples/ShowcaseApp.WPF/ShowcaseApp.WPF.csproj | 6 ++++++ .../Templates/GeneralTemplate.xaml | 4 ++-- Examples/ShowcaseApp.WPF/app.ico | Bin 0 -> 23558 bytes 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 Examples/ShowcaseApp.WPF/app.ico diff --git a/Documents/CHANGELOG.txt b/Documents/CHANGELOG.txt index 9a5ea528..79ee986d 100644 --- 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: [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 index 35cd9721..d57fedac 100644 --- a/Examples/ShowcaseApp.WPF/ShowcaseApp.WPF.csproj +++ b/Examples/ShowcaseApp.WPF/ShowcaseApp.WPF.csproj @@ -35,6 +35,9 @@ prompt 4 + + app.ico + ..\..\packages\Accordion.1.0.0\lib\Accordion.dll @@ -317,6 +320,9 @@ + + + diff --git a/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml b/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml index d921058f..1a90195e 100644 --- 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"/> - - + --> diff --git a/Examples/ShowcaseApp.WPF/app.ico b/Examples/ShowcaseApp.WPF/app.ico new file mode 100644 index 0000000000000000000000000000000000000000..0388ac9f0c8faa57f4864bc83fa710abe53b4274 GIT binary patch literal 23558 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 A)&Kwi literal 0 HcmV?d00001