Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

MainWindow.xaml

@@ -71,7 +71,7 @@
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ListBox" Width="25" Height="25" Margin="10" VerticalAlignment="Center" />
-                            <TextBlock Text="总览" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="{x:Static lang:Resources.Whole}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
@@ -115,7 +115,7 @@
         </Grid>
 
         <Grid x:Name="gdMian" Background="White" Margin="60,50,0,0">
-            
+            <ContentControl x:Name="Picture"/>
         </Grid>
 
 

MainWindow.xaml.cs

@@ -9,6 +9,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -32,7 +33,7 @@ namespace SunlightCentralizedControlManagement_SCCM_
 
         private void ButtonPopUpLogout_Click(object sender, RoutedEventArgs e)
         {
-            Application.Current.Shutdown();
+            System.Windows.Application.Current.Shutdown();
         }
         private void ButtonMaximize_Click(object sender, RoutedEventArgs e)
         {
@@ -80,8 +81,8 @@ namespace SunlightCentralizedControlManagement_SCCM_
 
         private void Buttonhelp_Click(object sender, RoutedEventArgs e)
         {
-          // Windows.Help help_page = new Windows.Help();
+            WindowsView.Help help_page = new WindowsView.Help();
-         //   help_page.ShowDialog();//实例化并置顶打开信息窗口     
+            help_page.Show();  
         }
     }
 }

Properties/Resources.Designer.cs

@@ -2202,6 +2202,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Whole 的本地化字符串。
+        /// </summary>
+        public static string Whole {
+            get {
+                return ResourceManager.GetString("Whole", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Wiggle 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -858,4 +858,10 @@
   <data name="PopUpLogout" xml:space="preserve">
     <value>Quit</value>
   </data>
+  <data name="Help" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="Whole" xml:space="preserve">
+    <value>Whole</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -861,4 +861,7 @@
   <data name="Help" xml:space="preserve">
     <value>Help</value>
   </data>
+  <data name="Whole" xml:space="preserve">
+    <value>Whole</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -858,4 +858,10 @@
   <data name="PopUpLogout" xml:space="preserve">
     <value>退出</value>
   </data>
+  <data name="Help" xml:space="preserve">
+    <value>帮助</value>
+  </data>
+  <data name="Whole" xml:space="preserve">
+    <value>全局</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -858,4 +858,10 @@
   <data name="PopUpLogout" xml:space="preserve">
     <value>退出</value>
   </data>
+  <data name="Whole" xml:space="preserve">
+    <value>全域</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>幫助</value>
+  </data>
 </root>

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -96,6 +96,9 @@
     <Compile Include="UserClass\UserControlMenuItem.cs" />
     <Compile Include="ViewModel\MainWindowViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="View\Whole.xaml.cs">
+      <DependentUpon>Whole.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WindowsView\Help.xaml.cs">
       <DependentUpon>Help.xaml</DependentUpon>
     </Compile>
@@ -117,9 +120,13 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="WindowsView\Help.xaml">
+    <Page Include="View\Whole.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WindowsView\Help.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
   </ItemGroup>
   <ItemGroup>
@@ -218,9 +225,7 @@
       <Version>2.1.10</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup />
-    <Folder Include="View\" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />

View/Whole.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.Whole"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>

View/Whole.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SunlightCentralizedControlManagement_SCCM_.View
+{
+    /// <summary>
+    /// Whole.xaml 的交互逻辑
+    /// </summary>
+    public partial class Whole : UserControl
+    {
+        public Whole()
+        {
+            InitializeComponent();
+        }
+    }
+}

WindowsView/Help.xaml

@@ -1,15 +1,15 @@
-<Window x:Class="formula_manage.Help"
+<Window x:Class="SunlightCentralizedControlManagement_SCCM_.WindowsView.Help"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:formula_manage"
+        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
         mc:Ignorable="d"
             Title="SUNLIGHT" Height="480" Width="300" WindowStartupLocation="CenterScreen"  ResizeMode="NoResize">
     <Grid>
         <Rectangle Height="150" Margin="0,20,0,0" VerticalAlignment="Top">
             <Rectangle.Fill>
-                <ImageBrush ImageSource="/Windows/sunlight_logotext.jpg"/>
+                <ImageBrush ImageSource="/WindowsView/sunlight_logotext.jpg"/>
             </Rectangle.Fill>
         </Rectangle>
         <Label Content="SUNLIGHT (SCCM)" HorizontalAlignment="Left" Height="35" Margin="65,210,0,0" VerticalAlignment="Top" Width="155" FontSize="16"/>

WindowsView/Help.xaml.cs

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace formula_manage
+namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
 {
     /// <summary>
     /// Help.xaml 的交互逻辑