diff --git a/v2rayN/v2rayN.sln b/v2rayN/v2rayN.sln
index 64cf71f4..f4dc9d50 100644
--- a/v2rayN/v2rayN.sln
+++ b/v2rayN/v2rayN.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2050
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29926.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "v2rayN", "v2rayN\v2rayN.csproj", "{0A9785E6-D256-4B73-9757-4EF59955FD1E}"
EndProject
@@ -35,7 +35,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- RESX_SortFileContentOnSave = True
+ RESX_ResXSortingComparison = CurrentCulture
SolutionGuid = {56B88873-C9CC-4069-A1E5-DABD6C6E865E}
+ RESX_SortFileContentOnSave = True
EndGlobalSection
EndGlobal
diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index b8d03aca..6aabf5cc 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -167,7 +167,6 @@
this.lvServers.UseCompatibleStateImageBehavior = false;
this.lvServers.View = System.Windows.Forms.View.Details;
this.lvServers.SelectedIndexChanged += new System.EventHandler(this.lvServers_SelectedIndexChanged);
- this.lvServers.Click += new System.EventHandler(this.lvServers_Click);
this.lvServers.DoubleClick += new System.EventHandler(this.lvServers_DoubleClick);
this.lvServers.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyDown);
//
diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 59cb17a2..4a0f04b9 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -312,24 +312,18 @@ namespace v2rayN.Forms
private void lvServers_SelectedIndexChanged(object sender, EventArgs e)
{
- int index = -1;
- try
- {
- if (lvServers.SelectedIndices.Count > 0)
- {
- index = lvServers.SelectedIndices[0];
- }
- }
- catch
- {
- }
- if (index < 0)
- {
- return;
- }
- //qrCodeControl.showQRCode(index, config);
+ RefreshQRCodePanel();
}
+ private void RefreshQRCodePanel()
+ {
+ if (scMain.Panel2Collapsed) return; // saving cpu.
+ if (lvServers.SelectedIndices.Count > 0)
+ {
+ int index = lvServers.SelectedIndices[0];
+ qrCodeControl.showQRCode(index, config);
+ }
+ }
private void RefreshTaryIcon()
{
notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon);
@@ -464,26 +458,6 @@ namespace v2rayN.Forms
#region 功能按钮
- private void lvServers_Click(object sender, EventArgs e)
- {
- int index = -1;
- try
- {
- if (lvServers.SelectedIndices.Count > 0)
- {
- index = lvServers.SelectedIndices[0];
- }
- }
- catch
- {
- }
- if (index < 0)
- {
- return;
- }
- qrCodeControl.showQRCode(index, config);
- }
-
private void lvServers_DoubleClick(object sender, EventArgs e)
{
int index = GetLvSelectedIndex();
@@ -1601,6 +1575,7 @@ namespace v2rayN.Forms
{
bool bShow = tsbQRCodeSwitch.Checked;
scMain.Panel2Collapsed = !bShow;
+ RefreshQRCodePanel();
}
#endregion
@@ -1629,8 +1604,6 @@ namespace v2rayN.Forms
RefreshTaryIcon();
}
-
-
private async void toolSslServerLatencyRefresh()
{
toolSslServerLatencySet(UIRes.I18N("ServerLatencyChecking"));
diff --git a/v2rayN/v2rayN/Properties/Resources.resx b/v2rayN/v2rayN/Properties/Resources.resx
index ebe3751a..7cd3b257 100644
--- a/v2rayN/v2rayN/Properties/Resources.resx
+++ b/v2rayN/v2rayN/Properties/Resources.resx
@@ -163,10 +163,10 @@
..\resources\sub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
..\resources\sysproxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file