HomeContent系统进一步优化

LFYG · Jun 8, 2019 · 522746a · 522746a
1 parent 57cc979
commit 522746a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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</s:String>
+Newtonsoft.Json | Google | Android | Linux | C# | Microsoft | HandyControl</s:String>
     <!--关于信息-->
 
     <s:String x:Key="warningOpenNetDebugging">

diff --git 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 
     </s:String>
     <!--关于信息-->
 

diff --git 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
@@ -22,9 +22,11 @@
             <TabItem TabIndex="0" Width="120" Background="Transparent" Header="{DynamicResource Home}">
                 <DockPanel>
                     <controls:LoadingLine x:Name="LoadingLine" DockPanel.Dock="Top"/>
-                    <ContentControl x:Name="HomeContent">
-                        <local:PanelDefaultInformation/>
-                    </ContentControl>
+                    <ScrollViewer>
+                        <ContentControl x:Name="HomeContent">
+                            <local:PanelDefaultInformation/>
+                        </ContentControl>
+                    </ScrollViewer>
                 </DockPanel>
             </TabItem>
             <TabItem  TabIndex="1"  Background="Transparent" Header="{DynamicResource Functions}">