Skip to content

张东亮 / NS100

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

中英文修改。设置界面调整。

1 个父辈 e68ad55b
内嵌 并排
正在显示 7 个修改的文件 包含 59 行增加 和 63 行删除
IDHIKCamera/IDHIK.cs
using MvCodeReaderSDKNet;
using MVIDCodeReaderNet;
using System;
using System.Collections.Generic;
using System.Drawing;
......
SmartScan/Form/FrmDrawText.Designer.cs
......@@ -72,7 +72,7 @@
this.Controls.Add(this.faceButton1);
this.Icon = ((System.Drawing.Bitmap)(resources.GetObject("$this.Icon")));
this.Name = "FrmDrawText";
this.Text = "Using OCR result";
this.Text = "Using OCR Result";
this.Controls.SetChildIndex(this.faceButton1, 0);
this.Controls.SetChildIndex(this.faceButton2, 0);
this.ResumeLayout(false);
......
SmartScan/Language/en-US.lngres
......@@ -22,7 +22,7 @@ Dialog_RepeatPrint 该料盘标签已打印 The Label Has Been Printed
Dialog_MaterialScanning 拍照识别... In Recognition...
Dialog_MaterialTemplateMatching 模版匹配... Template Matching...
Dialog_MaterialProcessing 计算结果... Processing Results...
Dialog_PleaseWaiting 请稍后... Please Waiting...
Dialog_PleaseWaiting 请稍后... Please Wait...
Dialog_MatchType_max 匹配数量至多 Match Times At Most
Dialog_MatchType_equals 匹配数量等于 Match Times Equals
Dialog_MatchType_min 匹配数量至少 Match Times At Least
......@@ -264,3 +264,7 @@ UsrKeywordlabeling_UpdateLabel 修改关键字 Modify keywords Arial,12,,
UsrKeywordlabeling_SaveLabel 确认 Confirm Arial,12,,
FrmKeyCollection_FrmKeyCollection 选择关键字 Select keywords Arial,12,,
FrmKeyCollection_faceButton1 确认 Confirm Arial,12,,
FrmDataFilePreview_BtnCancel 取消 Cancel 微软雅黑,12,,
FrmDataFilePreview_BtnOK 确认 OK 微软雅黑,12,,
FrmDataFilePreview_LblEncoding 编码格式 Encoding Format 微软雅黑,12,,
FrmDataFilePreview_FrmDataFilePreview 文件预览 File Preview 微软雅黑,12,,
SmartScan/Language/zh-CN.lngres
......@@ -263,3 +263,8 @@ UsrKeywordlabeling_UpdateLabel 修改关键字 修改关键字 微软雅黑,12,,
UsrKeywordlabeling_SaveLabel 确认 确认 微软雅黑,12,,
FrmKeyCollection_FrmKeyCollection 选择关键字 选择关键字 微软雅黑,12,,
FrmKeyCollection_faceButton1 确认 确认 微软雅黑,12,,
FrmDataFilePreview_BtnCancel 取消 取消 微软雅黑,12,,
FrmDataFilePreview_BtnOK 确认 确认 微软雅黑,12,,
FrmDataFilePreview_LblEncoding 编码格式 编码格式 微软雅黑,12,,
FrmDataFilePreview_FrmDataFilePreview 文件预览 文件预览 微软雅黑,12,,
SmartScan/SetControl/FrmDataFilePreview.Designer.cs
......@@ -87,10 +87,10 @@ namespace SmartScan
this.LblEncoding.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblEncoding.BorderWidth = 0;
this.LblEncoding.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblEncoding.Location = new System.Drawing.Point(354, 44);
this.LblEncoding.Location = new System.Drawing.Point(211, 44);
this.LblEncoding.Name = "LblEncoding";
this.LblEncoding.Padding = new System.Windows.Forms.Padding(3);
this.LblEncoding.Size = new System.Drawing.Size(139, 35);
this.LblEncoding.Size = new System.Drawing.Size(282, 35);
this.LblEncoding.TabIndex = 22;
this.LblEncoding.Text = "编码格式";
this.LblEncoding.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......
SmartScan/SetControl/FrmDataFilePreview.cs
......@@ -25,6 +25,8 @@ namespace SmartScan
FrmDataFilePreview frmDataFile = new FrmDataFilePreview();
frmDataFile.Filename = filename;
Encodingtxt = frmDataFile.EncodingTxt;
Asa.FaceControl.Language.SetLanguage(frmDataFile);
if (frmDataFile.ShowDialog() != DialogResult.OK)
return false;
......
SmartScan/SetControl/UsrDataSource.Designer.cs
......@@ -57,12 +57,11 @@ namespace SmartScan
this.but_StartService.Controls.Add(this.LblContent);
this.but_StartService.Controls.Add(this.CboDataType);
this.but_StartService.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.but_StartService.Location = new System.Drawing.Point(4, 4);
this.but_StartService.Margin = new System.Windows.Forms.Padding(4);
this.but_StartService.Location = new System.Drawing.Point(3, 3);
this.but_StartService.Name = "but_StartService";
this.but_StartService.Padding = new System.Windows.Forms.Padding(4);
this.but_StartService.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.but_StartService.ShowText = false;
this.but_StartService.Size = new System.Drawing.Size(1160, 668);
this.but_StartService.Size = new System.Drawing.Size(1113, 773);
this.but_StartService.TabIndex = 1;
this.but_StartService.Text = "facePanel1";
this.but_StartService.TitleFont = new System.Drawing.Font("宋体", 12F);
......@@ -78,10 +77,9 @@ namespace SmartScan
this.panel1.Controls.Add(this.CboDataTitle);
this.panel1.Controls.Add(this.CboDataKey);
this.panel1.Controls.Add(this.TxtDataSource);
this.panel1.Location = new System.Drawing.Point(8, 95);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Location = new System.Drawing.Point(6, 115);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1144, 565);
this.panel1.Size = new System.Drawing.Size(1101, 652);
this.panel1.TabIndex = 22;
//
// ChkRecursive
......@@ -90,23 +88,21 @@ namespace SmartScan
this.ChkRecursive.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.ChkRecursive.BorderWidth = 0;
this.ChkRecursive.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkRecursive.Location = new System.Drawing.Point(851, 29);
this.ChkRecursive.Margin = new System.Windows.Forms.Padding(4);
this.ChkRecursive.Location = new System.Drawing.Point(760, 23);
this.ChkRecursive.Name = "ChkRecursive";
this.ChkRecursive.Padding = new System.Windows.Forms.Padding(4);
this.ChkRecursive.Size = new System.Drawing.Size(289, 56);
this.ChkRecursive.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.ChkRecursive.Size = new System.Drawing.Size(322, 45);
this.ChkRecursive.TabIndex = 23;
this.ChkRecursive.Text = "遍历同目录";
this.ChkRecursive.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// groupBox_lblkey
//
this.groupBox_lblkey.Controls.Add(this.txtkey);
this.groupBox_lblkey.ForeColor = System.Drawing.Color.White;
this.groupBox_lblkey.Location = new System.Drawing.Point(517, 144);
this.groupBox_lblkey.Margin = new System.Windows.Forms.Padding(4);
this.groupBox_lblkey.Location = new System.Drawing.Point(474, 128);
this.groupBox_lblkey.Name = "groupBox_lblkey";
this.groupBox_lblkey.Padding = new System.Windows.Forms.Padding(4);
this.groupBox_lblkey.Size = new System.Drawing.Size(400, 289);
this.groupBox_lblkey.Size = new System.Drawing.Size(543, 440);
this.groupBox_lblkey.TabIndex = 22;
this.groupBox_lblkey.TabStop = false;
this.groupBox_lblkey.Text = "标签可用字段";
......@@ -116,14 +112,14 @@ namespace SmartScan
this.txtkey.BackColor = System.Drawing.Color.Black;
this.txtkey.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.txtkey.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtkey.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtkey.ForeColor = System.Drawing.Color.White;
this.txtkey.Location = new System.Drawing.Point(4, 22);
this.txtkey.Margin = new System.Windows.Forms.Padding(4);
this.txtkey.Location = new System.Drawing.Point(3, 17);
this.txtkey.Multiline = true;
this.txtkey.Name = "txtkey";
this.txtkey.ReadOnly = true;
this.txtkey.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.txtkey.Size = new System.Drawing.Size(392, 263);
this.txtkey.Size = new System.Drawing.Size(537, 420);
this.txtkey.TabIndex = 0;
this.txtkey.Tag = "not";
//
......@@ -134,11 +130,10 @@ namespace SmartScan
this.BtnSelectFile.BorderWidth = 2;
this.BtnSelectFile.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnSelectFile.HoldPress = false;
this.BtnSelectFile.Location = new System.Drawing.Point(723, 29);
this.BtnSelectFile.Margin = new System.Windows.Forms.Padding(4);
this.BtnSelectFile.Location = new System.Drawing.Point(542, 23);
this.BtnSelectFile.Name = "BtnSelectFile";
this.BtnSelectFile.Padding = new System.Windows.Forms.Padding(4);
this.BtnSelectFile.Size = new System.Drawing.Size(120, 56);
this.BtnSelectFile.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.BtnSelectFile.Size = new System.Drawing.Size(212, 45);
this.BtnSelectFile.TabIndex = 1;
this.BtnSelectFile.Text = "选择文件";
this.BtnSelectFile.Click += new System.EventHandler(this.BtnSelectFile_Click);
......@@ -149,11 +144,10 @@ namespace SmartScan
this.faceLabel2.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceLabel2.BorderWidth = 0;
this.faceLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceLabel2.Location = new System.Drawing.Point(24, 285);
this.faceLabel2.Margin = new System.Windows.Forms.Padding(4);
this.faceLabel2.Location = new System.Drawing.Point(18, 228);
this.faceLabel2.Name = "faceLabel2";
this.faceLabel2.Padding = new System.Windows.Forms.Padding(4);
this.faceLabel2.Size = new System.Drawing.Size(400, 56);
this.faceLabel2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.faceLabel2.Size = new System.Drawing.Size(396, 45);
this.faceLabel2.TabIndex = 21;
this.faceLabel2.Text = "关键字匹配数据标题";
this.faceLabel2.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
......@@ -164,11 +158,10 @@ namespace SmartScan
this.faceLabel1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceLabel1.BorderWidth = 0;
this.faceLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceLabel1.Location = new System.Drawing.Point(24, 144);
this.faceLabel1.Margin = new System.Windows.Forms.Padding(4);
this.faceLabel1.Location = new System.Drawing.Point(18, 115);
this.faceLabel1.Name = "faceLabel1";
this.faceLabel1.Padding = new System.Windows.Forms.Padding(4);
this.faceLabel1.Size = new System.Drawing.Size(445, 56);
this.faceLabel1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.faceLabel1.Size = new System.Drawing.Size(396, 45);
this.faceLabel1.TabIndex = 21;
this.faceLabel1.Text = "识别关键词";
this.faceLabel1.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
......@@ -179,11 +172,10 @@ namespace SmartScan
this.LblFilestatus.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblFilestatus.BorderWidth = 0;
this.LblFilestatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblFilestatus.Location = new System.Drawing.Point(31, 92);
this.LblFilestatus.Margin = new System.Windows.Forms.Padding(4);
this.LblFilestatus.Location = new System.Drawing.Point(18, 74);
this.LblFilestatus.Name = "LblFilestatus";
this.LblFilestatus.Padding = new System.Windows.Forms.Padding(4);
this.LblFilestatus.Size = new System.Drawing.Size(548, 44);
this.LblFilestatus.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblFilestatus.Size = new System.Drawing.Size(518, 35);
this.LblFilestatus.TabIndex = 21;
this.LblFilestatus.Text = "文件状态:";
this.LblFilestatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -194,13 +186,12 @@ namespace SmartScan
this.CboDataTitle.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.CboDataTitle.BorderWidth = 2;
this.CboDataTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.CboDataTitle.Location = new System.Drawing.Point(31, 349);
this.CboDataTitle.Margin = new System.Windows.Forms.Padding(4);
this.CboDataTitle.Location = new System.Drawing.Point(18, 279);
this.CboDataTitle.Name = "CboDataTitle";
this.CboDataTitle.Padding = new System.Windows.Forms.Padding(4);
this.CboDataTitle.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.CboDataTitle.SelectedIndex = -1;
this.CboDataTitle.SelectedText = "";
this.CboDataTitle.Size = new System.Drawing.Size(319, 56);
this.CboDataTitle.Size = new System.Drawing.Size(396, 45);
this.CboDataTitle.TabIndex = 0;
this.CboDataTitle.Tag = "not";
//
......@@ -210,13 +201,12 @@ namespace SmartScan
this.CboDataKey.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.CboDataKey.BorderWidth = 2;
this.CboDataKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.CboDataKey.Location = new System.Drawing.Point(31, 208);
this.CboDataKey.Margin = new System.Windows.Forms.Padding(4);
this.CboDataKey.Location = new System.Drawing.Point(18, 166);
this.CboDataKey.Name = "CboDataKey";
this.CboDataKey.Padding = new System.Windows.Forms.Padding(4);
this.CboDataKey.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.CboDataKey.SelectedIndex = -1;
this.CboDataKey.SelectedText = "";
this.CboDataKey.Size = new System.Drawing.Size(319, 56);
this.CboDataKey.Size = new System.Drawing.Size(396, 45);
this.CboDataKey.TabIndex = 0;
this.CboDataKey.Tag = "not";
//
......@@ -225,17 +215,16 @@ namespace SmartScan
this.TxtDataSource.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.TxtDataSource.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtDataSource.BorderWidth = 2;
this.TxtDataSource.Location = new System.Drawing.Point(31, 29);
this.TxtDataSource.Margin = new System.Windows.Forms.Padding(4);
this.TxtDataSource.Location = new System.Drawing.Point(18, 23);
this.TxtDataSource.MaxLength = 32767;
this.TxtDataSource.Name = "TxtDataSource";
this.TxtDataSource.Padding = new System.Windows.Forms.Padding(4);
this.TxtDataSource.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.TxtDataSource.SelectedText = "";
this.TxtDataSource.SelectionLength = 0;
this.TxtDataSource.SelectionStart = 0;
this.TxtDataSource.ShowDel = false;
this.TxtDataSource.ShowQuery = false;
this.TxtDataSource.Size = new System.Drawing.Size(684, 56);
this.TxtDataSource.Size = new System.Drawing.Size(513, 45);
this.TxtDataSource.TabIndex = 0;
this.TxtDataSource.Tag = "not";
this.TxtDataSource.Text = "faceTextBox1";
......@@ -246,14 +235,13 @@ namespace SmartScan
this.LblContent.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblContent.BorderWidth = 0;
this.LblContent.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblContent.Location = new System.Drawing.Point(8, 20);
this.LblContent.Margin = new System.Windows.Forms.Padding(4);
this.LblContent.Location = new System.Drawing.Point(24, 6);
this.LblContent.Name = "LblContent";
this.LblContent.Padding = new System.Windows.Forms.Padding(4);
this.LblContent.Size = new System.Drawing.Size(161, 44);
this.LblContent.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblContent.Size = new System.Drawing.Size(396, 45);
this.LblContent.TabIndex = 21;
this.LblContent.Text = "标签数据源";
this.LblContent.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.LblContent.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// CboDataType
//
......@@ -261,25 +249,23 @@ namespace SmartScan
this.CboDataType.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.CboDataType.BorderWidth = 2;
this.CboDataType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.CboDataType.Location = new System.Drawing.Point(177, 12);
this.CboDataType.Margin = new System.Windows.Forms.Padding(4);
this.CboDataType.Location = new System.Drawing.Point(24, 57);
this.CboDataType.Name = "CboDataType";
this.CboDataType.Padding = new System.Windows.Forms.Padding(4);
this.CboDataType.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.CboDataType.SelectedIndex = -1;
this.CboDataType.SelectedText = "";
this.CboDataType.Size = new System.Drawing.Size(200, 56);
this.CboDataType.Size = new System.Drawing.Size(192, 45);
this.CboDataType.TabIndex = 0;
this.CboDataType.Tag = "not";
this.CboDataType.Text = "CboDataType";
//
// UsrDataSource
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.but_StartService);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "UsrDataSource";
this.Size = new System.Drawing.Size(1207, 691);
this.Size = new System.Drawing.Size(1119, 779);
this.but_StartService.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.groupBox_lblkey.ResumeLayout(false);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!