From ca0c8ce7a016cedc4c40eecff3264782990f8cd8 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 25 Oct 2018 14:06:23 +0800 Subject: [PATCH] Demo adds language switching --- HandyControl/Controls/Growl.cs | 6 +- .../Themes/Styles/Base/CheckBoxBaseStyle.xaml | 2 + .../Styles/Base/RadioButtonBaseStyle.xaml | 4 +- HandyControl/Themes/Styles/RadioButton.xaml | 6 +- HandyControl/Themes/Styles/ToggleButton.xaml | 2 + HandyControl/Themes/Styles/TreeView.xaml | 1 - HandyControlDemo/App.xaml.cs | 11 ++- HandyControlDemo/Data/AppConfig.cs | 11 +++ HandyControlDemo/Data/GlobalData.cs | 29 +++++++ HandyControlDemo/HandyControlDemo.csproj | 75 +++++++++-------- .../Properties/Langs/Lang.Designer.cs | 45 ++++++++++ .../Properties/Langs/Lang.en.resx | 15 ++++ HandyControlDemo/Properties/Langs/Lang.resx | 15 ++++ HandyControlDemo/Resources/Img/Flag/cn.png | Bin 0 -> 1947 bytes HandyControlDemo/Resources/Img/Flag/en.png | Bin 0 -> 1621 bytes .../BorderElement_16x.png | Bin .../{ => LeftMainContent}/ButtonClick_16x.png | Bin .../{ => LeftMainContent}/Calendar_16x.png | Bin .../{ => LeftMainContent}/Carousel_16x.png | Bin .../{ => LeftMainContent}/CheckBox_16x.png | Bin .../ColorPalette_16x.png | Bin .../{ => LeftMainContent}/ComboBox_16x.png | Bin .../{ => LeftMainContent}/ContextMenu_16x.png | Bin .../{ => LeftMainContent}/DataGrid_16x.png | Bin .../{ => LeftMainContent}/DatePicker_16x.png | Bin .../{ => LeftMainContent}/Expander_16x.png | Bin .../Img/{ => LeftMainContent}/Flow_16x.png | Bin .../ImageBrowser_16x.png | Bin .../Img/{ => LeftMainContent}/ListBox_16x.png | Bin .../Loading_Blue_16x.png | Bin .../Img/{ => LeftMainContent}/Message_16x.png | Bin .../NumericListBox_16x.png | Bin .../{ => LeftMainContent}/Paginator_16x.png | Bin .../{ => LeftMainContent}/PasswordBox_16x.png | Bin .../Img/{ => LeftMainContent}/Path_16x.png | Bin .../{ => LeftMainContent}/ProgressBar_16x.png | Bin .../{ => LeftMainContent}/RadioButton_16x.png | Bin .../{ => LeftMainContent}/ScrollBox_16x.png | Bin .../ShapeArcRing_16x.png | Bin .../SplitterControl_16x.png | Bin .../Img/{ => LeftMainContent}/TabPage_16x.png | Bin .../{ => LeftMainContent}/TextBlock_16x.png | Bin .../Img/{ => LeftMainContent}/TextBox_16x.png | Bin .../{ => LeftMainContent}/TimePicker_16x.png | Bin .../{ => LeftMainContent}/Time_color_16x.png | Bin .../{ => LeftMainContent}/Timeline_16x.png | Bin .../Img/{ => LeftMainContent}/Toggle_16x.png | Bin .../{ => LeftMainContent}/TreeView_16x.png | Bin .../{ => LeftMainContent}/WindowsForm_16x.png | Bin .../UserControl/Controls/GrowlDemoCtl.xaml | 15 ++-- .../UserControl/Main/LeftMainContent.xaml | 72 ++++++++-------- .../UserControl/Main/NoUserContent.xaml | 79 +++++++++++------- .../UserControl/Main/NoUserContent.xaml.cs | 37 +++++++- .../ViewModel/GrowlDemoViewModel.cs | 10 +-- HandyControlDemo/packages.config | 1 + 55 files changed, 313 insertions(+), 123 deletions(-) create mode 100644 HandyControlDemo/Data/AppConfig.cs create mode 100644 HandyControlDemo/Data/GlobalData.cs create mode 100644 HandyControlDemo/Resources/Img/Flag/cn.png create mode 100644 HandyControlDemo/Resources/Img/Flag/en.png rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/BorderElement_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ButtonClick_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Calendar_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Carousel_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/CheckBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ColorPalette_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ComboBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ContextMenu_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/DataGrid_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/DatePicker_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Expander_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Flow_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ImageBrowser_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ListBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Loading_Blue_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Message_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/NumericListBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Paginator_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/PasswordBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Path_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ProgressBar_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/RadioButton_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ScrollBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/ShapeArcRing_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/SplitterControl_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/TabPage_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/TextBlock_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/TextBox_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/TimePicker_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Time_color_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Timeline_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/Toggle_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/TreeView_16x.png (100%) rename HandyControlDemo/Resources/Img/{ => LeftMainContent}/WindowsForm_16x.png (100%) diff --git a/HandyControl/Controls/Growl.cs b/HandyControl/Controls/Growl.cs index 7fe15efa..b56772d7 100644 --- a/HandyControl/Controls/Growl.cs +++ b/HandyControl/Controls/Growl.cs @@ -388,9 +388,11 @@ namespace HandyControl.Controls /// 询问 /// /// - public static void Ask(string message) => Ask(new GrowlInfo + /// + public static void Ask(string message, Func actionBeforeClose) => Ask(new GrowlInfo { - Message = message + Message = message, + ActionBeforeClose = actionBeforeClose }); /// diff --git a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml index a3b43856..75269a20 100644 --- a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml @@ -7,6 +7,8 @@ + + diff --git a/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml index 23567c7a..369d8dab 100644 --- a/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml @@ -7,6 +7,8 @@ + + @@ -44,7 +46,7 @@ - + diff --git a/HandyControl/Themes/Styles/RadioButton.xaml b/HandyControl/Themes/Styles/RadioButton.xaml index 673b13c2..20051738 100644 --- a/HandyControl/Themes/Styles/RadioButton.xaml +++ b/HandyControl/Themes/Styles/RadioButton.xaml @@ -1,9 +1,13 @@ - + +