callm 3 дней назад
Родитель
Сommit
0cfae2e215

+ 3 - 0
UAS_MES_JH/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -105,6 +105,9 @@
             // 
             resources.ApplyResources(this.UpperCollection, "UpperCollection");
             this.UpperCollection.Name = "UpperCollection";
+            // 
+            // 
+            // 
             this.UpperCollection.Properties.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("UpperCollection.Properties.Appearance.Font")));
             this.UpperCollection.Properties.Appearance.Options.UseFont = true;
             this.UpperCollection.Properties.OffText = resources.GetString("UpperCollection.Properties.OffText");

+ 48 - 24
UAS_MES_JH/CustomControl/HeadBar/HeadBar.resx

@@ -130,13 +130,13 @@
     <value>NoControl</value>
   </data>
   <data name="TitleLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 6</value>
+    <value>16, 12</value>
   </data>
   <data name="TitleLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 0, 2, 0</value>
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="TitleLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 22</value>
+    <value>0, 42</value>
   </data>
   <data name="TitleLabel.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -160,10 +160,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>491, 0</value>
+    <value>978, 0</value>
+  </data>
+  <data name="MinWindow2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="MinWindow2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 28</value>
+    <value>30, 52</value>
   </data>
   <data name="MinWindow2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -190,10 +193,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>506, 0</value>
+    <value>1008, 0</value>
+  </data>
+  <data name="MinWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="MinWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 28</value>
+    <value>60, 52</value>
   </data>
   <data name="MinWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -220,10 +226,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>536, 0</value>
+    <value>1068, 0</value>
+  </data>
+  <data name="MinWindow1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="MinWindow1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 28</value>
+    <value>30, 52</value>
   </data>
   <data name="MinWindow1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -250,10 +259,13 @@
     <value>NoControl</value>
   </data>
   <data name="CloseWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>551, 0</value>
+    <value>1098, 0</value>
+  </data>
+  <data name="CloseWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="CloseWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 28</value>
+    <value>60, 52</value>
   </data>
   <data name="CloseWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -273,6 +285,9 @@
   <data name="&gt;&gt;CloseWindow.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
+  <metadata name="LoginOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="LoginOut.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 12pt</value>
   </data>
@@ -283,13 +298,13 @@
     <value>NoControl</value>
   </data>
   <data name="LoginOut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>411, 0</value>
+    <value>818, 0</value>
   </data>
   <data name="LoginOut.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="LoginOut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 28</value>
+    <value>160, 52</value>
   </data>
   <data name="LoginOut.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -309,6 +324,9 @@
   <data name="&gt;&gt;LoginOut.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <metadata name="Change_psw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>199, 17</value>
+  </metadata>
   <data name="Change_psw.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 12pt</value>
   </data>
@@ -319,13 +337,13 @@
     <value>NoControl</value>
   </data>
   <data name="Change_psw.Location" type="System.Drawing.Point, System.Drawing">
-    <value>298, 0</value>
+    <value>592, 0</value>
   </data>
   <data name="Change_psw.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="Change_psw.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 28</value>
+    <value>226, 52</value>
   </data>
   <data name="Change_psw.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -345,14 +363,17 @@
   <data name="&gt;&gt;Change_psw.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <metadata name="UpperCollection.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>419, 17</value>
+  </metadata>
   <data name="UpperCollection.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
   </data>
-  <data name="UpperCollection.EditValue" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
   <data name="UpperCollection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>166, 0</value>
+    <value>328, 0</value>
+  </data>
+  <data name="UpperCollection.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="UpperCollection.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
@@ -364,7 +385,7 @@
     <value>大写采集</value>
   </data>
   <data name="UpperCollection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 28</value>
+    <value>264, 52</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">
@@ -418,10 +439,13 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+    <value>12, 24</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>581, 28</value>
+    <value>1158, 52</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HeadBar</value>

+ 1 - 0
UAS_MES_JH/UAS_MES_JH.csproj

@@ -1270,6 +1270,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\HeadBar\HeadBar.resx">
       <DependentUpon>HeadBar.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\HeadBar\HeadBar.zu.resx">
       <DependentUpon>HeadBar.cs</DependentUpon>