Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0b4e58dd 由 LN
选项

Merge branch '无轨道开发' of http://106.15.194.121:8083/lina/Line-Smart-Workstation into 无轨道开发

2 个父辈 055ea1b5 7de813ca
内嵌 并排
正在显示 4 个修改的文件 包含 13 行增加 和 12 行删除
TSA-V/FrmBoardList.Designer.cs
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
// label24 // label24
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(372, 64); this.label24.Location = new System.Drawing.Point(396, 64);
this.label24.Name = "label24"; this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17); this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 37; this.label24.TabIndex = 37;
...@@ -204,16 +204,16 @@ ...@@ -204,16 +204,16 @@
// txtPointCount // txtPointCount
// //
this.txtPointCount.Enabled = false; this.txtPointCount.Enabled = false;
this.txtPointCount.Location = new System.Drawing.Point(297, 95); this.txtPointCount.Location = new System.Drawing.Point(323, 95);
this.txtPointCount.Name = "txtPointCount"; this.txtPointCount.Name = "txtPointCount";
this.txtPointCount.Size = new System.Drawing.Size(70, 23); this.txtPointCount.Size = new System.Drawing.Size(70, 23);
this.txtPointCount.TabIndex = 8; this.txtPointCount.TabIndex = 8;
// //
// label5 // label5
// //
this.label5.Location = new System.Drawing.Point(202, 99); this.label5.Location = new System.Drawing.Point(164, 97);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(92, 17); this.label5.Size = new System.Drawing.Size(153, 19);
this.label5.TabIndex = 7; this.label5.TabIndex = 7;
this.label5.Text = "组装数量："; this.label5.Text = "组装数量：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -221,16 +221,16 @@ ...@@ -221,16 +221,16 @@
// txtWidth // txtWidth
// //
this.txtWidth.Enabled = false; this.txtWidth.Enabled = false;
this.txtWidth.Location = new System.Drawing.Point(297, 61); this.txtWidth.Location = new System.Drawing.Point(323, 61);
this.txtWidth.Name = "txtWidth"; this.txtWidth.Name = "txtWidth";
this.txtWidth.Size = new System.Drawing.Size(70, 23); this.txtWidth.Size = new System.Drawing.Size(70, 23);
this.txtWidth.TabIndex = 6; this.txtWidth.TabIndex = 6;
// //
// label4 // label4
// //
this.label4.Location = new System.Drawing.Point(202, 64); this.label4.Location = new System.Drawing.Point(204, 64);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(92, 17); this.label4.Size = new System.Drawing.Size(113, 17);
this.label4.TabIndex = 5; this.label4.TabIndex = 5;
this.label4.Text = "长度→："; this.label4.Text = "长度→：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......
TSA-V/FrmLanguage.Designer.cs
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
this.rbtnRussian.TabStop = true; this.rbtnRussian.TabStop = true;
this.rbtnRussian.Text = "俄文"; this.rbtnRussian.Text = "俄文";
this.rbtnRussian.UseVisualStyleBackColor = true; this.rbtnRussian.UseVisualStyleBackColor = true;
this.rbtnRussian.Visible = false;
// //
// FrmLanguage // FrmLanguage
// //
......
TSA-V/FrmMaintenance.resx
此文件的差异太大，无法显示。
TSA-V/Properties/Resource.en-US.resx
...@@ -382,7 +382,7 @@ ...@@ -382,7 +382,7 @@
<value>Soldering Joint List</value> <value>Soldering Joint List</value>
</data> </data>
<data name="FrmBoardList_label5_Text" xml:space="preserve"> <data name="FrmBoardList_label5_Text" xml:space="preserve">
<value>Assembly Quantity</value> <value>Component Qty:</value>
</data> </data>
<data name="FrmBoardList_label4_Text" xml:space="preserve"> <data name="FrmBoardList_label4_Text" xml:space="preserve">
<value>Length→ :</value> <value>Length→ :</value>
...@@ -965,7 +965,7 @@ ...@@ -965,7 +965,7 @@
<value>Assembly Code:</value> <value>Assembly Code:</value>
</data> </data>
<data name="FrmAddBoard_xyMoveControl1_Text" xml:space="preserve"> <data name="FrmAddBoard_xyMoveControl1_Text" xml:space="preserve">
<value>Lower Right Coordinates</value> <value>Coordinates</value>
</data> </data>
<data name="FrmBoardSelect_label1_Text" xml:space="preserve"> <data name="FrmBoardSelect_label1_Text" xml:space="preserve">
<value>Program Selection</value> <value>Program Selection</value>
...@@ -1523,7 +1523,7 @@ ...@@ -1523,7 +1523,7 @@
<value>Up</value> <value>Up</value>
</data> </data>
<data name="FrmAddBoard_group_Text" xml:space="preserve"> <data name="FrmAddBoard_group_Text" xml:space="preserve">
<value>Lower Right Coordinates</value> <value>Coordinates</value>
</data> </data>
<data name="FrmAddBoard_lblCurrPosition_Text" xml:space="preserve"> <data name="FrmAddBoard_lblCurrPosition_Text" xml:space="preserve">
<value>Real-Time Coordinate</value> <value>Real-Time Coordinate</value>
...@@ -2147,10 +2147,10 @@ ...@@ -2147,10 +2147,10 @@
<value>Motor Position</value> <value>Motor Position</value>
</data> </data>
<data name="FrmChangeWidth_Text" xml:space="preserve"> <data name="FrmChangeWidth_Text" xml:space="preserve">
<value>Track The Wide</value> <value>Conveyor Control</value>
</data> </data>
<data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve"> <data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve">
<value>Track The Wide</value> <value>Conveyor Control</value>
</data> </data>
<data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve"> <data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve">
<value>Inline Mode</value> <value>Inline Mode</value>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!