Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
8dadfe6579 | ||
|
|
6c06de63e4 | ||
|
|
54a122ae34 | ||
|
|
7a0daee443 | ||
|
88b5e29092 | ||
|
|
b3ea08dd99 | ||
|
|
95794bc5b2 | ||
|
|
3275454bd6 | ||
|
|
7f5bb86127 |
42
v2rayN/v2rayN/Forms/MainForm.Designer.cs
generated
42
v2rayN/v2rayN/Forms/MainForm.Designer.cs
generated
@@ -42,11 +42,11 @@
|
||||
this.menuAddServers = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuScanScreen = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.menuServerFilter = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuRemoveServer = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuRemoveDuplicateServer = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuCopyServer = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuSetDefaultServer = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuServerFilter = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.menuMoveToGroup = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuMoveEvent = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@@ -68,9 +68,9 @@
|
||||
this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
|
||||
this.tabGroup = new System.Windows.Forms.TabControl();
|
||||
this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
|
||||
this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
|
||||
this.scBig = new System.Windows.Forms.SplitContainer();
|
||||
this.gbServers = new System.Windows.Forms.GroupBox();
|
||||
this.mainMsgControl = new v2rayN.Forms.MainMsgControl();
|
||||
@@ -130,6 +130,7 @@
|
||||
this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.tsbClose = new System.Windows.Forms.ToolStripButton();
|
||||
this.tsbRestoreGuiNConfig = new System.Windows.Forms.ToolStripMenuItem();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scServers)).BeginInit();
|
||||
this.scServers.Panel1.SuspendLayout();
|
||||
this.scServers.Panel2.SuspendLayout();
|
||||
@@ -216,6 +217,7 @@
|
||||
this.menuExport2ShareUrl,
|
||||
this.menuExport2SubContent});
|
||||
this.cmsLv.Name = "cmsLv";
|
||||
this.cmsLv.OwnerItem = this.tsbServer;
|
||||
resources.ApplyResources(this.cmsLv, "cmsLv");
|
||||
//
|
||||
// menuAddVmessServer
|
||||
@@ -271,6 +273,12 @@
|
||||
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
||||
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
|
||||
//
|
||||
// menuServerFilter
|
||||
//
|
||||
this.menuServerFilter.Name = "menuServerFilter";
|
||||
resources.ApplyResources(this.menuServerFilter, "menuServerFilter");
|
||||
this.menuServerFilter.Click += new System.EventHandler(this.menuServerFilter_Click);
|
||||
//
|
||||
// menuRemoveServer
|
||||
//
|
||||
this.menuRemoveServer.Name = "menuRemoveServer";
|
||||
@@ -295,12 +303,6 @@
|
||||
resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
|
||||
this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
|
||||
//
|
||||
// menuServerFilter
|
||||
//
|
||||
this.menuServerFilter.Name = "menuServerFilter";
|
||||
resources.ApplyResources(this.menuServerFilter, "menuServerFilter");
|
||||
this.menuServerFilter.Click += new System.EventHandler(this.menuServerFilter_Click);
|
||||
//
|
||||
// toolStripSeparator3
|
||||
//
|
||||
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
||||
@@ -428,13 +430,6 @@
|
||||
resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
|
||||
this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
|
||||
//
|
||||
// tsbServer
|
||||
//
|
||||
this.tsbServer.DropDown = this.cmsLv;
|
||||
this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
|
||||
resources.ApplyResources(this.tsbServer, "tsbServer");
|
||||
this.tsbServer.Name = "tsbServer";
|
||||
//
|
||||
// tabGroup
|
||||
//
|
||||
resources.ApplyResources(this.tabGroup, "tabGroup");
|
||||
@@ -447,6 +442,13 @@
|
||||
resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
|
||||
this.qrCodeControl.Name = "qrCodeControl";
|
||||
//
|
||||
// tsbServer
|
||||
//
|
||||
this.tsbServer.DropDown = this.cmsLv;
|
||||
this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
|
||||
resources.ApplyResources(this.tsbServer, "tsbServer");
|
||||
this.tsbServer.Name = "tsbServer";
|
||||
//
|
||||
// scBig
|
||||
//
|
||||
resources.ApplyResources(this.scBig, "scBig");
|
||||
@@ -672,7 +674,8 @@
|
||||
this.tsbGlobalHotkeySetting,
|
||||
this.tsbGroupSetting,
|
||||
this.toolStripSeparator14,
|
||||
this.tsbBackupGuiNConfig});
|
||||
this.tsbBackupGuiNConfig,
|
||||
this.tsbRestoreGuiNConfig});
|
||||
this.tsbSetting.Image = global::v2rayN.Properties.Resources.option;
|
||||
resources.ApplyResources(this.tsbSetting, "tsbSetting");
|
||||
this.tsbSetting.Name = "tsbSetting";
|
||||
@@ -863,6 +866,12 @@
|
||||
this.tsbClose.Name = "tsbClose";
|
||||
this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
|
||||
//
|
||||
// tsbRestoreGuiNConfig
|
||||
//
|
||||
this.tsbRestoreGuiNConfig.Name = "tsbRestoreGuiNConfig";
|
||||
resources.ApplyResources(this.tsbRestoreGuiNConfig, "tsbRestoreGuiNConfig");
|
||||
this.tsbRestoreGuiNConfig.Click += new System.EventHandler(this.tsbRestoreGuiNConfig_Click);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@@ -998,6 +1007,7 @@
|
||||
private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateSagerNetCore;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsbSubGroupUpdate;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsbSubGroupUpdateViaProxy;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsbRestoreGuiNConfig;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -158,18 +158,18 @@ namespace v2rayN.Forms
|
||||
{
|
||||
scServers.Panel2Collapsed = true;
|
||||
|
||||
if (!config.uiItem.mainLocation.IsEmpty)
|
||||
{
|
||||
if (config.uiItem.mainLocation.X >= SystemInformation.WorkingArea.Width
|
||||
|| config.uiItem.mainLocation.Y >= SystemInformation.WorkingArea.Height)
|
||||
{
|
||||
Location = new Point(0, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
Location = config.uiItem.mainLocation;
|
||||
}
|
||||
}
|
||||
//if (!config.uiItem.mainLocation.IsEmpty)
|
||||
//{
|
||||
// if (config.uiItem.mainLocation.X >= SystemInformation.WorkingArea.Width
|
||||
// || config.uiItem.mainLocation.Y >= SystemInformation.WorkingArea.Height)
|
||||
// {
|
||||
// Location = new Point(0, 0);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Location = config.uiItem.mainLocation;
|
||||
// }
|
||||
//}
|
||||
if (!config.uiItem.mainSize.IsEmpty)
|
||||
{
|
||||
Width = config.uiItem.mainSize.Width;
|
||||
@@ -811,6 +811,7 @@ namespace v2rayN.Forms
|
||||
if (statistics != null)
|
||||
{
|
||||
statistics.ClearAllServerStatistics();
|
||||
RefreshServers();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1082,6 +1083,14 @@ namespace v2rayN.Forms
|
||||
{
|
||||
MainFormHandler.Instance.BackupGuiNConfig(config);
|
||||
}
|
||||
|
||||
private void tsbRestoreGuiNConfig_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (MainFormHandler.Instance.RestoreGuiNConfig(ref config))
|
||||
{
|
||||
RefreshServers();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
@@ -1469,6 +1478,15 @@ namespace v2rayN.Forms
|
||||
{
|
||||
UpdateSubscriptionProcess("", true);
|
||||
}
|
||||
private void tsbSubGroupUpdate_Click(object sender, EventArgs e)
|
||||
{
|
||||
UpdateSubscriptionProcess(_groupId, true);
|
||||
}
|
||||
|
||||
private void tsbSubGroupUpdateViaProxy_Click(object sender, EventArgs e)
|
||||
{
|
||||
UpdateSubscriptionProcess(_groupId, true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// the subscription update process
|
||||
@@ -1581,14 +1599,5 @@ namespace v2rayN.Forms
|
||||
}
|
||||
#endregion
|
||||
|
||||
private void tsbSubGroupUpdate_Click(object sender, EventArgs e)
|
||||
{
|
||||
UpdateSubscriptionProcess(_groupId, true);
|
||||
}
|
||||
|
||||
private void tsbSubGroupUpdateViaProxy_Click(object sender, EventArgs e)
|
||||
{
|
||||
UpdateSubscriptionProcess(_groupId, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -218,30 +218,6 @@
|
||||
<data name="menuMoveToGroup.Text" xml:space="preserve">
|
||||
<value>Move to Group</value>
|
||||
</data>
|
||||
<data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="menuMoveTop.Text" xml:space="preserve">
|
||||
<value>Move to top (T)</value>
|
||||
</data>
|
||||
<data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="menuMoveUp.Text" xml:space="preserve">
|
||||
<value>Up (U)</value>
|
||||
</data>
|
||||
<data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="menuMoveDown.Text" xml:space="preserve">
|
||||
<value>Down (D)</value>
|
||||
</data>
|
||||
<data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="menuMoveBottom.Text" xml:space="preserve">
|
||||
<value>Move to bottom (B)</value>
|
||||
</data>
|
||||
<data name="menuMoveEvent.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>355, 22</value>
|
||||
</data>
|
||||
@@ -326,8 +302,20 @@
|
||||
<data name="menuExport2SubContent.Text" xml:space="preserve">
|
||||
<value>Export subscription (base64) share to clipboard</value>
|
||||
</data>
|
||||
<data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
<data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>64, 53</value>
|
||||
</data>
|
||||
<data name="tsbServer.Text" xml:space="preserve">
|
||||
<value>Servers</value>
|
||||
</data>
|
||||
<data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
|
||||
<value>ImageAboveText</value>
|
||||
</data>
|
||||
<data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>356, 644</value>
|
||||
<value>356, 622</value>
|
||||
</data>
|
||||
<data name=">>cmsLv.Name" xml:space="preserve">
|
||||
<value>cmsLv</value>
|
||||
@@ -476,17 +464,29 @@
|
||||
<data name=">>scServers.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
<data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>64, 53</value>
|
||||
<data name="menuMoveTop.Text" xml:space="preserve">
|
||||
<value>Move to top (T)</value>
|
||||
</data>
|
||||
<data name="tsbServer.Text" xml:space="preserve">
|
||||
<value>Servers</value>
|
||||
<data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
|
||||
<value>ImageAboveText</value>
|
||||
<data name="menuMoveUp.Text" xml:space="preserve">
|
||||
<value>Up (U)</value>
|
||||
</data>
|
||||
<data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="menuMoveDown.Text" xml:space="preserve">
|
||||
<value>Down (D)</value>
|
||||
</data>
|
||||
<data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 22</value>
|
||||
</data>
|
||||
<data name="menuMoveBottom.Text" xml:space="preserve">
|
||||
<value>Move to bottom (B)</value>
|
||||
</data>
|
||||
<data name="scBig.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
@@ -599,6 +599,27 @@
|
||||
<data name="cmsMain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>278, 192</value>
|
||||
</data>
|
||||
<data name=">>cmsMain.Name" xml:space="preserve">
|
||||
<value>cmsMain</value>
|
||||
</data>
|
||||
<data name=">>cmsMain.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="notifyMain.Text" xml:space="preserve">
|
||||
<value>v2rayN</value>
|
||||
</data>
|
||||
<data name="notifyMain.Visible" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>277, 22</value>
|
||||
</data>
|
||||
<data name="menuSysAgentMode.Text" xml:space="preserve">
|
||||
<value>System proxy</value>
|
||||
</data>
|
||||
<data name="menuKeepClear.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>243, 22</value>
|
||||
</data>
|
||||
@@ -617,12 +638,6 @@
|
||||
<data name="menuKeepNothing.Text" xml:space="preserve">
|
||||
<value>Do not change system proxy</value>
|
||||
</data>
|
||||
<data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>277, 22</value>
|
||||
</data>
|
||||
<data name="menuSysAgentMode.Text" xml:space="preserve">
|
||||
<value>System proxy</value>
|
||||
</data>
|
||||
<data name="menuRoutings.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>277, 22</value>
|
||||
</data>
|
||||
@@ -671,21 +686,6 @@
|
||||
<data name="menuExit.Text" xml:space="preserve">
|
||||
<value>Exit</value>
|
||||
</data>
|
||||
<data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>278, 192</value>
|
||||
</data>
|
||||
<data name=">>cmsMain.Name" xml:space="preserve">
|
||||
<value>cmsMain</value>
|
||||
</data>
|
||||
<data name=">>cmsMain.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="notifyMain.Text" xml:space="preserve">
|
||||
<value>v2rayN</value>
|
||||
</data>
|
||||
<data name="notifyMain.Visible" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Top</value>
|
||||
</data>
|
||||
@@ -716,36 +716,6 @@
|
||||
<data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 56</value>
|
||||
</data>
|
||||
<data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubSetting.Text" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdate.Text" xml:space="preserve">
|
||||
<value>Update subscription without proxy</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdateViaProxy.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdateViaProxy.Text" xml:space="preserve">
|
||||
<value>Update subscription with proxy</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdate.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdate.Text" xml:space="preserve">
|
||||
<value>Update group subscription without proxy</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdateViaProxy.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdateViaProxy.Text" xml:space="preserve">
|
||||
<value>Update group subscription with proxy</value>
|
||||
</data>
|
||||
<data name="tsbSub.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
@@ -809,6 +779,12 @@
|
||||
<data name="tsbBackupGuiNConfig.Text" xml:space="preserve">
|
||||
<value>BackupGuiConfig</value>
|
||||
</data>
|
||||
<data name="tsbRestoreGuiNConfig.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>195, 22</value>
|
||||
</data>
|
||||
<data name="tsbRestoreGuiNConfig.Text" xml:space="preserve">
|
||||
<value>RestoreGuiNConfig</value>
|
||||
</data>
|
||||
<data name="tsbSetting.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
@@ -842,54 +818,6 @@
|
||||
<data name="toolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 56</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateN.Text" xml:space="preserve">
|
||||
<value>v2rayN (this software)</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateCore.Text" xml:space="preserve">
|
||||
<value>Update v2fly Core</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateSagerNetCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateSagerNetCore.Text" xml:space="preserve">
|
||||
<value>Update SagerNet Core</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateXrayCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateXrayCore.Text" xml:space="preserve">
|
||||
<value>Update Xray Core</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator16.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>216, 6</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashCore.Text" xml:space="preserve">
|
||||
<value>Update clash Core</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashMetaCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashMetaCore.Text" xml:space="preserve">
|
||||
<value>Update Clash.Meta Core</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>216, 6</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateGeo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateGeo.Text" xml:space="preserve">
|
||||
<value>Update Geo files</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
@@ -905,33 +833,6 @@
|
||||
<data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 56</value>
|
||||
</data>
|
||||
<data name="tsbAbout.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbAbout.Text" xml:space="preserve">
|
||||
<value>v2rayN Project</value>
|
||||
</data>
|
||||
<data name="tsbV2rayWebsite.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbV2rayWebsite.Text" xml:space="preserve">
|
||||
<value>V2Ray Website</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>184, 6</value>
|
||||
</data>
|
||||
<data name="tsbLanguageDef.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbLanguageDef.Text" xml:space="preserve">
|
||||
<value>Language-[English]</value>
|
||||
</data>
|
||||
<data name="tsbLanguageZhHans.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbLanguageZhHans.Text" xml:space="preserve">
|
||||
<value>语言-[中文简体]</value>
|
||||
</data>
|
||||
<data name="tsbHelp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
@@ -992,6 +893,111 @@
|
||||
<data name=">>tsMain.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubSetting.Text" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdate.Text" xml:space="preserve">
|
||||
<value>Update subscription without proxy</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdateViaProxy.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubUpdateViaProxy.Text" xml:space="preserve">
|
||||
<value>Update subscription with proxy</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdate.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdate.Text" xml:space="preserve">
|
||||
<value>Update group subscription without proxy</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdateViaProxy.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>317, 22</value>
|
||||
</data>
|
||||
<data name="tsbSubGroupUpdateViaProxy.Text" xml:space="preserve">
|
||||
<value>Update group subscription with proxy</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateN.Text" xml:space="preserve">
|
||||
<value>v2rayN (this software)</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateCore.Text" xml:space="preserve">
|
||||
<value>Update v2fly Core</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateSagerNetCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateSagerNetCore.Text" xml:space="preserve">
|
||||
<value>Update SagerNet Core</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateXrayCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateXrayCore.Text" xml:space="preserve">
|
||||
<value>Update Xray Core</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator16.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>216, 6</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashCore.Text" xml:space="preserve">
|
||||
<value>Update clash Core</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashMetaCore.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateClashMetaCore.Text" xml:space="preserve">
|
||||
<value>Update Clash.Meta Core</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>216, 6</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateGeo.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 22</value>
|
||||
</data>
|
||||
<data name="tsbCheckUpdateGeo.Text" xml:space="preserve">
|
||||
<value>Update Geo files</value>
|
||||
</data>
|
||||
<data name="tsbAbout.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbAbout.Text" xml:space="preserve">
|
||||
<value>v2rayN Project</value>
|
||||
</data>
|
||||
<data name="tsbV2rayWebsite.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbV2rayWebsite.Text" xml:space="preserve">
|
||||
<value>V2Ray Website</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>184, 6</value>
|
||||
</data>
|
||||
<data name="tsbLanguageDef.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbLanguageDef.Text" xml:space="preserve">
|
||||
<value>Language-[English]</value>
|
||||
</data>
|
||||
<data name="tsbLanguageZhHans.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>187, 22</value>
|
||||
</data>
|
||||
<data name="tsbLanguageZhHans.Text" xml:space="preserve">
|
||||
<value>语言-[中文简体]</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@@ -1064,6 +1070,12 @@
|
||||
<data name=">>toolStripSeparator1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>menuServerFilter.Name" xml:space="preserve">
|
||||
<value>menuServerFilter</value>
|
||||
</data>
|
||||
<data name=">>menuServerFilter.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>menuRemoveServer.Name" xml:space="preserve">
|
||||
<value>menuRemoveServer</value>
|
||||
</data>
|
||||
@@ -1088,12 +1100,6 @@
|
||||
<data name=">>menuSetDefaultServer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>menuServerFilter.Name" xml:space="preserve">
|
||||
<value>menuServerFilter</value>
|
||||
</data>
|
||||
<data name=">>menuServerFilter.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>toolStripSeparator3.Name" xml:space="preserve">
|
||||
<value>toolStripSeparator3</value>
|
||||
</data>
|
||||
@@ -1544,6 +1550,12 @@
|
||||
<data name=">>tsbClose.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsbRestoreGuiNConfig.Name" xml:space="preserve">
|
||||
<value>tsbRestoreGuiNConfig</value>
|
||||
</data>
|
||||
<data name=">>tsbRestoreGuiNConfig.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>MainForm</value>
|
||||
</data>
|
||||
|
||||
@@ -579,4 +579,7 @@
|
||||
<data name="tsbSubGroupUpdateViaProxy.Text" xml:space="preserve">
|
||||
<value>更新当前分组订阅(通过代理)</value>
|
||||
</data>
|
||||
<data name="tsbRestoreGuiNConfig.Text" xml:space="preserve">
|
||||
<value>恢复v2rayN配置文件</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -145,12 +145,12 @@ namespace v2rayN.Handler
|
||||
coreInfos.Add(new CoreInfo
|
||||
{
|
||||
coreType = ECoreType.hysteria,
|
||||
coreExes = new List<string> { "hysteria-tun-windows-6.0-amd64", "hysteria-tun-windows-6.0-386", "hysteria" },
|
||||
coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
|
||||
arguments = "",
|
||||
coreUrl = Global.hysteriaCoreUrl,
|
||||
coreReleaseApiUrl = Global.hysteriaCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
|
||||
coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-tun-windows-6.0-386.exe",
|
||||
coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-tun-windows-6.0-amd64.exe",
|
||||
coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
|
||||
coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
|
||||
});
|
||||
|
||||
coreInfos.Add(new CoreInfo
|
||||
|
||||
@@ -232,6 +232,46 @@ namespace v2rayN.Handler
|
||||
}
|
||||
}
|
||||
|
||||
public bool RestoreGuiNConfig(ref Config config)
|
||||
{
|
||||
var fileContent = string.Empty;
|
||||
using (OpenFileDialog fileDialog = new OpenFileDialog())
|
||||
{
|
||||
fileDialog.InitialDirectory = Utils.GetBackupPath("");
|
||||
fileDialog.Filter = "guiNConfig|*.json|All|*.*";
|
||||
fileDialog.FilterIndex = 2;
|
||||
fileDialog.RestoreDirectory = true;
|
||||
|
||||
if (fileDialog.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
fileContent = Utils.LoadResource(fileDialog.FileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (Utils.IsNullOrEmpty(fileContent))
|
||||
{
|
||||
UI.ShowWarning(ResUI.OperationFailed);
|
||||
return false;
|
||||
}
|
||||
|
||||
var resConfig = Utils.FromJson<Config>(fileContent);
|
||||
if (resConfig == null)
|
||||
{
|
||||
UI.ShowWarning(ResUI.OperationFailed);
|
||||
return false;
|
||||
}
|
||||
//backup first
|
||||
BackupGuiNConfig(config, true);
|
||||
|
||||
config = resConfig;
|
||||
LazyConfig.Instance.SetConfig(ref config);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void UpdateTask(Config config, Action<bool, string> update)
|
||||
{
|
||||
Task.Run(() => UpdateTaskRun(config, update));
|
||||
|
||||
@@ -190,15 +190,16 @@ namespace v2rayN.Handler
|
||||
{
|
||||
if (serverStatistics_ != null)
|
||||
{
|
||||
foreach (var item in serverStatistics_.server)
|
||||
{
|
||||
item.todayUp = 0;
|
||||
item.todayDown = 0;
|
||||
item.totalUp = 0;
|
||||
item.totalDown = 0;
|
||||
// update ui display to zero
|
||||
updateFunc_(0, 0, new List<ServerStatItem> { item });
|
||||
}
|
||||
//foreach (var item in serverStatistics_.server)
|
||||
//{
|
||||
// item.todayUp = 0;
|
||||
// item.todayDown = 0;
|
||||
// item.totalUp = 0;
|
||||
// item.totalDown = 0;
|
||||
// // update ui display to zero
|
||||
// updateFunc_(0, 0, new List<ServerStatItem> { item });
|
||||
//}
|
||||
serverStatistics_.server = new List<ServerStatItem>();
|
||||
|
||||
// update statistic json file
|
||||
SaveToFile();
|
||||
|
||||
@@ -361,7 +361,7 @@ namespace v2rayN.Handler
|
||||
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
string msg = string.Format(ResUI.NotFoundCore, @"");
|
||||
string msg = string.Format(ResUI.NotFoundCore, @"", "");
|
||||
//ShowMsg(true, msg);
|
||||
return "";
|
||||
}
|
||||
@@ -403,7 +403,7 @@ namespace v2rayN.Handler
|
||||
{
|
||||
try
|
||||
{
|
||||
var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
|
||||
var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
|
||||
string version;
|
||||
if (preRelease)
|
||||
{
|
||||
|
||||
@@ -186,7 +186,7 @@ namespace v2rayN.Handler
|
||||
}
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
string msg = string.Format(ResUI.NotFoundCore, coreInfo.coreUrl);
|
||||
string msg = string.Format(ResUI.NotFoundCore, string.Join(", ", lstCoreTemp.ToArray()), coreInfo.coreUrl);
|
||||
ShowMsg(false, msg);
|
||||
}
|
||||
return fileName;
|
||||
|
||||
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
|
||||
// 方法是按如下所示使用“*”:
|
||||
//[assembly: AssemblyVersion("1.0.*")]
|
||||
//[assembly: AssemblyVersion("1.0.0")]
|
||||
[assembly: AssemblyFileVersion("5.32")]
|
||||
[assembly: AssemblyFileVersion("5.33")]
|
||||
|
||||
2
v2rayN/v2rayN/Resx/ResUI.Designer.cs
generated
2
v2rayN/v2rayN/Resx/ResUI.Designer.cs
generated
@@ -736,7 +736,7 @@ namespace v2rayN.Resx {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Core not found, please download: {0} 的本地化字符串。
|
||||
/// 查找类似 Core not found({0}), please download: {1} 的本地化字符串。
|
||||
/// </summary>
|
||||
internal static string NotFoundCore {
|
||||
get {
|
||||
|
||||
@@ -295,7 +295,7 @@
|
||||
<value> non-standard service, this feature is invalid</value>
|
||||
</data>
|
||||
<data name="NotFoundCore" xml:space="preserve">
|
||||
<value>Core not found, please download: {0}</value>
|
||||
<value>Core not found({0}), please download: {1}</value>
|
||||
</data>
|
||||
<data name="NoValidQRcodeFound" xml:space="preserve">
|
||||
<value>Scan completed, no valid QR code found</value>
|
||||
|
||||
@@ -295,7 +295,7 @@
|
||||
<value>非标准服务，此功能无效</value>
|
||||
</data>
|
||||
<data name="NotFoundCore" xml:space="preserve">
|
||||
<value>找不到Core，下载地址: {0}</value>
|
||||
<value>找不到Core(文件名:{0})，下载地址: {1}</value>
|
||||
</data>
|
||||
<data name="NoValidQRcodeFound" xml:space="preserve">
|
||||
<value>扫描完成,未发现有效二维码</value>
|
||||
|
||||
@@ -594,6 +594,12 @@ namespace v2rayN
|
||||
{
|
||||
try
|
||||
{
|
||||
//clear
|
||||
if (!RegReadValue(autoRunRegPath, "v2rayNAutoRun", "").IsNullOrEmpty())
|
||||
{
|
||||
RegWriteValue(autoRunRegPath, "v2rayNAutoRun", "");
|
||||
}
|
||||
|
||||
string value = RegReadValue(autoRunRegPath, autoRunName, "");
|
||||
string exePath = GetExePath();
|
||||
if (value?.Equals(exePath) == true || value?.Equals($"\"{exePath}\"") == true)
|
||||
|
||||
@@ -492,18 +492,18 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Google.Protobuf">
|
||||
<Version>3.21.1</Version>
|
||||
<Version>3.21.5</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Grpc.Core">
|
||||
<Version>2.46.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Grpc.Tools">
|
||||
<Version>2.46.3</Version>
|
||||
<Version>2.47.0</Version>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="log4net">
|
||||
<Version>2.0.14</Version>
|
||||
<Version>2.0.15</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Newtonsoft.Json">
|
||||
<Version>13.0.1</Version>
|
||||
|
||||
Reference in New Issue
Block a user