Browse Source

Impoved stocktake icons on StockLocationGrid

frogsoftware 1 năm trước cách đây
mục cha
commit
0edf2270b9

+ 4 - 0
prs.desktop/PRSDesktop.csproj

@@ -756,6 +756,10 @@
         <Resource Include="Resources\forminstance.png">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Resource>
+        <None Remove="Resources\schedule - overdue.png" />
+        <Resource Include="Resources\schedule - overdue.png">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Resource>
     </ItemGroup>
 
     <ItemGroup>

+ 3 - 3
prs.desktop/Panels/Products/Locations/StockLocationGrid.cs

@@ -20,9 +20,9 @@ public class StockLocationGrid : DynamicDataGrid<StockLocation>
 
     private BitmapImage _stocktakeheader = PRSDesktop.Resources.schedule_enabled.AsBitmapImage();
     private BitmapImage _stocktakedisabled = PRSDesktop.Resources.schedule_disabled.AsBitmapImage();
-    private BitmapImage _stocktakeinprogress = PRSDesktop.Resources.locked.AsBitmapImage();
-    private BitmapImage _stocktakenotyetdue = PRSDesktop.Resources.tick.AsBitmapImage();
-    private BitmapImage _stocktakeoverdue = PRSDesktop.Resources.warning.AsBitmapImage();
+    private BitmapImage _stocktakeinprogress = PRSDesktop.Resources.notification.AsBitmapImage();
+    private BitmapImage _stocktakenotyetdue = PRSDesktop.Resources.schedule_enabled.AsBitmapImage();
+    private BitmapImage _stocktakeoverdue = PRSDesktop.Resources.schedule_overdue.AsBitmapImage();
     
     protected override void Init()
     {

+ 20 - 1
prs.desktop/Resources.Designer.cs

@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -1027,6 +1026,16 @@ namespace PRSDesktop {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap notification {
+            get {
+                object obj = ResourceManager.GetObject("notification", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1346,6 +1355,16 @@ namespace PRSDesktop {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap schedule_overdue {
+            get {
+                object obj = ResourceManager.GetObject("schedule_overdue", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

+ 8 - 0
prs.desktop/Resources.resx

@@ -776,4 +776,12 @@
   <data name="post" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\post.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="schedule_overdue"  type="System.Resources.ResXFileRef, System.Windows.Forms">
+      <value>.\Resources\schedule - overdue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0,
+          Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="notification"  type="System.Resources.ResXFileRef, System.Windows.Forms">
+      <value>.\Resources\notification.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0,
+          Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

BIN
prs.desktop/Resources/._schedule - overdue.png


BIN
prs.desktop/Resources/notification.png


BIN
prs.desktop/Resources/schedule - overdue.png