From 04ffd38e143eadbaa8657a5e241991f4c437c895 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 28 Mar 2024 15:39:09 +0800
Subject: [PATCH 1/2] feat: add DatePicker & TimePicker support.

---
 src/Semi.Avalonia/Controls/DatePicker.axaml |  6 +++---
 src/Semi.Avalonia/Controls/TimePicker.axaml |  6 ++++--
 src/Semi.Avalonia/Locale/en-us.axaml        | 15 ++++++++++++---
 src/Semi.Avalonia/Locale/zh-cn.axaml        | 15 ++++++++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 515bc26..6420567 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -172,7 +172,7 @@
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="day" />
+                                        Text="{DynamicResource STRING_DATEPICKER_DAY_TEXT}" />
                                     <TextBlock
                                         Name="PART_MonthTextBlock"
                                         Padding="12,0"
@@ -180,7 +180,7 @@
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="month"
+                                        Text="{DynamicResource STRING_DATEPICKER_MONTH_TEXT}"
                                         TextAlignment="Left" />
                                     <TextBlock
                                         Name="PART_YearTextBlock"
@@ -190,7 +190,7 @@
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="year" />
+                                        Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" />
                                     <Rectangle
                                         x:Name="PART_FirstSpacer"
                                         Grid.Column="1"
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index 3e7a943..950f4e8 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -177,7 +177,8 @@
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
                                             FontSize="{TemplateBinding FontSize}"
-                                            FontWeight="{TemplateBinding FontWeight}" />
+                                            FontWeight="{TemplateBinding FontWeight}"
+                                            Text="{DynamicResource STRING_TIMEPICKER_HOUR_TEXT}" />
                                     </Border>
 
                                     <Rectangle
@@ -199,7 +200,8 @@
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
                                             FontSize="{TemplateBinding FontSize}"
-                                            FontWeight="{TemplateBinding FontWeight}" />
+                                            FontWeight="{TemplateBinding FontWeight}"
+                                            Text="{DynamicResource STRING_TIMEPICKER_MINUTE_TEXT}" />
                                     </Border>
 
                                     <Rectangle
diff --git a/src/Semi.Avalonia/Locale/en-us.axaml b/src/Semi.Avalonia/Locale/en-us.axaml
index 82f5da2..9ddd7dc 100644
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -1,10 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- DatePicker -->
+    <x:String x:Key="STRING_DATEPICKER_DAY_TEXT">day</x:String>
+    <x:String x:Key="STRING_DATEPICKER_MONTH_TEXT">month</x:String>
+    <x:String x:Key="STRING_DATEPICKER_YEAR_TEXT">year</x:String>
+    <!-- TimePicker -->
+    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">hour</x:String>
+    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">minute</x:String>
+    <!-- TextBox/SelectableTextBox flyout -->
+    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
+    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
+    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
+    <!-- ManagedFileChooser -->
     <x:String x:Key="STRING_CHOOSER_FILE_NAME">File name</x:String>
     <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">Show hidden flies</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_OK">OK</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Cancel</x:String>
-    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
-    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
 </ResourceDictionary>
\ 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..fbab5cf 100644
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml
@@ -1,10 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- DatePicker -->
+    <x:String x:Key="STRING_DATEPICKER_DAY_TEXT">日</x:String>
+    <x:String x:Key="STRING_DATEPICKER_MONTH_TEXT">月</x:String>
+    <x:String x:Key="STRING_DATEPICKER_YEAR_TEXT">年</x:String>
+    <!-- TimePicker -->
+    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">时</x:String>
+    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">分</x:String>
+    <!-- TextBox/SelectableTextBox flyout -->
+    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
+    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
+    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
+    <!-- ManagedFileChooser -->
     <x:String x:Key="STRING_CHOOSER_FILE_NAME">文件名</x:String>
     <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">显示隐藏文件</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_OK">确认</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">取消</x:String>
-    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
-    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
 </ResourceDictionary>
\ No newline at end of file

From d7de64a4efce49ea3f4974468c699be63a705b76 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 28 Mar 2024 15:52:47 +0800
Subject: [PATCH 2/2] feat: ManagedFileChooser columns.

---
 src/Semi.Avalonia/Controls/ManagedFileChooser.axaml | 8 ++++----
 src/Semi.Avalonia/Locale/en-us.axaml                | 4 ++++
 src/Semi.Avalonia/Locale/zh-cn.axaml                | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
index 9f42cbb..706ab9f 100644
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -131,13 +131,13 @@
                                     <ColumnDefinition Width="200" SharedSizeGroup="Size" />
                                 </Grid.ColumnDefinitions>
                                 <GridSplitter Grid.Column="1" Width="1" />
-                                <TextBlock Grid.Column="2" Text="Name" />
+                                <TextBlock Grid.Column="2" Text="{DynamicResource STRING_CHOOSER_NAME_COLUMN}" />
                                 <GridSplitter Grid.Column="3" Width="1" />
-                                <TextBlock Grid.Column="4" Text="Date Modified" />
+                                <TextBlock Grid.Column="4" Text="{DynamicResource STRING_CHOOSER_DATEMODIFIED_COLUMN}" />
                                 <GridSplitter Grid.Column="5" Width="1" />
-                                <TextBlock Grid.Column="6" Text="Type" />
+                                <TextBlock Grid.Column="6" Text="{DynamicResource STRING_CHOOSER_TYPE_COLUMN}" />
                                 <GridSplitter Grid.Column="7" Width="1" />
-                                <TextBlock Grid.Column="8" Text="Size" />
+                                <TextBlock Grid.Column="8" Text="{DynamicResource STRING_CHOOSER_SIZE_COLUMN}" />
                             </Grid>
                             <ListBox
                                 Name="PART_Files"
diff --git a/src/Semi.Avalonia/Locale/en-us.axaml b/src/Semi.Avalonia/Locale/en-us.axaml
index 9ddd7dc..44ae5f6 100644
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -16,4 +16,8 @@
     <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">Show hidden flies</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_OK">OK</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Cancel</x:String>
+    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">Name</x:String>
+    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">Date Modified</x:String>
+    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">Type</x:String>
+    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">Size</x:String>
 </ResourceDictionary>
\ 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 fbab5cf..ce37ee9 100644
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml
@@ -16,4 +16,8 @@
     <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">显示隐藏文件</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_OK">确认</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">取消</x:String>
+    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">名称</x:String>
+    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">修改日期</x:String>
+    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">类型</x:String>
+    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">大小</x:String>
 </ResourceDictionary>
\ No newline at end of file