diff --git a/v2rayN/v2rayN.Desktop/Assets/NotifyIcon4.ico b/v2rayN/v2rayN.Desktop/Assets/NotifyIcon4.ico new file mode 100644 index 00000000..05a3d011 Binary files /dev/null and b/v2rayN/v2rayN.Desktop/Assets/NotifyIcon4.ico differ diff --git a/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs b/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs index 5b266748..0b9ff319 100644 --- a/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs +++ b/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs @@ -48,13 +48,16 @@ namespace v2rayN.Desktop.Common break; case ESysProxyType.ForcedChange: - case ESysProxyType.Pac: index = 2; break; case ESysProxyType.Unchanged: index = 3; break; + + case ESysProxyType.Pac: + index = 4; + break; } var uri = new Uri($"avares://{Assembly.GetExecutingAssembly().GetName().Name}/Assets/NotifyIcon{index}.ico"); using var bitmap = new Bitmap(AssetLoader.Open(uri)); diff --git a/v2rayN/v2rayN/Handler/WindowsHandler.cs b/v2rayN/v2rayN/Handler/WindowsHandler.cs index df2f2661..2520b47e 100644 --- a/v2rayN/v2rayN/Handler/WindowsHandler.cs +++ b/v2rayN/v2rayN/Handler/WindowsHandler.cs @@ -33,7 +33,7 @@ namespace v2rayN.Handler 0 => Properties.Resources.NotifyIcon1, 1 => Properties.Resources.NotifyIcon2, 2 => Properties.Resources.NotifyIcon3, - 3 => Properties.Resources.NotifyIcon2, + 3 => Properties.Resources.NotifyIcon4, _ => Properties.Resources.NotifyIcon1, // default }; } @@ -54,13 +54,16 @@ namespace v2rayN.Handler break; case ESysProxyType.ForcedChange: - case ESysProxyType.Pac: index = 2; break; case ESysProxyType.Unchanged: index = 3; break; + + case ESysProxyType.Pac: + index = 4; + break; } return BitmapFrame.Create(new Uri($"pack://application:,,,/Resources/NotifyIcon{index}.ico", UriKind.RelativeOrAbsolute)); } diff --git a/v2rayN/v2rayN/Properties/Resources.Designer.cs b/v2rayN/v2rayN/Properties/Resources.Designer.cs index 24b5f9dd..2394f731 100644 --- a/v2rayN/v2rayN/Properties/Resources.Designer.cs +++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs @@ -150,6 +150,16 @@ namespace v2rayN.Properties { } } + /// + /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// + internal static System.Drawing.Icon NotifyIcon4 { + get { + object obj = ResourceManager.GetObject("NotifyIcon4", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/v2rayN/v2rayN/Properties/Resources.resx b/v2rayN/v2rayN/Properties/Resources.resx index 60899900..9d3f743d 100644 --- a/v2rayN/v2rayN/Properties/Resources.resx +++ b/v2rayN/v2rayN/Properties/Resources.resx @@ -127,4 +127,7 @@ ..\Resources\NotifyIcon3.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\NotifyIcon4.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/v2rayN/v2rayN/Resources/NotifyIcon4.ico b/v2rayN/v2rayN/Resources/NotifyIcon4.ico new file mode 100644 index 00000000..05a3d011 Binary files /dev/null and b/v2rayN/v2rayN/Resources/NotifyIcon4.ico differ diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index b8cd8e3a..d2b38350 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -29,6 +29,7 @@ +