diff --git a/v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs b/v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs index 616c5634..96e61724 100644 --- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs @@ -34,14 +34,18 @@ this.panel2 = new System.Windows.Forms.Panel(); this.btnClose = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button(); + this.btnFilterDirect = new System.Windows.Forms.Button(); + this.btnFilderProxy = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); this.panel2.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // - resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.btnFilderProxy); + this.groupBox1.Controls.Add(this.btnFilterDirect); this.groupBox1.Controls.Add(this.txtMsgFilter); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -52,15 +56,15 @@ // // panel2 // - resources.ApplyResources(this.panel2, "panel2"); this.panel2.Controls.Add(this.btnClose); this.panel2.Controls.Add(this.btnOK); + resources.ApplyResources(this.panel2, "panel2"); this.panel2.Name = "panel2"; // // btnClose // - resources.ApplyResources(this.btnClose, "btnClose"); this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.btnClose, "btnClose"); this.btnClose.Name = "btnClose"; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); @@ -72,6 +76,20 @@ this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // + // btnFilterDirect + // + resources.ApplyResources(this.btnFilterDirect, "btnFilterDirect"); + this.btnFilterDirect.Name = "btnFilterDirect"; + this.btnFilterDirect.UseVisualStyleBackColor = true; + this.btnFilterDirect.Click += new System.EventHandler(this.btnFilterDirect_Click); + // + // btnFilderProxy + // + resources.ApplyResources(this.btnFilderProxy, "btnFilderProxy"); + this.btnFilderProxy.Name = "btnFilderProxy"; + this.btnFilderProxy.UseVisualStyleBackColor = true; + this.btnFilderProxy.Click += new System.EventHandler(this.btnFilderProxy_Click); + // // MsgFilterSetForm // resources.ApplyResources(this, "$this"); @@ -94,5 +112,7 @@ private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Button btnFilderProxy; + private System.Windows.Forms.Button btnFilterDirect; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/MsgFilterSetForm.cs b/v2rayN/v2rayN/Forms/MsgFilterSetForm.cs index cbfdd0cd..debeb482 100644 --- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.cs +++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.cs @@ -34,5 +34,15 @@ namespace v2rayN.Forms { this.DialogResult = DialogResult.Cancel; } + + private void btnFilderProxy_Click(object sender, EventArgs e) + { + txtMsgFilter.Text = "^(?!.*proxy).*$"; + } + + private void btnFilterDirect_Click(object sender, EventArgs e) + { + txtMsgFilter.Text = "^(?!.*direct).*$"; + } } } diff --git a/v2rayN/v2rayN/Forms/MsgFilterSetForm.resx b/v2rayN/v2rayN/Forms/MsgFilterSetForm.resx index 7a65393f..e154ee94 100644 --- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.resx +++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.resx @@ -117,151 +117,226 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 0 - - - txtMsgFilter - - - &OK - - - NoControl - - - &Cancel - - - groupBox1 - - - 41, 29 + + 157, 47 - - 490, 60 + + 95, 23 - - 11 + + 13 - - v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + Filter Proxy - - panel2 + + btnFilderProxy - - $this - - - 1 - - - 396, 17 - - - 0 - - - 1 - - - 0 - - - 75, 23 - - - 9 - - - 5 - - - groupBox1 - - - 8 - - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 - + + 0 + + + NoControl - - panel2 + + 41, 47 - - 4 + + 95, 23 - - MsgFilterSetForm + + 12 + + + Filter Direct + + + btnFilterDirect + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 41, 20 409, 21 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 11 - - 0, 0 - - - 0, 76 + + txtMsgFilter System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Bottom + + groupBox1 + + + 2 + + + Fill + + + 0, 0 490, 76 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnClose - - - panel2 + + 8 Filter + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + btnClose + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 0 + btnOK - - 490, 136 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 75, 23 + + panel2 - - 303, 17 + + 1 - - 6, 12 + + Bottom + + + 0, 76 + + + 490, 60 + + + 9 + + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - MsgFilterSetForm + + 1 + + + NoControl + + + 396, 17 + + + 75, 23 + + + 4 + + + &Cancel + + + btnClose + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 0 + + + NoControl + + + 303, 17 + + + 75, 23 + + + 5 + + + &OK + + + btnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 1 True + + 6, 12 + + + 490, 136 + + + MsgFilterSetForm + + + MsgFilterSetForm + + + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx index 351a04cb..67a72ead 100644 --- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx @@ -129,4 +129,10 @@ 设置过滤器 + + 过滤Proxy + + + 过滤Direct + \ No newline at end of file