From 4f90995afe9c4c8b12bfefbf810049a27248c35b Mon Sep 17 00:00:00 2001 From: XAS-712 Date: Fri, 17 May 2019 23:16:24 +0800 Subject: [PATCH] small changes --- MifareOneTool/Form1.Designer.cs | 37 ++- MifareOneTool/Form1.cs | 46 +--- MifareOneTool/Form1.resx | 401 ++++++++++++++++---------------- 3 files changed, 220 insertions(+), 264 deletions(-) diff --git a/MifareOneTool/Form1.Designer.cs b/MifareOneTool/Form1.Designer.cs index a6ea0c5..99074bb 100644 --- a/MifareOneTool/Form1.Designer.cs +++ b/MifareOneTool/Form1.Designer.cs @@ -136,8 +136,8 @@ this.tableLayoutPanel12 = new System.Windows.Forms.TableLayoutPanel(); this.numericCLIFontSize = new System.Windows.Forms.NumericUpDown(); this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); this.buttonCLIColor = new System.Windows.Forms.Button(); + this.label10 = new System.Windows.Forms.Label(); this.groupBox14 = new System.Windows.Forms.GroupBox(); this.flowLayoutPanel5 = new System.Windows.Forms.FlowLayoutPanel(); this.checkBoxNewScan = new System.Windows.Forms.CheckBox(); @@ -156,6 +156,7 @@ this.groupBox11 = new System.Windows.Forms.GroupBox(); this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); this.checkBoxHardLowCost = new System.Windows.Forms.CheckBox(); + this.imageList2 = new System.Windows.Forms.ImageList(this.components); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.runTimeLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -163,7 +164,6 @@ this.curDevice = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripCheckUpdate = new System.Windows.Forms.ToolStripSplitButton(); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.imageList2 = new System.Windows.Forms.ImageList(this.components); this.groupBox1.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); this.flowLayoutPanel12.SuspendLayout(); @@ -294,9 +294,9 @@ // // richTextBox1 // - resources.ApplyResources(this.richTextBox1, "richTextBox1"); this.richTextBox1.BackColor = System.Drawing.Color.AliceBlue; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + resources.ApplyResources(this.richTextBox1, "richTextBox1"); this.richTextBox1.ForeColor = System.Drawing.Color.Black; this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; @@ -600,7 +600,6 @@ this.groupBox4.ForeColor = System.Drawing.Color.MediumBlue; this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; - this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // // tableLayoutPanel6 // @@ -672,7 +671,6 @@ resources.ApplyResources(this.label8, "label8"); this.label8.ForeColor = System.Drawing.SystemColors.HotTrack; this.label8.Name = "label8"; - this.label8.Click += new System.EventHandler(this.label8_Click); // // pictureBox3 // @@ -696,7 +694,6 @@ this.tableLayoutPanel15.Controls.Add(this.tableLayoutPanel1, 0, 0); this.tableLayoutPanel15.Controls.Add(this.label13, 0, 1); this.tableLayoutPanel15.Name = "tableLayoutPanel15"; - this.tableLayoutPanel15.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel15_Paint); // // tableLayoutPanel1 // @@ -708,7 +705,6 @@ this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 1, 0); this.tableLayoutPanel1.Controls.Add(this.pictureBox2, 3, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Paint += new System.Windows.Forms.PaintEventHandler(this.TableLayoutPanel1_Paint); // // label7 // @@ -861,7 +857,6 @@ // resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Click += new System.EventHandler(this.label6_Click); // // buttonEStop // @@ -1178,11 +1173,6 @@ resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; // - // label10 - // - resources.ApplyResources(this.label10, "label10"); - this.label10.Name = "label10"; - // // buttonCLIColor // resources.ApplyResources(this.buttonCLIColor, "buttonCLIColor"); @@ -1192,6 +1182,11 @@ this.buttonCLIColor.UseVisualStyleBackColor = false; this.buttonCLIColor.Click += new System.EventHandler(this.buttonCLIColor_Click); // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // // groupBox14 // resources.ApplyResources(this.groupBox14, "groupBox14"); @@ -1344,6 +1339,14 @@ this.checkBoxHardLowCost.UseVisualStyleBackColor = true; this.checkBoxHardLowCost.CheckedChanged += new System.EventHandler(this.checkBoxHardLowCost_CheckedChanged); // + // imageList2 + // + this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream"))); + this.imageList2.TransparentColor = System.Drawing.Color.Transparent; + this.imageList2.Images.SetKeyName(0, "sharp_file_copy_black_18pt_1x.png"); + this.imageList2.Images.SetKeyName(1, "round_settings_black_18pt_1x.png"); + this.imageList2.Images.SetKeyName(2, "round_build_black_18pt_1x.png"); + // // statusStrip1 // this.statusStrip1.BackColor = System.Drawing.Color.Transparent; @@ -1401,14 +1404,6 @@ this.timer1.Enabled = true; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // imageList2 - // - this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream"))); - this.imageList2.TransparentColor = System.Drawing.Color.Transparent; - this.imageList2.Images.SetKeyName(0, "sharp_file_copy_black_18pt_1x.png"); - this.imageList2.Images.SetKeyName(1, "round_settings_black_18pt_1x.png"); - this.imageList2.Images.SetKeyName(2, "round_build_black_18pt_1x.png"); - // // Form1 // resources.ApplyResources(this, "$this"); diff --git a/MifareOneTool/Form1.cs b/MifareOneTool/Form1.cs index 28e5976..cab0c77 100644 --- a/MifareOneTool/Form1.cs +++ b/MifareOneTool/Form1.cs @@ -1529,28 +1529,13 @@ namespace MifareOneTool mff08.ShowDialog(); } - private void Label7_Click(object sender, EventArgs e) - { - - } - - private void TableLayoutPanel1_Paint(object sender, PaintEventArgs e) - { - - } - - private void TableLayoutPanel11_Paint(object sender, PaintEventArgs e) - { - - } - private void ComboBox1_SelectedIndexChanged(object sender, EventArgs e) { if (comboBox1.SelectedItem.ToString() == Resources.标准) { - System.Threading.Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("zh-ZH"); - System.Threading.Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("zh-ZH"); - Properties.Settings.Default.Language = "zh-ZH"; + System.Threading.Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("zh-cn"); + System.Threading.Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("zh-cn"); + Properties.Settings.Default.Language = "zh-cn"; Properties.Settings.Default.Save(); Application.Restart(); } @@ -1564,30 +1549,5 @@ namespace MifareOneTool } } - - private void label5_Click(object sender, EventArgs e) - { - - } - - private void tableLayoutPanel15_Paint(object sender, PaintEventArgs e) - { - - } - - private void label6_Click(object sender, EventArgs e) - { - - } - - private void label8_Click(object sender, EventArgs e) - { - - } - - private void groupBox4_Enter(object sender, EventArgs e) - { - - } } } diff --git a/MifareOneTool/Form1.resx b/MifareOneTool/Form1.resx index 495bd71..1fce82c 100644 --- a/MifareOneTool/Form1.resx +++ b/MifareOneTool/Form1.resx @@ -332,7 +332,7 @@ Fill - 2, 20 + 2, 17 2 @@ -362,7 +362,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 2, 2 @@ -374,7 +374,7 @@ 2, 2, 2, 2 - 144, 96 + 144, 93 0 @@ -394,20 +394,17 @@ 0 - - Top, Left, Right - - Yu Gothic UI, 9.75pt + Microsoft Sans Serif, 9.75pt - 4, 257 + 4, 237 2, 2, 2, 2 - 643, 199 + 716, 298 1 @@ -680,7 +677,7 @@ Fill - 2, 20 + 2, 17 2 @@ -710,7 +707,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 150, 2 @@ -722,7 +719,7 @@ 2, 2, 2, 2 - 160, 96 + 160, 93 4 @@ -1216,7 +1213,7 @@ Fill - 2, 20 + 2, 17 2 @@ -1246,7 +1243,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 420, 2 @@ -1258,7 +1255,7 @@ 2, 2, 2, 2 - 128, 96 + 128, 93 5 @@ -1513,13 +1510,13 @@ Microsoft Sans Serif, 8.25pt - 2, 13 + 2, 15 2, 2, 2, 2 - 75, 25 + 83, 25 4 @@ -1747,7 +1744,7 @@ Fill - 2, 20 + 2, 17 2 @@ -1777,7 +1774,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 2, 2 @@ -1789,7 +1786,7 @@ 2, 2, 2, 2 - 192, 96 + 192, 93 11 @@ -1834,7 +1831,7 @@ Fill - Yu Gothic UI, 9.75pt + Microsoft Sans Serif, 9.75pt BottomCenter @@ -1846,7 +1843,7 @@ 2, 0, 2, 0 - 35, 34 + 38, 32 12 @@ -1877,10 +1874,10 @@ NoControl - 3, 37 + 3, 35 - 33, 29 + 36, 27 16 @@ -1904,10 +1901,10 @@ TopDown - 335, 3 + 369, 3 - 39, 215 + 42, 196 18 @@ -1955,19 +1952,19 @@ Left - Yu Gothic UI, 9.75pt + Microsoft Sans Serif, 9.75pt NoControl - 2, 34 + 2, 32 2, 0, 2, 0 - 35, 34 + 38, 32 13 @@ -2001,7 +1998,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -2010,7 +2007,7 @@ 2, 2, 2, 2 - 61, 30 + 71, 28 0 @@ -2043,16 +2040,16 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold - 103, 2 + 113, 2 2, 2, 2, 2 - 65, 30 + 71, 28 5 @@ -2085,16 +2082,16 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold - 103, 36 + 113, 34 2, 2, 2, 2 - 65, 30 + 71, 28 1 @@ -2118,10 +2115,10 @@ Fill - 68, 3 + 78, 3 - 30, 28 + 30, 26 14 @@ -2142,10 +2139,10 @@ NoControl - 173, 3 + 189, 3 - 30, 25 + 30, 23 15 @@ -2172,7 +2169,7 @@ 2 - 206, 68 + 222, 64 12 @@ -2199,16 +2196,17 @@ Left - 3, 72 + 3, 68 - 185, 68 + 229, 80 13 - 本工具仅支持SAK=08/18/28的 + +本工具仅支持SAK=08/18/28的 卡片复制。SAK28无一键解密。 若要复制S70卡片，请在高级界 面上取消勾选“数据写入保护”。 @@ -2230,13 +2228,13 @@ 1 - 12, 20 + 12, 18 2 - 210, 140 + 235, 148 14 @@ -2260,13 +2258,13 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 3, 3 - 228, 215 + 253, 196 13 @@ -2314,7 +2312,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 33 @@ -2323,7 +2321,7 @@ 2, 2, 2, 2 - 86, 27 + 95, 27 3 @@ -2356,16 +2354,16 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold - 2, 166 + 2, 150 2, 2, 2, 2 - 86, 27 + 95, 27 1 @@ -2398,7 +2396,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 64 @@ -2407,7 +2405,7 @@ 2, 2, 2, 2 - 86, 27 + 95, 27 2 @@ -2440,7 +2438,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -2449,7 +2447,7 @@ 2, 2, 2, 2 - 86, 27 + 95, 27 0 @@ -2482,7 +2480,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 95 @@ -2491,7 +2489,7 @@ 2, 2, 2, 2 - 86, 27 + 95, 27 2 @@ -2515,13 +2513,13 @@ Fill - 2, 20 + 2, 17 5 - 90, 195 + 99, 179 13 @@ -2545,10 +2543,10 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold - 236, 2 + 261, 2 2, 2, 2, 2 @@ -2557,13 +2555,13 @@ 2, 2, 2, 2 - 94, 217 + 103, 198 0 - [2]读取原卡 + [2]读原卡 groupBox5 @@ -2599,7 +2597,7 @@ 3, 3 - 30, 26 + 30, 24 0 @@ -2629,7 +2627,7 @@ 2, 0, 2, 0 - 112, 32 + 136, 30 10 @@ -2656,10 +2654,10 @@ Bottom - 3, 72 + 3, 65 - 154, 32 + 179, 30 13 @@ -2692,16 +2690,16 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold - 115, 186 + 138, 167 2, 2, 2, 2 - 43, 27 + 45, 27 13 @@ -2725,13 +2723,13 @@ Fill - 478, 3 + 526, 3 2 - 160, 215 + 185, 196 16 @@ -2779,7 +2777,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -2788,7 +2786,7 @@ 2, 2, 2, 2 - 86, 27 + 97, 27 2 @@ -2821,7 +2819,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 64 @@ -2830,7 +2828,7 @@ 2, 2, 2, 2 - 86, 27 + 97, 27 1 @@ -2863,7 +2861,7 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 33 @@ -2872,7 +2870,7 @@ 2, 2, 2, 2 - 86, 27 + 97, 27 2 @@ -2905,19 +2903,19 @@ Flat - Yu Gothic UI, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold NoControl - 5, 166 + 8, 150 2, 2, 2, 2 - 79, 27 + 84, 27 0 @@ -2941,13 +2939,13 @@ Fill - 2, 20 + 2, 17 4 - 90, 195 + 101, 179 13 @@ -2971,10 +2969,10 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold - 379, 2 + 416, 2 2, 2, 2, 2 @@ -2983,7 +2981,7 @@ 2, 2, 2, 2 - 94, 217 + 105, 198 3 @@ -3013,7 +3011,7 @@ 1 - 641, 221 + 714, 202 15 @@ -3034,7 +3032,7 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="flowLayoutPanel1" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="groupBox16" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="groupBox5" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="tableLayoutPanel3" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="groupBox7" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold sharp_file_copy_black_18pt_1x.png @@ -3049,7 +3047,7 @@ 2, 2, 2, 2 - 645, 225 + 718, 206 1 @@ -3208,7 +3206,7 @@ Fill - 2, 20 + 2, 17 2 @@ -3238,7 +3236,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 198, 2 @@ -3250,7 +3248,7 @@ 2, 2, 2, 2 - 218, 96 + 218, 93 6 @@ -3274,10 +3272,10 @@ Top - 3, 109 + 3, 104 - 601, 100 + 708, 95 15 @@ -3376,7 +3374,7 @@ Fill - 2, 20 + 2, 17 2 @@ -3406,7 +3404,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 314, 2 @@ -3418,7 +3416,7 @@ 2, 2, 2, 2 - 198, 96 + 198, 93 6 @@ -3457,16 +3455,16 @@ Fill - Yu Gothic UI, 9.75pt + Microsoft Sans Serif, 9.75pt - 2, 40 + 2, 42 2, 0, 2, 0 - 75, 34 + 83, 32 5 @@ -3497,10 +3495,10 @@ BottomUp - 2, 20 + 2, 17 - 79, 74 + 87, 74 0 @@ -3521,7 +3519,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 516, 2 @@ -3533,7 +3531,7 @@ 2, 2, 2, 2 - 83, 96 + 91, 93 14 @@ -3560,7 +3558,7 @@ 3, 3 - 601, 100 + 708, 95 14 @@ -3580,14 +3578,17 @@ 1 + + Fill + - 8, 5 + 2, 2 2 - 607, 212 + 714, 202 0 @@ -3620,7 +3621,7 @@ 2, 2, 2, 2 - 645, 225 + 718, 206 0 @@ -3674,7 +3675,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -3683,7 +3684,7 @@ 2, 2, 2, 2 - 119, 19 + 136, 19 2 @@ -3710,7 +3711,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 25 @@ -3719,7 +3720,7 @@ 2, 2, 2, 2 - 130, 19 + 148, 19 12 @@ -3746,7 +3747,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 48 @@ -3755,7 +3756,7 @@ 2, 2, 2, 2 - 123, 19 + 137, 19 11 @@ -3782,13 +3783,13 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 3, 72 - 109, 19 + 121, 19 13 @@ -3815,10 +3816,10 @@ TopDown - 2, 20 + 2, 17 - 134, 94 + 152, 94 14 @@ -3839,7 +3840,7 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 2, 2 @@ -3851,7 +3852,7 @@ 2, 2, 2, 2 - 138, 116 + 156, 113 0 @@ -3893,16 +3894,16 @@ Top - Yu Gothic UI, 9pt + Microsoft Sans Serif, 9pt - 83, 49 + 91, 49 2, 2, 2, 2 - 54, 23 + 56, 21 16 @@ -3929,7 +3930,7 @@ Fill - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 0 @@ -3938,7 +3939,7 @@ 2, 0, 2, 0 - 77, 47 + 85, 47 13 @@ -3974,16 +3975,16 @@ Popup - Yu Gothic UI, 9pt + Microsoft Sans Serif, 9pt - 83, 2 + 91, 2 2, 2, 2, 2 - 54, 43 + 56, 43 14 @@ -4010,7 +4011,7 @@ Top - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 47 @@ -4019,7 +4020,7 @@ 2, 0, 2, 0 - 77, 15 + 85, 15 15 @@ -4046,13 +4047,13 @@ Fill - 2, 20 + 2, 17 2 - 139, 94 + 149, 94 14 @@ -4076,10 +4077,10 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold - 144, 2 + 162, 2 2, 2, 2, 2 @@ -4088,7 +4089,7 @@ 2, 2, 2, 2 - 143, 116 + 153, 113 12 @@ -4127,7 +4128,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -4136,7 +4137,7 @@ 2, 2, 2, 2 - 101, 19 + 114, 19 1 @@ -4163,13 +4164,13 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 3, 26 - 269, 19 + 304, 19 4 @@ -4193,13 +4194,13 @@ True - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 3, 48 - 51, 15 + 59, 15 3 @@ -4223,7 +4224,7 @@ Flat - Yu Gothic UI, 9pt + Microsoft Sans Serif, 9pt 3, 66 @@ -4253,10 +4254,10 @@ TopDown - 2, 20 + 2, 17 - 275, 94 + 310, 94 14 @@ -4277,10 +4278,10 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold - 291, 2 + 319, 2 2, 2, 2, 2 @@ -4289,7 +4290,7 @@ 2, 2, 2, 2 - 279, 116 + 314, 113 15 @@ -4316,7 +4317,7 @@ 3, 3 - 639, 120 + 712, 117 14 @@ -4361,7 +4362,7 @@ Fill - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold NoControl @@ -4370,7 +4371,7 @@ 3, 0 - 73, 15 + 85, 15 0 @@ -4397,7 +4398,7 @@ Flat - Yu Gothic UI, 9pt + Microsoft Sans Serif, 9pt 标准 @@ -4409,7 +4410,7 @@ 3, 18 - 73, 23 + 85, 23 1 @@ -4433,10 +4434,10 @@ TopDown - 3, 21 + 3, 18 - 79, 44 + 91, 44 13 @@ -4457,13 +4458,13 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold 3, 3 - 85, 68 + 97, 65 14 @@ -4502,7 +4503,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -4511,7 +4512,7 @@ 2, 2, 2, 2 - 137, 19 + 153, 19 0 @@ -4538,7 +4539,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 25 @@ -4547,7 +4548,7 @@ 2, 2, 2, 2 - 138, 19 + 151, 19 1 @@ -4574,13 +4575,13 @@ TopDown - Yu Gothic UI, 9pt + Microsoft Sans Serif, 9pt - 2, 20 + 2, 17 - 142, 48 + 157, 48 14 @@ -4601,10 +4602,10 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold - 93, 2 + 105, 2 2, 2, 2, 2 @@ -4613,7 +4614,7 @@ 2, 2, 2, 2 - 146, 70 + 161, 67 13 @@ -4655,7 +4656,7 @@ Flat - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 2, 2 @@ -4664,7 +4665,7 @@ 2, 2, 2, 2 - 77, 19 + 88, 19 0 @@ -4691,10 +4692,10 @@ TopDown - 2, 20 + 2, 17 - 81, 48 + 92, 48 14 @@ -4715,10 +4716,10 @@ Fill - Yu Gothic UI Semibold, 9.75pt, style=Bold + Microsoft Sans Serif, 9.75pt, style=Bold - 243, 2 + 270, 2 2, 2, 2, 2 @@ -4727,7 +4728,7 @@ 2, 2, 2, 2 - 85, 70 + 96, 67 14 @@ -4751,10 +4752,10 @@ Fill - 3, 129 + 3, 126 - 639, 93 + 712, 77 16 @@ -4784,7 +4785,7 @@ 2 - 645, 225 + 718, 206 15 @@ -4805,7 +4806,7 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="flowLayoutPanel6" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="flowLayoutPanel22" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0" /></TableLayoutSettings> - Yu Gothic UI, 9.75pt + Microsoft Sans Serif, 9.75pt round_settings_black_18pt_1x.png @@ -4817,7 +4818,7 @@ 2, 2, 2, 2 - 645, 225 + 718, 206 2 @@ -4838,7 +4839,7 @@ 2 - Yu Gothic UI Semibold, 9pt, style=Bold + Microsoft Sans Serif, 9pt, style=Bold 384, 17 @@ -4848,7 +4849,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACu - CgAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -4880,8 +4881,8 @@ BP8RAAT/FAAB8wFtCAABFAHzBwABBwLtAe8QAAH/AfIB7AFtAfEB/xMAAfMBbQgAARQB8wMABP8BbQIA ARUE/wsAAf8B8gFtAgAB7AH/EwAB8wFtCAABFAHzAgAB/wH0Ae8BvAHvARECAAEOAe8B8AHvAfMB/woA AfIB6gMAAfcB/xEAAfIB8AHzAW0IAAEUAfMCAAH/AZIBDgEQAQ8EAAEOAREBDgHsAf8JAAHyARIDAAHr - AfMB/xEAAe8B+AHzAW0IAAEUAfMCAAHzAQ8DAAFDAfcB7wERAwABDwHxAf8HAAHyARQDAAHrAfMB/xIA - AfcBbQHzAW0IAAEUAfMCAAH/AfgCAAFDAfIC/wHyAQ8CAAFtAfQB/wMAAf8B8gHwAbwBFQMAAW0B8wH/ + AfMB/xEAAe8B7AHzAW0IAAEUAfMCAAHzAQ8DAAFDAfcB7wERAwABDwHxAf8HAAHyARQDAAHrAfMB/xIA + AfcBbQHzAW0IAAEUAfMCAAH/AewCAAFDAfIC/wHyAQ8CAAFtAfQB/wMAAf8B8gHwAbwBFQMAAW0B8wH/ EwAB9wFtAfMBbQgAARQB8wMAAfQB6gEAAewB9AIAAf8B7QEAARMB8wMAAf8B8AFDBgAB6gH0FQAB9wFt AfMBbQQAAQcC/wHvAesB9AIAAf8B8wESAQAB6wH0AgAB/wHsAQABFAHyAf8CAAHwBwAB6gH0FgAB9wFt AfMBbQQAAQcB/wHvAW0B8QH/AgAB9AFtAgABDgEHAvQBvAEPAgAB6gHzAv8BQwEAAg4EAAHxFwAB9wFt @@ -4903,7 +4904,7 @@ 2, 2, 2, 2 - 653, 253 + 726, 234 11 @@ -4924,13 +4925,13 @@ 157, 17 - Yu Gothic UI, 9.75pt + Microsoft Sans Serif, 9.75pt None - 53, 22 + 56, 22 就绪 @@ -4939,7 +4940,7 @@ None - 67, 22 + 71, 22 计时器 @@ -4966,7 +4967,7 @@ White - 78, 22 + 84, 22 检查更新 @@ -4975,13 +4976,13 @@ 检查更新 - 0, 434 + 0, 537 1, 0, 10, 0 - 653, 22 + 726, 22 12 @@ -5011,13 +5012,13 @@ 41 - 6, 13 + 6, 12 GrowAndShrink - 653, 456 + 726, 559 @@ -6163,6 +6164,12 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + imageList2 + + + System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + statusLabel @@ -6199,12 +6206,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - imageList2 - - - System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Form1