github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/Code-Fight/master' into pr5

pull/567/head
YFdyh000 2020-03-20 07:15:22 +08:00
parent 2d2e4deb82 c1bb333555
commit 01b34dd45a
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v2rayN/v2rayN/Forms/MainForm.Designer.cs generated
View File

@ -76,6 +76,7 @@
this.menuAddServers2 = new System.Windows.Forms.ToolStripMenuItem(); this.menuAddServers2 = new System.Windows.Forms.ToolStripMenuItem();
this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem(); this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem();
this.menuCopyPACUrl = new System.Windows.Forms.ToolStripMenuItem(); this.menuCopyPACUrl = new System.Windows.Forms.ToolStripMenuItem();
this.update_subscription = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.menuExit = new System.Windows.Forms.ToolStripMenuItem(); this.menuExit = new System.Windows.Forms.ToolStripMenuItem();
this.bgwScan = new System.ComponentModel.BackgroundWorker(); this.bgwScan = new System.ComponentModel.BackgroundWorker();
@ -389,6 +390,7 @@
this.menuAddServers2, this.menuAddServers2,
this.menuScanScreen2, this.menuScanScreen2,
this.menuCopyPACUrl, this.menuCopyPACUrl,
this.update_subscription,
this.toolStripSeparator2, this.toolStripSeparator2,
this.menuExit}); this.menuExit});
this.cmsMain.Name = "contextMenuStrip1"; this.cmsMain.Name = "contextMenuStrip1";
@ -474,6 +476,12 @@
resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl"); resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click); this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click);
// //
// update_subscription
//
this.update_subscription.Name = "update_subscription";
resources.ApplyResources(this.update_subscription, "update_subscription");
this.update_subscription.Click += new System.EventHandler(this.update_subscription_Click);
//
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
@ -910,6 +918,7 @@
private System.Windows.Forms.ToolStripMenuItem menuRealPingServer; private System.Windows.Forms.ToolStripMenuItem menuRealPingServer;
private System.Windows.Forms.ToolStripMenuItem menuNotEnabledHttp; private System.Windows.Forms.ToolStripMenuItem menuNotEnabledHttp;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13; private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.ToolStripMenuItem update_subscription;
private System.Windows.Forms.ToolStripMenuItem tsbV2rayWebsite; private System.Windows.Forms.ToolStripMenuItem tsbV2rayWebsite;
private System.Windows.Forms.ToolStripButton tsbTestMe; private System.Windows.Forms.ToolStripButton tsbTestMe;
private System.Windows.Forms.ToolStripMenuItem menuKeepNothing; private System.Windows.Forms.ToolStripMenuItem menuKeepNothing;

13
v2rayN/v2rayN/Forms/MainForm.cs
View File

@ -883,6 +883,11 @@ namespace v2rayN.Forms
return counter; return counter;
} }
private void update_subscription_Click(object sender, EventArgs e)
{
UpdateSubscriptionProcess();
}
#endregion #endregion
@ -1427,6 +1432,14 @@ namespace v2rayN.Forms
} }
private void tsbSubUpdate_Click(object sender, EventArgs e) private void tsbSubUpdate_Click(object sender, EventArgs e)
{
UpdateSubscriptionProcess();
}
/// <summary>
/// the subscription update process
/// </summary>
private void UpdateSubscriptionProcess()
{ {
AppendText(false, UIRes.I18N("MsgUpdateSubscriptionStart")); AppendText(false, UIRes.I18N("MsgUpdateSubscriptionStart"));

14
v2rayN/v2rayN/Forms/MainForm.resx
View File

@ -184,7 +184,7 @@
<value>cmsMain</value> <value>cmsMain</value>
</data> </data>
<data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing"> <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>265, 142</value> <value>265, 186</value>
</data> </data>
<data name="&gt;&gt;cmsMain.Type" xml:space="preserve"> <data name="&gt;&gt;cmsMain.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -1466,4 +1466,16 @@
<data name="&gt;&gt;txtMsgBox.ZOrder" xml:space="preserve"> <data name="&gt;&gt;txtMsgBox.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;update_subscription.Name" xml:space="preserve">
<value>update_subscription</value>
</data>
<data name="update_subscription.Size" type="System.Drawing.Size, System.Drawing">
<value>264, 22</value>
</data>
<data name="update_subscription.Text" xml:space="preserve">
<value>update subscription</value>
</data>
<data name="&gt;&gt;update_subscription.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root> </root>

3
v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
View File

@ -495,4 +495,7 @@
<data name="tsbV2rayWebsite.Text" xml:space="preserve"> <data name="tsbV2rayWebsite.Text" xml:space="preserve">
<value>V2Ray 官网</value> <value>V2Ray 官网</value>
</data> </data>
<data name="update_subscription.Text" xml:space="preserve">
<value>更新订阅</value>
</data>
</root> </root>