Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-05-01 20:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize server filter

Browse source
This commit is contained in:
2dust 2023-04-12 11:34:42 +08:00
parent 3fa22fdc55
commit b8959c8f12
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2rayN/v2rayN/Resx/ResUI.Designer.cs generated
View file

@ -1411,7 +1411,7 @@ namespace v2rayN.Resx {
} }
/// <summary> /// <summary>
/// 查找类似 Servers Filter 的本地化字符串。 /// 查找类似 Servers Filter, press Enter to execute 的本地化字符串。
/// </summary> /// </summary>
public static string MsgServerTitle { public static string MsgServerTitle {
get { get {

2
v2rayN/v2rayN/Resx/ResUI.resx
View file

@ -434,7 +434,7 @@
<value>Local</value> <value>Local</value>
</data> </data>
<data name="MsgServerTitle" xml:space="preserve"> <data name="MsgServerTitle" xml:space="preserve">
<value>Servers Filter</value> <value>Servers Filter, press Enter to execute</value>
</data> </data>
<data name="menuCheckUpdate" xml:space="preserve"> <data name="menuCheckUpdate" xml:space="preserve">
<value>Check Update</value> <value>Check Update</value>

2
v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
View file

@ -434,7 +434,7 @@
<value>本地</value> <value>本地</value>
</data> </data>
<data name="MsgServerTitle" xml:space="preserve"> <data name="MsgServerTitle" xml:space="preserve">
<value>服务器过滤器</value> <value>服务器过滤器，按回车执行</value>
</data> </data>
<data name="menuCheckUpdate" xml:space="preserve"> <data name="menuCheckUpdate" xml:space="preserve">
<value>检查更新</value> <value>检查更新</value>

7
v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
View file

@ -718,10 +718,13 @@ namespace v2rayN.ViewModels
return; return;
} }
_serverFilter = ServerFilter; _serverFilter = ServerFilter;
RefreshServers(); if (Utils.IsNullOrEmpty(_serverFilter))
{
RefreshServers();
}
} }
private void RefreshServers() public void RefreshServers()
{ {
List<ProfileItemModel> lstModel = LazyConfig.Instance.ProfileItems(_subId, _serverFilter); List<ProfileItemModel> lstModel = LazyConfig.Instance.ProfileItems(_subId, _serverFilter);

1
v2rayN/v2rayN/Views/MainWindow.xaml
View file

@ -499,6 +499,7 @@
GridLinesVisibility="All" GridLinesVisibility="All"
HeadersVisibility="All" HeadersVisibility="All"
IsReadOnly="True" IsReadOnly="True"
RowHeaderWidth="40"
Style="{StaticResource DefDataGrid}"> Style="{StaticResource DefDataGrid}">
<DataGrid.InputBindings> <DataGrid.InputBindings>
<KeyBinding Command="ApplicationCommands.NotACommand" Gesture="Ctrl+C" /> <KeyBinding Command="ApplicationCommands.NotACommand" Gesture="Ctrl+C" />

10
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View file

@ -30,10 +30,10 @@ namespace v2rayN.Views
this.Closing += MainWindow_Closing; this.Closing += MainWindow_Closing;
this.PreviewKeyDown += MainWindow_PreviewKeyDown; this.PreviewKeyDown += MainWindow_PreviewKeyDown;
btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click; btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown; lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
lstProfiles.SelectionChanged += lstProfiles_SelectionChanged; lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
lstProfiles.LoadingRow += LstProfiles_LoadingRow; lstProfiles.LoadingRow += LstProfiles_LoadingRow;
lstProfiles.RowHeaderWidth = 30;
if (_config.uiItem.enableDragDropSort) if (_config.uiItem.enableDragDropSort)
{ {
lstProfiles.AllowDrop = true; lstProfiles.AllowDrop = true;
@ -408,6 +408,14 @@ namespace v2rayN.Views
it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto); it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
} }
} }
private void TxtServerFilter_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key is Key.Enter or Key.Return)
{
ViewModel?.RefreshServers();
}
}
#endregion #endregion
#region UI #region UI