Эх сурвалжийг харах

修复窗口因AutoScaleMode导致的问题。

JeffWang 3 жил өмнө
parent
commit
d3e21089b6

+ 15 - 12
FactoryTool_CShare/Views/Upgrade.Designer.cs

@@ -41,10 +41,11 @@
             this.ProgressBar1.BarBack = null;
             this.ProgressBar1.BarRadiusStyle = CCWin.SkinClass.RoundStyle.All;
             this.ProgressBar1.ForeColor = System.Drawing.Color.Red;
-            this.ProgressBar1.Location = new System.Drawing.Point(40, 130);
+            this.ProgressBar1.Location = new System.Drawing.Point(30, 103);
+            this.ProgressBar1.Margin = new System.Windows.Forms.Padding(2);
             this.ProgressBar1.Name = "ProgressBar1";
             this.ProgressBar1.RadiusStyle = CCWin.SkinClass.RoundStyle.All;
-            this.ProgressBar1.Size = new System.Drawing.Size(274, 38);
+            this.ProgressBar1.Size = new System.Drawing.Size(223, 30);
             this.ProgressBar1.TabIndex = 0;
             // 
             // skinLabel1
@@ -53,41 +54,43 @@
             this.skinLabel1.BackColor = System.Drawing.Color.Transparent;
             this.skinLabel1.BorderColor = System.Drawing.Color.White;
             this.skinLabel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.skinLabel1.Location = new System.Drawing.Point(49, 85);
+            this.skinLabel1.Location = new System.Drawing.Point(28, 71);
+            this.skinLabel1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.skinLabel1.Name = "skinLabel1";
-            this.skinLabel1.Size = new System.Drawing.Size(261, 20);
+            this.skinLabel1.Size = new System.Drawing.Size(226, 17);
             this.skinLabel1.TabIndex = 1;
-            this.skinLabel1.Text = "-                                                            -";
+            this.skinLabel1.Text = "-                                                    -";
             // 
             // skinButton1
             // 
             this.skinButton1.BackColor = System.Drawing.Color.Transparent;
             this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.skinButton1.DownBack = null;
-            this.skinButton1.Location = new System.Drawing.Point(124, 195);
+            this.skinButton1.Location = new System.Drawing.Point(93, 156);
+            this.skinButton1.Margin = new System.Windows.Forms.Padding(2);
             this.skinButton1.MouseBack = null;
             this.skinButton1.Name = "skinButton1";
             this.skinButton1.NormlBack = null;
-            this.skinButton1.Size = new System.Drawing.Size(102, 36);
+            this.skinButton1.Size = new System.Drawing.Size(76, 29);
             this.skinButton1.TabIndex = 2;
             this.skinButton1.Text = "Cancel";
             this.skinButton1.UseVisualStyleBackColor = false;
             this.skinButton1.Click += new System.EventHandler(this.skinButton1_Click);
             // 
-            // Download
+            // Upgrade
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.CaptionBackColorBottom = System.Drawing.Color.Cyan;
             this.CaptionBackColorTop = System.Drawing.Color.RoyalBlue;
-            this.ClientSize = new System.Drawing.Size(352, 242);
+            this.ClientSize = new System.Drawing.Size(275, 194);
             this.Controls.Add(this.skinButton1);
             this.Controls.Add(this.skinLabel1);
             this.Controls.Add(this.ProgressBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "Download";
+            this.Name = "Upgrade";
             this.Text = "Download";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Download_FormClosed);
             this.Shown += new System.EventHandler(this.Download_Shown);

+ 4 - 19
FactoryTool_CShare/Views/Verify.Designer.cs

@@ -42,50 +42,35 @@
             this.BT_OK.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.BT_OK.DownBack = null;
             this.BT_OK.DownBaseColor = System.Drawing.Color.Yellow;
-            this.BT_OK.Location = new System.Drawing.Point(360, 174);
-            this.BT_OK.Margin = new System.Windows.Forms.Padding(2);
+            resources.ApplyResources(this.BT_OK, "BT_OK");
             this.BT_OK.MouseBack = null;
             this.BT_OK.Name = "BT_OK";
             this.BT_OK.NormlBack = null;
-            this.BT_OK.Size = new System.Drawing.Size(83, 30);
-            this.BT_OK.TabIndex = 1;
-            this.BT_OK.Text = "确定";
             this.BT_OK.UseVisualStyleBackColor = false;
             this.BT_OK.Click += new System.EventHandler(this.BT_OK_Click);
             // 
             // LB_MSG
             // 
-            this.LB_MSG.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            resources.ApplyResources(this.LB_MSG, "LB_MSG");
             this.LB_MSG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.LB_MSG.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.LB_MSG.Font = new System.Drawing.Font("新宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LB_MSG.Location = new System.Drawing.Point(11, 48);
-            this.LB_MSG.Multiline = true;
             this.LB_MSG.Name = "LB_MSG";
             this.LB_MSG.ReadOnly = true;
-            this.LB_MSG.Size = new System.Drawing.Size(434, 122);
-            this.LB_MSG.TabIndex = 3;
-            this.LB_MSG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // Verify
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.CanResize = false;
             this.CaptionBackColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.CaptionBackColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.ClientSize = new System.Drawing.Size(456, 210);
+            resources.ApplyResources(this, "$this");
             this.ControlBox = false;
             this.Controls.Add(this.LB_MSG);
             this.Controls.Add(this.BT_OK);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "Verify";
-            this.Text = "Verify";
             this.Load += new System.EventHandler(this.Verify_Load);
             this.ResumeLayout(false);
             this.PerformLayout();

+ 80 - 0
FactoryTool_CShare/Views/Verify.resx

@@ -118,6 +118,77 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="BT_OK.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft YaHei UI, 9pt</value>
+  </data>
+  <data name="BT_OK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>360, 174</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="BT_OK.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
+  </data>
+  <data name="BT_OK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 30</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="BT_OK.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="BT_OK.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="&gt;&gt;BT_OK.Name" xml:space="preserve">
+    <value>BT_OK</value>
+  </data>
+  <data name="&gt;&gt;BT_OK.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinButton, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;BT_OK.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;BT_OK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="LB_MSG.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="LB_MSG.Font" type="System.Drawing.Font, System.Drawing">
+    <value>新宋体, 15.75pt</value>
+  </data>
+  <data name="LB_MSG.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 48</value>
+  </data>
+  <data name="LB_MSG.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="LB_MSG.Size" type="System.Drawing.Size, System.Drawing">
+    <value>434, 122</value>
+  </data>
+  <data name="LB_MSG.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="LB_MSG.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Center</value>
+  </data>
+  <data name="&gt;&gt;LB_MSG.Name" xml:space="preserve">
+    <value>LB_MSG</value>
+  </data>
+  <data name="&gt;&gt;LB_MSG.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;LB_MSG.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;LB_MSG.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>456, 210</value>
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAwMAAAAQAgAKglAADGBgAAKAAAABAA
@@ -312,4 +383,13 @@
         AAD/wAAAA/8AAP/wAAAP/wAA//wAAD//AAD//wAA//8AAA==
 </value>
   </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Verify</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>Verify</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>CCWin.Skin_Color, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
 </root>