Browse Source

V5.0.0 Released

master 5.0.0
XceedBoucherS 3 months ago
parent
commit
5c5bcb3875
  1. 45
      ExtendedWPFToolkitSolution/CommunityLicense.txt
  2. 3
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj
  3. 15
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj
  4. 3
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj
  5. 15
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
  6. 3
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj
  7. 15
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj
  8. 4
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
  9. 3
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj
  10. 15
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
  11. 11
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
  12. 2
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt
  13. 38
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt
  14. 2
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
  15. 1
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
  16. 4
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj
  17. 12
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
  18. 2
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
  19. 55
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chart/Converters/BooleanToTimeSpanConverter.cs
  20. 70
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chart/Converters/InverseBooleanToDoubleConverter.cs
  21. 32
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
  22. 8
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs
  23. 3
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj
  24. 15
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj

45
ExtendedWPFToolkitSolution/CommunityLicense.txt

@ -0,0 +1,45 @@
XCEED SOFTWARE, INC.
COMMUNITY LICENSE AGREEMENT (for non-commercial use)
This Community License Agreement (the "Agreement") is a legal agreement between you ("Licensee") and Xceed Software, Inc. ("Xceed"). Licensee wishes to use the "Xceed Extended WPF Toolkit" (the "Software"), an Xceed product, for "Non-Commercial Use". Such use of the Software means that it is not primarily intended for commercial advantages or for monetary compensation or any other type of compensation, including donations. Xceed agrees to license its products to developers like you as along as all terms & conditions set forth herein are respected. The Software is provided under a license; it is not "sold" in any manner. By installing, copying or otherwise using the Software, you confirm your agreement to the terms and conditions expressed in this Agreement. If you do not agree, you are not authorized to use our Software.
GENERAL
Subject to compliance with the conditions set out below, Xceed grants to Licensee a non-exclusive and perpetual right (unless/until revoked by Xceed at its discretion) to install and use the Software for designing, building, testing and/or deploying/distributing (to less than 10 users or end-users) an application, system or program for Non-Commercial Use only. Would Licensee need to use the Software for any purpose that is not strictly Non-Commercial Use, or if the Software is to be deployed or distributed to more than 10 users/end-users - even in a Non-Commercial Use, Licensee must acquire a Commercial License (with a paid subscription).
The license granted under this Agreement is conditional on Licensee complying at all times with the following conditions:
-All of the Agreement's terms & conditions are strictly complied with by the Licensee;
-The Software is used for Non-Commercial Use only;
-The Software cannot be resold, licensed, sublicensed or distributed by Licensee in any manner other than as specified above;
-Xceed's name and logo must appear clearly in the resulting work with an Xceed Copyright notice; the name and notice must be visible, not be hidden;
-Licensee is not authorized to "deploy" the Software for/in any commercial environment;
-Licensee commits not to create a competitive software product based on the Software;
-Licensee is not authorized to sell or license/sub-license/lease the resulting work to anyone nor charge any amounts of money or accept donations or exchange services for the said resulting work.
SUPPORT
Support is not included in Community Licenses. The Software is provided on an "as is" basis only. Licensee can send requests to Xceed's technical support team only if a commercial license has been obtained. Bugs may be corrected at Xceed's discretion.
WARRANTY
Xceed clearly states that this Community License includes no warranty of any type. Xceed products are provided on an "as is" basis. In no case shall Xceed be responsible or liable for any direct or indirect, or consequential damages whatsoever (including, without limitation, any damages for loss of revenues, of business profits, business interruption, or loss of business information, or any other type of loss or damages) arising out of the use of the Software even if Xceed may have been advised of such potential damages or loss.
OTHER
Xceed does not allow Community Licensees to publish results from benchmarks or performance comparison tests (with other products) without advance permission by Xceed. Licensee is not authorized to use Xceed's name, tradenames and trademarks without Xceed's written permission (other than the Copyright notice stated above in the "General" section).
GOVERNING LAW
This Agreement shall be governed by the laws of the Province of Quebec (Canada). Any claim, dispute or problem arising out of this Agreement shall be deemed non-receivable or may be settled or disposed of at Xceed's discretion. Xceed reserves the right to settle any action before an arbitration board in Quebec as per generally accepted, international rules of arbitration prevailing in Quebec.
Xceed reserves the right to modify this Agreement at all times without notice.
(C) Copyright: Xceed Software, Inc. - 2021. All rights reserved.

3
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj

@ -26,9 +26,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="AeroColors.cs" />
<Compile Include="Controls\SplineBorder.cs" />
<Compile Include="Properties\AssemblyInfo.cs">

15
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj

@ -52,9 +52,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="AeroColors.cs" />
<Compile Include="Controls\SplineBorder.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
@ -188,11 +185,11 @@
<Resource Include="Images\PinDocMenu_Dark.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

3
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj

@ -26,9 +26,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>

15
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj

@ -52,9 +52,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
@ -115,11 +112,11 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

3
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj

@ -34,9 +34,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>

15
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj

@ -64,9 +64,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
@ -135,11 +132,11 @@
<Resource Include="Images\PinRestore_Black.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

4
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs

@ -2855,6 +2855,7 @@ namespace Xceed.Wpf.AvalonDock
Top = fwTop,
Left = fwLeft
};
fwc.Resources = this.Resources;
this.ShowInTaskbar( fwc );
@ -2980,6 +2981,7 @@ namespace Xceed.Wpf.AvalonDock
Left = contentModel.FloatingLeft,
Top = contentModel.FloatingTop
};
fwc.Resources = this.Resources;
}
else
{
@ -3002,7 +3004,7 @@ namespace Xceed.Wpf.AvalonDock
Left = contentModel.FloatingLeft,
Top = contentModel.FloatingTop
};
fwc.Resources = this.Resources;
}
this.ShowInTaskbar( fwc );

3
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj

@ -26,9 +26,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="Commands\RelayCommand.cs" />
<Compile Include="Controls\AnchorablePaneControlOverlayArea.cs" />
<Compile Include="Controls\AnchorablePaneDropTarget.cs" />

15
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj

@ -61,9 +61,6 @@
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
<Link>AssemblyVersionInfoCommon.cs</Link>
</Compile>
<Compile Include="Commands\RelayCommand.cs" />
<Compile Include="Controls\AnchorablePaneControlOverlayArea.cs" />
<Compile Include="Controls\AnchorablePaneDropTarget.cs" />
@ -421,11 +418,11 @@
<Resource Include="Themes\Generic\Images\PinRestore_White.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

11
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt

@ -386,6 +386,17 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Margin="3" />
<TextBlock Text="Show Axis Pointer: "
Grid.Row="6"
Grid.Column="4"
VerticalAlignment="Center"
Margin="10,0,0,0" />
<CheckBox Grid.Row="6"
Grid.Column="5"
IsChecked="{Binding SelectedAxis.ShowAxisPointer, ElementName=_demo}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Margin="3" />
</Grid>
</GroupBox>

2
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt

@ -98,7 +98,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
private void AddDefaultSeries()
{
if( _series.Layout.LayoutType != PredefinedLayoutTypes.Pie )
if(( _series.Layout.LayoutType != PredefinedLayoutTypes.Pie) && (_series.Layout.LayoutType != PredefinedLayoutTypes.Doughnut) )
{
if( _pieSeries == null )
{

38
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt

@ -75,8 +75,9 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
@ -88,23 +89,25 @@
<!-- 1st column-->
<TextBlock Text="Layout: " VerticalAlignment="Center" />
<ComboBox x:Name="_layoutComboBox" Grid.Column="1" SelectedValue="{Binding Layout, ElementName=_series, Converter={StaticResource LayoutEngineToPredefinedLayoutConverter}}" SelectedValuePath="Content" ItemContainerStyle="{StaticResource ComboBoxItemStyle}" SelectionChanged="OnLayoutSelectionChanged" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
<ComboBox x:Name="_layoutComboBox" Grid.Column="1" SelectedValue="{Binding Layout, ElementName=_series, Converter={StaticResource LayoutEngineToPredefinedLayoutConverter}}" SelectedValuePath="Content" ItemContainerStyle="{StaticResource ComboBoxItemStyle}" SelectionChanged="OnLayoutSelectionChanged" Width="85" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
<ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Area}" />
<ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Doughnut}" />
<ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Column}" />
<ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Line}" />
<ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Pie}" />
<ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Pie}" />
</ComboBox>
<TextBlock Grid.Row="1" Text="Title: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_title}"/>
<TextBox x:Name="_title" Grid.Row="1" Grid.Column="1" Text="{Binding Title, ElementName=_series, UpdateSourceTrigger=PropertyChanged}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=title}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<TextBox x:Name="_title" Grid.Row="1" Grid.Column="1" Text="{Binding Title, ElementName=_series, UpdateSourceTrigger=PropertyChanged}" Width="85" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=title}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<TextBlock Grid.Row="2" Text="Default Interior: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_defaultInterior}"/>
<xctk:ColorPicker x:Name="_defaultInterior" Grid.Row="2" Grid.Column="1" SelectedColor="{Binding DefaultInterior, ElementName=_series, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=defaultInterior}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<xctk:ColorPicker x:Name="_defaultInterior" Grid.Row="2" Grid.Column="1" SelectedColor="{Binding DefaultInterior, ElementName=_series, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="85" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=defaultInterior}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<!-- 2nd column-->
<TextBlock Grid.Column="2" Text="Show Hint Labels: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_showHintLabels}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
<CheckBox x:Name="_showHintLabels" Grid.Column="3" IsChecked="{Binding ShowHintLabels, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showHintLabels}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<TextBlock Grid.Row="1" Grid.Column="2" Text="Show Points in Legend: " IsEnabled="{Binding IsEnabled, ElementName=_showPointsInLegend}" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
<CheckBox x:Name="_showPointsInLegend" Grid.Row="1" Grid.Column="3" IsChecked="{Binding ShowPointsInLegend, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showPointsInLegend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<CheckBox x:Name="_showPointsInLegend" Grid.Row="1" Grid.Column="3" IsChecked="{Binding ShowPointsInLegend, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showPointsInLegend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<TextBlock Grid.Row="2" Grid.Column="2" Text="Is Smooth: " IsEnabled="{Binding IsEnabled, ElementName=_isSmooth}" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}" />
<CheckBox x:Name="_isSmooth" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding IsSmooth, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=smooth}" Margin="5" />
<!-- 3rd column-->
<TextBlock Grid.Column="4" Text="Hint Line Length: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_hintLineLength}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
<xctk:IntegerUpDown x:Name="_hintLineLength" Grid.Column="5" Minimum="0" Maximum="200" Value="{Binding HintLineLength, ElementName=_series}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
@ -117,18 +120,27 @@
</xctk:IntegerUpDown>
<TextBlock Grid.Row="1" Grid.Column="4" Text="Spacing: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_spacing}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
<xctk:IntegerUpDown x:Name="_spacing" Grid.Row="1" Grid.Column="5" Minimum="0" Maximum="100" Value="{Binding Spacing, ElementName=_series}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=spacing}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
</Grid>
<TextBlock Grid.Row="3" Grid.Column="2" Text="Use Gradient Background: " IsEnabled="{Binding IsEnabled, ElementName=_useGradient}" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}" />
<CheckBox x:Name="_useGradient" Grid.Row="3" Grid.Column="3" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding UseGradientBackground, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=gradient}" Margin="5" />
<TextBlock Grid.Row="2" Grid.Column="4" Text="Inner Radius: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_innerRadius}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}" />
<xctk:IntegerUpDown x:Name="_innerRadius" Grid.Row="2" Grid.Column="5" Minimum="0" Maximum="90" Value="{Binding Layout.InnerRadius, ElementName=_series}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=inner_radius}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
<TextBlock Grid.Row="3" Grid.Column="4" Text="Use Animations: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_useAnimations}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}" />
<CheckBox x:Name="_useAnimations" Grid.Row="3" Grid.Column="5" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding UseAnimations, ElementName=_series}" Margin="5" />
</Grid>
</GroupBox>
<TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
<xctk:Chart Grid.Row="2" MinHeight="200">
<xctk:Chart.Areas>
<xctk:Area x:Name="_area1" Title="Area #1">
<xctk:Area.Series>
<xctk:Series x:Name="_series"
DefaultInterior="BlueViolet"
<xctk:Area x:Name="_area1" Title="Area #1">
<xctk:Area.Series>
<xctk:Series x:Name="_series"
DefaultInterior="#5470C6"
Spacing="20"
IsSmooth="False"
UseGradientBackground="False"
UseAnimations="False"
Title="Average"
ShowPointsInLegend="false"
ShowHintLabels="false"

2
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs

@ -66,7 +66,7 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion( "4.7" )]
[assembly: AssemblyVersion( "5.0" )]
#pragma warning disable 1699
[assembly: AssemblyDelaySign( false )]

1
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml

@ -63,6 +63,5 @@
<Image Source="..\OpenSourceImages\ChartBasicTypes.png" Width="600" Height="400"/>
</local:DemoView>

4
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj

@ -1440,8 +1440,8 @@
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<!-- .NET Core projects use a custom AssemblySearchPaths value that doesn't
include the ReferencePath property. No good reason why. We reactivate its use here
<!-- .NET Core projects use a custom AssemblySearchPaths value that doesn't
include the ReferencePath property. No good reason why. We reactivate its use here
-->
<AssemblySearchPaths>$(ReferencePath);$(AssemblySearchPaths)</AssemblySearchPaths>
</PropertyGroup>

12
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj

@ -1552,11 +1552,11 @@
<Resource Include="Samples\Theming\OpenSourceImages\Toolkit_Windows10.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

2
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs

@ -22,7 +22,7 @@
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "4.7";
public const string BaseVersion = "5.0";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
".0.0";

55
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chart/Converters/BooleanToTimeSpanConverter.cs

@ -0,0 +1,55 @@
/*************************************************************************************
Toolkit for WPF
Copyright (C) 2007-2025 Xceed Software Inc.
This program is provided to you under the terms of the XCEED SOFTWARE, INC.
COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
For more features, controls, and fast professional support,
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
***********************************************************************************/
using System.Globalization;
using System.Windows.Data;
using System;
namespace Xceed.Wpf.Toolkit.Converters
{
public class BooleanToTimeSpanConverter : IValueConverter
{
public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
{
string param = parameter as string;
if( value is bool useAnimations )
{
if( useAnimations )
{
if( param == "adddelay" )
{
return TimeSpan.FromSeconds( 0.7 );
}
else
{
return TimeSpan.Zero;
}
}
else
{
return TimeSpan.FromDays(1);
}
}
return TimeSpan.Zero;
}
public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
{
throw new NotImplementedException();
}
}
}

70
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs → ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chart/Converters/InverseBooleanToDoubleConverter.cs

@ -1,23 +1,47 @@
/*************************************************************************************
Toolkit for WPF
Copyright (C) 2007-2025 Xceed Software Inc.
This program is provided to you under the terms of the XCEED SOFTWARE, INC.
COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
For more features, controls, and fast professional support,
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
***********************************************************************************/
internal static class _XceedVersionInfoCommon
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Build = ".*";
}
/*************************************************************************************
Toolkit for WPF
Copyright (C) 2007-2025 Xceed Software Inc.
This program is provided to you under the terms of the XCEED SOFTWARE, INC.
COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
For more features, controls, and fast professional support,
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
***********************************************************************************/
using System;
using System.Globalization;
using System.Windows.Data;
namespace Xceed.Wpf.Toolkit.Converters
{
public class InverseBooleanToDoubleConverter : IValueConverter
{
public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
{
if( value is bool useAnimations )
{
if( useAnimations )
{
return 0;
}
else
{
return 1;
}
}
return 1;
}
public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
{
throw new NotImplementedException();
}
}
}

32
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs

@ -60,7 +60,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
{
get
{
return ( DateTimePart )GetValue( CurrentDateTimePartProperty );
return (DateTimePart)GetValue( CurrentDateTimePartProperty );
}
set
{
@ -72,7 +72,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
{
DateTimeUpDownBase<T> dateTimeUpDownBase = o as DateTimeUpDownBase<T>;
if( dateTimeUpDownBase != null )
dateTimeUpDownBase.OnCurrentDateTimePartChanged( ( DateTimePart )e.OldValue, ( DateTimePart )e.NewValue );
dateTimeUpDownBase.OnCurrentDateTimePartChanged( (DateTimePart)e.OldValue, (DateTimePart)e.NewValue );
}
protected virtual void OnCurrentDateTimePartChanged( DateTimePart oldValue, DateTimePart newValue )
@ -90,7 +90,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
{
get
{
return ( int )GetValue( StepProperty );
return (int)GetValue( StepProperty );
}
set
{
@ -102,7 +102,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
{
var dateTimeUpDownBase = o as DateTimeUpDownBase<T>;
if( dateTimeUpDownBase != null )
dateTimeUpDownBase.OnStepChanged( ( int )e.OldValue, ( int )e.NewValue );
dateTimeUpDownBase.OnStepChanged( (int)e.OldValue, (int)e.NewValue );
}
protected virtual void OnStepChanged( int oldValue, int newValue )
@ -207,7 +207,9 @@ namespace Xceed.Wpf.Toolkit.Primitives
private void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
{
if( _fireSelectionChangedEvent )
{
this.PerformMouseSelection();
}
else
_fireSelectionChangedEvent = true;
}
@ -232,19 +234,23 @@ namespace Xceed.Wpf.Toolkit.Primitives
protected virtual void PerformMouseSelection()
{
var dateTimeInfo = this.GetDateTimeInfo( TextBox.SelectionStart );
if( ( dateTimeInfo != null ) && ( dateTimeInfo.Type == DateTimePart.Other ) )
// Due to case 3424 - TimePicker/DateTimePicker : Selecting any time part always increments the first part
// Using DispatcherPriority.ApplicationIdle ensures that PerformMouseSelection() runs after any base class has finished handling the mouse click.
this.Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, new Action( () =>
{
this.Dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( () =>
var dateTimeInfo = this.GetDateTimeInfo( TextBox.SelectionStart );
if( ( dateTimeInfo != null ) && ( dateTimeInfo.Type == DateTimePart.Other ) )
{
// Select the next dateTime part
this.Select( this.GetDateTimeInfo( dateTimeInfo.StartPosition + dateTimeInfo.Length ) );
this.Dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( () =>
{
this.Select( this.GetDateTimeInfo( dateTimeInfo.StartPosition + dateTimeInfo.Length ) );
} ) );
return;
}
) );
return;
}
this.Select( dateTimeInfo );
this.Select( dateTimeInfo );
} ) );
}
protected virtual bool IsLowerThan( T value1, T value2 )

8
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs

@ -29,7 +29,7 @@ namespace Xceed.Utils.Exceptions
public static void ThrowArgumentException( string message, string paramName, Exception innerExcept )
{
#if( XCEEDCF || SILVERLIGHT || PORTABLE )
#if( XCEEDCF || SILVERLIGHT )
throw new ArgumentException( message, innerExcept );
#else
throw new ArgumentException( message, paramName, innerExcept );
@ -38,7 +38,7 @@ namespace Xceed.Utils.Exceptions
public static void ThrowArgumentOutOfRangeException( string paramName, object value, string message )
{
#if( XCEEDCF || SILVERLIGHT || PORTABLE )
#if( XCEEDCF || SILVERLIGHT )
throw new ArgumentOutOfRangeException( message );
#else
throw new ArgumentOutOfRangeException( paramName, value, message );
@ -50,7 +50,7 @@ namespace Xceed.Utils.Exceptions
#endif // !NO_CODE_ANALYSIS
public static void ThrowLicenseException( Type type, object instance, string message )
{
#if PORTABLE || NETCORE || NET5
#if NETCOREAPP || NET
throw new Exception( message );
#elif ( XCEEDCF || SILVERLIGHT || XAMARIN )
throw new SystemException( message );
@ -62,7 +62,7 @@ namespace Xceed.Utils.Exceptions
#else
throw new System.ComponentModel.LicenseException( type, instance, message );
#endif // XBAP_FRIENDLY
#endif // ( XCEEDCF || NETCORE || NET5)
#endif // NETCOREAPP || NET
}
#endregion PUBLIC STATIC METHODS

3
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj

@ -364,12 +364,13 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyVersionInfo.cs" />
<Compile Include="AssemblyVersionInfoCommon.cs" />
<Compile Include="AutoSelectTextBox\Implementation\AutoSelectBehaviorEnum.cs" />
<Compile Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.cs" />
<Compile Include="AutoSelectTextBox\Implementation\QueryMoveFocusEventArgs.cs" />
<Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
<Compile Include="BusyIndicator\Implementation\Converters\ProgressBarWidthConverter.cs" />
<Compile Include="Chart\Converters\BooleanToTimeSpanConverter.cs" />
<Compile Include="Chart\Converters\InverseBooleanToDoubleConverter.cs" />
<Compile Include="ColorPicker\Implementation\ColorPickerTabItem.cs" />
<Compile Include="Core\Converters\ColorModeToTabItemSelectedConverter.cs" />
<Compile Include="Core\Converters\PrintableFontFamilyConverter.cs" />

15
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj

@ -398,12 +398,13 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyVersionInfo.cs" />
<Compile Include="AssemblyVersionInfoCommon.cs" />
<Compile Include="AutoSelectTextBox\Implementation\AutoSelectBehaviorEnum.cs" />
<Compile Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.cs" />
<Compile Include="AutoSelectTextBox\Implementation\QueryMoveFocusEventArgs.cs" />
<Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
<Compile Include="BusyIndicator\Implementation\Converters\ProgressBarWidthConverter.cs" />
<Compile Include="Chart\Converters\BooleanToTimeSpanConverter.cs" />
<Compile Include="Chart\Converters\InverseBooleanToDoubleConverter.cs" />
<Compile Include="ColorPicker\Implementation\ColorPickerTabItem.cs" />
<Compile Include="Core\Converters\ColorModeToTabItemSelectedConverter.cs" />
<Compile Include="Core\Converters\PrintableFontFamilyConverter.cs" />
@ -1015,11 +1016,11 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading…
Cancel
Save