diff --git a/App.xaml b/App.xaml index 92d050d..6a1a9a5 100644 --- a/App.xaml +++ b/App.xaml @@ -3,14 +3,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_" StartupUri="MainWindow.xaml"> - - - - - - - - - - + + + + + + + + + + diff --git a/MainWindow.xaml b/MainWindow.xaml index 65ecd31..36b2f93 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -11,7 +11,8 @@ d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}" mc:Ignorable="d" Title="SUNLIGHT SCCM b0.0.1 (2024/08/10)" - Height="1080" Width="1920" Background="#FF003640"> + Height="1080" Width="1920" Background="#FF003640" + WindowState ="Maximized" WindowStyle="None"> @@ -37,63 +38,93 @@ - - + + - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - + + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 191d9fd..6c77522 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -34,6 +34,21 @@ namespace SunlightCentralizedControlManagement_SCCM_ { Application.Current.Shutdown(); } + private void ButtonMaximize_Click(object sender, RoutedEventArgs e) + { + if (WindowState == WindowState.Maximized) + { WindowState = WindowState.Normal; } + else + { WindowState = WindowState.Maximized; } + } + + private void ButtonMinimize_Click(object sender, RoutedEventArgs e) + { + if (WindowState == WindowState.Minimized) + { WindowState = WindowState.Normal; } + else + { WindowState = WindowState.Minimized; } + } private void ButtonOpenMenu_Click(object sender, RoutedEventArgs e) { @@ -62,5 +77,7 @@ namespace SunlightCentralizedControlManagement_SCCM_ { } + + } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 1da8fef..88cd832 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ using System.Windows; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("DyeingComputer")] +[assembly: AssemblyTitle("SCCM")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DyeingComputer")] +[assembly: AssemblyCompany("SUNLIGHT")] +[assembly: AssemblyProduct("SCCM")] [assembly: AssemblyCopyright("Copyright © 2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 3824b05..5a3253e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -1104,6 +1104,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 Maximize 的本地化字符串。 + /// + public static string Maximize { + get { + return ResourceManager.GetString("Maximize", resourceCulture); + } + } + /// /// 查找类似 Measure 的本地化字符串。 /// @@ -1176,6 +1185,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 Minimize 的本地化字符串。 + /// + public static string Minimize { + get { + return ResourceManager.GetString("Minimize", resourceCulture); + } + } + /// /// 查找类似 Mixing 的本地化字符串。 /// @@ -1428,6 +1446,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 PopUpLogout 的本地化字符串。 + /// + public static string PopUpLogout { + get { + return ResourceManager.GetString("PopUpLogout", resourceCulture); + } + } + /// /// 查找类似 Port 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 94fafa1..e7b878a 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -849,4 +849,13 @@ Bottom + + MINIMIZED + + + Maximize + + + Quit + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 527ac21..b38cbca 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -849,4 +849,13 @@ Bottom + + Minimize + + + Maximize + + + PopUpLogout + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index d7fa694..3f90bf5 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -849,4 +849,13 @@ + + 最小化 + + + 最大化 + + + 退出 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 7e825d9..c8576b2 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -849,4 +849,13 @@ + + 最小化 + + + 最大化 + + + 退出 + \ No newline at end of file diff --git a/SunlightCentralizedControlManagement(SCCM).csproj b/SunlightCentralizedControlManagement(SCCM).csproj index baf2986..caf7739 100644 --- a/SunlightCentralizedControlManagement(SCCM).csproj +++ b/SunlightCentralizedControlManagement(SCCM).csproj @@ -14,9 +14,24 @@ 4 true true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true - AnyCPU + x64 true full false @@ -175,7 +190,7 @@ 2.0.0-rc4.5 - 5.1.1-ci795 + 5.1.0 1.0.2895-prerelease @@ -225,6 +240,18 @@ True + + + False + Microsoft .NET Framework 4.7.2 %28x86 和 x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + +