Skip to content

Commit f68e7f5

Browse files
friedcucumberfriedcucumber
committed
24.1.3+ Branch Created
1 parent aa5ad99 commit f68e7f5

File tree

90 files changed

+493
-843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+493
-843
lines changed

‎CS/ASPDataBaseServer/Grid_Data_From_APS.NET_Server.sln

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.Debug|Any CPU.Deploy.0 = Debug|Any CPU
2+
.Release|Any CPU.Deploy.0 = Release|Any CPU
13

24
Microsoft Visual Studio Solution File, Format Version 12.00
35
# Visual Studio Version 16

‎CS/ASPDataBaseServer/MauiDataGridView_GetFromASPServer/MainPage.xaml

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
3-
xmlns:dxg="clr-namespace:DevExpress.Maui.DataGrid;assembly=DevExpress.Maui.DataGrid"
4-
xmlns:dxe="clr-namespace:DevExpress.Maui.Editors;assembly=DevExpress.Maui.Editors"
5-
xmlns:dx="clr-namespace:DevExpress.Maui.Core;assembly=DevExpress.Maui.Core"
3+
xmlns:dx="http://schemas.devexpress.com/maui"
64
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
75
ios:Page.UseSafeArea="False"
86
x:Class="MauiDataGridView_GetFromASPServer.MainPage">
97
<Grid>
10-
<dxg:DataGridView x:Name="datagrid"
8+
<dx:DataGridView x:Name="datagrid"
119
EditorShowMode="Never" IsReadOnly="False" VerticalLineThickness="1" ShowGroupedColumns="True">
12-
<dxg:DataGridView.CellAppearance>
13-
<dxg:CellAppearance BorderColor="Transparent" HorizontalLineThickness="0"/>
14-
</dxg:DataGridView.CellAppearance>
15-
<dxg:DataGridView.GroupRowAppearance>
16-
<dxg:GroupRowAppearance BackgroundColor="Transparent"/>
17-
</dxg:DataGridView.GroupRowAppearance>
18-
<dxg:DataGridView.Columns>
19-
<dxg:TemplateColumn MinWidth="310" Caption="Customers" FieldName="Name" IsGrouped="true" GroupInterval="Alphabetical" SortOrder="Ascending">
20-
<dxg:TemplateColumn.DisplayTemplate>
10+
<dx:DataGridView.CellAppearance>
11+
<dx:CellAppearance BorderColor="Transparent" HorizontalLineThickness="0"/>
12+
</dx:DataGridView.CellAppearance>
13+
<dx:DataGridView.GroupRowAppearance>
14+
<dx:GroupRowAppearance BackgroundColor="Transparent"/>
15+
</dx:DataGridView.GroupRowAppearance>
16+
<dx:DataGridView.Columns>
17+
<dx:TemplateColumn MinWidth="310" Caption="Customers" FieldName="Name" IsGrouped="true" GroupInterval="Alphabetical" SortOrder="Ascending">
18+
<dx:TemplateColumn.DisplayTemplate>
2119
<DataTemplate>
2220
<Grid VerticalOptions="Center" Padding="15, 5, 0, 10" RowDefinitions="*" ColumnDefinitions="Auto, 3*, *">
2321
<Border
@@ -49,9 +47,9 @@
4947
</dx:DXStackLayout>
5048
</Grid>
5149
</DataTemplate>
52-
</dxg:TemplateColumn.DisplayTemplate>
53-
</dxg:TemplateColumn>
54-
</dxg:DataGridView.Columns>
55-
</dxg:DataGridView>
50+
</dx:TemplateColumn.DisplayTemplate>
51+
</dx:TemplateColumn>
52+
</dx:DataGridView.Columns>
53+
</dx:DataGridView>
5654
</Grid>
5755
</ContentPage>

‎CS/ASPDataBaseServer/MauiDataGridView_GetFromASPServer/MauiDataGridView_GetFromASPServer.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
<MauiFont Include="Resources\Fonts\*" />
3636
</ItemGroup>
3737
<ItemGroup>
38-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
3938
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
40-
<PackageReference Include="DevExpress.Maui.Editors" Version="23.2.*" />
41-
<PackageReference Include="DevExpress.Maui.Core" Version="23.2.*" />
42-
<PackageReference Include="DevExpress.Maui.DataGrid" Version="23.2.*" />
39+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
40+
<PackageReference Include="DevExpress.Maui.Editors" Version="24.1.*" />
41+
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
42+
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.1.*" />
4343
</ItemGroup>
4444
</Project>

‎CS/ASPDataBaseServer/MauiDataGridView_GetFromASPServer/MauiProgram.cs

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ public static MauiApp CreateMauiApp() {
1313
builder
1414
.UseMauiApp<App>()
1515
.UseDevExpress(true)
16+
.UseDevExpressCollectionView()
17+
.UseDevExpressControls()
18+
.UseDevExpressDataGrid()
19+
.UseDevExpressEditors()
1620
.ConfigureFonts(fonts => {
1721
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
1822
fonts.AddFont("univia-pro-regular.ttf", "Univia-Pro");

‎CS/AdvancedColumnLayout/AdvancedColumnLayout.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
</EmbeddedResource>
3737
</ItemGroup>
3838
<ItemGroup>
39-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
4039
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
41-
<PackageReference Include="DevExpress.Maui.Core" Version="23.2.*" />
42-
<PackageReference Include="DevExpress.Maui.DataGrid" Version="23.2.*" />
40+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
41+
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
42+
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.1.*" />
4343
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4444
</ItemGroup>
4545
<PropertyGroup>

‎CS/AdvancedColumnLayout/MainPage.xaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
3-
xmlns:dxg="clr-namespace:DevExpress.Maui.DataGrid;assembly=DevExpress.Maui.DataGrid"
3+
xmlns:dx="http://schemas.devexpress.com/maui"
44
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
55
ios:Page.UseSafeArea="true"
66
x:Class="AdvancedColumnLayout.MainPage">
7-
<dxg:DataGridView ItemsSource="{Binding Employees}">
8-
<!--<dxg:DataGridView.AdvancedColumnLayout>
9-
<dxg:AdvancedColumnLayout>
10-
<dxg:AdvancedColumnLayout.ColumnDefinitions>
7+
<dx:DataGridView ItemsSource="{Binding Employees}">
8+
<dx:DataGridView.AdvancedColumnLayout>
9+
<dx:AdvancedColumnLayout>
10+
<dx:AdvancedColumnLayout.ColumnDefinitions>
1111
<ColumnDefinition Width="80"/>
1212
<ColumnDefinition Width="3*"/>
1313
<ColumnDefinition Width="8*"/>
1414
<ColumnDefinition Width="8*"/>
1515
<ColumnDefinition Width="9*"/>
16-
</dxg:AdvancedColumnLayout.ColumnDefinitions>
17-
<dxg:AdvancedColumnLayout.RowDefinitions>
16+
</dx:AdvancedColumnLayout.ColumnDefinitions>
17+
<dx:AdvancedColumnLayout.RowDefinitions>
1818
<RowDefinition Height="Auto"/>
1919
<RowDefinition Height="Auto"/>
2020
<RowDefinition Height="Auto"/>
2121
<RowDefinition Height="Auto"/>
22-
</dxg:AdvancedColumnLayout.RowDefinitions>
23-
</dxg:AdvancedColumnLayout>
24-
</dxg:DataGridView.AdvancedColumnLayout>-->
22+
</dx:AdvancedColumnLayout.RowDefinitions>
23+
</dx:AdvancedColumnLayout>
24+
</dx:DataGridView.AdvancedColumnLayout>
2525

26-
<dxg:ImageColumn FieldName="Image" Caption="Photo" Column="0" />
26+
<dx:ImageColumn FieldName="Image" Caption="Photo" Column="0" />
2727

28-
<dxg:TextColumn FieldName="FullName" Column="1"/>
28+
<dx:TextColumn FieldName="FullName" Column="1"/>
2929

30-
<dxg:TextColumn FieldName="JobTitle" Column="2" />
30+
<dx:TextColumn FieldName="JobTitle" Column="2" />
3131

32-
</dxg:DataGridView>
32+
</dx:DataGridView>
3333
</ContentPage>

‎CS/AdvancedColumnLayout/MauiProgram.cs

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ public static MauiApp CreateMauiApp() {
1212
builder
1313
.UseMauiApp<App>()
1414
.UseDevExpress()
15+
.UseDevExpressCollectionView()
16+
.UseDevExpressControls()
17+
.UseDevExpressDataGrid()
18+
.UseDevExpressEditors()
1519
.ConfigureFonts(fonts => {
1620
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
1721
fonts.AddFont("univia-pro-regular.ttf", "Univia-Pro");

‎CS/AdvancedColumnLayout/Resources/Fonts/OpenSans-Regular.ttf

-94.7 KB
Binary file not shown.

‎CS/AdvancedColumnLayout/Resources/Fonts/roboto-bold.ttf

-160 KB
Binary file not shown.

‎CS/AdvancedColumnLayout/Resources/Fonts/roboto-regular.ttf

-155 KB
Binary file not shown.

‎CS/AdvancedColumnLayout/Resources/Fonts/univia-pro-regular.ttf

-63.7 KB
Binary file not shown.

‎CS/AdvancedColumnLayout/Resources/Images/background.svg

-117
This file was deleted.

0 commit comments

Comments
 (0)