Rename
This commit is contained in:
Родитель
5d6c454c12
Коммит
e445a61456
|
@ -1,6 +1,6 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ItemsRepeaterDataGridDemo", "src\ItemsRepeaterDataGridDemo\ItemsRepeaterDataGridDemo.csproj", "{A2CC1506-A489-4C79-8EF3-FA9B786D1C91}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplatedDataGridDemo", "src\TemplatedDataGridDemo\TemplatedDataGridDemo.csproj", "{A2CC1506-A489-4C79-8EF3-FA9B786D1C91}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplatedDataGrid", "src\TemplatedDataGrid\TemplatedDataGrid.csproj", "{941DBB36-F74A-442F-8D4D-F43E6B58F2A9}"
|
||||
EndProject
|
|
@ -1 +1 @@
|
|||
dotnet publish -c Release -r win7-x64 -o ItemsRepeaterDataGridDemo-win7-x64 -p:PublishReadyToRun=true .\src\ItemsRepeaterDataGridDemo\ItemsRepeaterDataGridDemo.csproj
|
||||
dotnet publish -c Release -r win7-x64 -o ItemsRepeaterDataGridDemo-win7-x64 -p:PublishReadyToRun=true .\src\TemplatedDataGridDemo\TemplatedDataGridDemo.csproj
|
|
@ -1,6 +1,6 @@
|
|||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:g="using:ItemsRepeaterDataGrid">
|
||||
xmlns:g="using:TemplatedDataGrid">
|
||||
<Design.PreviewWith>
|
||||
<g:DataGrid />
|
||||
</Design.PreviewWith>
|
||||
|
|
|
@ -5,7 +5,7 @@ using Avalonia.Collections;
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Primitives;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGrid : TemplatedControl
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:g="using:ItemsRepeaterDataGrid">
|
||||
xmlns:g="using:TemplatedDataGrid">
|
||||
<Design.PreviewWith>
|
||||
<g:DataGridCell />
|
||||
</Design.PreviewWith>
|
||||
|
|
|
@ -3,7 +3,7 @@ using Avalonia.Controls.Primitives;
|
|||
using Avalonia.Controls.Templates;
|
||||
using Avalonia.Metadata;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridCell : TemplatedControl
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridColumn : AvaloniaObject
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:g="using:ItemsRepeaterDataGrid">
|
||||
xmlns:g="using:TemplatedDataGrid">
|
||||
<Design.PreviewWith>
|
||||
<g:DataGridColumnHeader />
|
||||
</Design.PreviewWith>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using Avalonia;
|
||||
using Avalonia.Controls.Primitives;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridColumnHeader : TemplatedControl
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:g="using:ItemsRepeaterDataGrid">
|
||||
xmlns:g="using:TemplatedDataGrid">
|
||||
<Design.PreviewWith>
|
||||
<g:DataGridColumnHeadersPresenter />
|
||||
</Design.PreviewWith>
|
||||
|
|
|
@ -4,7 +4,7 @@ using Avalonia.Collections;
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Primitives;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridColumnHeadersPresenter : TemplatedControl
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:g="using:ItemsRepeaterDataGrid">
|
||||
xmlns:g="using:TemplatedDataGrid">
|
||||
<Design.PreviewWith>
|
||||
<g:DataGridRow />
|
||||
</Design.PreviewWith>
|
||||
|
|
|
@ -4,7 +4,7 @@ using Avalonia.Collections;
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Primitives;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridRow : TemplatedControl
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:g="using:ItemsRepeaterDataGrid">
|
||||
xmlns:g="using:TemplatedDataGrid">
|
||||
<Design.PreviewWith>
|
||||
<g:DataGridRowsPresenter />
|
||||
</Design.PreviewWith>
|
||||
|
|
|
@ -5,7 +5,7 @@ using Avalonia.Controls;
|
|||
using Avalonia.Controls.Primitives;
|
||||
using Avalonia.Controls.Templates;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridRowsPresenter : TemplatedControl
|
||||
{
|
||||
|
@ -67,7 +67,7 @@ namespace ItemsRepeaterDataGrid
|
|||
_listBox.ItemTemplate = new FuncDataTemplate<object>(
|
||||
(_, _) => new DataGridRow()
|
||||
{
|
||||
[!DataGridRow.ColumnsProperty] = this[!DataGrid.ColumnsProperty]
|
||||
[!DataGridRow.ColumnsProperty] = this[!DataGridRowsPresenter.ColumnsProperty]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ using Avalonia;
|
|||
using Avalonia.Controls.Templates;
|
||||
using Avalonia.Metadata;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public class DataGridTemplateColumn : DataGridColumn
|
||||
{
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System.Collections.Generic;
|
||||
using Avalonia.Controls;
|
||||
|
||||
namespace ItemsRepeaterDataGrid
|
||||
namespace TemplatedDataGrid
|
||||
{
|
||||
public static class GridExtensions
|
||||
internal static class GridExtensions
|
||||
{
|
||||
public static void SetRowDefinitions(this Grid grid, IEnumerable<RowDefinition> rowDefinitions)
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<IsPackable>True</IsPackable>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>ItemsRepeaterDataGrid</RootNamespace>
|
||||
<RootNamespace>TemplatedDataGrid</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AnalysisLevel>latest</AnalysisLevel>
|
||||
|
@ -16,10 +16,10 @@
|
|||
<Authors>Wiesław Šoltés</Authors>
|
||||
<Company>Wiesław Šoltés</Company>
|
||||
<Copyright>Copyright © Wiesław Šoltés 2021</Copyright>
|
||||
<PackageProjectUrl>https://github.com/wieslawsoltes/ItemsRepeaterDataGrid</PackageProjectUrl>
|
||||
<PackageProjectUrl>https://github.com/wieslawsoltes/DataGrid</PackageProjectUrl>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<Description>A DataGrid control based on ItemsRepeater panel.</Description>
|
||||
<Description>A DataGrid control based on ListBox and Grid panels.</Description>
|
||||
<PackageId>TemplatedDataGrid</PackageId>
|
||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||
<PackageTags>datagrid;panel;control;xaml;axaml;avalonia;avaloniaui</PackageTags>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Application xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="using:ItemsRepeaterDataGridDemo"
|
||||
x:Class="ItemsRepeaterDataGridDemo.App">
|
||||
xmlns:local="using:TemplatedDataGridDemo"
|
||||
x:Class="TemplatedDataGridDemo.App">
|
||||
<Application.DataTemplates>
|
||||
<local:ViewLocator />
|
||||
</Application.DataTemplates>
|
|
@ -1,10 +1,10 @@
|
|||
using Avalonia;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
using Avalonia.Markup.Xaml;
|
||||
using ItemsRepeaterDataGridDemo.ViewModels;
|
||||
using ItemsRepeaterDataGridDemo.Views;
|
||||
using TemplatedDataGridDemo.ViewModels;
|
||||
using TemplatedDataGridDemo.Views;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo
|
||||
namespace TemplatedDataGridDemo
|
||||
{
|
||||
public class App : Application
|
||||
{
|
До Ширина: | Высота: | Размер: 172 KiB После Ширина: | Высота: | Размер: 172 KiB |
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using Avalonia;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ItemsRepeaterDataGrid;
|
||||
using TemplatedDataGrid;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo
|
||||
namespace TemplatedDataGridDemo
|
||||
{
|
||||
class Program
|
||||
{
|
|
@ -4,7 +4,7 @@
|
|||
<TargetFramework>net5.0</TargetFramework>
|
||||
<IsPackable>False</IsPackable>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>ItemsRepeaterDataGridDemo</RootNamespace>
|
||||
<RootNamespace>TemplatedDataGridDemo</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AnalysisLevel>latest</AnalysisLevel>
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Templates;
|
||||
using ItemsRepeaterDataGridDemo.ViewModels;
|
||||
using TemplatedDataGridDemo.ViewModels;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo
|
||||
namespace TemplatedDataGridDemo
|
||||
{
|
||||
public class ViewLocator : IDataTemplate
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
using Avalonia;
|
||||
using ReactiveUI;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo.ViewModels
|
||||
namespace TemplatedDataGridDemo.ViewModels
|
||||
{
|
||||
public class ItemViewModel : ViewModelBase
|
||||
{
|
|
@ -5,7 +5,7 @@ using System.Threading.Tasks;
|
|||
using Avalonia;
|
||||
using ReactiveUI;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo.ViewModels
|
||||
namespace TemplatedDataGridDemo.ViewModels
|
||||
{
|
||||
public class MainWindowViewModel : ViewModelBase
|
||||
{
|
|
@ -1,6 +1,6 @@
|
|||
using ReactiveUI;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo.ViewModels
|
||||
namespace TemplatedDataGridDemo.ViewModels
|
||||
{
|
||||
public class ViewModelBase : ReactiveObject
|
||||
{
|
|
@ -1,16 +1,16 @@
|
|||
<Window xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vm="using:ItemsRepeaterDataGridDemo.ViewModels"
|
||||
xmlns:vm="using:TemplatedDataGridDemo.ViewModels"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:g="clr-namespace:ItemsRepeaterDataGrid;assembly=TemplatedDataGrid"
|
||||
xmlns:g="clr-namespace:TemplatedDataGrid;assembly=TemplatedDataGrid"
|
||||
mc:Ignorable="d" d:DesignWidth="840" d:DesignHeight="480"
|
||||
x:Class="ItemsRepeaterDataGridDemo.Views.MainWindow"
|
||||
x:Class="TemplatedDataGridDemo.Views.MainWindow"
|
||||
x:DataType="vm:MainWindowViewModel" x:CompileBindings="True"
|
||||
MinWidth="640" MinHeight="480"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Icon="/Assets/avalonia-logo.ico"
|
||||
Title="ItemsRepeaterDataGridDemo">
|
||||
Title="TemplatedDataGridDemo">
|
||||
|
||||
<Design.DataContext>
|
||||
<vm:MainWindowViewModel />
|
|
@ -2,7 +2,7 @@ using Avalonia;
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace ItemsRepeaterDataGridDemo.Views
|
||||
namespace TemplatedDataGridDemo.Views
|
||||
{
|
||||
public partial class MainWindow : Window
|
||||
{
|
Загрузка…
Ссылка в новой задаче