diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index c37bf46..df04d90 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -897,6 +897,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Run/Pause 的本地化字符串。 + /// + public static string R_P { + get { + return ResourceManager.GetString("R_P", resourceCulture); + } + } + /// /// 查找类似 RapidAcidAddition 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 1bf2bb2..09a1cb9 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -492,4 +492,7 @@ Protocols + + Run/Pause + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 2b6852d..d2e6963 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -492,4 +492,7 @@ Protocols + + Run/Pause + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 4d0bf2d..e804b51 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -492,4 +492,7 @@ 协议 + + 运行/暂停 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 1fdf7e8..f8d0cd2 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -492,4 +492,7 @@ + + + \ No newline at end of file diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index e23486c..b5a9838 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -292,7 +292,7 @@ namespace DyeingComputer.UserClass var _TechnologicalProcessView = Application.Current.Windows.Cast().FirstOrDefault(window => window is TechnologicalProcessView) as TechnologicalProcessView;//跨页面 // _TechnologicalProcessView.Grid.ItemsSource = TechnologicalProcessView.sql.Tables[0].DefaultView; - _TechnologicalProcessView.Grid.SelectedIndex = -1; + _TechnologicalProcessView.GridSTEP.SelectedIndex = -1; /**存入信息**/ SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 SQLiteHelpers.Open(); //打开数据库 diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml index 934ae99..665a29f 100644 --- a/View/TechnologicalProcessView.xaml +++ b/View/TechnologicalProcessView.xaml @@ -10,17 +10,24 @@ mc:Ignorable="d" Loaded="UserControl_Loaded" KeyDown="UserControl_KeyDown" d:DesignHeight="630" d:DesignWidth="1280"> - - + + Background="White" SelectionMode="Single" FontSize="15" MinHeight="632" TabIndex="1" Focusable="True" > + + +