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

MainWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="720" Width="1280" BorderBrush="White" Background="#FFE0E0E0">
     <Grid>
-        <Menu>
+        <Menu IsTabStop="False">
             <MenuItem Header="_设置" FontSize="16">
                 <MenuItem Header="_数据库设置" FontSize="16" Click="SQL"/>
                 <MenuItem Header="_备份/还原" FontSize="16"/>
@@ -79,8 +79,8 @@
             </DataGrid.Columns>
         </DataGrid>
         <Button Content="确认" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,140,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="confirm"/>
-        <Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print"/>
-        <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save"/>
-        <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete"/>
+        <Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print" IsTabStop="False"/>
+        <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False"/>
+        <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False"/>
     </Grid>
 </Window>

Windows/Sql.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
-        mc:Ignorable="d" Title="Sql" Loaded="Window_SQL" 
+        mc:Ignorable="d" Title="SqL" Loaded="Window_SQL" 
         Height="450" Width="280" MaxHeight="450" MaxWidth="280" ResizeMode="NoResize">
     <Grid>
         <TextBox x:Name="TEXT_SQLIP" Height="20" Margin="80,20,20,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" />
@@ -15,7 +15,7 @@
         <TextBox x:Name="TEXT_SQLNAME" Height="20" Margin="80,80,20,0" TextWrapping="Wrap" Text="Dispensing" VerticalAlignment="Top"/>
         <TextBox x:Name="TEXT_SQLUSER" Height="20" Margin="80,110,20,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top"/>
         <TextBox x:Name="TEXT_SQLPASWORD" Height="20" Margin="80,140,20,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" />
-        <RadioButton x:Name="TEXT_SQLINK" Content="连接对象" Height="19" Margin="80,170,20,0" VerticalAlignment="Top" />
+        <CheckBox x:Name="TEXT_SQLINK" Height="19" Margin="80,170,20,0" VerticalAlignment="Top" Content="连接对象" IsTabStop="False" />
         <TextBox x:Name="TEXT_SQLIP2" Height="20" Margin="80,190,20,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" />
         <TextBox x:Name="TEXT_SQLNAME2" Height="20" Margin="80,250,20,0" TextWrapping="Wrap" Text="BatchDyeingCentral" VerticalAlignment="Top" />
         <TextBox x:Name="TEXT_SQLUSER2" Height="20" Margin="80,280,20,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top"/>

Windows/Sql.xaml.cs

@@ -88,7 +88,7 @@ namespace formula_manage.Windows
             TEXT_SQMOD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL3");
             TEXT_SQLUSER.Text = Configini.IniReadvalue("SQL_SERVER", "SQL4");
             TEXT_SQLPASWORD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL5");
-            TEXT_SQLINK.DataContext = Configini.IniReadvalue("SQL_SERVER", "SQL6");
+            TEXT_SQLINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6"));
             TEXT_SQLIP2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL7");
             TEXT_SQLNAME2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL8");
             TEXT_SQMOD2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL9");