Skip to content

Commit d0449eb

Browse files
Update the position of components and fix a few discrepancies.
1 parent af7c828 commit d0449eb

File tree

17 files changed

+34
-35
lines changed

17 files changed

+34
-35
lines changed

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
2929
<StackPanel Margin="0,20,0,0">
3030
<StackPanel Orientation="Vertical" Margin="1">
31-
<TextBlock x:Name="TitleTextBlock" FontFamily="Segoe UI" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="#FF00C6D2" FontSize="17">
31+
<TextBlock x:Name="TitleTextBlock" FontFamily="Segoe UI" TextAlignment="Center" VerticalAlignment="Center" Foreground="#FF00C6D2" FontSize="17">
3232
Telerik UI compiled<LineBreak/>with OpenSilver
3333
</TextBlock>
3434
</StackPanel>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
<None Remove="Samples\Broken\RadScheduleView\RadScheduleView_Demo.xaml" />
4646
<None Remove="Samples\Broken\RadTimePicker\RadTimePicker_Demo.xaml" />
4747
<None Remove="Samples\Broken\RadToolBar\RadToolBar_Demo.xaml" />
48-
<None Remove="Samples\Broken\RadTreeView\RadTreeView_Demo.xaml" />
48+
<None Remove="Samples\InProgress\RadTreeView\RadTreeView_Demo.xaml" />
4949
<None Remove="Samples\Broken\RadTreeListView\RadTreeListView_Demo.xaml" />
5050
<None Remove="Samples\Broken\RadWrapPanel\RadWrapPanel_Demo.xaml" />
5151
<None Remove="Samples\Supported\RadContextMenu\RadContextMenu_Demo.xaml" />
5252
<None Remove="Samples\Supported\RadNumericUpDown\RadNumericUpDown_Demo.xaml" />
5353
<None Remove="Samples\Broken\RadPanelBar\RadPanelBar_Demo.xaml" />
54-
<None Remove="Samples\Broken\RadAlert\RadAlert_Demo.xaml" />
54+
<None Remove="Samples\InProgress\RadAlert\RadAlert_Demo.xaml" />
5555
<None Remove="Samples\Broken\RadRichTextBox\RadRichTextBox_Demo.xaml" />
5656
<None Remove="Samples\InProgress\RadComboBox\RadComboBox_Demo.xaml" />
5757
<None Remove="Samples\InProgress\RadDocking\RadDocking_Demo.xaml" />
58-
<None Remove="Samples\Broken\RadGridView\RadGridView_Demo.xaml" />
58+
<None Remove="Samples\InProgress\RadGridView\RadGridView_Demo.xaml" />
5959
<None Remove="Samples\SupportedViaKendoUI\RadGridViewViaKendoUI\RadGridViewViaKendoUI_Demo.xaml" />
6060
<None Remove="Samples\SupportedViaKendoUI\SupportedViaKendoUI.xaml" />
6161
<None Remove="Samples\Supported\RadDockPanel\RadDockPanel_Demo.xaml" />
@@ -160,7 +160,7 @@
160160
<Content Include="Samples\Broken\RadToolBar\RadToolBar_Demo.xaml">
161161
<Generator>MSBuild:Compile</Generator>
162162
</Content>
163-
<Content Include="Samples\Broken\RadTreeView\RadTreeView_Demo.xaml">
163+
<Content Include="Samples\InProgress\RadTreeView\RadTreeView_Demo.xaml">
164164
<Generator>MSBuild:Compile</Generator>
165165
</Content>
166166
<Content Include="Samples\Broken\RadTreeListView\RadTreeListView_Demo.xaml">
@@ -172,7 +172,7 @@
172172
<Content Include="Samples\Supported\RadContextMenu\RadContextMenu_Demo.xaml">
173173
<Generator>MSBuild:Compile</Generator>
174174
</Content>
175-
<Content Include="Samples\Broken\RadGridView\RadGridView_Demo.xaml">
175+
<Content Include="Samples\InProgress\RadGridView\RadGridView_Demo.xaml">
176176
<Generator>MSBuild:Compile</Generator>
177177
</Content>
178178
<Content Include="Samples\Supported\RadNumericUpDown\RadNumericUpDown_Demo.xaml">
@@ -181,7 +181,7 @@
181181
<Content Include="Samples\Broken\RadPanelBar\RadPanelBar_Demo.xaml">
182182
<Generator>MSBuild:Compile</Generator>
183183
</Content>
184-
<Content Include="Samples\Broken\RadAlert\RadAlert_Demo.xaml">
184+
<Content Include="Samples\InProgress\RadAlert\RadAlert_Demo.xaml">
185185
<Generator>MSBuild:Compile</Generator>
186186
</Content>
187187
<Content Include="Samples\Broken\RadRichTextBox\RadRichTextBox_Demo.xaml">
@@ -304,7 +304,7 @@
304304
</ItemGroup>
305305

306306
<ItemGroup>
307-
<PackageReference Include="OpenSilver.Compatibility.TelerikUI" Version="1.0.0-alpha-002" />
307+
<PackageReference Include="OpenSilver.Compatibility.TelerikUI" Version="0.1.0-alpha-002" />
308308
<PackageReference Include="OpenSilver.WorkInProgress" Version="1.0.0-alpha-020" />
309309
</ItemGroup>
310310

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/Broken.xaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,17 @@
1212
<local:RadWrapPanel_Demo HorizontalAlignment="Center"/>
1313
<local:RadCalendar_Demo HorizontalAlignment="Center"/>
1414
<local:RadToolBar_Demo HorizontalAlignment="Center"/>
15-
<local:RadAlert_Demo HorizontalAlignment="Center"/>
16-
<!--<local:RadCartesianChart_Demo HorizontalAlignment="Center"/>-->
17-
<!--<local:RadTreeListView_Demo HorizontalAlignment="Center"/>-->
18-
<!--<local:RadScheduleView_Demo HorizontalAlignment="Center"/>-->
19-
<!--<local:RadMap_Demo HorizontalAlignment="Center"/>-->
20-
<local:RadTreeView_Demo HorizontalAlignment="Center"/>
21-
15+
<local:RadTreeListView_Demo HorizontalAlignment="Center"/>
2216
<local:RadSplitButton_Demo HorizontalAlignment="Center"/>
2317
<local:RadTabControl_Demo HorizontalAlignment="Center"/>
24-
<!--The RadRichTextBox below is commented because it has an exception in the constructor which breaks this entire page.-->
18+
<!--The controls below are commented because they cause exceptions.-->
2519
<!--<local:RadRichTextBox_Demo HorizontalAlignment="Center"/>-->
26-
<local:RadPanelBar_Demo HorizontalAlignment="Center"/>
20+
<!--<local:RadCartesianChart_Demo HorizontalAlignment="Center"/>-->
21+
<!--<local:RadScheduleView_Demo HorizontalAlignment="Center"/>-->
22+
<!--<local:RadMap_Demo HorizontalAlignment="Center"/>-->
23+
<local:RadPanelBar_Demo HorizontalAlignment="Center"/>
2724
<local:RadToggleSwitchButton_Demo HorizontalAlignment="Center"/>
2825
<local:RadDatePicker_Demo HorizontalAlignment="Center"/>
29-
<!--<local:RadGridView_Demo HorizontalAlignment="Center"/>-->
3026
</local:MasonryPanelWithProgressiveLoading>
3127
</StackPanel>
3228
</UserControl>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCalendar/RadCalendar_Demo.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
2626
new ViewSourceButtonInfo()
2727
{
2828
TabHeader = "RadCalendar_Demo.xaml",
29-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadCalendar/RadCalendar_Demo.xaml"
29+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCalendar/RadCalendar_Demo.xaml"
3030
},
3131
new ViewSourceButtonInfo()
3232
{
3333
TabHeader = "RadCalendar_Demo.xaml.cs",
34-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadCalendar/RadCalendar_Demo.xaml.cs"
34+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCalendar/RadCalendar_Demo.xaml.cs"
3535
}
3636
});
3737
}

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCartesianChart/RadCartesianChart_Demo.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RowDefinition Height="*"/>
1414
<RowDefinition Height="Auto"/>
1515
</Grid.RowDefinitions>
16-
<ContentControl Content="Rad Button" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
16+
<ContentControl Content="Rad Cartesian chart" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
1717
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
1818
<telerik:RadCartesianChart x:Name="ReferenceGraph" HorizontalAlignment="Left" Margin="10,18,0,0" Background="Gray" VerticalAlignment="Top" Height="400" Width="730" BorderThickness="0" Visibility="Visible">
1919
<telerik:RadCartesianChart.Grid>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCartesianChart/RadCartesianChart_Demo.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
8282
new ViewSourceButtonInfo()
8383
{
8484
TabHeader = "RadCartesianChart_Demo.xaml",
85-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadCartesianChart/RadCartesianChart_Demo.xaml"
85+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCartesianChart/RadCartesianChart_Demo.xaml"
8686
},
8787
new ViewSourceButtonInfo()
8888
{
8989
TabHeader = "RadCartesianChart_Demo.xaml.cs",
90-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadCartesianChart/RadCartesianChart_Demo.xaml.cs"
90+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadCartesianChart/RadCartesianChart_Demo.xaml.cs"
9191
}
9292
});
9393
}

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadDatePicker/RadDatePicker_Demo.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
2626
new ViewSourceButtonInfo()
2727
{
2828
TabHeader = "RadDatePicker_Demo.xaml",
29-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadDatePicker/RadDatePicker_Demo.xaml"
29+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadDatePicker/RadDatePicker_Demo.xaml"
3030
},
3131
new ViewSourceButtonInfo()
3232
{
3333
TabHeader = "RadDatePicker_Demo.xaml.cs",
34-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadDatePicker/RadDatePicker_Demo.xaml.cs"
34+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadDatePicker/RadDatePicker_Demo.xaml.cs"
3535
}
3636
});
3737
}

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadScheduleView/RadScheduleView_Demo.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<RowDefinition Height="*"/>
1313
<RowDefinition Height="Auto"/>
1414
</Grid.RowDefinitions>
15-
<ContentControl Content="Rad Button" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
15+
<ContentControl Content="Rad Schedule View" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
1616
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
1717
<controls:RadScheduleView Width="150"/>
1818
</StackPanel>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadTimePicker/RadTimePicker_Demo.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<RowDefinition Height="*"/>
1313
<RowDefinition Height="Auto"/>
1414
</Grid.RowDefinitions>
15-
<ContentControl Content="Rad DatePicker" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
15+
<ContentControl Content="Rad TimePicker" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
1616
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
1717
<controls:RadTimePicker Width="100"/>
1818
</StackPanel>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadTimePicker/RadTimePicker_Demo.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
2626
new ViewSourceButtonInfo()
2727
{
2828
TabHeader = "RadTimePicker_Demo.xaml",
29-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadTimePicker/RadTimePicker_Demo.xaml"
29+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadTimePicker/RadTimePicker_Demo.xaml"
3030
},
3131
new ViewSourceButtonInfo()
3232
{
3333
TabHeader = "RadTimePicker_Demo.xaml.cs",
34-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadTimePicker/RadTimePicker_Demo.xaml.cs"
34+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadTimePicker/RadTimePicker_Demo.xaml.cs"
3535
}
3636
});
3737
}

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/InProgress/InProgress.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<local:RadDocking_Demo HorizontalAlignment="Center"/>
2121
<local:RadMenu_Demo HorizontalAlignment="Center"/>
2222
<local:RadRibbonView_Demo HorizontalAlignment="Center"/>
23+
<local:RadAlert_Demo HorizontalAlignment="Center"/>
24+
<local:RadTreeView_Demo HorizontalAlignment="Center"/>
25+
<local:RadGridView_Demo HorizontalAlignment="Center"/>
2326
</local:MasonryPanelWithProgressiveLoading>
2427
</StackPanel>
2528
</UserControl>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Broken/RadAlert/RadAlert_Demo.xaml.cs renamed to OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/InProgress/RadAlert/RadAlert_Demo.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
2626
new ViewSourceButtonInfo()
2727
{
2828
TabHeader = "RadAlert_Demo.xaml",
29-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadAlert/RadAlert_Demo.xaml"
29+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/InProgress/RadAlert/RadAlert_Demo.xaml"
3030
},
3131
new ViewSourceButtonInfo()
3232
{
3333
TabHeader = "RadAlert_Demo.xaml.cs",
34-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadAlert/RadAlert_Demo.xaml.cs"
34+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/InProgress/RadAlert/RadAlert_Demo.xaml.cs"
3535
}
3636
});
3737
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
xmlns:local="clr-namespace:OpenSilver.Samples.TelerikUI"
66
xmlns:controls="using:Telerik.Windows.Controls">
77

8-
<ContentControl Style="{StaticResource Card_Style}" Height="500" Width="440">
8+
<ContentControl Style="{StaticResource Card_Style}" Height="350" Width="730">
99
<Grid>
1010
<Grid.RowDefinitions>
1111
<RowDefinition Height="Auto"/>
1212
<RowDefinition Height="*"/>
1313
<RowDefinition Height="Auto"/>
1414
</Grid.RowDefinitions>
1515
<ContentControl Content="RadGridView (native)" Foreground="#FFD59851" Background="#FFBFA383" Style="{StaticResource HeaderControl_Style}"/>
16-
<controls:RadGridView x:Name="RadGridView1" Grid.Row="1" Width="400" Height="400" HorizontalAlignment="Center" VerticalAlignment="Center"/>
16+
<controls:RadGridView x:Name="RadGridView1" Grid.Row="1" CustomLayout="True" Width="700" Height="270" HorizontalAlignment="Center" VerticalAlignment="Center"/> <!--Width="750" Height="400"-->
1717
<Button Grid.Row="2" Content="VIEW SOURCE..." Click="ButtonViewSource_Click" Background="#FF6F7DFF" Style="{StaticResource ButtonViewSource_Style}"/>
1818
</Grid>
1919
</ContentControl>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ private void ButtonViewSource_Click(object sender, RoutedEventArgs e)
2626
new ViewSourceButtonInfo()
2727
{
2828
TabHeader = "RadTreeView_Demo.xaml",
29-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadTreeView/RadTreeView_Demo.xaml"
29+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/InProgress/RadTreeView/RadTreeView_Demo.xaml"
3030
},
3131
new ViewSourceButtonInfo()
3232
{
3333
TabHeader = "RadTreeView_Demo.xaml.cs",
34-
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Supported/RadTreeView/RadTreeView_Demo.xaml.cs"
34+
FilePathOnGitHub = "github.com/OpenSilver/OpenSilver.Samples.TelerikUI/blob/master/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/InProgress/RadTreeView/RadTreeView_Demo.xaml.cs"
3535
}
3636
});
3737
}

0 commit comments

Comments
 (0)