diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index 40bde609..1208e959 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -116,6 +116,8 @@
@@ -141,36 +143,46 @@
-
+
+ Header="{x:Static resx:ResUI.LvServiceType}"
+ Tag="configType" />
+ Header="{x:Static resx:ResUI.LvRemarks}"
+ Tag="remarks" />
+ Header="{x:Static resx:ResUI.LvAddress}"
+ Tag="address" />
+ Header="{x:Static resx:ResUI.LvPort}"
+ Tag="port" />
+ Header="{x:Static resx:ResUI.LvTransportProtocol}"
+ Tag="network" />
+ Header="{x:Static resx:ResUI.LvTLS}"
+ Tag="streamSecurity" />
-
+ Header="{x:Static resx:ResUI.LvSubscription}"
+ Tag="subRemarks" />
+
@@ -188,24 +200,29 @@
+ Header="{x:Static resx:ResUI.LvTestSpeed}"
+ Tag="speedVal" />
+ Header="{x:Static resx:ResUI.LvTodayUploadDataAmount}"
+ Tag="todayUp" />
+ Header="{x:Static resx:ResUI.LvTodayDownloadDataAmount}"
+ Tag="todayDown" />
+ Header="{x:Static resx:ResUI.LvTotalUploadDataAmount}"
+ Tag="totalUp" />
+ Header="{x:Static resx:ResUI.LvTotalDownloadDataAmount}"
+ Tag="totalDown" />
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 280a13b7..4df3854f 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -64,7 +64,7 @@ namespace v2rayN.Desktop.Views
this.BindCommand(ViewModel, vm => vm.SetDefaultLoadBalanceServerCmd, v => v.menuSetDefaultLoadBalanceServer).DisposeWith(disposables);
//servers move
- this.OneWayBind(ViewModel, vm => vm.SubItems, v => v.cmbMoveToGroup.ItemsSource).DisposeWith(disposables);
+ //this.OneWayBind(ViewModel, vm => vm.SubItems, v => v.cmbMoveToGroup.ItemsSource).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedMoveToGroup, v => v.cmbMoveToGroup.SelectedItem).DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.MoveTopCmd, v => v.menuMoveTop).DisposeWith(disposables);
@@ -86,9 +86,9 @@ namespace v2rayN.Desktop.Views
this.BindCommand(ViewModel, vm => vm.Export2ShareUrlBase64Cmd, v => v.menuExport2ShareUrlBase64).DisposeWith(disposables);
});
- //RestoreUI();
+ RestoreUI();
ViewModel?.RefreshServers();
- }
+ }
//#region Event
@@ -194,6 +194,7 @@ namespace v2rayN.Desktop.Views
{
ViewModel?.EditServerAsync(EConfigType.Custom);
}
+ StorageUI();
}
private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
@@ -301,6 +302,7 @@ namespace v2rayN.Desktop.Views
{
it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
}
+ StorageUI();
}
private void TxtServerFilter_KeyDown(object? sender, KeyEventArgs e)
@@ -315,61 +317,61 @@ namespace v2rayN.Desktop.Views
//#region UI
- //private void RestoreUI()
- //{
- // var lvColumnItem = _config.uiItem.mainColumnItem.OrderBy(t => t.Index).ToList();
- // var displayIndex = 0;
- // foreach (var item in lvColumnItem)
- // {
- // foreach (MyDGTextColumn item2 in lstProfiles.Columns)
- // {
- // if (item2.ExName == item.Name)
- // {
- // if (item.Width < 0)
- // {
- // item2.IsVisible = false;
- // }
- // else
- // {
- // item2.Width = item.Width;
- // item2.DisplayIndex = displayIndex++;
- // }
- // }
- // }
- // }
+ private void RestoreUI()
+ {
+ var lvColumnItem = _config.uiItem.mainColumnItem.OrderBy(t => t.Index).ToList();
+ var displayIndex = 0;
+ foreach (var item in lvColumnItem)
+ {
+ foreach (var item2 in lstProfiles.Columns)
+ {
+ if (item2.Tag == null)
+ {
+ continue;
+ }
+ if (item2.Tag.Equals(item.Name))
+ {
+ if (item.Width < 0)
+ {
+ item2.IsVisible = false;
+ }
+ else
+ {
+ item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel); ;
+ item2.DisplayIndex = displayIndex++;
+ }
+ if (item.Name.StartsWith("to"))
+ {
+ if (!_config.guiItem.enableStatistics)
+ {
+ item2.IsVisible = false;
+ }
+ }
+ }
+ }
+ }
+ }
- // if (!_config.guiItem.enableStatistics)
- // {
- // colTodayUp.IsVisible =
- // colTodayDown.IsVisible =
- // colTotalUp.IsVisible =
- // colTotalDown.IsVisible = false;
- // }
- // else
- // {
- // colTodayUp.IsVisible =
- // colTodayDown.IsVisible =
- // colTotalUp.IsVisible =
- // colTotalDown.IsVisible = true;
- // }
- //}
-
- //private void StorageUI()
- //{
- // List lvColumnItem = new();
- // for (int k = 0; k < lstProfiles.Columns.Count; k++)
- // {
- // var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
- // lvColumnItem.Add(new()
- // {
- // Name = item2.ExName,
- // Width = item2.IsVisible == true ? Utils.ToInt(item2.ActualWidth) : -1,
- // Index = item2.DisplayIndex
- // });
- // }
- // _config.uiItem.mainColumnItem = lvColumnItem;
- // ConfigHandler.SaveConfig(_config);
- //}
+ private void StorageUI()
+ {
+ List lvColumnItem = new();
+ for (int k = 0; k < lstProfiles.Columns.Count; k++)
+ {
+ var item2 = lstProfiles.Columns[k];
+ if (item2.Tag == null)
+ {
+ continue;
+ }
+ lvColumnItem.Add(new()
+ {
+ Name = (string)item2.Tag,
+ Width = item2.IsVisible == true ? Utils.ToInt(item2.ActualWidth) : -1,
+ Index = item2.DisplayIndex
+ });
+ }
+ _config.uiItem.mainColumnItem = lvColumnItem;
+ ConfigHandler.SaveConfig(_config);
+ }
//#endregion UI