From 7df583b81ca5c68b4600abc84b84c1f57b70cb49 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 29 Mar 2024 17:42:07 +0800 Subject: [PATCH 1/6] feat: backport combobox placeholder fix from #329. --- src/Semi.Avalonia/Controls/ComboBox.axaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml index b59da08..32431ce 100644 --- a/src/Semi.Avalonia/Controls/ComboBox.axaml +++ b/src/Semi.Avalonia/Controls/ComboBox.axaml @@ -61,6 +61,7 @@ Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" + TextTrimming="CharacterEllipsis" Foreground="{TemplateBinding Foreground}" IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" From c2bf03c3377919d0ecc78785039541259ddf2464 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 29 Mar 2024 17:51:40 +0800 Subject: [PATCH 2/6] feat: backport localization from #332 --- src/Semi.Avalonia/Controls/DatePicker.axaml | 6 +++--- .../Controls/ManagedFileChooser.axaml | 8 ++++---- src/Semi.Avalonia/Locale/en-us.axaml | 16 +++++++++++++--- src/Semi.Avalonia/Locale/zh-cn.axaml | 16 +++++++++++++--- 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml index 7a3210a..a89bf1c 100644 --- a/src/Semi.Avalonia/Controls/DatePicker.axaml +++ b/src/Semi.Avalonia/Controls/DatePicker.axaml @@ -171,7 +171,7 @@ FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" - Text="day" /> + Text="{DynamicResource STRING_DATEPICKER_DAY_TEXT}" /> + Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" /> - + - + - + - + + + day + month + year + + Cut + Copy + Paste + File name Show hidden flies OK Cancel - Cut - Copy - Paste + Name + Date Modified + Type + Size \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/zh-cn.axaml b/src/Semi.Avalonia/Locale/zh-cn.axaml index 41968ac..508ac13 100644 --- a/src/Semi.Avalonia/Locale/zh-cn.axaml +++ b/src/Semi.Avalonia/Locale/zh-cn.axaml @@ -1,10 +1,20 @@  + + + + + + 剪切 + 复制 + 粘贴 + 文件名 显示隐藏文件 确认 取消 - 剪切 - 复制 - 粘贴 + 名称 + 修改日期 + 类型 + 大小 \ No newline at end of file From e484dbfd21b30e4038744e15eed189abd02d86b5 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 28 Mar 2024 05:17:59 +0800 Subject: [PATCH 3/6] feat: redesign SplitViewDemo. (cherry picked from commit 38958c13263e4b273d3fccaf2c74e21cfcb15f22) --- .../Pages/SplitViewDemo.axaml | 281 ++++++++++-------- .../Pages/SplitViewDemo.axaml.cs | 28 +- .../ViewModels/DataGridDemoViewModel.cs | 2 +- 3 files changed, 192 insertions(+), 119 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml index 38a6db3..7de95ef 100644 --- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml @@ -4,147 +4,194 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - d:DesignHeight="450" + xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages" + d:DesignHeight="1000" d:DesignWidth="800" mc:Ignorable="d"> + + + + + + M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z + + - - + + + - - + + + + CompactPaneLength="48" + OpenPaneLength="256"> + + + + + + - + - - - - - - + + - - - - - - - - - - - - - + Theme="{DynamicResource ButtonToggleSwitch}" + IsChecked="{Binding #SplitView.IsPaneOpen}"> + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs index e8a834f..2fb52a5 100644 --- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs @@ -1,6 +1,7 @@ -using Avalonia; +using System.Collections.ObjectModel; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using CommunityToolkit.Mvvm.ComponentModel; namespace Semi.Avalonia.Demo.Pages; @@ -9,10 +10,35 @@ public partial class SplitViewDemo : UserControl public SplitViewDemo() { InitializeComponent(); + this.DataContext = new SplitViewDemoViewModel(); } private void InitializeComponent() { AvaloniaXamlLoader.Load(this); } +} + +public class SplitViewDemoViewModel : ObservableObject +{ + public ObservableCollection Songs { get; set; } = + [ + "320万年前", + "隐德来希", + "孔明", + "锦鲤卟噜噜", + "指鹿为马", + "热带季风Remix", + "加州梦境", + "渐近自由", + "世界所有的烂漫", + ]; + + public ObservableCollection DisplayModes { get; set; } = + [ + SplitViewDisplayMode.Inline, + SplitViewDisplayMode.CompactInline, + SplitViewDisplayMode.Overlay, + SplitViewDisplayMode.CompactOverlay, + ]; } \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs index bb8fa4b..43ecbf0 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs @@ -121,7 +121,7 @@ public class Song new("指鹿为马", "熊猫堂ProducePandas", 3, 12, "W.O.R.L.D.", 74, 2063175272), new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319), new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324), - new("渐进自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321), + new("渐近自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321), new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775), }; } From 7bd6c08e94199d66b1a2c5f26be97246ed92d873 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:18:31 +0800 Subject: [PATCH 4/6] feat: update package info. (cherry picked from commit 41662706ab5baff1a1a6fb54210485112097d5e6) --- src/Package.props | 11 ++++++++--- src/Semi.Avalonia.ColorPicker/irihi.png | Bin 0 -> 1508 bytes src/Semi.Avalonia.DataGrid/irihi.png | Bin 0 -> 1508 bytes .../Semi.Avalonia.TreeDataGrid.csproj | 9 ++++++--- src/Semi.Avalonia.TreeDataGrid/irihi.png | Bin 0 -> 1508 bytes src/Semi.Avalonia/irihi.png | Bin 0 -> 1508 bytes 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 src/Semi.Avalonia.ColorPicker/irihi.png create mode 100644 src/Semi.Avalonia.DataGrid/irihi.png create mode 100644 src/Semi.Avalonia.TreeDataGrid/irihi.png create mode 100644 src/Semi.Avalonia/irihi.png diff --git a/src/Package.props b/src/Package.props index 0212a03..038caf4 100644 --- a/src/Package.props +++ b/src/Package.props @@ -2,13 +2,18 @@ net6.0;netstandard2.0 enable - 11 + latest 11.0.7.1 - IRIHI Technology + IRIHI Technology Co., Ltd. Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia + MIT + irihi.png https://github.com/irihitech/Semi.Avalonia 11.0.7 - MIT + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/irihi.png b/src/Semi.Avalonia.ColorPicker/irihi.png new file mode 100644 index 0000000000000000000000000000000000000000..01c68d918e31705d8d659505b74b764ec3b72ac4 GIT binary patch literal 1508 zcmeAS@N?(olHy`uVBq!ia0y~yV9Wqv4mO}j)zieQK#H@#BeIx*f$uN~Gak=hkpdKy zEOCt}3C>R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fwb0YWF{EP7+iM4NpE&R^ z9K7tvnbRUYTPcL2gyCDUqS>2OEGHP*c;$?Z|1+HUxqmMMgS~J@gGM7;htMcRd=OY| z7q7VWv1R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fwb0YWF{EP7+iM4NpE&R^ z9K7tvnbRUYTPcL2gyCDUqS>2OEGHP*c;$?Z|1+HUxqmMMgS~J@gGM7;htMcRd=OY| z7q7VWv1 net6.0 enable - 11 + latest 11.0.1 - IRIHI Technology + IRIHI Technology Co., Ltd. Avalonia Theme inspired by Semi Design. + https://github.com/irihitech/Semi.Avalonia + MIT + irihi.png https://github.com/irihitech/Semi.Avalonia 11.0.0 - MIT + diff --git a/src/Semi.Avalonia.TreeDataGrid/irihi.png b/src/Semi.Avalonia.TreeDataGrid/irihi.png new file mode 100644 index 0000000000000000000000000000000000000000..01c68d918e31705d8d659505b74b764ec3b72ac4 GIT binary patch literal 1508 zcmeAS@N?(olHy`uVBq!ia0y~yV9Wqv4mO}j)zieQK#H@#BeIx*f$uN~Gak=hkpdKy zEOCt}3C>R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fwb0YWF{EP7+iM4NpE&R^ z9K7tvnbRUYTPcL2gyCDUqS>2OEGHP*c;$?Z|1+HUxqmMMgS~J@gGM7;htMcRd=OY| z7q7VWv1R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fwb0YWF{EP7+iM4NpE&R^ z9K7tvnbRUYTPcL2gyCDUqS>2OEGHP*c;$?Z|1+HUxqmMMgS~J@gGM7;htMcRd=OY| z7q7VWv1 Date: Fri, 15 Mar 2024 16:40:54 +0800 Subject: [PATCH 5/6] feat: add TopCenter and BottomCenter position. (cherry picked from commit 627aa65e1f82e76a0e5ca2369874533ed2371c9b) --- .../Controls/WindowNotificationManager.axaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Semi.Avalonia/Controls/WindowNotificationManager.axaml b/src/Semi.Avalonia/Controls/WindowNotificationManager.axaml index cfd96ac..74e4b53 100644 --- a/src/Semi.Avalonia/Controls/WindowNotificationManager.axaml +++ b/src/Semi.Avalonia/Controls/WindowNotificationManager.axaml @@ -21,6 +21,11 @@ + + + + From 047c9f953e076d3544ee8c3972a08faaf252c533 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 29 Mar 2024 19:35:04 +0800 Subject: [PATCH 6/6] fix: fix SplitViewDemo PanePlacement Binding mode, revert DatePicker locale. --- demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml | 2 +- src/Semi.Avalonia/Controls/DatePicker.axaml | 6 +++--- src/Semi.Avalonia/Locale/en-us.axaml | 4 ---- src/Semi.Avalonia/Locale/zh-cn.axaml | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml index 7de95ef..ac4c592 100644 --- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml @@ -46,7 +46,7 @@ Grid.Row="2" Grid.Column="1" OffContent="Left" OnContent="Right" - IsChecked="{Binding #SplitView.PanePlacement}" /> + IsChecked="{Binding #SplitView.PanePlacement, Mode=OneWayToSource}" />