From e5547307b39d13835d5e54b7b8894480e31c647a Mon Sep 17 00:00:00 2001
From: YFdyh000 <yfdyh000@gmail.com>
Date: Thu, 16 Apr 2020 08:25:59 +0800
Subject: [PATCH] Add QR Code button icon
https://www.flaticon.com/free-icon/qr-code_590562?term=QR&page=1&position=42
<div>Icons made by <a href="https://www.flaticon.com/authors/pixel-perfect" title="Pixel perfect">Pixel perfect</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>
---
v2rayN/v2rayN/Forms/MainForm.Designer.cs | 1 +
v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx | 2 +-
.../v2rayN/Properties/Resources.Designer.cs | 10 +++
v2rayN/v2rayN/Properties/Resources.resx | 75 +++++++++---------
v2rayN/v2rayN/Resources/qr-code.png | Bin 0 -> 685 bytes
5 files changed, 51 insertions(+), 37 deletions(-)
create mode 100644 v2rayN/v2rayN/Resources/qr-code.png
diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index 9bb10c68..e550927a 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -665,6 +665,7 @@
//
this.tsbQRCodeSwitch.CheckOnClick = true;
this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black;
+ this.tsbQRCodeSwitch.Image = global::v2rayN.Properties.Resources.qr_code;
resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch";
this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged);
diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
index db884ceb..21164412 100644
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -511,6 +511,6 @@
<value> 关闭窗口 </value>
</data>
<data name="tsbQRCodeSwitch.Text" xml:space="preserve">
- <value>分享二维码</value>
+ <value> 分享 </value>
</data>
</root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Properties/Resources.Designer.cs b/v2rayN/v2rayN/Properties/Resources.Designer.cs
index fb420525..3a699ebb 100644
--- a/v2rayN/v2rayN/Properties/Resources.Designer.cs
+++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs
@@ -177,6 +177,16 @@ namespace v2rayN.Properties {
}
}
+ /// <summary>
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// </summary>
+ internal static System.Drawing.Bitmap qr_code {
+ get {
+ object obj = ResourceManager.GetObject("qr-code", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
diff --git a/v2rayN/v2rayN/Properties/Resources.resx b/v2rayN/v2rayN/Properties/Resources.resx
index 38dc1d7e..8078ee80 100644
--- a/v2rayN/v2rayN/Properties/Resources.resx
+++ b/v2rayN/v2rayN/Properties/Resources.resx
@@ -118,52 +118,55 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="privoxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\privoxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="notify" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\notify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="option" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\option.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="pac_txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\pac.txt.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="privoxy_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\privoxy_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</value>
- </data>
- <data name="privoxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\privoxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="promotion" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\promotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="restart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="sub" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\sub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="sysproxy64_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name="sysproxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\sysproxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="sub" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\sub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="notify" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\notify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="promotion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\promotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="sysproxy64_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="privoxy_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\privoxy_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</value>
+ </data>
+ <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="pac_txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\pac.txt.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="qr-code" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\qr-code.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resources/qr-code.png b/v2rayN/v2rayN/Resources/qr-code.png
new file mode 100644
index 0000000000000000000000000000000000000000..f901bb697860e96257d32ec8f870cc16a26088e7
GIT binary patch
literal 685
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz
z5n0T@z;^_M8K-LVNdpDhOFVsD*`KfoFz|7d99Vvxfq}8w)5S5w<M`Rh_Wp+)B#zaW
zJiV{dx%t7W18Gg%2Ah6ma>P5a|F2;Qn(H%zBfxs6CsPe0yMn6WgdIPvZk*b>ciVwQ
z=XI}FzpHzHTfIC%`P2put%LrG3q|)&s&Tpb=xpxNS?9u27F?dbt*k{zOXk`^IitFh
zT6g(W<i6B4h~M8XddlJX|KOXqW?y^KC@F2`vvav1`vxb+xkg`NlN}`jx|&xsc!zNm
z-<mU7&3C35H%og|jQHaFue4kABInOP>{6hirf%f&qD`KUP0h*vWrc8}+=_Ra=b0An
zQ+;*sw`jrHDDEE*j@@0zvYf9$@=#<-eQL`}yUP51ZYNxrHl5hE`^EJcU8O2=ANc0D
zFm=7_lQ_VU;mQ<sz`*VZ+o7g8-zw&*9y(ff@RRKKyhjWNuY5`W&~iaJP*sLya?OHY
z%1r^jY!1BaiJt9TlAA(aY$*9H6MTa;aEZLv3iqiW-*K!cKHg#~t#)VEMbU50FG`L`
zADZ&m-u2I)6WOl{m{{li{KLked?{M{rGy(WW>iaDBT7;dOH!?pi&B9UgOP!efv$mx
zuAy0ofq|8wiIstcHjrUpaLV&X7K(=4{FKbJO57TDi#S{ZYLEok5S*V@Ql40p%1~Zj
hu9umYU7Va)kgAtols@~NjTBH3gQu&X%Q~loCIA+g0c8LH
literal 0
HcmV?d00001