diff --git a/README.md b/README.md index 29fc1921..18acdfdb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![logo](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/icon.png) -![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-7.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2017-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/NaBian/handycontrol) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) +![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-7.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2017-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/handyorg/handycontrol) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) [![wiki](https://img.shields.io/badge/wiki-Complete-brightgreen.svg)](https://github.com/ghost1372/HandyControl/wiki) # Welcome to HandyControl diff --git a/doc/.gitignore b/doc/.gitignore index 063b0e4c..7cb111d8 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -4,4 +4,5 @@ db.json *.log node_modules/ public/ -.deploy*/ \ No newline at end of file +.deploy*/ +.vs \ No newline at end of file diff --git a/doc/source/handycontrol/tnx/index.md b/doc/source/handycontrol/tnx/index.md index 4a7f298c..56d2b7a1 100644 --- a/doc/source/handycontrol/tnx/index.md +++ b/doc/source/handycontrol/tnx/index.md @@ -4,7 +4,7 @@ title: 鸣谢 # 感谢以下Coder提供代码贡献 -

ghost1372Dingping ZhangM0n7y5guanguanchuangyu

+

ghost1372Dingping ZhangM0n7y5guanguanchuangyuguanguanchuangyu

# 感谢以下User提供使用建议 @@ -16,4 +16,5 @@ title: 鸣谢 # 感谢以下捐赠者 -

bigorange1900

\ No newline at end of file +

bigorange1900bigorange1900

+QQ：1942142462 \ No newline at end of file diff --git a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml index b55926bd..ba1c6ec4 100644 --- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml +++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml @@ -1,57 +1,62 @@  + DataContext="{Binding NoUser,Source={StaticResource Locator}}" + xmlns:hc="https://handyorg.github.io/handycontrol" + xmlns:data="clr-namespace:HandyControlDemo.Data"> - + - + - + - + + + + + + - + - + - + @@ -62,14 +67,21 @@ - - - - + + + + + + + + + + + - - - - diff --git a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs index 2c886173..00d824ce 100644 --- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs +++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs @@ -1,14 +1,11 @@ using System.Diagnostics; using System.Windows; using System.Windows.Controls; -using GalaSoft.MvvmLight.Messaging; using HandyControl.Controls; using HandyControl.Data; using HandyControlDemo.Data; -using HandyControlDemo.Tools; using HandyControlDemo.Window; - namespace HandyControlDemo.UserControl { public partial class NoUserContent @@ -29,7 +26,9 @@ namespace HandyControlDemo.UserControl if (!b) return true; GlobalData.Config.Lang = tag; GlobalData.Save(); - Process.Start(Process.GetCurrentProcess().MainModule.FileName); + var processModule = Process.GetCurrentProcess().MainModule; + if (processModule != null) + Process.Start(processModule.FileName); Application.Current.Shutdown(); return true; }); @@ -50,28 +49,6 @@ namespace HandyControlDemo.UserControl } } - private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e) - { - if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag) - { - Process.Start(tag); - } - } - - private void MenuItemQQGroup_OnClick(object sender, RoutedEventArgs e) - { - Messenger.Default.Send(null, MessageToken.ClearLeftSelected); - Messenger.Default.Send(true, MessageToken.FullSwitch); - Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.QQGroupView}"), MessageToken.LoadShowContent); - } - - private void MenuItemContributors_OnClick(object sender, RoutedEventArgs e) - { - Messenger.Default.Send(null, MessageToken.ClearLeftSelected); - Messenger.Default.Send(true, MessageToken.FullSwitch); - Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.ContributorsView}"), MessageToken.LoadShowContent); - } - private void MenuAbout_OnClick(object sender, RoutedEventArgs e) { new AboutWindow diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index 3f62846b..0afdeaa1 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -8,6 +8,8 @@ 1.5.5.0 false false + Copyright © HandyOrg 2018-2019 + Contains some commonly used simple WPF controls TRACE;Core @@ -33,6 +35,9 @@ PublicResXFileCodeGenerator Lang.Designer.cs + + Properties\AssemblyInfo.cs + diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml index 8984ae6f..56fe5a0e 100644 --- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml +++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml @@ -37,12 +37,11 @@ - + + @@ -211,7 +223,7 @@ - + diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml index 88da46d1..d28b4fa2 100644 --- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml +++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml @@ -11,6 +11,7 @@ + + - + + @@ -212,7 +224,7 @@ - + diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml index 88da46d1..d28b4fa2 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml @@ -11,6 +11,7 @@ + + - + + @@ -211,7 +223,7 @@ - + diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml index 88da46d1..d28b4fa2 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml +++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml @@ -11,6 +11,7 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml index 455f44ce..c9fcc5bf 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml @@ -16,9 +16,6 @@ - - - \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml index e8a2237e..1e992ef9 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml @@ -17,7 +17,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml index d13f74d9..6426a285 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml @@ -134,6 +134,7 @@ + + - diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml index db718fdb..d2bec2dc 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml @@ -3,6 +3,7 @@ xmlns:controls="clr-namespace:HandyControl.Controls"> + + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml index 861062d2..a32f2f07 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml @@ -3,6 +3,7 @@ xmlns:controls="clr-namespace:HandyControl.Controls"> diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml index 21d815bd..39ffaf97 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml @@ -4,14 +4,26 @@ xmlns:system="clr-namespace:System;assembly=mscorlib"> + - + + - @@ -94,12 +106,11 @@ - - - + + @@ -30,7 +42,7 @@ -