diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml
index 8de7ec2..06320bd 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml
@@ -33,6 +33,7 @@
+
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml.cs b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml.cs
index 1b26ecc..1c8bf92 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml.cs
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml.cs
@@ -39,6 +39,10 @@ void ButtonControls_Click(object sender, RoutedEventArgs e)
{
NavigateToPage("/Controls");
}
+ void ButtonChartControls_Click(object sender, RoutedEventArgs e)
+ {
+ NavigateToPage("/ChartControls");
+ }
void ButtonHome_Click(object sender, RoutedEventArgs e)
{
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
index 1bc97d5..d84c669 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
@@ -28,8 +28,38 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -85,9 +115,71 @@
MSBuild:Compile
-
+
+ MSBuild:Compile
+
+
MSBuild:Compile
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
MSBuild:Compile
@@ -234,4 +326,8 @@
+
+
+
+
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Other/Styles.xaml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Other/Styles.xaml
index 6d3004c..182db5d 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Other/Styles.xaml
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Other/Styles.xaml
@@ -39,6 +39,12 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -->
-
-
-
-
-
-
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Controls/RadCartesianChart/RadCartesianChart_Demo.xaml.cs b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Controls/RadCartesianChart/RadCartesianChart_Demo.xaml.cs
deleted file mode 100644
index 06a670e..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Controls/RadCartesianChart/RadCartesianChart_Demo.xaml.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Navigation;
-using Telerik.Windows.Data;
-
-namespace OpenSilver.Samples.TelerikUI
-{
- public partial class RadCartesianChart_Demo : UserControl
- {
- /*
- public class DTPoint
- {
- public DateTime XValue { get; set; }
- public double YValue { get; set; }
- }
-
- static Random random = new Random();
- private RadObservableCollection centerAvgGraph = new RadObservableCollection();
- private float MaxScale, MinScale;
- private double MaxY;
-
- public RadCartesianChart_Demo()
- {
- this.InitializeComponent();
- Loaded += SetReferencePeriod_Loaded;
- }
-
- private void SetReferencePeriod_Loaded(object sender, RoutedEventArgs e)
- {
- ReferenceGraph.Series[0].ItemsSource = centerAvgGraph;
- MaxScale = 300;
- MaxY = MaxScale + 10.0;
- displayGraph();
- }
-
- private void Button_Click(object sender, RoutedEventArgs e)
- {
- displayGraph();
- }
-
- private void displayGraph()
- {
- centerAvgGraph.Clear();
- centerAvgGraph = GenerateRandomSerie(10, new DateTime(2000, 1, 1));
- XAxis.MajorTickInterval = 2;
- MaxY = MaxScale + 10.0;
- YAxis.Maximum = MaxY;
- ReferenceGraph.Series[0].ItemsSource = centerAvgGraph;
- ReferenceGraph.Series[1].ItemsSource = GenerateRandomSerie(5, new DateTime(2000, 1, 1));
- ReferenceGraph.Series[2].ItemsSource = GenerateRandomSerie(5, new DateTime(2000, 6, 1));
- }
-
- private RadObservableCollection GenerateRandomSerie(int size, DateTime initialDateTime, double minValue = 0, double maxValue = 300, int intervalBetweenPoints = 1)
- {
- RadObservableCollection serie = new RadObservableCollection();
- DateTime currentDate = initialDateTime;
- Random rd = new Random(random.Next());
- for (int i = 0; i < size; i++)
- {
- DTPoint point = new DTPoint
- {
- XValue = currentDate,
- YValue = rd.NextDouble() * (maxValue - minValue) + minValue,
- };
- serie.Add(point);
- currentDate = currentDate.AddMonths(intervalBetweenPoints);
- }
- return serie;
- }
- */
- private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
- {
- ViewSourceButtonHelper.ViewSource(new List()
- {
- new ViewSourceButtonInfo()
- {
- TabHeader = "RadCartesianChart_Demo.xaml",
- FilePathOnGitHub = "github/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Controls/RadCartesianChart/RadCartesianChart_Demo.xaml"
- },
- new ViewSourceButtonInfo()
- {
- TabHeader = "RadCartesianChart_Demo.xaml.cs",
- FilePathOnGitHub = "github/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Controls/RadCartesianChart/RadCartesianChart_Demo.xaml.cs"
- }
- });
- }
- }
-}
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml
index ebf9a5b..690c7f5 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml
@@ -43,9 +43,10 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml.cs b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml.cs
index da16089..837e93f 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml.cs
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml.cs
@@ -19,9 +19,13 @@ public Welcome()
this.InitializeComponent();
}
- private void ButtonToContinue_Click(object sender, RoutedEventArgs e)
+ private void ButtonContinueUIControls_Click(object sender, RoutedEventArgs e)
{
MainPage.Current.NavigateToPage("/Controls");
}
+ private void ButtonContinueChartsControls_Click(object sender, RoutedEventArgs e)
+ {
+ MainPage.Current.NavigateToPage("/ChartControls");
+ }
}
}