From 7d49fe63d26ec26ebee525a7ee26d8ee1dfbbc60 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 22 八月 2024 08:48:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs b/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
index 8cecf58..e92ad06 100644
--- a/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
+++ b/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
@@ -10,47 +10,57 @@
public class ImageLib
{
#region 16
- public static ImageCollection Lib16
+
+ public static ImageCollection Lib
{
get
{
- if (_lib16 == null)
+ if (_lib == null)
{
- _lib16 = new ImageCollection();
- _lib16.ImageSize = new Size(16, 16);
- _lib16.Images.Add(Resource1.Group, "Group");
- _lib16.Images.Add(Resource1.Series, "Series");
- _lib16.Images.Add(Resource1.Question, "Question");
+ _lib = new ImageCollection();
+ _lib.ImageSize = new Size(16, 16);
+ _lib.Images.Add(Resource1.Group, "Group");
+ _lib.Images.Add(Resource1.Series, "Series");
+ _lib.Images.Add(Resource1.Question, "Question");
+ _lib.Images.Add(Resource1.NotImported, "NotImported");
}
- return _lib16;
+ return _lib;
}
}
- private static ImageCollection _lib16;
+ private static ImageCollection _lib;
- public static int Group16
+ public static int Group
{
get => GetImage16Index("Group");
}
- public static int Series16
+
+ public static int Series
{
get => GetImage16Index("Series");
}
- public static int Question16
+
+ public static int Question
{
get => GetImage16Index("Question");
}
- private static int GetImage16Index(string imgName)
- {
- var img = Lib16.Images[imgName];
- if (img == null)
- img = Lib16.Images["Question"];
- return _lib16.Images.IndexOf(img);
+ public static int NotImported
+ {
+ get => GetImage16Index("NotImported");
}
- #endregion
-
+ private static int GetImage16Index(string imgName)
+ {
+ var img = Lib.Images[imgName];
+ if (img == null)
+ img = Lib.Images["Question"];
+
+ return _lib.Images.IndexOf(img);
+ }
+
+ #endregion 16
+
#region Svg
public static SvgImageCollection LibSvg
@@ -86,7 +96,6 @@
get => LibSvg[2];
}
- #endregion
-
+ #endregion Svg
}
}
\ No newline at end of file
--
Gitblit v1.9.3