-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add missing resource dictionaries in XAML styles
add XAML styles settings BREAKING CHANGE: remove DataTemplates.xaml files
- Loading branch information
Showing
110 changed files
with
9,632 additions
and
9,580 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:my="http://mynet.com/xaml/themes"> | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:my="http://mynet.com/xaml/themes"> | ||
|
|
||
| <ResourceDictionary.MergedDictionaries> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf.LiveCharts;component/Themes/MyNet.Styles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf.LiveCharts;component/Themes/MyNet.Styles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,61 @@ | ||
| <ResourceDictionary | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:my="http://mynet.com/xaml/themes"> | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:my="http://mynet.com/xaml/themes"> | ||
|
|
||
| <ResourceDictionary.MergedDictionaries> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf;component/Themes/MyNet.Styles.xaml" /> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf.LiveCharts;component/Themes/MyNet.Styles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf;component/Themes/MyNet.Styles.xaml" /> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf.LiveCharts;component/Themes/MyNet.Styles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <my:SharedConverter x:Key="SharedConverter" /> | ||
| <my:SharedVisibilityConverter x:Key="SharedVisibilityConverter" /> | ||
| <my:ChartPointLabelConverter x:Key="ChartPointLabelConverter" /> | ||
| <my:ParticipationVisibilityConverter x:Key="ParticipationVisibilityConverter" /> | ||
| <my:SharedConverter x:Key="SharedConverter" /> | ||
| <my:SharedVisibilityConverter x:Key="SharedVisibilityConverter" /> | ||
| <my:ChartPointLabelConverter x:Key="ChartPointLabelConverter" /> | ||
| <my:ParticipationVisibilityConverter x:Key="ParticipationVisibilityConverter" /> | ||
|
|
||
| <Style x:Key="MyNet.Styles.Series" TargetType="my:Series"> | ||
| <Setter Property="FontFamily" Value="{my:RobotoFont}" /> | ||
| <Setter Property="FontSize" Value="{StaticResource MyNet.Font.Size.Caption}" /> | ||
| <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Application.Foreground}" /> | ||
| <Setter Property="StrokeThickness" Value="1" /> | ||
| </Style> | ||
| <Style TargetType="my:DefaultTooltip"> | ||
| <Setter Property="Background" Value="{DynamicResource MyNet.Brushes.Control.Background.Inverse}" /> | ||
| <Setter Property="FontFamily" Value="{my:RobotoFont}" /> | ||
| <Setter Property="FontSize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Application.Foreground}" /> | ||
| </Style> | ||
|
|
||
| <Style TargetType="my:DefaultTooltip"> | ||
| <Setter Property="FontFamily" Value="{my:RobotoFont}" /> | ||
| <Setter Property="FontSize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Application.Foreground}" /> | ||
| <Setter Property="Background" Value="{DynamicResource MyNet.Brushes.Control.Background.Inverse}" /> | ||
| </Style> | ||
| <Style TargetType="my:Separator"> | ||
| <Setter Property="Stroke" Value="{DynamicResource MyNet.Brushes.Control.Border}" /> | ||
| <Setter Property="StrokeDashArray" Value="3" /> | ||
| <Setter Property="StrokeThickness" Value="1" /> | ||
| <Style.Triggers> | ||
| <Trigger Property="AxisOrientation" Value="X"> | ||
| <Setter Property="IsEnabled" Value="False" /> | ||
| </Trigger> | ||
| </Style.Triggers> | ||
| </Style> | ||
|
|
||
| <Style TargetType="my:Separator"> | ||
| <Setter Property="StrokeThickness" Value="1" /> | ||
| <Setter Property="StrokeDashArray" Value="3" /> | ||
| <Setter Property="Stroke" Value="{DynamicResource MyNet.Brushes.Control.Border}" /> | ||
| <Style.Triggers> | ||
| <Trigger Property="AxisOrientation" Value="X"> | ||
| <Setter Property="IsEnabled" Value="False" /> | ||
| </Trigger> | ||
| </Style.Triggers> | ||
| </Style> | ||
| <Style TargetType="my:Axis"> | ||
| <Setter Property="FontFamily" Value="{my:RobotoFont}" /> | ||
| <Setter Property="FontSize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Application.Foreground}" /> | ||
| </Style> | ||
|
|
||
| <Style TargetType="my:Axis"> | ||
| <Setter Property="FontSize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| <Setter Property="FontFamily" Value="{my:RobotoFont}" /> | ||
| <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Application.Foreground}" /> | ||
| </Style> | ||
|
|
||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:CandleSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:ColumnSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:HeatSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:LineSeries"> | ||
| <Setter Property="PointGeometrySize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| </Style> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:StepLineSeries"> | ||
| <Setter Property="PointGeometrySize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| </Style> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:VerticalLineSeries"> | ||
| <Setter Property="PointGeometrySize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| </Style> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:OhlcSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:RowSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:ScatterSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:StackedAreaSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:StackedColumnSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:StackedRowSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:VerticalStackedAreaSeries" /> | ||
| <Style BasedOn="{StaticResource MyNet.Styles.Series}" TargetType="my:PieSeries"> | ||
| <Setter Property="StrokeThickness" Value="0" /> | ||
| </Style> | ||
| <Style TargetType="my:CandleSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:ColumnSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:HeatSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:LineSeries" BasedOn="{StaticResource MyNet.Styles.Series}"> | ||
| <Setter Property="PointGeometrySize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| </Style> | ||
| <Style TargetType="my:StepLineSeries" BasedOn="{StaticResource MyNet.Styles.Series}"> | ||
| <Setter Property="PointGeometrySize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| </Style> | ||
| <Style TargetType="my:VerticalLineSeries" BasedOn="{StaticResource MyNet.Styles.Series}"> | ||
| <Setter Property="PointGeometrySize" Value="{StaticResource MyNet.Font.Size}" /> | ||
| </Style> | ||
| <Style TargetType="my:OhlcSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:RowSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:ScatterSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:StackedAreaSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:StackedColumnSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:StackedRowSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:VerticalStackedAreaSeries" BasedOn="{StaticResource MyNet.Styles.Series}" /> | ||
| <Style TargetType="my:PieSeries" BasedOn="{StaticResource MyNet.Styles.Series}"> | ||
| <Setter Property="StrokeThickness" Value="0" /> | ||
| </Style> | ||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:my="http://mynet.com/xaml/themes"> | ||
|
|
||
| <ResourceDictionary.MergedDictionaries> | ||
| <my:SharedResourceDictionary Source="pack://application:,,,/MyNet.Wpf.Presentation;component/Themes/MyNet.Styles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| </ResourceDictionary> | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.