Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9fbd2f90 由 张东亮
选项

1

1 个父辈 00dba650
全部展开
内嵌 并排
正在显示 36 个修改的文件 包含 357 行增加 和 114 行删除
BLL/Extension.cs
...@@ -118,7 +118,7 @@ namespace BLL ...@@ -118,7 +118,7 @@ namespace BLL
{"Width", 100}, {"Width", 100},
{"Height", 40}, {"Height", 40},
{"Text", key}, {"Text", key},
{"TextAlign", "MiddleRight"} {"TextAlign", "MiddleLeft"}
} }
}, },
}; };
...@@ -180,7 +180,7 @@ namespace BLL ...@@ -180,7 +180,7 @@ namespace BLL
//{"BorderWidth", 0}, //{"BorderWidth", 0},
{"Width", -1}, {"Width", -1},
{"Height", 40}, {"Height", 40},
{"Text", Asa.FaceControl.Language.Dialog("PrintLabel","Label Printing")},//"Print Label" {"Text", Asa.FaceControl.Language.Dialog("PrintLabel","Print")},//"Print Label"
} }
}, },
......
SmartScan/Form/FrmAbout.Designer.cs
...@@ -39,7 +39,8 @@ namespace SmartScan ...@@ -39,7 +39,8 @@ namespace SmartScan
// //
this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top; this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.pictureBox1.Image = global::SmartScan.Properties.Resources.App; this.pictureBox1.Image = global::SmartScan.Properties.Resources.App;
this.pictureBox1.Location = new System.Drawing.Point(38, 55); this.pictureBox1.Location = new System.Drawing.Point(51, 69);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(411, 94); this.pictureBox1.Size = new System.Drawing.Size(411, 94);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
...@@ -54,10 +55,11 @@ namespace SmartScan ...@@ -54,10 +55,11 @@ namespace SmartScan
this.LblName.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.LblName.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblName.BorderWidth = 2; this.LblName.BorderWidth = 2;
this.LblName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblName.Location = new System.Drawing.Point(11, 155); this.LblName.Location = new System.Drawing.Point(15, 194);
this.LblName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblName.Name = "LblName"; this.LblName.Name = "LblName";
this.LblName.Padding = new System.Windows.Forms.Padding(3); this.LblName.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblName.Size = new System.Drawing.Size(464, 50); this.LblName.Size = new System.Drawing.Size(619, 62);
this.LblName.TabIndex = 8; this.LblName.TabIndex = 8;
this.LblName.Text = "faceLabel1"; this.LblName.Text = "faceLabel1";
// //
...@@ -69,24 +71,27 @@ namespace SmartScan ...@@ -69,24 +71,27 @@ namespace SmartScan
this.faceLabel2.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.faceLabel2.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceLabel2.BorderWidth = 2; this.faceLabel2.BorderWidth = 2;
this.faceLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.faceLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceLabel2.Location = new System.Drawing.Point(11, 211); this.faceLabel2.Location = new System.Drawing.Point(15, 264);
this.faceLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceLabel2.Name = "faceLabel2"; this.faceLabel2.Name = "faceLabel2";
this.faceLabel2.Padding = new System.Windows.Forms.Padding(3); this.faceLabel2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceLabel2.Size = new System.Drawing.Size(464, 45); this.faceLabel2.Size = new System.Drawing.Size(619, 56);
this.faceLabel2.TabIndex = 9; this.faceLabel2.TabIndex = 9;
this.faceLabel2.Text = "faceLabel2"; this.faceLabel2.Text = "faceLabel2";
this.faceLabel2.Click += new System.EventHandler(this.faceLabel2_Click); this.faceLabel2.Click += new System.EventHandler(this.faceLabel2_Click);
// //
// FrmAbout // FrmAbout
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(486, 339); this.ClientSize = new System.Drawing.Size(648, 424);
this.Controls.Add(this.faceLabel2); this.Controls.Add(this.faceLabel2);
this.Controls.Add(this.LblName); this.Controls.Add(this.LblName);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmAbout"; this.Name = "FrmAbout";
this.Padding = new System.Windows.Forms.Padding(11, 10, 11, 10);
this.Text = "FrmAbout"; this.Text = "FrmAbout";
this.Load += new System.EventHandler(this.FrmAbout_Load); this.Load += new System.EventHandler(this.FrmAbout_Load);
this.Controls.SetChildIndex(this.pictureBox1, 0); this.Controls.SetChildIndex(this.pictureBox1, 0);
......
SmartScan/Form/FrmCodeExtract.cs
...@@ -87,8 +87,9 @@ namespace SmartScan ...@@ -87,8 +87,9 @@ namespace SmartScan
pnl.Height = PnlTemp.Height; pnl.Height = PnlTemp.Height;
pnl.Anchor = PnlTemp.Anchor; pnl.Anchor = PnlTemp.Anchor;
pnl.Visible = false; pnl.Visible = false;
Controls.Add(pnl); //Controls.Add(pnl);
this.tableLayoutPanel3.Controls.Add(pnl, 0, 1);
Maximize();
clacWindowHeight(); clacWindowHeight();
} }
...@@ -99,25 +100,25 @@ namespace SmartScan ...@@ -99,25 +100,25 @@ namespace SmartScan
void clacWindowHeight() void clacWindowHeight()
{ {
if (flowLayoutPanel1.Controls.Count > 14) //if (flowLayoutPanel1.Controls.Count > 14)
{ //{
matchButton.Values.ToList().ForEach((x) => { x.GetPanel().Top = 418 + 56 * 2; });//184 // matchButton.Values.ToList().ForEach((x) => { x.GetPanel().Top = 418 + 56 * 2; });//184
flowLayoutPanel1.Height = 56 * 3; // flowLayoutPanel1.Height = 56 * 3;
this.Height = windowHeight + 56 * 2 - 4; // this.Height = windowHeight + 56 * 2 - 4;
} //}
else if (flowLayoutPanel1.Controls.Count > 7) //else if (flowLayoutPanel1.Controls.Count > 7)
{ //{
matchButton.Values.ToList().ForEach((x) => { x.GetPanel().Top = 418 + 56 * 1; }); // matchButton.Values.ToList().ForEach((x) => { x.GetPanel().Top = 418 + 56 * 1; });
flowLayoutPanel1.Height = 56 * 2 - 4; // flowLayoutPanel1.Height = 56 * 2 - 4;
this.Height = windowHeight + 56; // this.Height = windowHeight + 56;
} //}
else //else
{ //{
matchButton.Values.ToList().ForEach((x) => { x.GetPanel().Top = 418; }); // matchButton.Values.ToList().ForEach((x) => { x.GetPanel().Top = 418; });
flowLayoutPanel1.Height = 56 - 4; // flowLayoutPanel1.Height = 56 - 4;
this.Height = windowHeight; // this.Height = windowHeight;
} //}
} }
private void List_KeyChanged(object sender, string key) private void List_KeyChanged(object sender, string key)
{ {
......
SmartScan/Form/FrmCodeOCR.Designer.cs
...@@ -46,10 +46,11 @@ namespace SmartScan ...@@ -46,10 +46,11 @@ namespace SmartScan
this.BtnSelect.BorderWidth = 2; this.BtnSelect.BorderWidth = 2;
this.BtnSelect.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnSelect.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnSelect.HoldPress = false; this.BtnSelect.HoldPress = false;
this.BtnSelect.Location = new System.Drawing.Point(11, 55); this.BtnSelect.Location = new System.Drawing.Point(15, 69);
this.BtnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnSelect.Name = "BtnSelect"; this.BtnSelect.Name = "BtnSelect";
this.BtnSelect.Padding = new System.Windows.Forms.Padding(3); this.BtnSelect.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnSelect.Size = new System.Drawing.Size(140, 50); this.BtnSelect.Size = new System.Drawing.Size(187, 62);
this.BtnSelect.TabIndex = 6; this.BtnSelect.TabIndex = 6;
this.BtnSelect.Text = "矩形选择"; this.BtnSelect.Text = "矩形选择";
this.BtnSelect.Click += new System.EventHandler(this.BtnSelect_Click); this.BtnSelect.Click += new System.EventHandler(this.BtnSelect_Click);
...@@ -61,10 +62,11 @@ namespace SmartScan ...@@ -61,10 +62,11 @@ namespace SmartScan
this.BtnMove.BorderWidth = 2; this.BtnMove.BorderWidth = 2;
this.BtnMove.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnMove.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnMove.HoldPress = false; this.BtnMove.HoldPress = false;
this.BtnMove.Location = new System.Drawing.Point(11, 111); this.BtnMove.Location = new System.Drawing.Point(15, 139);
this.BtnMove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnMove.Name = "BtnMove"; this.BtnMove.Name = "BtnMove";
this.BtnMove.Padding = new System.Windows.Forms.Padding(3); this.BtnMove.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnMove.Size = new System.Drawing.Size(140, 50); this.BtnMove.Size = new System.Drawing.Size(187, 62);
this.BtnMove.TabIndex = 7; this.BtnMove.TabIndex = 7;
this.BtnMove.Text = "移动图像"; this.BtnMove.Text = "移动图像";
this.BtnMove.Click += new System.EventHandler(this.BtnMove_Click); this.BtnMove.Click += new System.EventHandler(this.BtnMove_Click);
...@@ -76,10 +78,11 @@ namespace SmartScan ...@@ -76,10 +78,11 @@ namespace SmartScan
this.BtnDel.BorderWidth = 2; this.BtnDel.BorderWidth = 2;
this.BtnDel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnDel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnDel.HoldPress = false; this.BtnDel.HoldPress = false;
this.BtnDel.Location = new System.Drawing.Point(11, 167); this.BtnDel.Location = new System.Drawing.Point(15, 209);
this.BtnDel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnDel.Name = "BtnDel"; this.BtnDel.Name = "BtnDel";
this.BtnDel.Padding = new System.Windows.Forms.Padding(3); this.BtnDel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnDel.Size = new System.Drawing.Size(140, 50); this.BtnDel.Size = new System.Drawing.Size(187, 62);
this.BtnDel.TabIndex = 8; this.BtnDel.TabIndex = 8;
this.BtnDel.Text = "删除"; this.BtnDel.Text = "删除";
this.BtnDel.Click += new System.EventHandler(this.BtnDel_Click); this.BtnDel.Click += new System.EventHandler(this.BtnDel_Click);
...@@ -91,10 +94,11 @@ namespace SmartScan ...@@ -91,10 +94,11 @@ namespace SmartScan
this.BtnKey.BorderWidth = 2; this.BtnKey.BorderWidth = 2;
this.BtnKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnKey.HoldPress = false; this.BtnKey.HoldPress = false;
this.BtnKey.Location = new System.Drawing.Point(11, 223); this.BtnKey.Location = new System.Drawing.Point(15, 279);
this.BtnKey.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnKey.Name = "BtnKey"; this.BtnKey.Name = "BtnKey";
this.BtnKey.Padding = new System.Windows.Forms.Padding(3); this.BtnKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnKey.Size = new System.Drawing.Size(140, 50); this.BtnKey.Size = new System.Drawing.Size(187, 62);
this.BtnKey.TabIndex = 9; this.BtnKey.TabIndex = 9;
this.BtnKey.Text = "关键字"; this.BtnKey.Text = "关键字";
this.BtnKey.Click += new System.EventHandler(this.BtnKey_Click); this.BtnKey.Click += new System.EventHandler(this.BtnKey_Click);
...@@ -105,9 +109,10 @@ namespace SmartScan ...@@ -105,9 +109,10 @@ namespace SmartScan
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.PicImage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); this.PicImage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.PicImage.Location = new System.Drawing.Point(157, 55); this.PicImage.Location = new System.Drawing.Point(209, 69);
this.PicImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PicImage.Name = "PicImage"; this.PicImage.Name = "PicImage";
this.PicImage.Size = new System.Drawing.Size(720, 433); this.PicImage.Size = new System.Drawing.Size(960, 541);
this.PicImage.TabIndex = 10; this.PicImage.TabIndex = 10;
this.PicImage.TabStop = false; this.PicImage.TabStop = false;
// //
...@@ -119,10 +124,11 @@ namespace SmartScan ...@@ -119,10 +124,11 @@ namespace SmartScan
this.BtnCancel.BorderWidth = 2; this.BtnCancel.BorderWidth = 2;
this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnCancel.HoldPress = false; this.BtnCancel.HoldPress = false;
this.BtnCancel.Location = new System.Drawing.Point(757, 494); this.BtnCancel.Location = new System.Drawing.Point(1009, 618);
this.BtnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCancel.Name = "BtnCancel"; this.BtnCancel.Name = "BtnCancel";
this.BtnCancel.Padding = new System.Windows.Forms.Padding(3); this.BtnCancel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCancel.Size = new System.Drawing.Size(120, 40); this.BtnCancel.Size = new System.Drawing.Size(160, 50);
this.BtnCancel.TabIndex = 28; this.BtnCancel.TabIndex = 28;
this.BtnCancel.Text = "Cancel"; this.BtnCancel.Text = "Cancel";
this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click); this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
...@@ -135,19 +141,20 @@ namespace SmartScan ...@@ -135,19 +141,20 @@ namespace SmartScan
this.BtnOK.BorderWidth = 2; this.BtnOK.BorderWidth = 2;
this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnOK.HoldPress = false; this.BtnOK.HoldPress = false;
this.BtnOK.Location = new System.Drawing.Point(631, 494); this.BtnOK.Location = new System.Drawing.Point(841, 618);
this.BtnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnOK.Name = "BtnOK"; this.BtnOK.Name = "BtnOK";
this.BtnOK.Padding = new System.Windows.Forms.Padding(3); this.BtnOK.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnOK.Size = new System.Drawing.Size(120, 40); this.BtnOK.Size = new System.Drawing.Size(160, 50);
this.BtnOK.TabIndex = 27; this.BtnOK.TabIndex = 27;
this.BtnOK.Text = "OK"; this.BtnOK.Text = "OK";
this.BtnOK.Click += new System.EventHandler(this.BtnOK_Click); this.BtnOK.Click += new System.EventHandler(this.BtnOK_Click);
// //
// FrmCodeOCR // FrmCodeOCR
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(888, 545); this.ClientSize = new System.Drawing.Size(1184, 681);
this.Controls.Add(this.BtnCancel); this.Controls.Add(this.BtnCancel);
this.Controls.Add(this.BtnOK); this.Controls.Add(this.BtnOK);
this.Controls.Add(this.PicImage); this.Controls.Add(this.PicImage);
...@@ -155,8 +162,10 @@ namespace SmartScan ...@@ -155,8 +162,10 @@ namespace SmartScan
this.Controls.Add(this.BtnDel); this.Controls.Add(this.BtnDel);
this.Controls.Add(this.BtnMove); this.Controls.Add(this.BtnMove);
this.Controls.Add(this.BtnSelect); this.Controls.Add(this.BtnSelect);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmCodeOCR"; this.Name = "FrmCodeOCR";
this.Padding = new System.Windows.Forms.Padding(11, 10, 11, 10);
this.Text = "FrmCodeOCR"; this.Text = "FrmCodeOCR";
this.Controls.SetChildIndex(this.BtnSelect, 0); this.Controls.SetChildIndex(this.BtnSelect, 0);
this.Controls.SetChildIndex(this.BtnMove, 0); this.Controls.SetChildIndex(this.BtnMove, 0);
......
SmartScan/Form/FrmFieldContent.Designer.cs
...@@ -45,11 +45,12 @@ namespace SmartScan ...@@ -45,11 +45,12 @@ namespace SmartScan
this.faceListBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.faceListBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceListBox1.BorderWidth = 2; this.faceListBox1.BorderWidth = 2;
this.faceListBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.faceListBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceListBox1.Location = new System.Drawing.Point(11, 55); this.faceListBox1.Location = new System.Drawing.Point(15, 69);
this.faceListBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceListBox1.Name = "faceListBox1"; this.faceListBox1.Name = "faceListBox1";
this.faceListBox1.Padding = new System.Windows.Forms.Padding(3); this.faceListBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceListBox1.SelectedIndex = -1; this.faceListBox1.SelectedIndex = -1;
this.faceListBox1.Size = new System.Drawing.Size(170, 293); this.faceListBox1.Size = new System.Drawing.Size(227, 366);
this.faceListBox1.TabIndex = 6; this.faceListBox1.TabIndex = 6;
// //
// BtnInsert // BtnInsert
...@@ -59,10 +60,11 @@ namespace SmartScan ...@@ -59,10 +60,11 @@ namespace SmartScan
this.BtnInsert.BorderWidth = 2; this.BtnInsert.BorderWidth = 2;
this.BtnInsert.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnInsert.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnInsert.HoldPress = false; this.BtnInsert.HoldPress = false;
this.BtnInsert.Location = new System.Drawing.Point(187, 187); this.BtnInsert.Location = new System.Drawing.Point(249, 234);
this.BtnInsert.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnInsert.Name = "BtnInsert"; this.BtnInsert.Name = "BtnInsert";
this.BtnInsert.Padding = new System.Windows.Forms.Padding(3); this.BtnInsert.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnInsert.Size = new System.Drawing.Size(164, 45); this.BtnInsert.Size = new System.Drawing.Size(219, 56);
this.BtnInsert.TabIndex = 7; this.BtnInsert.TabIndex = 7;
this.BtnInsert.Text = "插入"; this.BtnInsert.Text = "插入";
this.BtnInsert.Click += new System.EventHandler(this.BtnInsert_Click); this.BtnInsert.Click += new System.EventHandler(this.BtnInsert_Click);
...@@ -75,10 +77,11 @@ namespace SmartScan ...@@ -75,10 +77,11 @@ namespace SmartScan
this.BtnOK.BorderWidth = 2; this.BtnOK.BorderWidth = 2;
this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnOK.HoldPress = false; this.BtnOK.HoldPress = false;
this.BtnOK.Location = new System.Drawing.Point(297, 308); this.BtnOK.Location = new System.Drawing.Point(396, 385);
this.BtnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnOK.Name = "BtnOK"; this.BtnOK.Name = "BtnOK";
this.BtnOK.Padding = new System.Windows.Forms.Padding(3); this.BtnOK.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnOK.Size = new System.Drawing.Size(120, 40); this.BtnOK.Size = new System.Drawing.Size(160, 50);
this.BtnOK.TabIndex = 8; this.BtnOK.TabIndex = 8;
this.BtnOK.Text = "OK"; this.BtnOK.Text = "OK";
this.BtnOK.Click += new System.EventHandler(this.BtnOK_Click); this.BtnOK.Click += new System.EventHandler(this.BtnOK_Click);
...@@ -91,10 +94,11 @@ namespace SmartScan ...@@ -91,10 +94,11 @@ namespace SmartScan
this.BtnCancel.BorderWidth = 2; this.BtnCancel.BorderWidth = 2;
this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnCancel.HoldPress = false; this.BtnCancel.HoldPress = false;
this.BtnCancel.Location = new System.Drawing.Point(423, 308); this.BtnCancel.Location = new System.Drawing.Point(564, 385);
this.BtnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCancel.Name = "BtnCancel"; this.BtnCancel.Name = "BtnCancel";
this.BtnCancel.Padding = new System.Windows.Forms.Padding(3); this.BtnCancel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCancel.Size = new System.Drawing.Size(120, 40); this.BtnCancel.Size = new System.Drawing.Size(160, 50);
this.BtnCancel.TabIndex = 9; this.BtnCancel.TabIndex = 9;
this.BtnCancel.Text = "Cancel"; this.BtnCancel.Text = "Cancel";
this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click); this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
...@@ -107,10 +111,11 @@ namespace SmartScan ...@@ -107,10 +111,11 @@ namespace SmartScan
this.LblContent.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.LblContent.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblContent.BorderWidth = 0; this.LblContent.BorderWidth = 0;
this.LblContent.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblContent.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblContent.Location = new System.Drawing.Point(187, 55); this.LblContent.Location = new System.Drawing.Point(249, 69);
this.LblContent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblContent.Name = "LblContent"; this.LblContent.Name = "LblContent";
this.LblContent.Padding = new System.Windows.Forms.Padding(3); this.LblContent.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblContent.Size = new System.Drawing.Size(356, 35); this.LblContent.Size = new System.Drawing.Size(475, 44);
this.LblContent.TabIndex = 10; this.LblContent.TabIndex = 10;
this.LblContent.Text = "faceLabel1"; this.LblContent.Text = "faceLabel1";
this.LblContent.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblContent.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -122,33 +127,36 @@ namespace SmartScan ...@@ -122,33 +127,36 @@ namespace SmartScan
this.faceTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); this.faceTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.faceTextBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.faceTextBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceTextBox1.BorderWidth = 2; this.faceTextBox1.BorderWidth = 2;
this.faceTextBox1.Location = new System.Drawing.Point(187, 96); this.faceTextBox1.Location = new System.Drawing.Point(249, 120);
this.faceTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceTextBox1.MaxLength = 32767; this.faceTextBox1.MaxLength = 32767;
this.faceTextBox1.Multiline = true; this.faceTextBox1.Multiline = true;
this.faceTextBox1.Name = "faceTextBox1"; this.faceTextBox1.Name = "faceTextBox1";
this.faceTextBox1.Padding = new System.Windows.Forms.Padding(3); this.faceTextBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceTextBox1.SelectedText = ""; this.faceTextBox1.SelectedText = "";
this.faceTextBox1.SelectionLength = 0; this.faceTextBox1.SelectionLength = 0;
this.faceTextBox1.SelectionStart = 0; this.faceTextBox1.SelectionStart = 0;
this.faceTextBox1.ShowDel = true; this.faceTextBox1.ShowDel = true;
this.faceTextBox1.ShowQuery = false; this.faceTextBox1.ShowQuery = false;
this.faceTextBox1.Size = new System.Drawing.Size(356, 85); this.faceTextBox1.Size = new System.Drawing.Size(475, 106);
this.faceTextBox1.TabIndex = 11; this.faceTextBox1.TabIndex = 11;
this.faceTextBox1.Text = "faceTextBox1"; this.faceTextBox1.Text = "faceTextBox1";
// //
// FrmFieldContent // FrmFieldContent
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(554, 359); this.ClientSize = new System.Drawing.Size(739, 449);
this.Controls.Add(this.faceTextBox1); this.Controls.Add(this.faceTextBox1);
this.Controls.Add(this.LblContent); this.Controls.Add(this.LblContent);
this.Controls.Add(this.BtnCancel); this.Controls.Add(this.BtnCancel);
this.Controls.Add(this.BtnOK); this.Controls.Add(this.BtnOK);
this.Controls.Add(this.BtnInsert); this.Controls.Add(this.BtnInsert);
this.Controls.Add(this.faceListBox1); this.Controls.Add(this.faceListBox1);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmFieldContent"; this.Name = "FrmFieldContent";
this.Padding = new System.Windows.Forms.Padding(11, 10, 11, 10);
this.Text = "FrmFieldContent"; this.Text = "FrmFieldContent";
this.Controls.SetChildIndex(this.faceListBox1, 0); this.Controls.SetChildIndex(this.faceListBox1, 0);
this.Controls.SetChildIndex(this.BtnInsert, 0); this.Controls.SetChildIndex(this.BtnInsert, 0);
......
SmartScan/Form/FrmMain.Designer.cs
...@@ -58,6 +58,7 @@ namespace SmartScan ...@@ -58,6 +58,7 @@ namespace SmartScan
this.BtnStart.Padding = new System.Windows.Forms.Padding(3); this.BtnStart.Padding = new System.Windows.Forms.Padding(3);
this.BtnStart.Size = new System.Drawing.Size(160, 100); this.BtnStart.Size = new System.Drawing.Size(160, 100);
this.BtnStart.TabIndex = 3; this.BtnStart.TabIndex = 3;
this.BtnStart.Tag = "";
this.BtnStart.Text = "faceButton1"; this.BtnStart.Text = "faceButton1";
this.BtnStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BtnStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.BtnStart.Click += new System.EventHandler(this.BtnStart_Click); this.BtnStart.Click += new System.EventHandler(this.BtnStart_Click);
...@@ -275,6 +276,7 @@ namespace SmartScan ...@@ -275,6 +276,7 @@ namespace SmartScan
this.Icon = global::SmartScan.Properties.Resources.App; this.Icon = global::SmartScan.Properties.Resources.App;
this.Name = "FrmMain"; this.Name = "FrmMain";
this.Text = "Form1"; this.Text = "Form1";
this.TitleFont = new System.Drawing.Font("宋体", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TitleHeight = 50; this.TitleHeight = 50;
this.Activated += new System.EventHandler(this.FrmMain_Activated); this.Activated += new System.EventHandler(this.FrmMain_Activated);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
......
SmartScan/Form/FrmMain.cs
...@@ -24,6 +24,7 @@ namespace SmartScan ...@@ -24,6 +24,7 @@ namespace SmartScan
public FrmMain() public FrmMain()
{ {
InitializeComponent(); InitializeComponent();
BtnStart.Tag = "not";
} }
private bool CheckCamera() private bool CheckCamera()
...@@ -277,7 +278,7 @@ namespace SmartScan ...@@ -277,7 +278,7 @@ namespace SmartScan
{ {
BtnStart.Enabled = false; BtnStart.Enabled = false;
} }
changeBtnStartText();
} }
private void Monitor_Timeout(object sender, EventArgs e) private void Monitor_Timeout(object sender, EventArgs e)
...@@ -322,9 +323,28 @@ namespace SmartScan ...@@ -322,9 +323,28 @@ namespace SmartScan
Language.LoadLanguage(CboLanguage.Text); Language.LoadLanguage(CboLanguage.Text);
BLLCommon.config.Language = CboLanguage.Text; BLLCommon.config.Language = CboLanguage.Text;
BLLCommon.config.Save(); BLLCommon.config.Save();
changeBtnStartText();
}
}
void changeBtnStartText()
{
if(BLLCommon.config.Language.Equals("English"))
{
BtnStart.Font = new Font("Arial",14,FontStyle.Bold);
}
else
{
BtnStart.Font = new Font("微软雅黑", 14, FontStyle.Bold);
}
if(scanWork?.isRun??false)
{
BtnStart.Text = Language.Dialog("Exit", "退出");
}
else
{
BtnStart.Text = Language.Dialog("Start", "开始");
} }
} }
#region 通过webservice触发 #region 通过webservice触发
...@@ -352,6 +372,7 @@ namespace SmartScan ...@@ -352,6 +372,7 @@ namespace SmartScan
scanWork.Open(); scanWork.Open();
else else
scanWork.Close(); scanWork.Close();
changeBtnStartText();
} }
private void BtnRetrospect_Click(object sender, EventArgs e) private void BtnRetrospect_Click(object sender, EventArgs e)
......
SmartScan/Form/FrmMatchingInfo.Designer.cs
...@@ -42,23 +42,25 @@ namespace SmartScan ...@@ -42,23 +42,25 @@ namespace SmartScan
this.LstMaterial.BorderWidth = 2; this.LstMaterial.BorderWidth = 2;
this.LstMaterial.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.LstMaterial.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstMaterial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LstMaterial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstMaterial.Location = new System.Drawing.Point(12, 55); this.LstMaterial.Location = new System.Drawing.Point(16, 69);
this.LstMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstMaterial.Name = "LstMaterial"; this.LstMaterial.Name = "LstMaterial";
this.LstMaterial.Padding = new System.Windows.Forms.Padding(3); this.LstMaterial.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstMaterial.SelectedIndex = -1; this.LstMaterial.SelectedIndex = -1;
this.LstMaterial.Size = new System.Drawing.Size(506, 301); this.LstMaterial.Size = new System.Drawing.Size(675, 376);
this.LstMaterial.TabIndex = 14; this.LstMaterial.TabIndex = 14;
this.LstMaterial.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; this.LstMaterial.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
// //
// FrmMatchingInfo // FrmMatchingInfo
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(530, 368); this.ClientSize = new System.Drawing.Size(707, 460);
this.Controls.Add(this.LstMaterial); this.Controls.Add(this.LstMaterial);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmMatchingInfo"; this.Name = "FrmMatchingInfo";
this.Padding = new System.Windows.Forms.Padding(9); this.Padding = new System.Windows.Forms.Padding(12, 11, 12, 11);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "FrmMatchingInfo"; this.Text = "FrmMatchingInfo";
this.Controls.SetChildIndex(this.LstMaterial, 0); this.Controls.SetChildIndex(this.LstMaterial, 0);
......
SmartScan/Form/FrmSet.Designer.cs
...@@ -194,7 +194,7 @@ namespace SmartScan ...@@ -194,7 +194,7 @@ namespace SmartScan
this.Controls.Add(this.BtnMaterial); this.Controls.Add(this.BtnMaterial);
this.Controls.Add(this.BtnLabel); this.Controls.Add(this.BtnLabel);
this.Controls.Add(this.BtnGenneralSetting); this.Controls.Add(this.BtnGenneralSetting);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Name = "FrmSet"; this.Name = "FrmSet";
this.ShowIcon = false; this.ShowIcon = false;
this.Text = "FrmSet"; this.Text = "FrmSet";
......
SmartScan/Form/FrmSet.cs
...@@ -44,6 +44,7 @@ namespace SmartScan ...@@ -44,6 +44,7 @@ namespace SmartScan
BtnKeyword.HoldPress = true; BtnKeyword.HoldPress = true;
menu[BtnKeyword].GetPanel().Visible = true; menu[BtnKeyword].GetPanel().Visible = true;
Maximize();
} }
private void BtnMenu_Click(object sender, EventArgs e) private void BtnMenu_Click(object sender, EventArgs e)
......
SmartScan/Form/FrmUsersLogin.Designer.cs
...@@ -42,10 +42,11 @@ namespace SmartScan ...@@ -42,10 +42,11 @@ namespace SmartScan
this.LblUser.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.LblUser.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblUser.BorderWidth = 0; this.LblUser.BorderWidth = 0;
this.LblUser.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblUser.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblUser.Location = new System.Drawing.Point(11, 59); this.LblUser.Location = new System.Drawing.Point(15, 74);
this.LblUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblUser.Name = "LblUser"; this.LblUser.Name = "LblUser";
this.LblUser.Padding = new System.Windows.Forms.Padding(3); this.LblUser.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblUser.Size = new System.Drawing.Size(90, 45); this.LblUser.Size = new System.Drawing.Size(120, 56);
this.LblUser.TabIndex = 6; this.LblUser.TabIndex = 6;
this.LblUser.Text = "用户名："; this.LblUser.Text = "用户名：";
this.LblUser.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.LblUser.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -56,16 +57,17 @@ namespace SmartScan ...@@ -56,16 +57,17 @@ namespace SmartScan
this.TxtUser.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.TxtUser.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtUser.BorderWidth = 2; this.TxtUser.BorderWidth = 2;
this.TxtUser.ImeMode = System.Windows.Forms.ImeMode.Disable; this.TxtUser.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.TxtUser.Location = new System.Drawing.Point(107, 59); this.TxtUser.Location = new System.Drawing.Point(143, 74);
this.TxtUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtUser.MaxLength = 32767; this.TxtUser.MaxLength = 32767;
this.TxtUser.Name = "TxtUser"; this.TxtUser.Name = "TxtUser";
this.TxtUser.Padding = new System.Windows.Forms.Padding(3); this.TxtUser.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtUser.SelectedText = ""; this.TxtUser.SelectedText = "";
this.TxtUser.SelectionLength = 0; this.TxtUser.SelectionLength = 0;
this.TxtUser.SelectionStart = 0; this.TxtUser.SelectionStart = 0;
this.TxtUser.ShowDel = true; this.TxtUser.ShowDel = true;
this.TxtUser.ShowQuery = false; this.TxtUser.ShowQuery = false;
this.TxtUser.Size = new System.Drawing.Size(224, 45); this.TxtUser.Size = new System.Drawing.Size(299, 56);
this.TxtUser.TabIndex = 0; this.TxtUser.TabIndex = 0;
// //
// FacePwd // FacePwd
...@@ -74,10 +76,11 @@ namespace SmartScan ...@@ -74,10 +76,11 @@ namespace SmartScan
this.FacePwd.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.FacePwd.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.FacePwd.BorderWidth = 2; this.FacePwd.BorderWidth = 2;
this.FacePwd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.FacePwd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.FacePwd.Location = new System.Drawing.Point(11, 110); this.FacePwd.Location = new System.Drawing.Point(15, 138);
this.FacePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.FacePwd.Name = "FacePwd"; this.FacePwd.Name = "FacePwd";
this.FacePwd.Padding = new System.Windows.Forms.Padding(3); this.FacePwd.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.FacePwd.Size = new System.Drawing.Size(320, 270); this.FacePwd.Size = new System.Drawing.Size(427, 338);
this.FacePwd.TabIndex = 1; this.FacePwd.TabIndex = 1;
this.FacePwd.NumberEnter += new Asa.FaceControl.FacePasswordLock.NumberEnterHandler(this.FacePwd_NumberEnter); this.FacePwd.NumberEnter += new Asa.FaceControl.FacePasswordLock.NumberEnterHandler(this.FacePwd_NumberEnter);
// //
...@@ -88,10 +91,11 @@ namespace SmartScan ...@@ -88,10 +91,11 @@ namespace SmartScan
this.BtnCancel.BorderWidth = 2; this.BtnCancel.BorderWidth = 2;
this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnCancel.HoldPress = false; this.BtnCancel.HoldPress = false;
this.BtnCancel.Location = new System.Drawing.Point(95, 402); this.BtnCancel.Location = new System.Drawing.Point(127, 502);
this.BtnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCancel.Name = "BtnCancel"; this.BtnCancel.Name = "BtnCancel";
this.BtnCancel.Padding = new System.Windows.Forms.Padding(3); this.BtnCancel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCancel.Size = new System.Drawing.Size(90, 45); this.BtnCancel.Size = new System.Drawing.Size(120, 56);
this.BtnCancel.TabIndex = 3; this.BtnCancel.TabIndex = 3;
this.BtnCancel.Text = "取消"; this.BtnCancel.Text = "取消";
this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click); this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
...@@ -103,26 +107,29 @@ namespace SmartScan ...@@ -103,26 +107,29 @@ namespace SmartScan
this.BtnLogin.BorderWidth = 2; this.BtnLogin.BorderWidth = 2;
this.BtnLogin.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnLogin.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnLogin.HoldPress = false; this.BtnLogin.HoldPress = false;
this.BtnLogin.Location = new System.Drawing.Point(191, 402); this.BtnLogin.Location = new System.Drawing.Point(255, 502);
this.BtnLogin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnLogin.Name = "BtnLogin"; this.BtnLogin.Name = "BtnLogin";
this.BtnLogin.Padding = new System.Windows.Forms.Padding(3); this.BtnLogin.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnLogin.Size = new System.Drawing.Size(140, 45); this.BtnLogin.Size = new System.Drawing.Size(187, 56);
this.BtnLogin.TabIndex = 2; this.BtnLogin.TabIndex = 2;
this.BtnLogin.Text = "登录"; this.BtnLogin.Text = "登录";
this.BtnLogin.Click += new System.EventHandler(this.BtnLogin_Click); this.BtnLogin.Click += new System.EventHandler(this.BtnLogin_Click);
// //
// FrmUsersLogin // FrmUsersLogin
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(342, 458); this.ClientSize = new System.Drawing.Size(456, 572);
this.Controls.Add(this.BtnLogin); this.Controls.Add(this.BtnLogin);
this.Controls.Add(this.BtnCancel); this.Controls.Add(this.BtnCancel);
this.Controls.Add(this.FacePwd); this.Controls.Add(this.FacePwd);
this.Controls.Add(this.TxtUser); this.Controls.Add(this.TxtUser);
this.Controls.Add(this.LblUser); this.Controls.Add(this.LblUser);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmUsersLogin"; this.Name = "FrmUsersLogin";
this.Padding = new System.Windows.Forms.Padding(11, 10, 11, 10);
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "登录"; this.Text = "登录";
......
SmartScan/Form/FrmWaitting.Designer.cs
...@@ -58,13 +58,13 @@ namespace SmartScan ...@@ -58,13 +58,13 @@ namespace SmartScan
// //
// FrmWaitting // FrmWaitting
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 266); this.ClientSize = new System.Drawing.Size(800, 266);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.faceLoading1); this.Controls.Add(this.faceLoading1);
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.App;
this.Location = new System.Drawing.Point(0, 0); this.Location = new System.Drawing.Point(0, 0);
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
......
SmartScan/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace SmartScan.Properties { ...@@ -19,7 +19,7 @@ namespace SmartScan.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -83,6 +83,86 @@ namespace SmartScan.Properties { ...@@ -83,6 +83,86 @@ namespace SmartScan.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap camera {
get {
object obj = ResourceManager.GetObject("camera", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap copy {
get {
object obj = ResourceManager.GetObject("copy", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap create {
get {
object obj = ResourceManager.GetObject("create", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap delete {
get {
object obj = ResourceManager.GetObject("delete", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap filter {
get {
object obj = ResourceManager.GetObject("filter", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap light_off {
get {
object obj = ResourceManager.GetObject("light_off", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap light_on {
get {
object obj = ResourceManager.GetObject("light_on", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap localfile {
get {
object obj = ResourceManager.GetObject("localfile", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap NEO_64 { internal static System.Drawing.Bitmap NEO_64 {
get { get {
object obj = ResourceManager.GetObject("NEO 64", resourceCulture); object obj = ResourceManager.GetObject("NEO 64", resourceCulture);
...@@ -93,6 +173,36 @@ namespace SmartScan.Properties { ...@@ -93,6 +173,36 @@ namespace SmartScan.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap OCR {
get {
object obj = ResourceManager.GetObject("OCR", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap recognize {
get {
object obj = ResourceManager.GetObject("recognize", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap rename {
get {
object obj = ResourceManager.GetObject("rename", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Retrospect { internal static System.Drawing.Bitmap Retrospect {
get { get {
object obj = ResourceManager.GetObject("Retrospect", resourceCulture); object obj = ResourceManager.GetObject("Retrospect", resourceCulture);
...@@ -103,6 +213,16 @@ namespace SmartScan.Properties { ...@@ -103,6 +213,16 @@ namespace SmartScan.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap saveas {
get {
object obj = ResourceManager.GetObject("saveas", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Set { internal static System.Drawing.Bitmap Set {
get { get {
object obj = ResourceManager.GetObject("Set", resourceCulture); object obj = ResourceManager.GetObject("Set", resourceCulture);
...@@ -113,6 +233,16 @@ namespace SmartScan.Properties { ...@@ -113,6 +233,16 @@ namespace SmartScan.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap validate {
get {
object obj = ResourceManager.GetObject("validate", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Work { internal static System.Drawing.Bitmap Work {
get { get {
object obj = ResourceManager.GetObject("Work", resourceCulture); object obj = ResourceManager.GetObject("Work", resourceCulture);
......
SmartScan/Properties/Resources.resx
...@@ -118,22 +118,61 @@ ...@@ -118,22 +118,61 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="validate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\validate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\About.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Work" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Work.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="light_on" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\light_on.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="recognize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\recognize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Retrospect" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Retrospect" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Retrospect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Retrospect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="App" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="App" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\App.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\App.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Work" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Work.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Set" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Set" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Set.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Set.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="OCR" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\About.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\OCR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="saveas" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\saveas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="rename" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="create" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\create.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="light_off" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\light_off.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="NEO 64" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="NEO 64" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\NEO 64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\NEO 64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="localfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\localfile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
SmartScan/ScanWork.cs
...@@ -12,7 +12,7 @@ namespace SmartScan ...@@ -12,7 +12,7 @@ namespace SmartScan
{ {
public class ScanWork public class ScanWork
{ {
private bool isRun = false; public bool isRun = false;
private bool isTouch = false; private bool isTouch = false;
private readonly FacePictureBox picShow; private readonly FacePictureBox picShow;
private readonly FaceButton btnMatchedName; private readonly FaceButton btnMatchedName;
......
SmartScan/SetControl/UsrMaterialTemplate.cs
...@@ -31,7 +31,7 @@ namespace SmartScan ...@@ -31,7 +31,7 @@ namespace SmartScan
mateCopy = BLLCommon.mateEdit.ToCopy(); mateCopy = BLLCommon.mateEdit.ToCopy();
Language.SetLanguage(this); Language.SetLanguage(this);
BtnCameraImage.Enabled = BLLCommon.cameraVision.Count > 0; BtnCameraImage.Enabled = BLLCommon.cameraVision.Count > 0;
LstMate.SelectedFirst(); //LstMate.SelectedFirst();
} }
public FacePanel GetPanel() public FacePanel GetPanel()
......
SmartScan/SetControl/UsrPrintTemplate.cs
...@@ -32,7 +32,7 @@ namespace SmartScan ...@@ -32,7 +32,7 @@ namespace SmartScan
CboFieldType.Items.AddRange(Enum.GetNames(typeof(PrintLabelFieldType))); CboFieldType.Items.AddRange(Enum.GetNames(typeof(PrintLabelFieldType)));
labelCopy = BLLCommon.labelEdit.ToCopy(); labelCopy = BLLCommon.labelEdit.ToCopy();
Language.SetLanguage(this); Language.SetLanguage(this);
LstLabel.SelectedFirst(); //LstLabel.SelectedFirst();
} }
public FacePanel GetPanel() public FacePanel GetPanel()
...@@ -317,5 +317,10 @@ namespace SmartScan ...@@ -317,5 +317,10 @@ namespace SmartScan
LstLabel.Items.Add(input.InputValue); LstLabel.Items.Add(input.InputValue);
LstLabel.SelectedLast(); LstLabel.SelectedLast();
} }
private void tableLayoutPanel2_Paint(object sender, PaintEventArgs e)
{
}
} }
} }
SmartScan/SmartScan.csproj
...@@ -385,6 +385,19 @@ ...@@ -385,6 +385,19 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="App.ico" /> <Content Include="App.ico" />
<None Include="Resources\copy.png" />
<None Include="Resources\validate.png" />
<None Include="Resources\filter.png" />
<None Include="Resources\recognize.png" />
<None Include="Resources\OCR.png" />
<None Include="Resources\saveas.png" />
<None Include="Resources\camera.png" />
<None Include="Resources\localfile.png" />
<None Include="Resources\light_off.png" />
<None Include="Resources\light_on.png" />
<None Include="Resources\rename.png" />
<None Include="Resources\delete.png" />
<None Include="Resources\create.png" />
<None Include="Resources\NEO 64.png" /> <None Include="Resources\NEO 64.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!