mirrors/PersistentWindows
1
0
Fork 0
mirror of https://github.com/kangyu-california/PersistentWindows.git synced 2025-05-11 04:55:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename variables

Browse source
This commit is contained in:
Kang Yu 2024-07-26 21:53:51 -07:00
parent ff53cc352d
commit db6ca09f65
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
View file

@ -284,7 +284,7 @@ namespace PersistentWindows.SystrayShell
var iconHandle = (legacy_icon ? Properties.Resources.pwIcon2: Properties.Resources.pwIcon).GetHicon(); var iconHandle = (legacy_icon ? Properties.Resources.pwIcon2: Properties.Resources.pwIcon).GetHicon();
IdleIcon = System.Drawing.Icon.FromHandle(iconHandle); IdleIcon = System.Drawing.Icon.FromHandle(iconHandle);
iconHandle = (legacy_icon ? Properties.Resources.pwIconBusy2 : Properties.Resources.pwIconBusy).GetHicon(); iconHandle = (legacy_icon ? Properties.Resources.pwIconBusy2 : Properties.Resources.pwIconBusy).GetHicon();
BusyIcon = System.Drawing.Icon.FromHandle(legacy_icon ? Properties.Resources.pwIconBusy2.GetHicon() : iconHandle); BusyIcon = System.Drawing.Icon.FromHandle(iconHandle);
iconHandle = (legacy_icon ? Properties.Resources.pwIconUpdate2 : Properties.Resources.pwIconUpdate2).GetHicon(); iconHandle = (legacy_icon ? Properties.Resources.pwIconUpdate2 : Properties.Resources.pwIconUpdate2).GetHicon();
UpdateIcon = System.Drawing.Icon.FromHandle(iconHandle); UpdateIcon = System.Drawing.Icon.FromHandle(iconHandle);
@ -294,40 +294,40 @@ namespace PersistentWindows.SystrayShell
if (i == 1) if (i == 1)
iconFolder = AppDomain.CurrentDomain.BaseDirectory; iconFolder = AppDomain.CurrentDomain.BaseDirectory;
string icon_path = Path.Combine(iconFolder, "pwIcon.ico"); string ico_path = Path.Combine(iconFolder, "pwIcon.ico");
string icon_png_path = Path.Combine(iconFolder, "pwIcon.png"); string png_path = Path.Combine(iconFolder, "pwIcon.png");
if (File.Exists(icon_png_path)) if (File.Exists(png_path))
{ {
var bitmap = new System.Drawing.Bitmap(icon_png_path); // or get it from resource var bitmap = new System.Drawing.Bitmap(png_path);
IdleIcon = System.Drawing.Icon.FromHandle(bitmap.GetHicon()); IdleIcon = System.Drawing.Icon.FromHandle(bitmap.GetHicon());
} }
else if (File.Exists(icon_path)) else if (File.Exists(ico_path))
{ {
IdleIcon = new System.Drawing.Icon(icon_path); IdleIcon = new System.Drawing.Icon(ico_path);
} }
icon_path = Path.Combine(iconFolder, "pwIconBusy.ico"); ico_path = Path.Combine(iconFolder, "pwIconBusy.ico");
icon_png_path = Path.Combine(iconFolder, "pwIconBusy.png"); png_path = Path.Combine(iconFolder, "pwIconBusy.png");
if (File.Exists(icon_png_path)) if (File.Exists(png_path))
{ {
var bitmap = new System.Drawing.Bitmap(icon_png_path); var bitmap = new System.Drawing.Bitmap(png_path);
BusyIcon = System.Drawing.Icon.FromHandle(bitmap.GetHicon()); BusyIcon = System.Drawing.Icon.FromHandle(bitmap.GetHicon());
} }
else if (File.Exists(icon_path)) else if (File.Exists(ico_path))
{ {
BusyIcon = new System.Drawing.Icon(icon_path); BusyIcon = new System.Drawing.Icon(ico_path);
} }
icon_path = Path.Combine(iconFolder, "pwIconUpdate.ico"); ico_path = Path.Combine(iconFolder, "pwIconUpdate.ico");
icon_png_path = Path.Combine(iconFolder, "pwIconUpdate.png"); png_path = Path.Combine(iconFolder, "pwIconUpdate.png");
if (File.Exists(icon_png_path)) if (File.Exists(png_path))
{ {
var bitmap = new System.Drawing.Bitmap(icon_png_path); var bitmap = new System.Drawing.Bitmap(png_path);
UpdateIcon = System.Drawing.Icon.FromHandle(bitmap.GetHicon()); UpdateIcon = System.Drawing.Icon.FromHandle(bitmap.GetHicon());
} }
else if (File.Exists(icon_path)) else if (File.Exists(ico_path))
{ {
UpdateIcon = new System.Drawing.Icon(icon_path); UpdateIcon = new System.Drawing.Icon(ico_path);
} }
} }