diff --git a/AutumnBox.GUI/MVVM/ViewModelBase.cs b/AutumnBox.GUI/MVVM/ViewModelBase.cs index e72ff3872..338f07946 100644 --- a/AutumnBox.GUI/MVVM/ViewModelBase.cs +++ b/AutumnBox.GUI/MVVM/ViewModelBase.cs @@ -7,6 +7,7 @@ using AutumnBox.GUI.Util.Bus; using AutumnBox.GUI.Util.Debugging; using AutumnBox.GUI.Util.Net.HomeContent; +using AutumnBox.GUI.Util.UI; using AutumnBox.Logging; using System; using System.Diagnostics; @@ -80,6 +81,8 @@ public ICommand RefreshHomeContent } private ICommand _refreshHomeContent; + public string Sentence => Sentences.Next(); + public ViewModelBase() { OpenUrl = _OpenUrlCommand; diff --git a/AutumnBox.GUI/Resources/Languages/en-US.xaml b/AutumnBox.GUI/Resources/Languages/en-US.xaml index 136b3b67b..cb4f62984 100644 --- a/AutumnBox.GUI/Resources/Languages/en-US.xaml +++ b/AutumnBox.GUI/Resources/Languages/en-US.xaml @@ -830,7 +830,7 @@ Agreement modification: The Box of Autumn is currently open sourced with LGPL 3.0, safe, free, trustworthy, and if necessary, please comply with the open source agreement. Acknowledgement: MonoLogueChi,饼干怪兽,hxy,yume,白瀛,web1n,咖枯,毛线没有团团,my0402 -Newtonsoft.Json | Google | Android | Linux | C# | Microsoft | MaterialDesignInXaml +Newtonsoft.Json | Google | Android | Linux | C# | Microsoft | HandyControl diff --git a/AutumnBox.GUI/Resources/Languages/zh-CN.xaml b/AutumnBox.GUI/Resources/Languages/zh-CN.xaml index 266b79216..186bf4878 100644 --- a/AutumnBox.GUI/Resources/Languages/zh-CN.xaml +++ b/AutumnBox.GUI/Resources/Languages/zh-CN.xaml @@ -437,7 +437,7 @@ 秋之盒目前以LGPL3.0进行开源,安全,免费,值得信任,在必要时,也请您遵守开源协议 鸣谢: MonoLogueChi,饼干怪兽,hxy,yume,白瀛,web1n,咖枯,毛线没有团团,my0402 -Newtonsoft.Json | Google | Android | Linux | C# | Microsoft | MaterialDesignInXaml +Newtonsoft.Json | Google | Android | Linux | C# | Microsoft | HandyOrg diff --git a/AutumnBox.GUI/Util/Net/HomeContent/RemoteXamlReader.cs b/AutumnBox.GUI/Util/Net/HomeContent/RemoteXamlReader.cs index 5e26f2216..13cd8cae6 100644 --- a/AutumnBox.GUI/Util/Net/HomeContent/RemoteXamlReader.cs +++ b/AutumnBox.GUI/Util/Net/HomeContent/RemoteXamlReader.cs @@ -24,7 +24,7 @@ static RemoteXamlReader() context.XmlnsDictionary.Add("mc", "http://schemas.openxmlformats.org/markup-compatibility/2006"); context.XmlnsDictionary.Add("vm", "clr-namespace:AutumnBox.GUI.ViewModel"); context.XmlnsDictionary.Add("system", "clr-namespace:System;assembly=mscorlib"); - //context.XmlnsDictionary.Add("handycontrol", "clr-namespace:HandyControl.Controls;assembly=HandyControl"); + context.XmlnsDictionary.Add("handycontrol", "clr-namespace:HandyControl.Controls;assembly=HandyControl"); //context.XmlnsDictionary.Add("panel", "clr-namespace:AutumnBox.GUI.View.Panel"); //context.XmlnsDictionary.Add("atmbctrl", "clr-namespace:AutumnBox.GUI.View.Controls"); } diff --git a/AutumnBox.GUI/View/Panel/PanelMain.xaml b/AutumnBox.GUI/View/Panel/PanelMain.xaml index 7eae09602..39e448b02 100644 --- a/AutumnBox.GUI/View/Panel/PanelMain.xaml +++ b/AutumnBox.GUI/View/Panel/PanelMain.xaml @@ -22,9 +22,11 @@ - - - + + + + +