diff --git a/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs
index 7588122f0b..8b8b2376c6 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs
@@ -54,7 +54,6 @@
this.dUCTDOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tRUONG2DToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NotifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
- this.imgListIcon = new System.Windows.Forms.ImageList(this.components);
this.picLogonLogo = new System.Windows.Forms.PictureBox();
this.MainMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLogonLogo)).BeginInit();
@@ -228,12 +227,6 @@
this.NotifyIcon.Text = "Microsoft® Visual Studio® 2010";
this.NotifyIcon.MouseDown += new System.Windows.Forms.MouseEventHandler(this.NotifyIcon_MouseDown);
//
- // imgListIcon
- //
- this.imgListIcon.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgListIcon.ImageStream")));
- this.imgListIcon.TransparentColor = System.Drawing.Color.Transparent;
- this.imgListIcon.Images.SetKeyName(0, "Logo.ico");
- //
// picLogonLogo
//
this.picLogonLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
@@ -286,7 +279,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem dUCTDOToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem tRUONG2DToolStripMenuItem;
- private System.Windows.Forms.ImageList imgListIcon;
private System.Windows.Forms.ToolStripMenuItem menuSendScreenCapture;
private System.Windows.Forms.ToolStripMenuItem menuSend2Myself;
private System.Windows.Forms.ToolStripMenuItem menuGetScreenCapture;
diff --git a/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs b/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
index 8decdebe35..d0d541126b 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
@@ -21,7 +21,7 @@ using Microsoft.PowerToys.Telemetry;
// 2023- Included in PowerToys.
//
using MouseWithoutBorders.Class;
-using MouseWithoutBorders.Form;
+using MouseWithoutBorders.Properties;
using Timer = System.Windows.Forms.Timer;
[module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.frmScreen.#ShowMouseWithoutBordersUiOnWinLogonDesktop(System.Boolean)", Justification = "Dotnet port with style preservation")]
@@ -617,7 +617,7 @@ namespace MouseWithoutBorders
{
Graphics g;
Pen p;
- Bitmap bm = new(imgListIcon.Images[0]);
+ Bitmap bm = Images.notify_default;
/*
if (curIcon == Common.ICON_ONE)
diff --git a/src/modules/MouseWithoutBorders/App/Form/frmScreen.resx b/src/modules/MouseWithoutBorders/App/Form/frmScreen.resx
index 076454b8c3..fa54f646ac 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.resx
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.resx
@@ -196,48 +196,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAA//8AAP//AAD//wAA7/8AAMfnAADjzwAA8Z8AAAAAAAABAAAA848AAOfHAADJJwAA+T8AAP//
AAD//wAA//8AAA==
-
-
-
- 233, 17
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
- LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABW
- BwAAAk1TRnQBSQFMAwEBAAHEAQABxAEAASABAAEgAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA
- ASADAAEBAQABGAYAATD/AP8A/wD/AP8A/wD/AP8A/wAwAAESAY0B9jAAARIBjQH2/wBIAAESAY0B9gEU
- AYsB9wESAY0B9ioAARIBjQH2AREBiwH3ARIBjQH2/wBCAAESAY0B9gEEAYcB9wEYAZAB9gESAYsB9wES
- AY0B9iQAARIBjQH2AQkBiQH3ARkBkAH2AQwBhwH4ARIBjQH2/wBCAAFBAZsB9AEUAY4B9gEaAZEB9gEU
- AYsB9wESAY0B9h4AARIBjQH2AQoBiQH3ARwBkQH2ARQBjgH2AUABmwH0/wBIAAE0AZYB9QEUAY4B9gEZ
- AZAB9gEeAY8B9gESAY0B9hgAARIBjQH2ARIBjQH2ARsBkQH2ARQBjgH2ATQBlgH1/wBOAAE+AZoB9AEW
- AY4B9gEZAZAB9gEOAYkB9wESAY0B9hIAARIBjQH2AQQBiAH3ARwBkQH2ARYBjgH2AT4BmgH0/wBUAAE6
- AZkB9AEWAY8B9gEZAZAB9gEgAY8B9gESAY0B9gwAARIBjQH2ARMBjQH2ARwBkQH2ARYBjwH2AToBmQH0
- /wBaAAEiAY8B9gEcAZEB9gEZAZAB9gEWAYwB9wESAY0B9gYAARIBjQH2AQoBigH3ARwBkQH2ARwBkQH2
- ASIBjwH2/wA/AAFRAZ4B8wEDAYcB9wEKAYkB9wEKAYkB9wEKAYkB9wEKAYkB9wEKAYkB9wEKAYkB9wEK
- AYkB9wENAYsB9wEcAZEB9gEeAZIB9gEdAZEB9gEZAZAB9gEYAYwB9gESAY0B9gESAY0B9gELAYsB9wEc
- AZEB9gEeAZIB9gEeAZIB9gEcAZEB9gENAYsB9wEKAYkB9wEKAYkB9wEKAYkB9wEKAYkB9wEKAYkB9wEK
- AYkB9wEKAYkB9wEAAYUB+AESAY0B9v8AIQABWgGiAfMBDwGNAfYBFgGPAfYBFgGPAfYBFgGPAfYBFgGP
- AfYBFgGPAfYBFgGPAfYBFgGPAfYBFwGPAfYBHQGRAfYBHgGSAfYBHgGSAfYBHQGRAfYBEQGNAfYBOwGY
- AfQBNgGXAfQBFAGOAfYBHQGRAfYBHgGSAfYBHgGSAfYBHAGRAfYBFgGPAfYBFgGPAfYBFgGPAfYBFgGP
- AfYBFgGPAfYBFgGPAfYBFgGPAfYBFgGPAfYBCwGLAfcBEgGNAfb/ACEAAX4BswHvAUkBowHyAU4BpAHy
- AU4BpAHyAU4BpAHyAU4BpAHyAU4BpAHyAU4BpAHyAU8BpQHyAVcBqAHxASABkQH2AR0BkQH2AR4BkgH2
- ARIBjQH2AToBmwH0BgABLAGUAfYBFQGPAfYBHgGSAfYBHAGRAfYBKwGUAfUBVwGpAfEBTwGkAfIBTgGk
- AfIBTgGkAfIBTgGkAfIBTgGkAfIBTgGkAfIBTgGkAfIBRgGhAfMBEgGNAfb/ADwAAR0BkQH2ARkBjgH2
- AR0BkQH2ARIBjQH2ATgBmgH0DAABKQGTAfUBFQGPAfYBGwGRAfYBIwGRAfYBEgGNAfb/AFQAAR0BkQH2
- AR4BjwH2ARoBkQH2ARIBjQH2AT0BnAH0EgABLwGWAfUBFQGPAfYBGAGQAfYBKAGUAfYBEgGNAfb/AE4A
- AR0BkQH2ARsBjgH2ARkBkAH2ARMBjQH2ATYBmQH0GAABKAGSAfUBFgGPAfYBFgGPAfYBJwGTAfYBEgGN
- Afb/AEgAAR0BkQH2AR4BkAH2ARgBkAH2ARQBjgH2ATEBmAH1HgABJQGSAfYBFgGPAfYBFgGPAfYBKgGU
- AfUBEgGNAfb/AEIAAR0BkQH2ARQBiwH3ARkBkAH2ARMBjgH2ATEBlwH1BgAGBAwABgQGAAElAZIB9gEW
- AY8B9gEWAY8B9gEfAY8B9wESAY0B9v8APwABEgGNAfYBHwGQAfYBDgGMAfYBMwGYAfQGAAwEBgAMBAYA
- ASYBkgH1AQ8BjAH2AScBlAH1ARIBjQH2/wBCAAESAY0B9gE0AZgB9QkAAwQB/wH4AfAGBAYAAwQB/wH4
- AfAGBAkAATABlgH1ARIBjQH2/wBUAAwEBgAMBP8AZgAGBAwABgT/AP8A/wD/AP8A/wD/AP8A/wD/AE4A
- AUIBTQE+BwABPgMAASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAT/DAAE/wwABP8MAAT/DAAE/wwA
- BP8MAAH+Av8BfwwAAfwBfwH+AT8MAAH4AT8B/AEfDAAB/AEfAfgBPwwAAf4BDwHwAX8MAAH/AQcB4AH/
- DAAB/wGDAcEB/wwAAf8BwQGDAf8tAAEBAYANAAH/AYMBwQH/DAAB/wEHAeAB/wwAAf4BDwHwAX8MAAH8
- AR8B+AE/DAAB+AEzAcwBHwwAAfgBYQGGAR8MAAH8AeEBhwE/DAAB/wHhAYcB/wwAAf8B8wHPAf8MAAT/
- DAAE/wwABP8MAAT/DAAE/wwABP8MAAs=
diff --git a/src/modules/MouseWithoutBorders/App/Icon/notify_default.bmp b/src/modules/MouseWithoutBorders/App/Icon/notify_default.bmp
new file mode 100644
index 0000000000..f0ce85ee2a
Binary files /dev/null and b/src/modules/MouseWithoutBorders/App/Icon/notify_default.bmp differ
diff --git a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj
index 9e922c28ad..af242f40a8 100644
--- a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj
+++ b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj
@@ -103,6 +103,11 @@
UserControl
+
+ True
+ True
+ Images.resx
+
@@ -243,6 +248,12 @@
+
+
+ ResXFileCodeGenerator
+ Images.Designer.cs
+
+
True
diff --git a/src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs b/src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs
index 1625d54a5c..07eabb49a5 100644
--- a/src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs
@@ -1,4 +1,4 @@
-
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -6,7 +6,7 @@
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//
-
+//------------------------------------------------------------------------------
namespace MouseWithoutBorders.Properties {
using System;
@@ -600,6 +600,16 @@ namespace MouseWithoutBorders.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap notify_default {
+ get {
+ object obj = ResourceManager.GetObject("notify_default", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/src/modules/MouseWithoutBorders/App/Properties/Images.resx b/src/modules/MouseWithoutBorders/App/Properties/Images.resx
index 91dad667f0..07184ecae0 100644
--- a/src/modules/MouseWithoutBorders/App/Properties/Images.resx
+++ b/src/modules/MouseWithoutBorders/App/Properties/Images.resx
@@ -112,10 +112,10 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -355,4 +355,7 @@
..\Icon\two_row_button_unchecked.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Icon\notify_default.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file