diff --git a/MainWindow.xaml b/MainWindow.xaml index 2d68e2d..da13e4e 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -71,7 +71,7 @@ - + @@ -115,7 +115,7 @@ - + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index f590252..6fc35e6 100644 --- a/MainWindow.xaml.cs +++ b/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(); - // help_page.ShowDialog();//实例化并置顶打开信息窗口 + WindowsView.Help help_page = new WindowsView.Help(); + help_page.Show(); } } } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 658e8f7..a3c3c2c 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -2202,6 +2202,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 Whole 的本地化字符串。 + /// + public static string Whole { + get { + return ResourceManager.GetString("Whole", resourceCulture); + } + } + /// /// 查找类似 Wiggle 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index e7b878a..e70f019 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -858,4 +858,10 @@ Quit + + Help + + + Whole + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index ec3d346..f3ef7bc 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -861,4 +861,7 @@ Help + + Whole + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 3f90bf5..4d17e73 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -858,4 +858,10 @@ 退出 + + 帮助 + + + 全局 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index c8576b2..be36650 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -858,4 +858,10 @@ 退出 + + 全域 + + + 幫助 + \ No newline at end of file diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index bba48be..caef07f 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -96,6 +96,9 @@ + + Whole.xaml + Help.xaml @@ -117,9 +120,13 @@ MainWindow.xaml Code - + + Designer MSBuild:Compile + + Designer + XamlIntelliSenseFileGenerator @@ -218,9 +225,7 @@ 2.1.10 - - - + diff --git a/View/Whole.xaml b/View/Whole.xaml new file mode 100644 index 0000000..7b405f9 --- /dev/null +++ b/View/Whole.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/View/Whole.xaml.cs b/View/Whole.xaml.cs new file mode 100644 index 0000000..2c8d5f9 --- /dev/null +++ b/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 +{ + /// + /// Whole.xaml 的交互逻辑 + /// + public partial class Whole : UserControl + { + public Whole() + { + InitializeComponent(); + } + } +} diff --git a/WindowsView/Help.xaml b/WindowsView/Help.xaml index 28fb432..89e7e7f 100644 --- a/WindowsView/Help.xaml +++ b/WindowsView/Help.xaml @@ -1,15 +1,15 @@ - - +