Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

Audit.csproj

@@ -156,8 +156,8 @@
     <Compile Include="Windows\LogWindow.xaml.cs">
       <DependentUpon>LogWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Windows\Set_up.xaml.cs">
+    <Compile Include="Windows\Set_up_Sql.xaml.cs">
-      <DependentUpon>Set_up.xaml</DependentUpon>
+      <DependentUpon>Set_up_Sql.xaml</DependentUpon>
     </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -191,7 +191,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Windows\Set_up.xaml">
+    <Page Include="Windows\Set_up_Sql.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

Windows/LogWindow.xaml.cs

@@ -55,10 +55,10 @@ namespace Audit.Windows
             string Passwds = this.Passwds.Text;
             if (users == "sunlight")//内置账号
             {
-                if (Passwds == "setup")//设置页面判断
+                if (Passwds == "sql")//数据库设置页面判断
                 {
-                    MessageBox.Show("警告：进入设置模式请您明确操作目的及可能需承担的后果");
+                    MessageBox.Show("警告：进入数据库设置模式请您明确操作目的及可能需承担的后果");
-                    Windows.Set_up setup = new Windows.Set_up();
+                    Windows.Set_up_Sql setup = new Windows.Set_up_Sql();
                     setup.Show();//实例化并打开设置窗口
                     this.Close();//关闭当前窗口
                 }

Windows/Set_up.xaml → Windows/Set_up_Sql.xaml

@@ -1,4 +1,4 @@
-<mah:MetroWindow  xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" x:Class="Audit.Windows.Set_up"
+<mah:MetroWindow  xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" x:Class="Audit.Windows.Set_up_Sql"
         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"

Windows/Set_up.xaml.cs → Windows/Set_up_Sql.xaml.cs

@@ -18,12 +18,12 @@ namespace Audit.Windows
     /// <summary>
     /// Set_up.xaml 的交互逻辑
     /// </summary>
-    public partial class Set_up : MetroWindow
+    public partial class Set_up_Sql : MetroWindow
     {
         ///<Summary>
         /// Set_up
         ///</Summary>
-        public Set_up()
+        public Set_up_Sql()
         {
             InitializeComponent();
         }