other-projects/BatteryWidget
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed signature of ImageLoader methods

Browse Source
This commit is contained in:
Victor 2013-10-07 19:10:41 +03:00
parent eb27840141
commit 67051a5725
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BatteryWidget/ImageLoader.cs
View File

@ -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);
}

17
BatteryWidget/WidgetForm.cs
View File

@ -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
}