mirror of
https://github.com/2dust/v2rayN.git
synced 2025-05-03 05:38:51 +00:00
store msg filter
This commit is contained in:
parent
f4c9ca8dff
commit
24be7b2180
4 changed files with 16 additions and 2 deletions
|
@ -114,7 +114,7 @@
|
||||||
public static readonly List<string> Protocols = new List<string> { "http", "tls", "bittorrent" };
|
public static readonly List<string> Protocols = new List<string> { "http", "tls", "bittorrent" };
|
||||||
public static readonly List<string> TunMtus = new List<string> { "9000", "1500" };
|
public static readonly List<string> TunMtus = new List<string> { "9000", "1500" };
|
||||||
public static readonly List<string> TunStacks = new List<string> { "gvisor", "system" };
|
public static readonly List<string> TunStacks = new List<string> { "gvisor", "system" };
|
||||||
public static readonly List<string> PresetMsgFilters = new List<string> { "^(?!.*proxy).*$", "^(?!.*direct).*$", "" };
|
public static readonly List<string> PresetMsgFilters = new List<string> { "proxy", "direct", "block", "" };
|
||||||
public static readonly List<string> SpeedTestUrls = new List<string> { @"http://cachefly.cachefly.net/100mb.test", @"http://cachefly.cachefly.net/10mb.test" };
|
public static readonly List<string> SpeedTestUrls = new List<string> { @"http://cachefly.cachefly.net/100mb.test", @"http://cachefly.cachefly.net/10mb.test" };
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
@ -122,6 +122,7 @@ namespace v2rayN.Mode
|
||||||
public bool enableDragDropSort { get; set; }
|
public bool enableDragDropSort { get; set; }
|
||||||
public bool doubleClick2Activate { get; set; }
|
public bool doubleClick2Activate { get; set; }
|
||||||
public bool autoHideStartup { get; set; } = true;
|
public bool autoHideStartup { get; set; } = true;
|
||||||
|
public string mainMsgFilter { get; set; }
|
||||||
public Dictionary<string, int> mainLvColWidth { get; set; }
|
public Dictionary<string, int> mainLvColWidth { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,8 @@
|
||||||
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
|
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
|
||||||
materialDesign:TextFieldAssist.HasClearButton="True"
|
materialDesign:TextFieldAssist.HasClearButton="True"
|
||||||
IsEditable="True"
|
IsEditable="True"
|
||||||
Style="{StaticResource DefComboBox}" />
|
Style="{StaticResource DefComboBox}"
|
||||||
|
TextBoxBase.TextChanged="cmbMsgFilter_TextChanged" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="8,0"
|
Margin="8,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
|
@ -3,19 +3,27 @@ using System.Reactive.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
using v2rayN.Base;
|
using v2rayN.Base;
|
||||||
|
using v2rayN.Handler;
|
||||||
|
using v2rayN.Mode;
|
||||||
|
|
||||||
namespace v2rayN.Views
|
namespace v2rayN.Views
|
||||||
{
|
{
|
||||||
public partial class MsgView
|
public partial class MsgView
|
||||||
{
|
{
|
||||||
|
private static Config _config;
|
||||||
public MsgView()
|
public MsgView()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
_config = LazyConfig.Instance.GetConfig();
|
||||||
MessageBus.Current.Listen<string>("MsgView").Subscribe(x => DelegateAppendText(x));
|
MessageBus.Current.Listen<string>("MsgView").Subscribe(x => DelegateAppendText(x));
|
||||||
Global.PresetMsgFilters.ForEach(it =>
|
Global.PresetMsgFilters.ForEach(it =>
|
||||||
{
|
{
|
||||||
cmbMsgFilter.Items.Add(it);
|
cmbMsgFilter.Items.Add(it);
|
||||||
});
|
});
|
||||||
|
if (!_config.uiItem.mainMsgFilter.IsNullOrEmpty())
|
||||||
|
{
|
||||||
|
cmbMsgFilter.Text = _config.uiItem.mainMsgFilter;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DelegateAppendText(string msg)
|
void DelegateAppendText(string msg)
|
||||||
|
@ -86,6 +94,10 @@ namespace v2rayN.Views
|
||||||
private void menuMsgViewClear_Click(object sender, System.Windows.RoutedEventArgs e)
|
private void menuMsgViewClear_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
ClearMsg();
|
ClearMsg();
|
||||||
|
}
|
||||||
|
private void cmbMsgFilter_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
_config.uiItem.mainMsgFilter = cmbMsgFilter.Text.TrimEx();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue