Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e38ec8f57 | ||
|
|
eda7b1789a | ||
|
|
db2510fac5 | ||
|
|
e354dad70b | ||
|
|
02607e116e | ||
|
|
932fd330ce | ||
|
|
c9c0dc9b5b | ||
|
|
2b3e29f3d1 | ||
|
|
b83b624dc3 |
2
v2rayN/v2rayN/Forms/MainForm.Designer.cs
generated
2
v2rayN/v2rayN/Forms/MainForm.Designer.cs
generated
@@ -163,7 +163,7 @@
|
|||||||
this.lvServers.SelectedIndexChanged += new System.EventHandler(this.lvServers_SelectedIndexChanged);
|
this.lvServers.SelectedIndexChanged += new System.EventHandler(this.lvServers_SelectedIndexChanged);
|
||||||
this.lvServers.Click += new System.EventHandler(this.lvServers_Click);
|
this.lvServers.Click += new System.EventHandler(this.lvServers_Click);
|
||||||
this.lvServers.DoubleClick += new System.EventHandler(this.lvServers_DoubleClick);
|
this.lvServers.DoubleClick += new System.EventHandler(this.lvServers_DoubleClick);
|
||||||
this.lvServers.KeyUp += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyUp);
|
this.lvServers.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyDown);
|
||||||
//
|
//
|
||||||
// cmsLv
|
// cmsLv
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -464,7 +464,7 @@ namespace v2rayN.Forms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void lvServers_KeyUp(object sender, KeyEventArgs e)
|
private void lvServers_KeyDown(object sender, KeyEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.Control)
|
if (e.Control)
|
||||||
{
|
{
|
||||||
@@ -479,12 +479,6 @@ namespace v2rayN.Forms
|
|||||||
case Keys.V:
|
case Keys.V:
|
||||||
menuAddServers_Click(null, null);
|
menuAddServers_Click(null, null);
|
||||||
break;
|
break;
|
||||||
case Keys.U:
|
|
||||||
menuMoveTop_Click(null, null);
|
|
||||||
break;
|
|
||||||
case Keys.D:
|
|
||||||
menuMoveBottom_Click(null, null);
|
|
||||||
break;
|
|
||||||
case Keys.P:
|
case Keys.P:
|
||||||
menuPingServer_Click(null, null);
|
menuPingServer_Click(null, null);
|
||||||
break;
|
break;
|
||||||
@@ -494,6 +488,9 @@ namespace v2rayN.Forms
|
|||||||
case Keys.R:
|
case Keys.R:
|
||||||
menuRealPingServer_Click(null, null);
|
menuRealPingServer_Click(null, null);
|
||||||
break;
|
break;
|
||||||
|
case Keys.S:
|
||||||
|
menuScanScreen_Click(null, null);
|
||||||
|
break;
|
||||||
case Keys.T:
|
case Keys.T:
|
||||||
menuSpeedServer_Click(null, null);
|
menuSpeedServer_Click(null, null);
|
||||||
break;
|
break;
|
||||||
@@ -509,6 +506,12 @@ namespace v2rayN.Forms
|
|||||||
case Keys.Delete:
|
case Keys.Delete:
|
||||||
menuRemoveServer_Click(null, null);
|
menuRemoveServer_Click(null, null);
|
||||||
break;
|
break;
|
||||||
|
case Keys.T:
|
||||||
|
menuMoveTop_Click(null, null);
|
||||||
|
break;
|
||||||
|
case Keys.B:
|
||||||
|
menuMoveBottom_Click(null, null);
|
||||||
|
break;
|
||||||
case Keys.U:
|
case Keys.U:
|
||||||
menuMoveUp_Click(null, null);
|
menuMoveUp_Click(null, null);
|
||||||
break;
|
break;
|
||||||
@@ -665,7 +668,8 @@ namespace v2rayN.Forms
|
|||||||
if (sb.Length > 0)
|
if (sb.Length > 0)
|
||||||
{
|
{
|
||||||
Utils.SetClipboardData(sb.ToString());
|
Utils.SetClipboardData(sb.ToString());
|
||||||
UI.Show(UIRes.I18N("BatchExportURLSuccessfully"));
|
AppendText(false, UIRes.I18N("BatchExportURLSuccessfully"));
|
||||||
|
//UI.Show(UIRes.I18N("BatchExportURLSuccessfully"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -162,7 +162,7 @@
|
|||||||
<value>355, 22</value>
|
<value>355, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuScanScreen.Text" xml:space="preserve">
|
<data name="menuScanScreen.Text" xml:space="preserve">
|
||||||
<value>Scan QR code on the screen</value>
|
<value>Scan QR code on the screen (Ctrl+S)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>352, 6</value>
|
<value>352, 6</value>
|
||||||
@@ -198,13 +198,13 @@
|
|||||||
<value>355, 22</value>
|
<value>355, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveTop.Text" xml:space="preserve">
|
<data name="menuMoveTop.Text" xml:space="preserve">
|
||||||
<value>Move to top (Ctrl+U)</value>
|
<value>Move to top (T)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>355, 22</value>
|
<value>355, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveUp.Text" xml:space="preserve">
|
<data name="menuMoveUp.Text" xml:space="preserve">
|
||||||
<value>Upward (U)</value>
|
<value>Up (U)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>355, 22</value>
|
<value>355, 22</value>
|
||||||
@@ -216,7 +216,7 @@
|
|||||||
<value>355, 22</value>
|
<value>355, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveBottom.Text" xml:space="preserve">
|
<data name="menuMoveBottom.Text" xml:space="preserve">
|
||||||
<value>Move to bottom (Ctrl+D)</value>
|
<value>Move to bottom (B)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>355, 22</value>
|
<value>355, 22</value>
|
||||||
|
|||||||
@@ -152,7 +152,7 @@
|
|||||||
<value>278, 22</value>
|
<value>278, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuScanScreen.Text" xml:space="preserve">
|
<data name="menuScanScreen.Text" xml:space="preserve">
|
||||||
<value>扫描屏幕上的二维码</value>
|
<value>扫描屏幕上的二维码 (Ctrl+S)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>275, 6</value>
|
<value>275, 6</value>
|
||||||
@@ -188,7 +188,7 @@
|
|||||||
<value>278, 22</value>
|
<value>278, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveTop.Text" xml:space="preserve">
|
<data name="menuMoveTop.Text" xml:space="preserve">
|
||||||
<value>上移至顶 (Ctrl+U)</value>
|
<value>上移至顶 (T)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>278, 22</value>
|
<value>278, 22</value>
|
||||||
@@ -206,7 +206,7 @@
|
|||||||
<value>278, 22</value>
|
<value>278, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuMoveBottom.Text" xml:space="preserve">
|
<data name="menuMoveBottom.Text" xml:space="preserve">
|
||||||
<value>下移至底 (Ctrl+D)</value>
|
<value>下移至底 (B)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>278, 22</value>
|
<value>278, 22</value>
|
||||||
|
|||||||
@@ -446,15 +446,7 @@ namespace v2rayN.Handler
|
|||||||
{
|
{
|
||||||
//远程服务器底层传输配置
|
//远程服务器底层传输配置
|
||||||
streamSettings.network = config.network();
|
streamSettings.network = config.network();
|
||||||
string host;
|
var host = config.requestHost();
|
||||||
if (streamSettings.network != "quic")
|
|
||||||
{
|
|
||||||
host = config.requestHost();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
host = config.address();
|
|
||||||
}
|
|
||||||
//if tls
|
//if tls
|
||||||
if (config.streamSecurity() == Global.StreamSecurity)
|
if (config.streamSecurity() == Global.StreamSecurity)
|
||||||
{
|
{
|
||||||
@@ -548,7 +540,7 @@ namespace v2rayN.Handler
|
|||||||
quicsettings.key = config.path();
|
quicsettings.key = config.path();
|
||||||
quicsettings.header = new Header();
|
quicsettings.header = new Header();
|
||||||
quicsettings.header.type = config.headerType();
|
quicsettings.header.type = config.headerType();
|
||||||
|
streamSettings.tlsSettings.serverName = config.address();
|
||||||
streamSettings.quicSettings = quicsettings;
|
streamSettings.quicSettings = quicsettings;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
|
|||||||
// 方法是按如下所示使用“*”:
|
// 方法是按如下所示使用“*”:
|
||||||
//[assembly: AssemblyVersion("1.0.*")]
|
//[assembly: AssemblyVersion("1.0.*")]
|
||||||
//[assembly: AssemblyVersion("1.0.0")]
|
//[assembly: AssemblyVersion("1.0.0")]
|
||||||
[assembly: AssemblyFileVersion("3.6")]
|
[assembly: AssemblyFileVersion("3.7")]
|
||||||
|
|||||||
Reference in New Issue
Block a user