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 6412815f..ba1c6ec4 100644 --- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml +++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml @@ -3,7 +3,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" Height="29" - xmlns:hc="https://handyorg.github.io/handycontrol"> + DataContext="{Binding NoUser,Source={StaticResource Locator}}" + xmlns:hc="https://handyorg.github.io/handycontrol" + xmlns:data="clr-namespace:HandyControlDemo.Data"> @@ -20,36 +22,41 @@ - + - + - + - + + + + + + - + - + - + @@ -60,10 +67,17 @@ - - - - + + + + + + + + + + + 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/Themes/Styles/Window.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml index c93bc3f5..042c245e 100644 --- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml +++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml @@ -46,6 +46,10 @@ + + + + - + + @@ -211,7 +223,7 @@ - + diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml index c93bc3f5..042c245e 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml +++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml @@ -46,6 +46,10 @@ + + + + + + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml index dd4ffb4c..ff11c428 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml @@ -2,7 +2,11 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="clr-namespace:HandyControl.Controls"> - + + @@ -30,7 +42,7 @@ -