标签编辑界面翻译

AutoScanAndLabel/Form1.cs

@@ -140,7 +140,7 @@ namespace AutoScanAndLabel
                 AddForm("Res0007", crc.GetString("Res0007", "日志"), lc);
             RobotManage.Init();
             RobotManage.UserPauseSet += RobotManage_UserPauseSet;
-            Common.LabelResult += Common_LabelResult;
+            DeviceLibrary.Common.LabelResult += Common_LabelResult;
             OnlineStore.CodeResourceControl.RefreshLanguageEvent += CodeResourceControl_RefreshLanguageEvent;
         }
 

AutoScanAndLabel/SettingControl.cs

@@ -82,7 +82,7 @@ namespace AutoScanAndLabel
             //crc.CurrLanguage = "";
             frmLabel.Text = crc.GetString("FrmLabel_Text", "标签编辑");
             crc.LanguageProcess(frmLabel, "FrmLabel");
-            frmLabel.KeyWord.AddRange(keys);
+            //frmLabel.KeyWord.AddRange(keys);
             frmLabel.ShowDialog();
             RobotManage_LoadFinishEvent(true, "");
             RobotManage.LoadPrintSetting();

AutoScanAndLabel/UC_U1.Designer.cs

@@ -42,18 +42,20 @@ namespace AutoScanAndLabel
             this.label_dir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label_dir.AutoSize = true;
-            this.label_dir.Location = new System.Drawing.Point(3, 53);
+            this.label_dir.Location = new System.Drawing.Point(4, 66);
+            this.label_dir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label_dir.Name = "label_dir";
-            this.label_dir.Size = new System.Drawing.Size(83, 12);
+            this.label_dir.Size = new System.Drawing.Size(105, 15);
             this.label_dir.TabIndex = 16;
             this.label_dir.Text = "图像保存目录:";
             // 
             // btn_selectdir
             // 
             this.btn_selectdir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn_selectdir.Location = new System.Drawing.Point(355, 71);
+            this.btn_selectdir.Location = new System.Drawing.Point(480, 92);
+            this.btn_selectdir.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btn_selectdir.Name = "btn_selectdir";
-            this.btn_selectdir.Size = new System.Drawing.Size(65, 23);
+            this.btn_selectdir.Size = new System.Drawing.Size(87, 29);
             this.btn_selectdir.TabIndex = 15;
             this.btn_selectdir.Text = "浏览";
             this.btn_selectdir.UseVisualStyleBackColor = true;
@@ -61,12 +63,11 @@ namespace AutoScanAndLabel
             // 
             // txt_reelphotodir
             // 
-            this.txt_reelphotodir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txt_reelphotodir.Location = new System.Drawing.Point(3, 74);
+            this.txt_reelphotodir.Location = new System.Drawing.Point(4, 92);
+            this.txt_reelphotodir.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_reelphotodir.Name = "txt_reelphotodir";
             this.txt_reelphotodir.ReadOnly = true;
-            this.txt_reelphotodir.Size = new System.Drawing.Size(346, 21);
+            this.txt_reelphotodir.Size = new System.Drawing.Size(460, 25);
             this.txt_reelphotodir.TabIndex = 14;
             // 
             // cb_exportreephoto
@@ -74,9 +75,10 @@ namespace AutoScanAndLabel
             this.cb_exportreephoto.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.cb_exportreephoto.AutoSize = true;
-            this.cb_exportreephoto.Location = new System.Drawing.Point(6, 20);
+            this.cb_exportreephoto.Location = new System.Drawing.Point(8, 25);
+            this.cb_exportreephoto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cb_exportreephoto.Name = "cb_exportreephoto";
-            this.cb_exportreephoto.Size = new System.Drawing.Size(264, 16);
+            this.cb_exportreephoto.Size = new System.Drawing.Size(330, 19);
             this.cb_exportreephoto.TabIndex = 13;
             this.cb_exportreephoto.Text = "自动拍摄并保存料盘图像. 勾选后仅本次有效";
             this.cb_exportreephoto.UseVisualStyleBackColor = true;
@@ -89,19 +91,22 @@ namespace AutoScanAndLabel
             this.gb.Controls.Add(this.txt_reelphotodir);
             this.gb.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gb.Location = new System.Drawing.Point(0, 0);
+            this.gb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gb.Name = "gb";
-            this.gb.Size = new System.Drawing.Size(431, 148);
+            this.gb.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gb.Size = new System.Drawing.Size(575, 185);
             this.gb.TabIndex = 17;
             this.gb.TabStop = false;
             this.gb.Text = "料盘图像导出";
             // 
             // UC_U1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.gb);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "UC_U1";
-            this.Size = new System.Drawing.Size(431, 148);
+            this.Size = new System.Drawing.Size(575, 185);
             this.Load += new System.EventHandler(this.UC_U1_Load);
             this.gb.ResumeLayout(false);
             this.gb.PerformLayout();

AutoScanAndLabel/resources/en-US.lngres

@@ -202,7 +202,7 @@ FrmLabel_BtnLabelNew_Text	新建	Add
 FrmLabel_BtnPrintTest_Text	打印测试	Print test
 FrmLabel_BtnRename_Text	重命名	Rename
 FrmLabel_BtnSave_Text	保存	Save
-FrmLabel_groupBox1_Text	字段说明	Field description
+FrmLabel_grpDsc_Text	字段说明	Field description
 menuStrip1_关于ToolStripMenuItem_Text	关于	About
 menuStrip1_设备操作ToolStripMenuItem_Text	设备操作	Operation
 menuStrip1_语言toolStripMenuItem_Text	语言	Language

AutoScanAndLabel/resources/ja-JP.lngres

@@ -202,7 +202,7 @@ FrmLabel_BtnLabelNew_Text	新建	新築
 FrmLabel_BtnPrintTest_Text	打印测试	印刷テスト
 FrmLabel_BtnRename_Text	重命名	改名する
 FrmLabel_BtnSave_Text	保存	セーブ
-FrmLabel_groupBox1_Text	字段说明	フィールドの説明
+FrmLabel_grpDsc_Text	字段说明	フィールドの説明
 menuStrip1_关于ToolStripMenuItem_Text	关于	情報
 menuStrip1_设备操作ToolStripMenuItem_Text	设备操作	操作
 menuStrip1_语言toolStripMenuItem_Text	语言	言語

AutoScanAndLabel/resources/zh-CN.lngres

@@ -202,7 +202,7 @@ FrmLabel_BtnLabelNew_Text	新建	新建
 FrmLabel_BtnPrintTest_Text	打印测试	打印测试
 FrmLabel_BtnRename_Text	重命名	重命名
 FrmLabel_BtnSave_Text	保存	保存
-FrmLabel_groupBox1_Text	字段说明	字段说明
+FrmLabel_grpDsc_Text	字段说明	字段说明
 menuStrip1_关于ToolStripMenuItem_Text	关于	关于
 menuStrip1_设备操作ToolStripMenuItem_Text	设备操作	设备操作
 menuStrip1_语言toolStripMenuItem_Text	语言	语言

DeviceLibrary/DeviceLibrary/PrinterHelper.cs

@@ -15,7 +15,7 @@ namespace DeviceLibrary
         string Port;
         public PrinterHelper()
         {
-            print = new Asa.PrintLabel(Application.StartupPath + "\\Label", 300);
+            print = new Asa.PrintLabel(Application.StartupPath + "\\Label");
         }
         public static CustPrinterStatus LastPrintStatus = CustPrinterStatus.Unknown;
         public bool Connection(string port)
@@ -30,7 +30,7 @@ namespace DeviceLibrary
             }
             else
             {
-                print = new Asa.PrintLabel(Application.StartupPath + "\\Label", zebraManger.PrinterDPI);
+                print = new Asa.PrintLabel(Application.StartupPath + "\\Label");
                 return true;
             }
         }