From 67051a572544816969759d2ea28c73cd69db099a Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Mon, 7 Oct 2013 19:10:41 +0300
Subject: [PATCH] Changed signature of ImageLoader methods

---
 BatteryWidget/ImageLoader.cs | 10 +++++-----
 BatteryWidget/WidgetForm.cs  | 17 ++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/BatteryWidget/ImageLoader.cs b/BatteryWidget/ImageLoader.cs
index 0a80914..7a3f3b8 100644
--- a/BatteryWidget/ImageLoader.cs
+++ b/BatteryWidget/ImageLoader.cs
@@ -9,9 +9,9 @@ namespace BatteryWidget {
     public static class ImageLoader {
 
         private const int IMAGES_COUNT = 5;
-        private const string PATH = "res" + Path.PathSeparator;
+        private const string PATH = "res";
 
-        public static enum ImageName {
+        public enum Name {
             Gray,
             Red,
             Yellow,
@@ -19,9 +19,9 @@ namespace BatteryWidget {
             Power
         } 
 
-        private static Image[] cache = new Image[(int) ImageName.Power + 1];
+        private static Image[] cache = new Image[(int) Name.Power + 1];
 
-        public static Image getImage(ImageName name) {
+        public static Image get(Name name) {
             int index = (int) name;
 
             // Check cache availability
@@ -43,7 +43,7 @@ namespace BatteryWidget {
         }
 
         private static Image loadImage(string name) {
-            string filename = PATH + name;
+            string filename = PATH + Path.PathSeparator + name;
             using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read)) {
                 return new Bitmap(fs);
             }
diff --git a/BatteryWidget/WidgetForm.cs b/BatteryWidget/WidgetForm.cs
index c8d2732..10f7408 100644
--- a/BatteryWidget/WidgetForm.cs
+++ b/BatteryWidget/WidgetForm.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.Windows.Forms;
 using BatteryWidget.Properties;
 
@@ -26,8 +25,8 @@ namespace BatteryWidget {
         public WidgetForm() {
             InitializeComponent();
 
-            imageLabel.Image = ImageLoader.getImage(ImageLoader.ImageName.Green);
-            grayImage = ImageLoader.getImage(ImageLoader.ImageName.Gray);
+            imageLabel.Image = ImageLoader.get(ImageLoader.Name.Green);
+            grayImage = ImageLoader.get(ImageLoader.Name.Gray);
 
             graph = new BatteryGraph();
 
@@ -150,7 +149,7 @@ namespace BatteryWidget {
 
         private Image powerStateImage() {
             imageLabel.BackColor = Color.Black;
-            return ImageLoader.getImage(ImageLoader.ImageName.Power);
+            return ImageLoader.get(ImageLoader.Name.Power);
         }
 
         private Image normalStateImage(int percent) {
@@ -172,7 +171,7 @@ namespace BatteryWidget {
             updateInfoTimer.Interval = 800;
             if (imageLabel.Image.Equals(grayImage)) {
                 imageLabel.BackColor = Color.DarkGreen;
-                return ImageLoader.getImage(ImageLoader.ImageName.Red);
+                return ImageLoader.get(ImageLoader.Name.Red);
             }
             imageLabel.BackColor = Color.Red;
             return grayImage;
@@ -180,10 +179,10 @@ namespace BatteryWidget {
 
         private Image selectImage(int percent) {
             if (percent < 30)
-                return ImageLoader.getImage(ImageLoader.ImageName.Red);
+                return ImageLoader.get(ImageLoader.Name.Red);
             else if (percent < 70)
-                return ImageLoader.getImage(ImageLoader.ImageName.Yellow);
-            return ImageLoader.getImage(ImageLoader.ImageName.Green);
+                return ImageLoader.get(ImageLoader.Name.Yellow);
+            return ImageLoader.get(ImageLoader.Name.Green);
         } 
         #endregion
     }