界面优化

UAS_MES_NEW/CustomControl/AccordionMenu/NavagationBar.Designer.cs

@@ -33,6 +33,14 @@
             // 
             // NavagationBar
             // 
+            this.Appearance.Button.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.Button.Options.UseFont = true;
+            this.Appearance.ButtonHotTracked.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.ButtonHotTracked.Options.UseFont = true;
+            this.Appearance.ButtonPressed.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.ButtonPressed.Options.UseFont = true;
+            this.Appearance.Hint.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.Hint.Options.UseFont = true;
             this.Appearance.Item.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.Appearance.Item.Options.UseFont = true;
             this.Appearance.ItemActive.Font = new System.Drawing.Font("微软雅黑", 10F);
@@ -41,6 +49,14 @@
             this.Appearance.ItemHotTracked.Options.UseFont = true;
             this.Appearance.ItemPressed.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.Appearance.ItemPressed.Options.UseFont = true;
+            this.Appearance.NavigationPaneHeader.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.NavigationPaneHeader.Options.UseFont = true;
+            this.Appearance.NavPaneContentButton.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.NavPaneContentButton.Options.UseFont = true;
+            this.Appearance.NavPaneContentButtonHotTracked.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.NavPaneContentButtonHotTracked.Options.UseFont = true;
+            this.Appearance.NavPaneContentButtonPressed.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Appearance.NavPaneContentButtonPressed.Options.UseFont = true;
             this.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LinkInterval = 2;
             this.NavigationPaneGroupClientHeight = 300;

UAS_MES_NEW/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -46,7 +46,7 @@
             // TitleLabel
             // 
             resources.ApplyResources(this.TitleLabel, "TitleLabel");
-            this.TitleLabel.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.TitleLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.TitleLabel.ForeColor = System.Drawing.Color.RoyalBlue;
             this.TitleLabel.Name = "TitleLabel";
             // 
@@ -114,7 +114,7 @@
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.Controls.Add(this.UpperCollection);
             this.Controls.Add(this.Change_psw);
@@ -132,7 +132,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.MinWindow1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CloseWindow)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.UpperCollection.Properties)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS_MES_NEW/CustomControl/HeadBar/HeadBar.resx

@@ -130,7 +130,7 @@
     <value>NoControl</value>
   </data>
   <data name="TitleLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 6</value>
+    <value>8, 4</value>
   </data>
   <data name="TitleLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -160,10 +160,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>499, 0</value>
+    <value>497, 0</value>
   </data>
   <data name="MinWindow2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 30</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>514, 0</value>
+    <value>512, 0</value>
   </data>
   <data name="MinWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 30</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>544, 0</value>
+    <value>542, 0</value>
   </data>
   <data name="MinWindow1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 30</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>559, 0</value>
+    <value>557, 0</value>
   </data>
   <data name="CloseWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 30</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>419, 0</value>
+    <value>417, 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, 30</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>306, 0</value>
+    <value>304, 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, 30</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>166, 0</value>
+    <value>172, 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>140, 30</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>589, 30</value>
+    <value>587, 28</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HeadBar</value>

UAS_MES_NEW/Main.Designer.cs

@@ -68,7 +68,7 @@
             this.barHeaderItem2 = new DevExpress.XtraBars.BarHeaderItem();
             this.barWindow = new DevExpress.XtraBars.BarSubItem();
             this.barSubItem4 = new DevExpress.XtraBars.BarSubItem();
-            this.headBar1 = new CustomControl.HeadBar();
+            this.headBar1 = new UAS_MES_NEW.CustomControl.HeadBar();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.NavBar)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.BarManagerBottom)).BeginInit();
@@ -81,7 +81,7 @@
             // 
             // MainTabControl
             // 
-            this.MainTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            this.MainTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MainTabControl.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -149,6 +149,24 @@
             // 
             // BaseInf
             // 
+            this.BaseInf.BarAppearance.Disabled.BackColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Disabled.BackColor2 = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Disabled.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Disabled.Options.UseBackColor = true;
+            this.BaseInf.BarAppearance.Disabled.Options.UseBorderColor = true;
+            this.BaseInf.BarAppearance.Hovered.BackColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Hovered.BackColor2 = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Hovered.Options.UseBackColor = true;
+            this.BaseInf.BarAppearance.Normal.BackColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Normal.BackColor2 = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Normal.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Normal.Options.UseBackColor = true;
+            this.BaseInf.BarAppearance.Normal.Options.UseBorderColor = true;
+            this.BaseInf.BarAppearance.Pressed.BackColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Pressed.BackColor2 = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Pressed.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.BaseInf.BarAppearance.Pressed.Options.UseBackColor = true;
+            this.BaseInf.BarAppearance.Pressed.Options.UseBorderColor = true;
             this.BaseInf.BarName = "Status bar";
             this.BaseInf.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Bottom;
             this.BaseInf.DockCol = 0;
@@ -379,7 +397,7 @@
             // 
             // headBar1
             // 
-            this.headBar1.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.headBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.headBar1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(167, 0);
@@ -387,6 +405,7 @@
             this.headBar1.Size = new System.Drawing.Size(811, 32);
             this.headBar1.TabIndex = 13;
             this.headBar1.Title = "UAS制造执行系统";
+            this.headBar1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.headBar_MouseDown);
             // 
             // Main
             // 

UAS_MES_NEW/Main.cs

@@ -106,6 +106,7 @@ namespace UAS_MES_NEW
             Width = ScreenArea.Width;
             Height = ScreenArea.Height;
             SetForm();
+            DevExpress.LookAndFeel.UserLookAndFeel.Default.SkinName = "Visual Studio 2013 Blue";
         }
 
         //关闭打印进程

UAS_MES_NEW/Program.cs

@@ -48,6 +48,9 @@ namespace UAS_MES_NEW
                     Directory.CreateDirectory(SystemInf.CacheFolder);
                 FileStream fcaches = new FileStream(SystemInf.CacheFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite);
                 fcaches.Close();
+                DevExpress.UserSkins.BonusSkins.Register();
+                DevExpress.Skins.SkinManager.EnableFormSkins();
+                DevExpress.Skins.SkinManager.EnableMdiFormSkins();
                 //判断是否xml文件大小为0
                 FileInfo info = new FileInfo(SystemInf.CacheFilePath);
                 if (info.Length == 0)

UAS_MES_NEW/Properties/Resources.Designer.cs

@@ -373,9 +373,9 @@ namespace UAS_MES_NEW.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap close_16px_558195_easyicon_net {
+        internal static System.Drawing.Bitmap close {
             get {
-                object obj = ResourceManager.GetObject("close_16px_558195_easyicon_net", resourceCulture);
+                object obj = ResourceManager.GetObject("close", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -383,9 +383,9 @@ namespace UAS_MES_NEW.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap CLOSE_24px_1115282_easyicon_net {
+        internal static System.Drawing.Bitmap close_16px_558195_easyicon_net {
             get {
-                object obj = ResourceManager.GetObject("CLOSE_24px_1115282_easyicon_net", resourceCulture);
+                object obj = ResourceManager.GetObject("close_16px_558195_easyicon_net", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -393,9 +393,9 @@ namespace UAS_MES_NEW.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap close_24px_1139093_easyicon_net {
+        internal static System.Drawing.Bitmap CLOSE_24px_1115282_easyicon_net {
             get {
-                object obj = ResourceManager.GetObject("close_24px_1139093_easyicon_net", resourceCulture);
+                object obj = ResourceManager.GetObject("CLOSE_24px_1115282_easyicon_net", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -403,9 +403,9 @@ namespace UAS_MES_NEW.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap close_24px_1139293_easyicon_net {
+        internal static System.Drawing.Bitmap close_24px_1139093_easyicon_net {
             get {
-                object obj = ResourceManager.GetObject("close_24px_1139293_easyicon_net", resourceCulture);
+                object obj = ResourceManager.GetObject("close_24px_1139093_easyicon_net", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -713,20 +713,20 @@ namespace UAS_MES_NEW.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap Logout_32px_581264_easyicon_net {
+        internal static System.Drawing.Bitmap LoginCloseIcon {
             get {
-                object obj = ResourceManager.GetObject("Logout_32px_581264_easyicon_net", resourceCulture);
+                object obj = ResourceManager.GetObject("LoginCloseIcon", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static byte[] mailattachment {
+        internal static System.Drawing.Bitmap Logout_32px_581264_easyicon_net {
             get {
-                object obj = ResourceManager.GetObject("mailattachment", resourceCulture);
-                return ((byte[])(obj));
+                object obj = ResourceManager.GetObject("Logout_32px_581264_easyicon_net", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         

UAS_MES_NEW/Properties/Resources.resx

@@ -118,9 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="mailattachment" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mailattachment.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="Internet_Explorer_Windows_8_Windows8_32px_566667_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Internet_Explorer_Windows_8_Windows8_32px_566667_easyicon.net.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -208,7 +205,7 @@
   <data name="close_24px_1139093_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\close_24px_1139093_easyicon.net.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="close_24px_1139293_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="LoginCloseIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\close_24px_1139293_easyicon.net.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="close_32px_1181428_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -418,4 +415,7 @@
   <data name="系统设置" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\系统设置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

UAS_MES_NEW/UAS_MES_NEW.csproj

@@ -57,6 +57,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Tool\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
+    <Reference Include="DevExpress.BonusSkins.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Tool\DevExpress.BonusSkins.v15.2.dll</HintPath>
+    </Reference>
     <Reference Include="DevExpress.Data.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Utils.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -1394,6 +1398,7 @@
     <EmbeddedResource Include="PublicForm\SetLoadingWindow.resx">
       <DependentUpon>SetLoadingWindow.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="App.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -1403,7 +1408,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <None Include="Resources\mailattachment.zip" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\07.gif" />
@@ -1445,10 +1449,11 @@
     <Content Include="Resources\Button\normal.png" />
     <Content Include="Resources\Button\White-side.png" />
     <Content Include="Resources\change_password.png" />
+    <None Include="Resources\close.png" />
     <Content Include="Resources\close_16px_558195_easyicon.net.png" />
     <Content Include="Resources\CLOSE_24px_1115282_easyicon.net.png" />
     <Content Include="Resources\close_24px_1139093_easyicon.net.png" />
-    <Content Include="Resources\close_24px_1139293_easyicon.net.png" />
+    <None Include="Resources\close_24px_1139293_easyicon.net.png" />
     <Content Include="Resources\close_32px_1181428_easyicon.net.png" />
     <Content Include="Resources\Close_up_32px_1181430_easyicon.net.png" />
     <None Include="Resources\defaulticon.png" />
@@ -1506,7 +1511,6 @@
     <Content Include="Resources\two_arrow_right.png" />
     <Content Include="Resources\uas_blue.png" />
     <Content Include="Resources\updating.gif" />
-    <Content Include="Resources\upload_14.788550323176px_1191624_easyicon.net.png" />
     <Content Include="Resources\upload_17.459649122807px_1200703_easyicon.net %281%29.png" />
     <Content Include="Resources\upload_17.459649122807px_1200703_easyicon.net.png" />
     <None Include="Resources\upload_icon1.png" />
@@ -1559,22 +1563,22 @@
   <ItemGroup>
     <PublishFile Include="Resources\pluslogo.png">
       <Visible>False</Visible>
+      <PublishState>DataFile</PublishState>
+      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
-      <PublishState>DataFile</PublishState>
-      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Resources\preview_16px_25980_easyicon.net.png">
       <Visible>False</Visible>
+      <PublishState>DataFile</PublishState>
+      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
-      <PublishState>DataFile</PublishState>
-      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
   </ItemGroup>