Skip to content

Commit

Permalink
up pp
Browse files Browse the repository at this point in the history
  • Loading branch information
2dust committed Dec 2, 2019
1 parent ec31205 commit fe15fde
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 8 deletions.
1 change: 1 addition & 0 deletions v2rayN/v2rayN/Forms/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 25 additions & 2 deletions v2rayN/v2rayN/Forms/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ private void RefreshServersMenu()
{
menuServers.DropDownItems.Clear();

List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
for (int k = 0; k < config.vmess.Count; k++)
{
VmessItem item = config.vmess[k];
Expand All @@ -280,8 +281,9 @@ private void RefreshServersMenu()
ts.Checked = true;
}
ts.Click += new EventHandler(ts_Click);
menuServers.DropDownItems.Add(ts);
lst.Add(ts);
}
menuServers.DropDownItems.AddRange(lst.ToArray());
}

private void ts_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -314,7 +316,7 @@ private void lvServers_SelectedIndexChanged(object sender, EventArgs e)
{
return;
}
qrCodeControl.showQRCode(index, config);
//qrCodeControl.showQRCode(index, config);
}

private void DisplayToolStatus()
Expand Down Expand Up @@ -389,6 +391,26 @@ private void CloseV2ray()

#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();
Expand Down Expand Up @@ -1371,5 +1393,6 @@ private void SetCurrentLanguage(string value)

#endregion


}
}
2 changes: 1 addition & 1 deletion v2rayN/v2rayN/Forms/MainForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
<value>Exit</value>
</data>
<data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>265, 164</value>
<value>265, 142</value>
</data>
<data name="&gt;&gt;cmsMain.Name" xml:space="preserve">
<value>cmsMain</value>
Expand Down
8 changes: 4 additions & 4 deletions v2rayN/v2rayN/Handler/ConfigHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ public static int LoadConfig(ref Config config)
{
config.urlGFWList = Global.GFWLIST_URL;
}
if (Utils.IsNullOrEmpty(config.remoteDNS))
{
config.remoteDNS = "1.1.1.1";
}
//if (Utils.IsNullOrEmpty(config.remoteDNS))
//{
// config.remoteDNS = "1.1.1.1";
//}

if (config.subItem == null)
{
Expand Down
2 changes: 1 addition & 1 deletion v2rayN/v2rayN/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// 方法是按如下所示使用“*”:
//[assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("2.52")]
[assembly: AssemblyFileVersion("2.53")]

0 comments on commit fe15fde

Please sign in to comment.