Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 53f152a2 由 几米阳光
选项

中英文界面调整

1 个父辈 a84e6d1b
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 36 行增加 和 31 行删除
dll/CodeLibrary.dll
此文件类型无法预览
source/ACSingleStore/FrmAxisDebug.Designer.cs
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,9 @@
// btnMiddleMove // btnMiddleMove
// //
this.btnMiddleMove.BackColor = System.Drawing.SystemColors.Control; this.btnMiddleMove.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleMove.Location = new System.Drawing.Point(266, 64); this.btnMiddleMove.Location = new System.Drawing.Point(263, 64);
this.btnMiddleMove.Name = "btnMiddleMove"; this.btnMiddleMove.Name = "btnMiddleMove";
this.btnMiddleMove.Size = new System.Drawing.Size(133, 48); this.btnMiddleMove.Size = new System.Drawing.Size(144, 52);
this.btnMiddleMove.TabIndex = 4; this.btnMiddleMove.TabIndex = 4;
this.btnMiddleMove.Text = "旋转轴+(顺时针)"; this.btnMiddleMove.Text = "旋转轴+(顺时针)";
this.btnMiddleMove.UseVisualStyleBackColor = false; this.btnMiddleMove.UseVisualStyleBackColor = false;
...@@ -124,9 +124,9 @@ ...@@ -124,9 +124,9 @@
// btnUpDownMove // btnUpDownMove
// //
this.btnUpDownMove.BackColor = System.Drawing.SystemColors.Control; this.btnUpDownMove.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownMove.Location = new System.Drawing.Point(266, 118); this.btnUpDownMove.Location = new System.Drawing.Point(263, 118);
this.btnUpDownMove.Name = "btnUpDownMove"; this.btnUpDownMove.Name = "btnUpDownMove";
this.btnUpDownMove.Size = new System.Drawing.Size(133, 48); this.btnUpDownMove.Size = new System.Drawing.Size(144, 52);
this.btnUpDownMove.TabIndex = 9; this.btnUpDownMove.TabIndex = 9;
this.btnUpDownMove.Text = "升降轴+(上升)"; this.btnUpDownMove.Text = "升降轴+(上升)";
this.btnUpDownMove.UseVisualStyleBackColor = false; this.btnUpDownMove.UseVisualStyleBackColor = false;
...@@ -136,9 +136,9 @@ ...@@ -136,9 +136,9 @@
// btnInOutMove // btnInOutMove
// //
this.btnInOutMove.BackColor = System.Drawing.SystemColors.Control; this.btnInOutMove.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutMove.Location = new System.Drawing.Point(266, 171); this.btnInOutMove.Location = new System.Drawing.Point(263, 171);
this.btnInOutMove.Name = "btnInOutMove"; this.btnInOutMove.Name = "btnInOutMove";
this.btnInOutMove.Size = new System.Drawing.Size(133, 48); this.btnInOutMove.Size = new System.Drawing.Size(144, 52);
this.btnInOutMove.TabIndex = 10; this.btnInOutMove.TabIndex = 10;
this.btnInOutMove.Text = "进出轴+(前进)"; this.btnInOutMove.Text = "进出轴+(前进)";
this.btnInOutMove.UseVisualStyleBackColor = false; this.btnInOutMove.UseVisualStyleBackColor = false;
...@@ -148,9 +148,9 @@ ...@@ -148,9 +148,9 @@
// btnInOutMovej // btnInOutMovej
// //
this.btnInOutMovej.BackColor = System.Drawing.SystemColors.Control; this.btnInOutMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutMovej.Location = new System.Drawing.Point(401, 171); this.btnInOutMovej.Location = new System.Drawing.Point(410, 171);
this.btnInOutMovej.Name = "btnInOutMovej"; this.btnInOutMovej.Name = "btnInOutMovej";
this.btnInOutMovej.Size = new System.Drawing.Size(133, 48); this.btnInOutMovej.Size = new System.Drawing.Size(144, 52);
this.btnInOutMovej.TabIndex = 14; this.btnInOutMovej.TabIndex = 14;
this.btnInOutMovej.Text = "进出轴-(后退)"; this.btnInOutMovej.Text = "进出轴-(后退)";
this.btnInOutMovej.UseVisualStyleBackColor = false; this.btnInOutMovej.UseVisualStyleBackColor = false;
...@@ -160,9 +160,9 @@ ...@@ -160,9 +160,9 @@
// btnUpDownMovej // btnUpDownMovej
// //
this.btnUpDownMovej.BackColor = System.Drawing.SystemColors.Control; this.btnUpDownMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownMovej.Location = new System.Drawing.Point(401, 118); this.btnUpDownMovej.Location = new System.Drawing.Point(410, 118);
this.btnUpDownMovej.Name = "btnUpDownMovej"; this.btnUpDownMovej.Name = "btnUpDownMovej";
this.btnUpDownMovej.Size = new System.Drawing.Size(133, 48); this.btnUpDownMovej.Size = new System.Drawing.Size(144, 52);
this.btnUpDownMovej.TabIndex = 13; this.btnUpDownMovej.TabIndex = 13;
this.btnUpDownMovej.Text = "升降轴-(下降)"; this.btnUpDownMovej.Text = "升降轴-(下降)";
this.btnUpDownMovej.UseVisualStyleBackColor = false; this.btnUpDownMovej.UseVisualStyleBackColor = false;
...@@ -172,9 +172,9 @@ ...@@ -172,9 +172,9 @@
// btnMiddleMovej // btnMiddleMovej
// //
this.btnMiddleMovej.BackColor = System.Drawing.SystemColors.Control; this.btnMiddleMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleMovej.Location = new System.Drawing.Point(401, 64); this.btnMiddleMovej.Location = new System.Drawing.Point(410, 64);
this.btnMiddleMovej.Name = "btnMiddleMovej"; this.btnMiddleMovej.Name = "btnMiddleMovej";
this.btnMiddleMovej.Size = new System.Drawing.Size(133, 48); this.btnMiddleMovej.Size = new System.Drawing.Size(144, 52);
this.btnMiddleMovej.TabIndex = 12; this.btnMiddleMovej.TabIndex = 12;
this.btnMiddleMovej.Text = "旋转轴-(逆时针)"; this.btnMiddleMovej.Text = "旋转轴-(逆时针)";
this.btnMiddleMovej.UseVisualStyleBackColor = false; this.btnMiddleMovej.UseVisualStyleBackColor = false;
...@@ -193,21 +193,21 @@ ...@@ -193,21 +193,21 @@
// //
// txtInOutPosition // txtInOutPosition
// //
this.txtInOutPosition.Location = new System.Drawing.Point(551, 182); this.txtInOutPosition.Location = new System.Drawing.Point(563, 182);
this.txtInOutPosition.Name = "txtInOutPosition"; this.txtInOutPosition.Name = "txtInOutPosition";
this.txtInOutPosition.Size = new System.Drawing.Size(108, 23); this.txtInOutPosition.Size = new System.Drawing.Size(108, 23);
this.txtInOutPosition.TabIndex = 19; this.txtInOutPosition.TabIndex = 19;
// //
// txtUpdownPosition // txtUpdownPosition
// //
this.txtUpdownPosition.Location = new System.Drawing.Point(551, 129); this.txtUpdownPosition.Location = new System.Drawing.Point(563, 129);
this.txtUpdownPosition.Name = "txtUpdownPosition"; this.txtUpdownPosition.Name = "txtUpdownPosition";
this.txtUpdownPosition.Size = new System.Drawing.Size(108, 23); this.txtUpdownPosition.Size = new System.Drawing.Size(108, 23);
this.txtUpdownPosition.TabIndex = 18; this.txtUpdownPosition.TabIndex = 18;
// //
// txtMiddlePosition // txtMiddlePosition
// //
this.txtMiddlePosition.Location = new System.Drawing.Point(551, 75); this.txtMiddlePosition.Location = new System.Drawing.Point(563, 75);
this.txtMiddlePosition.Name = "txtMiddlePosition"; this.txtMiddlePosition.Name = "txtMiddlePosition";
this.txtMiddlePosition.Size = new System.Drawing.Size(108, 23); this.txtMiddlePosition.Size = new System.Drawing.Size(108, 23);
this.txtMiddlePosition.TabIndex = 17; this.txtMiddlePosition.TabIndex = 17;
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
// //
// label6 // label6
// //
this.label6.Location = new System.Drawing.Point(515, 31); this.label6.Location = new System.Drawing.Point(527, 31);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(180, 17); this.label6.Size = new System.Drawing.Size(180, 17);
this.label6.TabIndex = 21; this.label6.TabIndex = 21;
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
// //
// txtComPosition // txtComPosition
// //
this.txtComPosition.Location = new System.Drawing.Point(551, 290); this.txtComPosition.Location = new System.Drawing.Point(563, 290);
this.txtComPosition.Name = "txtComPosition"; this.txtComPosition.Name = "txtComPosition";
this.txtComPosition.Size = new System.Drawing.Size(108, 23); this.txtComPosition.Size = new System.Drawing.Size(108, 23);
this.txtComPosition.TabIndex = 26; this.txtComPosition.TabIndex = 26;
...@@ -245,9 +245,9 @@ ...@@ -245,9 +245,9 @@
// btnComMovej // btnComMovej
// //
this.btnComMovej.BackColor = System.Drawing.SystemColors.Control; this.btnComMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnComMovej.Location = new System.Drawing.Point(401, 279); this.btnComMovej.Location = new System.Drawing.Point(410, 279);
this.btnComMovej.Name = "btnComMovej"; this.btnComMovej.Name = "btnComMovej";
this.btnComMovej.Size = new System.Drawing.Size(133, 48); this.btnComMovej.Size = new System.Drawing.Size(144, 52);
this.btnComMovej.TabIndex = 25; this.btnComMovej.TabIndex = 25;
this.btnComMovej.Text = "压紧轴-(向下)"; this.btnComMovej.Text = "压紧轴-(向下)";
this.btnComMovej.UseVisualStyleBackColor = false; this.btnComMovej.UseVisualStyleBackColor = false;
...@@ -257,9 +257,9 @@ ...@@ -257,9 +257,9 @@
// btnComMove // btnComMove
// //
this.btnComMove.BackColor = System.Drawing.SystemColors.Control; this.btnComMove.BackColor = System.Drawing.SystemColors.Control;
this.btnComMove.Location = new System.Drawing.Point(266, 279); this.btnComMove.Location = new System.Drawing.Point(263, 279);
this.btnComMove.Name = "btnComMove"; this.btnComMove.Name = "btnComMove";
this.btnComMove.Size = new System.Drawing.Size(133, 48); this.btnComMove.Size = new System.Drawing.Size(144, 52);
this.btnComMove.TabIndex = 24; this.btnComMove.TabIndex = 24;
this.btnComMove.Text = "压紧轴+(向上)"; this.btnComMove.Text = "压紧轴+(向上)";
this.btnComMove.UseVisualStyleBackColor = false; this.btnComMove.UseVisualStyleBackColor = false;
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
// //
// txtAutoPosition // txtAutoPosition
// //
this.txtAutoPosition.Location = new System.Drawing.Point(551, 235); this.txtAutoPosition.Location = new System.Drawing.Point(563, 235);
this.txtAutoPosition.Name = "txtAutoPosition"; this.txtAutoPosition.Name = "txtAutoPosition";
this.txtAutoPosition.Size = new System.Drawing.Size(108, 23); this.txtAutoPosition.Size = new System.Drawing.Size(108, 23);
this.txtAutoPosition.TabIndex = 31; this.txtAutoPosition.TabIndex = 31;
...@@ -292,9 +292,9 @@ ...@@ -292,9 +292,9 @@
// btnAutoMovej // btnAutoMovej
// //
this.btnAutoMovej.BackColor = System.Drawing.SystemColors.Control; this.btnAutoMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnAutoMovej.Location = new System.Drawing.Point(401, 224); this.btnAutoMovej.Location = new System.Drawing.Point(410, 224);
this.btnAutoMovej.Name = "btnAutoMovej"; this.btnAutoMovej.Name = "btnAutoMovej";
this.btnAutoMovej.Size = new System.Drawing.Size(133, 48); this.btnAutoMovej.Size = new System.Drawing.Size(144, 52);
this.btnAutoMovej.TabIndex = 30; this.btnAutoMovej.TabIndex = 30;
this.btnAutoMovej.Text = "上下料轴-(向下)"; this.btnAutoMovej.Text = "上下料轴-(向下)";
this.btnAutoMovej.UseVisualStyleBackColor = false; this.btnAutoMovej.UseVisualStyleBackColor = false;
...@@ -304,9 +304,9 @@ ...@@ -304,9 +304,9 @@
// btnAutoMove // btnAutoMove
// //
this.btnAutoMove.BackColor = System.Drawing.SystemColors.Control; this.btnAutoMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAutoMove.Location = new System.Drawing.Point(266, 224); this.btnAutoMove.Location = new System.Drawing.Point(263, 224);
this.btnAutoMove.Name = "btnAutoMove"; this.btnAutoMove.Name = "btnAutoMove";
this.btnAutoMove.Size = new System.Drawing.Size(133, 48); this.btnAutoMove.Size = new System.Drawing.Size(144, 52);
this.btnAutoMove.TabIndex = 29; this.btnAutoMove.TabIndex = 29;
this.btnAutoMove.Text = "上下料轴+(向上)"; this.btnAutoMove.Text = "上下料轴+(向上)";
this.btnAutoMove.UseVisualStyleBackColor = false; this.btnAutoMove.UseVisualStyleBackColor = false;
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(707, 450); this.ClientSize = new System.Drawing.Size(751, 450);
this.Controls.Add(this.txtAutoPosition); this.Controls.Add(this.txtAutoPosition);
this.Controls.Add(this.btnAutoMovej); this.Controls.Add(this.btnAutoMovej);
this.Controls.Add(this.btnAutoMove); this.Controls.Add(this.btnAutoMove);
......
source/ACSingleStore/FrmIOStatus.cs
...@@ -55,7 +55,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -55,7 +55,7 @@ namespace OnlineStore.AutoInOutStore
control.IOValue = 0; control.IOValue = 0;
control.isCanClick = false; control.isCanClick = false;
control.Name = "IO_" + ioValue.ProName; control.Name = "IO_" + ioValue.ProName;
control.Size = new System.Drawing.Size(200, 25); control.Size = new System.Drawing.Size(260, 25);
control.TabIndex = 0; control.TabIndex = 0;
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
...@@ -74,7 +74,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -74,7 +74,7 @@ namespace OnlineStore.AutoInOutStore
control.isCanClick = true; control.isCanClick = true;
//control.Location = new System.Drawing.Point(0, 25*roleindex); //control.Location = new System.Drawing.Point(0, 25*roleindex);
control.Name = "IO_" + ioValue.ProName; control.Name = "IO_" + ioValue.ProName;
control.Size = new System.Drawing.Size(200, 25); control.Size = new System.Drawing.Size(260, 25);
control.TabIndex = 0; control.TabIndex = 0;
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex); this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -207,6 +207,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -207,6 +207,11 @@ namespace OnlineStore.AutoInOutStore
private bool LoadOk = false; private bool LoadOk = false;
private void FrmTest_Load(object sender, EventArgs e) private void FrmTest_Load(object sender, EventArgs e)
{ {
string language = ConfigAppSettings.GetValue(Setting_Init.Default_Language);
if (language.Equals(ResourceCulture.China) || language.Equals(ResourceCulture.English))
{
ResourceCulture.SetCurrentCulture(language);
}
GetVersion(); GetVersion();
LogUtil.logBox = this.richTextBox1; LogUtil.logBox = this.richTextBox1;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -589,7 +589,7 @@ ...@@ -589,7 +589,7 @@
<value>In-out axis+forward</value> <value>In-out axis+forward</value>
</data> </data>
<data name="FrmAxisDebug_btnUpDownMovej_Text" xml:space="preserve"> <data name="FrmAxisDebug_btnUpDownMovej_Text" xml:space="preserve">
<value>Lifting axis+descent</value> <value>l-axis+descent</value>
</data> </data>
<data name="FrmAxisDebug_btnMiddleMovej_Text" xml:space="preserve"> <data name="FrmAxisDebug_btnMiddleMovej_Text" xml:space="preserve">
<value>Rotation axis+clockwise</value> <value>Rotation axis+clockwise</value>
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
<value>In-out axis+backward</value> <value>In-out axis+backward</value>
</data> </data>
<data name="FrmAxisDebug_btnUpDownMove_Text" xml:space="preserve"> <data name="FrmAxisDebug_btnUpDownMove_Text" xml:space="preserve">
<value>Lifting axis+ascent</value> <value>l-axis+ascent</value>
</data> </data>
<data name="FrmAxisDebug_btnMiddleMove_Text" xml:space="preserve"> <data name="FrmAxisDebug_btnMiddleMove_Text" xml:space="preserve">
<value>Rotation axis+anti-clockwise</value> <value>Rotation axis+anti-clockwise</value>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!