Skip to content

孙克 / ACSingleStore

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

中英文切换后界面调整

1 个父辈 ddaed713
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 213 行增加 和 68 行删除
source/ACSingleStore/FrmAxisDebug.Designer.cs
......@@ -53,36 +53,36 @@
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(39, 77);
this.label1.Location = new System.Drawing.Point(10, 78);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(92, 17);
this.label1.Size = new System.Drawing.Size(155, 17);
this.label1.TabIndex = 0;
this.label1.Text = "（轴一）旋转轴";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(39, 131);
this.label2.Location = new System.Drawing.Point(10, 132);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(92, 17);
this.label2.Size = new System.Drawing.Size(155, 17);
this.label2.TabIndex = 1;
this.label2.Text = "（轴二）升降轴";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(39, 184);
this.label3.Location = new System.Drawing.Point(10, 185);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(92, 17);
this.label3.Size = new System.Drawing.Size(155, 17);
this.label3.TabIndex = 2;
this.label3.Text = "（轴三）进出轴";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnMiddleMove
//
this.btnMiddleMove.Location = new System.Drawing.Point(266, 70);
this.btnMiddleMove.Location = new System.Drawing.Point(266, 63);
this.btnMiddleMove.Name = "btnMiddleMove";
this.btnMiddleMove.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMove.Size = new System.Drawing.Size(131, 47);
this.btnMiddleMove.TabIndex = 4;
this.btnMiddleMove.Text = "旋转轴+(逆时针)";
this.btnMiddleMove.UseVisualStyleBackColor = true;
......@@ -91,30 +91,30 @@
//
// txtMiddleSpeed
//
this.txtMiddleSpeed.Location = new System.Drawing.Point(150, 75);
this.txtMiddleSpeed.Location = new System.Drawing.Point(172, 75);
this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(108, 23);
this.txtMiddleSpeed.Size = new System.Drawing.Size(90, 23);
this.txtMiddleSpeed.TabIndex = 5;
//
// txtUpDownSpeed
//
this.txtUpDownSpeed.Location = new System.Drawing.Point(150, 129);
this.txtUpDownSpeed.Location = new System.Drawing.Point(172, 129);
this.txtUpDownSpeed.Name = "txtUpDownSpeed";
this.txtUpDownSpeed.Size = new System.Drawing.Size(108, 23);
this.txtUpDownSpeed.Size = new System.Drawing.Size(90, 23);
this.txtUpDownSpeed.TabIndex = 6;
//
// txtInOutSpeed
//
this.txtInOutSpeed.Location = new System.Drawing.Point(150, 182);
this.txtInOutSpeed.Location = new System.Drawing.Point(172, 182);
this.txtInOutSpeed.Name = "txtInOutSpeed";
this.txtInOutSpeed.Size = new System.Drawing.Size(108, 23);
this.txtInOutSpeed.Size = new System.Drawing.Size(90, 23);
this.txtInOutSpeed.TabIndex = 7;
//
// btnUpDownMove
//
this.btnUpDownMove.Location = new System.Drawing.Point(266, 124);
this.btnUpDownMove.Location = new System.Drawing.Point(266, 117);
this.btnUpDownMove.Name = "btnUpDownMove";
this.btnUpDownMove.Size = new System.Drawing.Size(131, 36);
this.btnUpDownMove.Size = new System.Drawing.Size(131, 47);
this.btnUpDownMove.TabIndex = 9;
this.btnUpDownMove.Text = "升降轴+(上升)";
this.btnUpDownMove.UseVisualStyleBackColor = true;
......@@ -123,9 +123,9 @@
//
// btnInOutMove
//
this.btnInOutMove.Location = new System.Drawing.Point(266, 177);
this.btnInOutMove.Location = new System.Drawing.Point(266, 170);
this.btnInOutMove.Name = "btnInOutMove";
this.btnInOutMove.Size = new System.Drawing.Size(131, 36);
this.btnInOutMove.Size = new System.Drawing.Size(131, 47);
this.btnInOutMove.TabIndex = 10;
this.btnInOutMove.Text = "进出轴+(后退)";
this.btnInOutMove.UseVisualStyleBackColor = true;
......@@ -134,9 +134,9 @@
//
// btnInOutMovej
//
this.btnInOutMovej.Location = new System.Drawing.Point(401, 177);
this.btnInOutMovej.Location = new System.Drawing.Point(401, 170);
this.btnInOutMovej.Name = "btnInOutMovej";
this.btnInOutMovej.Size = new System.Drawing.Size(131, 36);
this.btnInOutMovej.Size = new System.Drawing.Size(131, 47);
this.btnInOutMovej.TabIndex = 14;
this.btnInOutMovej.Text = "进出轴-(前进)";
this.btnInOutMovej.UseVisualStyleBackColor = true;
......@@ -145,9 +145,9 @@
//
// btnUpDownMovej
//
this.btnUpDownMovej.Location = new System.Drawing.Point(401, 124);
this.btnUpDownMovej.Location = new System.Drawing.Point(401, 117);
this.btnUpDownMovej.Name = "btnUpDownMovej";
this.btnUpDownMovej.Size = new System.Drawing.Size(131, 36);
this.btnUpDownMovej.Size = new System.Drawing.Size(131, 47);
this.btnUpDownMovej.TabIndex = 13;
this.btnUpDownMovej.Text = "升降轴-(下降)";
this.btnUpDownMovej.UseVisualStyleBackColor = true;
......@@ -156,9 +156,9 @@
//
// btnMiddleMovej
//
this.btnMiddleMovej.Location = new System.Drawing.Point(401, 70);
this.btnMiddleMovej.Location = new System.Drawing.Point(401, 63);
this.btnMiddleMovej.Name = "btnMiddleMovej";
this.btnMiddleMovej.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMovej.Size = new System.Drawing.Size(131, 47);
this.btnMiddleMovej.TabIndex = 12;
this.btnMiddleMovej.Text = "旋转轴-(顺时针)";
this.btnMiddleMovej.UseVisualStyleBackColor = true;
......@@ -169,7 +169,7 @@
//
this.button1.Location = new System.Drawing.Point(402, 253);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.Size = new System.Drawing.Size(130, 53);
this.button1.TabIndex = 16;
this.button1.Text = "关闭";
this.button1.UseVisualStyleBackColor = true;
......@@ -198,21 +198,21 @@
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(172, 31);
this.label5.Location = new System.Drawing.Point(88, 31);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.Size = new System.Drawing.Size(255, 17);
this.label5.TabIndex = 20;
this.label5.Text = "点动速度";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(566, 31);
this.label6.Location = new System.Drawing.Point(496, 31);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(56, 17);
this.label6.Size = new System.Drawing.Size(217, 17);
this.label6.TabIndex = 21;
this.label6.Text = "实时坐标";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// timer1
//
......@@ -223,7 +223,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(707, 318);
this.ClientSize = new System.Drawing.Size(811, 318);
this.Controls.Add(this.label6);
this.Controls.Add(this.label5);
this.Controls.Add(this.txtInOutPosition);
......
source/ACSingleStore/FrmBase.cs
......@@ -46,7 +46,7 @@ namespace OnlineStore.ACSingleStore
foreach (Control con in this.Controls)
{
if (con is Label || con is Button || con is RadioButton || con is CheckBox||con is ToolStripMenuItem)
if (con is Label || con is Button || con is RadioButton || con is CheckBox )
{
string newStr = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, con.Name), con.Text);
con.Text = newStr;
......@@ -59,9 +59,18 @@ namespace OnlineStore.ACSingleStore
}
}
if(this is FrmStoreBox)
{
((FrmStoreBox)this).processMenu();
}
}
private void PreControlLanaguage(Control partentControl)
{
if(partentControl is UserFromControl.IOTextControl && this is FrmIOStatus)
{
return;
}
string className = this.ClassName;
partentControl.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, partentControl.Name), partentControl.Text);
foreach (Control con in partentControl.Controls)
......
source/ACSingleStore/FrmIOStatus.cs
......@@ -55,7 +55,7 @@ namespace OnlineStore.ACSingleStore
control.IOValue = 0;
control.isCanClick = false;
control.Name = "IO_" + ioValue.ProName;
control.Size = new System.Drawing.Size(200, 25);
control.Size = new System.Drawing.Size(310, 25);
control.TabIndex = 0;
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
......@@ -74,7 +74,7 @@ namespace OnlineStore.ACSingleStore
control.isCanClick = true;
//control.Location = new System.Drawing.Point(0, 25*roleindex);
control.Name = "IO_" + ioValue.ProName;
control.Size = new System.Drawing.Size(200, 25);
control.Size = new System.Drawing.Size(235, 25);
control.TabIndex = 0;
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -91,8 +91,53 @@ namespace OnlineStore.ACSingleStore
timer1.Enabled = true;
}
#endregion
private string WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
private string dooropen = ResourceCulture.GetString(ResourceCulture.DoorOpen, " 前门未关");
private string HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
private string StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto, "开始自动出入库");
private string StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库");
private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
public void processMenu()
{
string className = this.ClassName;
CurrLanguage = ResourceCulture.CurrLanguage;
WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
dooropen = ResourceCulture.GetString(ResourceCulture.DoorOpen, " 前门未关");
HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto, "开始自动出入库");
StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库");
AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
ToolStripItemCollection collection = menuStrip1.Items;
for (int i = 0; i < collection.Count; i++)
{
if (collection[i] is ToolStripMenuItem)
{
string newStr = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, collection[i].Name), collection[i].Text);
collection[i].Text = newStr;
ToolStripMenuItem a = (ToolStripMenuItem)collection[i];
ToolStripItemCollection newColl = a.DropDownItems;
for (int ii= 0;ii < newColl.Count; ii++)
{
if (newColl[ii] is ToolStripMenuItem)
{
newStr = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, newColl[ii].Name), newColl[ii].Text);
newColl[ii].Text = newStr;
}
}
}
}
显示ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, 显示ToolStripMenuItem.Name), 显示ToolStripMenuItem.Text);
toolStripMenuItem1.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, toolStripMenuItem1.Name), toolStripMenuItem1.Text);
notifyIcon1.Text = this.Text;
}
private void start_button_Click(object sender, EventArgs e)
{
......@@ -142,11 +187,18 @@ namespace OnlineStore.ACSingleStore
private void FrmTest_Load(object sender, EventArgs e)
{
LogUtil.logBox = this.richTextBox1;
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
string defaultL = ConfigAppSettings.GetValue(Setting_Init.Default_Language);
if (defaultL.Equals(ResourceCulture.English) || defaultL.Equals(ResourceCulture.China))
{
ResourceCulture.SetCurrentCulture(defaultL);
}
initValue();
this.ShowInTaskbar = true;
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
LoadOk = true;
HideForm();
}
private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e)
......@@ -222,26 +274,26 @@ namespace OnlineStore.ACSingleStore
{
if (store.KNDIOValue(IO_Type.Door_LimitSingle).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + ResourceCulture.GetString(ResourceCulture.DoorOpen," 前门未关");
lblWarnMsg.Text = lblWarnMsg.Text +dooropen ;
}
}
//如果不在出入库中，且叉子上有信号，需要提示检查叉子
if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && store.KNDIOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
lblWarnMsg.Text = lblWarnMsg.Text +ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
lblWarnMsg.Text = lblWarnMsg.Text + HasWare;
}
if (store.autoNext)
{
string msg = store.autoMsg;
lblMsg.Text = msg;
if (btnStartAuTo.Text.Equals(ResourceCulture.GetString(ResourceCulture.StartAuto,"开始自动出入库")))
if (btnStartAuTo.Text.Equals(StartAuto))
{
btnStartAuTo.Text =ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库");
btnStartAuTo.Text =StopAuto;
}
try
{
msg = msg.Replace(ResourceCulture.GetString(ResourceCulture.AutoOut,"自动出库："), "");
msg = msg.Replace(ResourceCulture.GetString(ResourceCulture.AutoIn,"自动入库："), "");
msg = msg.Replace(AutoOut, "");
msg = msg.Replace(AutoIn, "");
int index = store.PositionNumList.IndexOf(msg);
if (index >= 0 && (!msg.Equals("")))
{
......@@ -253,20 +305,21 @@ namespace OnlineStore.ACSingleStore
else
{
// lblMsg.Text = "没有开启自动出入库";
if (btnStartAuTo.Text.Equals(ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库")))
if (btnStartAuTo.Text.Equals(StopAuto))
{
btnStartAuTo.Text = ResourceCulture.GetString(ResourceCulture.StartAuto, "开始自动出入库");
btnStartAuTo.Text = StartAuto;
}
}
}
else
{
lblThisSta.Text =ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
lblThisSta.Text = WaitStart;
lblWarnMsg.Text = "";
btnStartAuTo.Text = ResourceCulture.GetString(ResourceCulture.StartAuto, "开始自动出入库");
btnStartAuTo.Text = StartAuto;
}
}
private void ReadPosistion()
{
string portName = GetPortName();
......@@ -859,24 +912,7 @@ namespace OnlineStore.ACSingleStore
FormManager.ShowIOShow(store);
}
private void 清理日志ToolStripMenuItem_Click(object sender, EventArgs e)
{
this.richTextBox1.Text = "";
}
//private void 开启DEBUGToolStripMenuItem_Click(object sender, EventArgs e)
//{
// if (LogUtil.debug_opened == false)
// {
// 开启DEBUGToolStripMenuItem.Text = "关闭DEBUG";
// LogUtil.debug_opened = true;
// }
// else
// {
// 开启DEBUGToolStripMenuItem.Text = "开启DEBUG";
// LogUtil.debug_opened = false;
// }
//}
private void btnClearLog_Click(object sender, EventArgs e)
{
......@@ -1191,5 +1227,38 @@ namespace OnlineStore.ACSingleStore
FrmLanguage frm = new FrmLanguage();
frm.ShowDialog();
}
private void 开启DEBUGToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void 清理日志ToolStripMenuItem_Click(object sender, EventArgs e)
{
string str = ResourceCulture.China;
ResourceCulture.SetCurrentCulture(str);
ConfigAppSettings.SaveValue(Setting_Init.Default_Language, str);
this.LanguageProcess();
}
private void 英文ToolStripMenuItem_Click(object sender, EventArgs e)
{
string str = ResourceCulture.English;
ResourceCulture.SetCurrentCulture(str);
ConfigAppSettings.SaveValue(Setting_Init.Default_Language, str);
this.LanguageProcess();
}
private void 德文ToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void groupBox5_Enter(object sender, EventArgs e)
{
}
}
}
source/ACSingleStore/FrmStoreBox.resx
......@@ -1263,7 +1263,7 @@
<value>107, 16</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>78</value>
<value>106</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
......
source/ACSingleStore/Properties/Resource.zh-CN.resx
......@@ -711,5 +711,70 @@
<data name="FrmLanguage_rbtnChina_Text" xml:space="preserve">
<value>中文</value>
</data>
<data name="FrmStoreBox_iO状态查看ToolStripMenuItem_Text" xml:space="preserve">
<value>设备调试</value>
</data>
<data name="FrmStoreBox_toolStripMenuItem2_Text" xml:space="preserve">
<value>门禁功能打开</value>
</data>
<data name="FrmStoreBox_toolStripMenuItem3_Text" xml:space="preserve">
<value>门禁功能屏蔽</value>
</data>
<data name="FrmStoreBox_停止ToolStripMenuItem_Text" xml:space="preserve">
<value>停止</value>
</data>
<data name="FrmStoreBox_关闭仓门ToolStripMenuItem_Text" xml:space="preserve">
<value>关闭仓门</value>
</data>
<data name="FrmStoreBox_启动ToolStripMenuItem_Text" xml:space="preserve">
<value>启动</value>
</data>
<data name="FrmStoreBox_回待机点ToolStripMenuItem_Text" xml:space="preserve">
<value>回待机点</value>
</data>
<data name="FrmStoreBox_复位ToolStripMenuItem_Text" xml:space="preserve">
<value>复位</value>
</data>
<data name="FrmStoreBox_学习二维码ToolStripMenuItem_Text" xml:space="preserve">
<value>学习二维码</value>
</data>
<data name="FrmStoreBox_德文ToolStripMenuItem_Text" xml:space="preserve">
<value>德文</value>
</data>
<data name="FrmStoreBox_打开舱门ToolStripMenuItem_Text" xml:space="preserve">
<value>打开仓门</value>
</data>
<data name="FrmStoreBox_扫码测试ToolStripMenuItem_Text" xml:space="preserve">
<value>扫码测试</value>
</data>
<data name="FrmStoreBox_料仓操作ToolStripMenuItem_Text" xml:space="preserve">
<value>料仓操作</value>
</data>
<data name="FrmStoreBox_料仓运转OFFToolStripMenuItem_Text" xml:space="preserve">
<value>料仓运转OFF</value>
</data>
<data name="FrmStoreBox_料仓运转ONToolStripMenuItem_Text" xml:space="preserve">
<value>料仓运转ON</value>
</data>
<data name="FrmStoreBox_显示ToolStripMenuItem_Text" xml:space="preserve">
<value>显示(&amp;S)</value>
</data>
<data name="FrmStoreBox_查看IOToolStripMenuItem_Text" xml:space="preserve">
<value>查看IO</value>
</data>
<data name="FrmStoreBox_清理日志ToolStripMenuItem_Text" xml:space="preserve">
<value>中文</value>
</data>
<data name="FrmStoreBox_英文ToolStripMenuItem_Text" xml:space="preserve">
<value>英文</value>
</data>
<data name="FrmStoreBox_语言_Text" xml:space="preserve">
<value>语言</value>
</data>
<data name="FrmStoreBox_轴卡点动ToolStripMenuItem_Text" xml:space="preserve">
<value>轴卡点动</value>
</data>
<data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve">
<value>退出系统</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/ResourceCulture.cs
......@@ -19,6 +19,7 @@ namespace OnlineStore.ACSingleStore
public static string CurrLanguage = "zh-CN";
public static Dictionary<string, string> defaultMap = new Dictionary<string, string>();
/// <summary>
/// Set current culture by name
......
source/UserFromControl/IOStatusControl.Designer.cs
......@@ -43,6 +43,7 @@
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 0;
this.label1.Text = "label1";
this.label1.Visible = false;
//
// pictureBox1
//
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!