继续删除无用View

LFYG · May 29, 2019 · 6f0df88 · 6f0df88
1 parent f5d3cb0
commit 6f0df88
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 437 deletions.
diff --git a/AutumnBox.GUI/AutumnBox.GUI.csproj b/AutumnBox.GUI/AutumnBox.GUI.csproj
@@ -271,6 +271,9 @@
     <Compile Include="View\Controls\MainMenu.xaml.cs">
       <DependentUpon>MainMenu.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Controls\RebootBar.xaml.cs">
+      <DependentUpon>RebootBar.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\CstPreview.xaml.cs">
       <DependentUpon>CstPreview.xaml</DependentUpon>
     </Compile>
@@ -298,21 +301,12 @@
     <Compile Include="View\Panel\PanelCst.xaml.cs">
       <DependentUpon>PanelCst.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Panel\PanelCurrentDevice.xaml.cs">
-      <DependentUpon>PanelCurrentDevice.xaml</DependentUpon>
-    </Compile>
     <Compile Include="View\Panel\PanelDefaultInformation.xaml.cs">
       <DependentUpon>PanelDefaultInformation.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Panel\PanelDeviceDetails.xaml.cs">
       <DependentUpon>PanelDeviceDetails.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Panel\PanelDevices.xaml.cs">
-      <DependentUpon>PanelDevices.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\Panel\PanelExtension.xaml.cs">
-      <DependentUpon>PanelExtension.xaml</DependentUpon>
-    </Compile>
     <Compile Include="View\Panel\PanelHome.xaml.cs">
       <DependentUpon>PanelHome.xaml</DependentUpon>
     </Compile>
@@ -325,9 +319,6 @@
     <Compile Include="View\Panel\PanelMore.xaml.cs">
       <DependentUpon>PanelMore.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Panel\PanelReboot.xaml.cs">
-      <DependentUpon>PanelReboot.xaml</DependentUpon>
-    </Compile>
     <Compile Include="View\Panel\PanelTips.xaml.cs">
       <DependentUpon>PanelTips.xaml</DependentUpon>
     </Compile>
@@ -529,6 +520,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Controls\RebootBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\CstPreview.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -565,10 +560,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Panel\PanelCurrentDevice.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="View\Panel\PanelDefaultInformation.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -577,14 +568,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Panel\PanelDevices.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="View\Panel\PanelExtension.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="View\Panel\PanelHome.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -601,10 +584,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\Panel\PanelReboot.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="View\Panel\PanelTips.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/AutumnBox.GUI/View/Panel/PanelReboot.xaml → AutumnBox.GUI/View/Controls/RebootBar.xaml b/AutumnBox.GUI/View/Panel/PanelReboot.xaml → AutumnBox.GUI/View/Controls/RebootBar.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="AutumnBox.GUI.View.Panel.PanelReboot"
+<UserControl x:Class="AutumnBox.GUI.View.Controls.RebootBar"
              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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:AutumnBox.GUI.View.Controls"
              xmlns:viewmodel="clr-namespace:AutumnBox.GUI.ViewModel"
-             FontFamily="{DynamicResource AutumnBox.Font}"
-             FontSize="20">
+             mc:Ignorable="d" 
+                    FontFamily="{DynamicResource AutumnBox.Font}">
     <UserControl.DataContext>
         <viewmodel:VMReboot/>
     </UserControl.DataContext>

diff --git a/AutumnBox.GUI/View/Controls/RebootBar.xaml.cs b/AutumnBox.GUI/View/Controls/RebootBar.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 AutumnBox.GUI.View.Controls
+{
+    /// <summary>
+    /// RebootBar.xaml 的交互逻辑
+    /// </summary>
+    public partial class RebootBar : UserControl
+    {
+        public RebootBar()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/AutumnBox.GUI/View/Panel/PanelCst.xaml b/AutumnBox.GUI/View/Panel/PanelCst.xaml
@@ -37,11 +37,8 @@
                 <StackPanel
                       Margin="30"
                       Visibility="{Binding Converter={StaticResource ObjectEqualsToVisibilityConverter},ConverterParameter=1, Path=Status}" >
-                    <materialDesign:PackIcon Kind="SmsFailed" Height="25" Width="25" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     <TextBlock Text="{DynamicResource PanelFailed}" Foreground="Gray" HorizontalAlignment="Center"/>
                 </StackPanel>
-
-
             </Grid>
         </Expander>
     </Grid>