章政 7 жил өмнө
parent
commit
3b6cfb5220

+ 1 - 0
UAS_MES_NEW/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -109,6 +109,7 @@
             this.UpperCollection.Properties.Appearance.Options.UseFont = true;
             this.UpperCollection.Properties.OffText = resources.GetString("UpperCollection.Properties.OffText");
             this.UpperCollection.Properties.OnText = resources.GetString("UpperCollection.Properties.OnText");
+            this.UpperCollection.Toggled += new System.EventHandler(this.UpperCollection_Toggled);
             // 
             // HeadBar
             // 

+ 5 - 5
UAS_MES_NEW/CustomControl/HeadBar/HeadBar.cs

@@ -107,11 +107,6 @@ namespace UAS_MES_NEW.CustomControl
             chagepwd.ShowDialog();
         }
 
-        private void UpperCollection_CheckedChanged(object sender, EventArgs e)
-        {
-            SystemInf.UpperCollection = UpperCollection.IsOn;
-        }
-
         private void HeadBar_BackColorChanged(object sender, EventArgs e)
         {
             Change_psw.BackColor = BackColor;
@@ -146,5 +141,10 @@ namespace UAS_MES_NEW.CustomControl
                 }
             }
         }
+
+        private void UpperCollection_Toggled(object sender, EventArgs e)
+        {
+            SystemInf.UpperCollection = UpperCollection.IsOn;
+        }
     }
 }

+ 15 - 15
UAS_MES_NEW/CustomControl/HeadBar/HeadBar.resx

@@ -160,10 +160,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>495, 0</value>
+    <value>491, 0</value>
   </data>
   <data name="MinWindow2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 32</value>
+    <value>15, 28</value>
   </data>
   <data name="MinWindow2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -190,10 +190,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>510, 0</value>
+    <value>506, 0</value>
   </data>
   <data name="MinWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 32</value>
+    <value>30, 28</value>
   </data>
   <data name="MinWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -220,10 +220,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>540, 0</value>
+    <value>536, 0</value>
   </data>
   <data name="MinWindow1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 32</value>
+    <value>15, 28</value>
   </data>
   <data name="MinWindow1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -250,10 +250,10 @@
     <value>NoControl</value>
   </data>
   <data name="CloseWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>555, 0</value>
+    <value>551, 0</value>
   </data>
   <data name="CloseWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 32</value>
+    <value>30, 28</value>
   </data>
   <data name="CloseWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -283,13 +283,13 @@
     <value>NoControl</value>
   </data>
   <data name="LoginOut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>415, 0</value>
+    <value>411, 0</value>
   </data>
   <data name="LoginOut.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
   <data name="LoginOut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 32</value>
+    <value>80, 28</value>
   </data>
   <data name="LoginOut.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -319,13 +319,13 @@
     <value>NoControl</value>
   </data>
   <data name="Change_psw.Location" type="System.Drawing.Point, System.Drawing">
-    <value>302, 0</value>
+    <value>298, 0</value>
   </data>
   <data name="Change_psw.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
   <data name="Change_psw.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 32</value>
+    <value>113, 28</value>
   </data>
   <data name="Change_psw.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -352,7 +352,7 @@
     <value>True</value>
   </data>
   <data name="UpperCollection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>170, 0</value>
+    <value>166, 0</value>
   </data>
   <data name="UpperCollection.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
@@ -364,7 +364,7 @@
     <value>大写采集</value>
   </data>
   <data name="UpperCollection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 32</value>
+    <value>132, 28</value>
   </data>
   <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="UpperCollection.SuperTip" type="DevExpress.Utils.SuperToolTip, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -421,7 +421,7 @@
     <value>6, 12</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>585, 32</value>
+    <value>581, 28</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HeadBar</value>