up 6.2

Update ResUI.fa-Ir.resx

v2rayN/v2rayN/Global.cs

@@ -98,7 +98,7 @@
         public static readonly List<string> fingerprints = new List<string> { "chrome", "firefox", "safari", "randomized", "" };
         public static readonly List<string> allowInsecures = new List<string> { "true", "false", "" };
         public static readonly List<string> domainStrategy4Freedoms = new List<string> { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
-        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en" };
+        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en", "fa-Ir" };
         public static readonly List<string> alpns = new List<string> { "h2", "http/1.1", "h2,http/1.1", "" };
         public static readonly List<string> LogLevel = new List<string> { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new List<string> { "socks", "http", "socks2", "http2" };

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -1217,6 +1217,22 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        public static int MoveToGroup(Config config, List<ProfileItem> lstProfile, string subid)
+        {
+            foreach (var it in lstProfile)
+            {
+                var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                if (item is null)
+                {
+                    continue;
+                }
+
+                item.subid = subid;
+                SqliteHelper.Instance.Update(item);
+            }
+
+            return 0;
+        }
         #endregion
 
         #region UI

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -1463,8 +1463,8 @@ namespace v2rayN.Handler
                     }
                     if (it.configType == EConfigType.VMess || it.configType == EConfigType.VLESS)
                     {
-                        var item2 = LazyConfig.Instance.GetProfileItem(config.indexId);
-                        if (item2 is null || !Utils.IsGuidByParse(item2.id))
+                        var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
+                        if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
                         {
                             continue;
                         }

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -11,9 +11,9 @@ namespace v2rayN.Handler
     /// </summary>
     class CoreHandler
     {
-        private static string coreCConfigRes = Global.coreConfigFileName;
-        private CoreInfo coreInfo;
-        private int processId = 0;
+        private static string _coreCConfigRes = Global.coreConfigFileName;
+        private CoreInfo _coreInfo;
+        private int _processId = 0;
         private Process _process;
         Action<bool, string> _updateFunc;
 
@@ -38,7 +38,7 @@ namespace v2rayN.Handler
                     ShowMsg(false, ResUI.CheckServerSettings);
                     return;
                 }
-                string fileName = Utils.GetConfigPath(coreCConfigRes);
+                string fileName = Utils.GetConfigPath(_coreCConfigRes);
                 if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
                 {
                     ShowMsg(false, msg);
@@ -62,7 +62,7 @@ namespace v2rayN.Handler
                     };
                     if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
                     {
-                        processId = CoreStartViaString(configStr);
+                        _processId = CoreStartViaString(configStr);
                     }
                 }
             }
@@ -96,17 +96,17 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    if (coreInfo == null || coreInfo.coreExes == null)
+                    if (_coreInfo == null || _coreInfo.coreExes == null)
                     {
                         return;
                     }
-                    foreach (string vName in coreInfo.coreExes)
+                    foreach (string vName in _coreInfo.coreExes)
                     {
                         Process[] existing = Process.GetProcessesByName(vName);
                         foreach (Process p in existing)
                         {
                             string path = p.MainModule.FileName;
-                            if (path == $"{Utils.GetBinPath(vName, coreInfo.coreType)}.exe")
+                            if (path == $"{Utils.GetBinPath(vName, _coreInfo.coreType)}.exe")
                             {
                                 KillProcess(p);
                             }
@@ -114,10 +114,10 @@ namespace v2rayN.Handler
                     }
                 }
 
-                if (processId > 0)
+                if (_processId > 0)
                 {
-                    CoreStopPid(processId);
-                    processId = 0;
+                    CoreStopPid(_processId);
+                    _processId = 0;
                 }
 
             }
@@ -140,10 +140,10 @@ namespace v2rayN.Handler
             }
         }
 
-        private string CoreFindexe(List<string> lstCoreTemp)
+        private string CoreFindexe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
-            foreach (string name in lstCoreTemp)
+            foreach (string name in coreInfo.coreExes)
             {
                 string vName = $"{name}.exe";
                 vName = Utils.GetBinPath(vName, coreInfo.coreType);
@@ -155,7 +155,7 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", lstCoreTemp.ToArray()), coreInfo.coreUrl);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -167,7 +167,7 @@ namespace v2rayN.Handler
 
             try
             {
-                string fileName = CoreFindexe(coreInfo.coreExes);
+                string fileName = CoreFindexe(_coreInfo);
                 if (fileName == "") return;
 
                 Process p = new Process
@@ -175,7 +175,7 @@ namespace v2rayN.Handler
                     StartInfo = new ProcessStartInfo
                     {
                         FileName = fileName,
-                        Arguments = coreInfo.arguments,
+                        Arguments = _coreInfo.arguments,
                         WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
                         RedirectStandardOutput = node.displayLog,
@@ -224,7 +224,8 @@ namespace v2rayN.Handler
 
             try
             {
-                string fileName = CoreFindexe(new List<string> { "xray", "wxray", "wv2ray", "v2ray" });
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
+                string fileName = CoreFindexe(coreInfo);
                 if (fileName == "") return -1;
 
                 Process p = new Process
@@ -305,9 +306,9 @@ namespace v2rayN.Handler
             }
             var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
 
-            coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+            _coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
 
-            if (coreInfo == null)
+            if (_coreInfo == null)
             {
                 return -1;
             }

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -91,6 +91,10 @@ namespace v2rayN.Handler
                             if (Global.ShowInTaskbar)
                             {
                                 server.indexId = config_.indexId;
+                                server.todayUp = _serverStatItem.todayUp;
+                                server.todayDown = _serverStatItem.todayDown;
+                                server.totalUp = _serverStatItem.totalUp;
+                                server.totalDown = _serverStatItem.totalDown;
                                 updateFunc_(server);
                             }
                             if (server.proxyUp != 0 || server.proxyDown != 0)

v2rayN/v2rayN/Handler/TunHandler.cs

@@ -200,15 +200,17 @@ namespace v2rayN.Base
                 {
                     return;
                 }
+                var showWindow = _config.tunModeItem.showWindow;
                 Process p = new Process
                 {
                     StartInfo = new ProcessStartInfo
                     {
                         FileName = fileName,
-                        Arguments = $"run -c {Utils.GetConfigPath(_tunConfigName)}",
+                        Arguments = $"run -c \"{Utils.GetConfigPath(_tunConfigName)}\"",
                         WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = _config.tunModeItem.showWindow,
-                        CreateNoWindow = !_config.tunModeItem.showWindow,
+                        UseShellExecute = showWindow,
+                        CreateNoWindow = !showWindow,
+                        RedirectStandardError = !showWindow,
                         Verb = "runas",
                     }
                 };
@@ -217,7 +219,14 @@ namespace v2rayN.Base
                 _isRunning = true;
                 if (p.WaitForExit(1000))
                 {
-                    throw new Exception("start tun mode fail");
+                    if (showWindow)
+                    {
+                        throw new Exception("start tun mode fail");
+                    }
+                    else
+                    {
+                        throw new Exception(p.StandardError.ReadToEnd());
+                    }
                 }
 
                 Global.processJob.AddProcess(p.Handle);

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -55,7 +55,7 @@ namespace v2rayN.Handler
                                 StartInfo = new ProcessStartInfo
                                 {
                                     FileName = "v2rayUpgrade.exe",
-                                    Arguments = "\"" + fileName + "\"",
+                                    Arguments = $"\"{fileName}\"",
                                     WorkingDirectory = Utils.StartupPath()
                                 }
                             };
@@ -457,6 +457,17 @@ namespace v2rayN.Handler
                         throw new ArgumentException("Type");
                 }
 
+                if (type == ECoreType.v2rayN)
+                {
+                    decimal.TryParse(curVersion, out decimal decCur);
+                    decimal.TryParse(version, out decimal dec);
+                    if (decCur >= dec)
+                    {
+                        AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
+                        return;
+                    }
+                }
+
                 if (curVersion == version)
                 {
                     AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));

v2rayN/v2rayN/Mode/Config.cs

@@ -45,6 +45,8 @@
             get; set;
         }
 
+        public bool autoRun { get; set; }
+
         /// <summary>
         /// 启用实时网速和流量统计
         /// </summary>
@@ -124,9 +126,9 @@
         }
         public string systemProxyAdvancedProtocol { get; set; }
 
-        public int autoUpdateInterval { get; set; } = 0;
+        public int autoUpdateInterval { get; set; } = 10;
 
-        public int autoUpdateSubInterval { get; set; } = 0;
+        public int autoUpdateSubInterval { get; set; } = 10;
 
         public bool checkPreReleaseUpdate { get; set; } = false;
 
@@ -135,7 +137,7 @@
             get; set;
         }
 
-        public int trayMenuServersLimit { get; set; }
+        public int trayMenuServersLimit { get; set; } = 20;
 
         public bool autoHideStartup { get; set; }
 

v2rayN/v2rayN/Mode/ServerSpeedItem.cs

@@ -1,12 +1,8 @@
 namespace v2rayN.Mode
 {
     [Serializable]
-    class ServerSpeedItem
+    class ServerSpeedItem : ServerStatItem
     {
-        public string indexId
-        {
-            get; set;
-        }
         public long proxyUp
         {
             get; set;

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -807,6 +807,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Move to group 的本地化字符串。
+        /// </summary>
+        public static string menuMoveToGroup {
+            get {
+                return ResourceManager.GetString("menuMoveToGroup", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Move to top (T) 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -1060,4 +1060,7 @@
   <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
     <value>Show console</value>
   </data>
+  <data name="menuMoveToGroup" xml:space="preserve">
+    <value>Move to group</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -1060,4 +1060,7 @@
   <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
     <value>显示控制台</value>
   </data>
+  <data name="menuMoveToGroup" xml:space="preserve">
+    <value>移至订阅分组</value>
+  </data>
 </root>

v2rayN/v2rayN/Tool/Utils.cs

@@ -597,8 +597,16 @@ namespace v2rayN
         {
             try
             {
-                string exePath = GetExePath();
-                RegWriteValue(Global.AutoRunRegPath, Global.AutoRunName, run ? $"\"{exePath}\"" : "");
+                var autoRunName = $"{Global.AutoRunName}_{GetMD5(StartupPath())}";
+
+                //delete first
+                RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+
+                if (run)
+                {
+                    string exePath = $"\"{GetExePath()}\"";
+                    RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath);
+                }
             }
             catch (Exception ex)
             {

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -58,6 +58,7 @@ namespace v2rayN.ViewModels
                 SaveServer();
             });
 
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -46,6 +46,7 @@ namespace v2rayN.ViewModels
                 SaveServer();
             });
 
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -62,6 +62,8 @@ namespace v2rayN.ViewModels
         [Reactive]
         public SubItem SelectedSub { get; set; }
         [Reactive]
+        public SubItem SelectedMoveToGroup { get; set; }
+        [Reactive]
         public RoutingItem SelectedRouting { get; set; }
         [Reactive]
         public ComboItem SelectedServer { get; set; }
@@ -86,7 +88,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> CopyServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SetDefaultServerCmd { get; }
         public ReactiveCommand<Unit, Unit> ShareServerCmd { get; }
-        //servers move
+        //servers move   
         public ReactiveCommand<Unit, Unit> MoveTopCmd { get; }
         public ReactiveCommand<Unit, Unit> MoveUpCmd { get; }
         public ReactiveCommand<Unit, Unit> MoveDownCmd { get; }
@@ -205,6 +207,7 @@ namespace v2rayN.ViewModels
 
             SelectedProfile = new();
             SelectedSub = new();
+            SelectedMoveToGroup = new();
             SelectedRouting = new();
             SelectedServer = new();
 
@@ -220,6 +223,10 @@ namespace v2rayN.ViewModels
                 x => x.SelectedSub,
                 y => y != null && !y.remarks.IsNullOrEmpty() && _subId != y.id)
                     .Subscribe(c => SubSelectedChanged(c));
+            this.WhenAnyValue(
+                 x => x.SelectedMoveToGroup,
+                 y => y != null && !y.remarks.IsNullOrEmpty())
+                     .Subscribe(c => MoveToGroup(c));            
 
             this.WhenAnyValue(
                 x => x.SelectedRouting,
@@ -305,7 +312,7 @@ namespace v2rayN.ViewModels
             {
                 ShareServer();
             }, canEditRemove);
-            //servers move
+            //servers move   
             MoveTopCmd = ReactiveCommand.Create(() =>
             {
                 MoveServer(EMove.Top);
@@ -533,6 +540,24 @@ namespace v2rayN.ViewModels
                     }
                     SpeedProxyDisplay = string.Format("{0}:{1}/s<><73> | {2}/s<><73>", Global.agentTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
                     SpeedDirectDisplay = string.Format("{0}:{1}/s<><73> | {2}/s<><73>", Global.directTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
+
+                    if (update.proxyUp + update.proxyDown > 0)
+                    {
+                        var second = DateTime.Now.Second;
+                        if (second % 3 == 0)
+                        {
+                            var item = _profileItems.Where(it => it.indexId == update.indexId).FirstOrDefault();
+                            if (item != null)
+                            {
+                                item.todayDown = Utils.HumanFy(update.todayDown);
+                                item.todayUp = Utils.HumanFy(update.todayUp);
+                                item.totalDown = Utils.HumanFy(update.totalDown);
+                                item.totalUp = Utils.HumanFy(update.totalUp);
+
+                                _profileItems.Replace(item, Utils.DeepCopy(item));
+                            }
+                        }
+                    }
                 }));
             }
             catch (Exception ex)
@@ -638,6 +663,8 @@ namespace v2rayN.ViewModels
             _subId = SelectedSub?.id;
 
             RefreshServers();
+
+            _updateView("ProfilesFocus");
         }
 
         private void ServerFilterChanged(bool c)
@@ -747,7 +774,7 @@ namespace v2rayN.ViewModels
         private int GetProfileItems(out List<ProfileItem> lstSelecteds)
         {
             lstSelecteds = new List<ProfileItem>();
-            if (SelectedProfiles == null && SelectedProfiles.Count() <= 0)
+            if (SelectedProfiles == null || SelectedProfiles.Count() <= 0)
             {
                 return -1;
             }
@@ -995,6 +1022,26 @@ namespace v2rayN.ViewModels
         }
 
         //move server
+        private void MoveToGroup(bool c)
+        {
+            if (!c)
+            {
+                return;
+            }
+
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            {
+                return;
+            }
+
+            ConfigHandler.MoveToGroup(_config, lstSelecteds, SelectedMoveToGroup.id);
+            _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+
+            RefreshServers();
+            SelectedMoveToGroup = new();
+            //Reload();
+        }
+
         public void MoveServer(EMove eMove)
         {
             var item = _lstProfile.FirstOrDefault(t => t.indexId == SelectedProfile.indexId);

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -125,7 +125,7 @@ namespace v2rayN.ViewModels
             #endregion
 
             #region UI
-            AutoRun = Utils.IsAutoRun();
+            AutoRun = _config.autoRun;
             EnableStatistics = _config.enableStatistics;
             StatisticsFreshRate = _config.statisticsFreshRate;
             KeepOlderDedupl = _config.keepOlderDedupl;
@@ -161,6 +161,8 @@ namespace v2rayN.ViewModels
             {
                 SaveSetting();
             });
+
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
 
         private void InitCoreType()
@@ -280,6 +282,7 @@ namespace v2rayN.ViewModels
 
             //UI
             Utils.SetAutoRun(AutoRun);
+            _config.autoRun = AutoRun;
             _config.enableStatistics = EnableStatistics;
             _config.statisticsFreshRate = StatisticsFreshRate;
             if (_config.statisticsFreshRate > 100 || _config.statisticsFreshRate < 1)

v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -61,6 +61,7 @@ namespace v2rayN.ViewModels
                 SaveRules();
             });
 
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
         private void SaveRules()
         {

v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs

@@ -115,6 +115,8 @@ namespace v2rayN.ViewModels
             {
                 SaveRouting();
             });
+
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
 
         public void RefreshRulesItems()

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -113,6 +113,8 @@ namespace v2rayN.ViewModels
             {
                 SaveRouting();
             });
+
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
 
         #region locked

v2rayN/v2rayN/ViewModels/SubEditViewModel.cs

@@ -41,6 +41,8 @@ namespace v2rayN.ViewModels
             {
                 SaveSub();
             });
+
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
         private void SaveSub()
         {

v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs

@@ -5,6 +5,7 @@ using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
+using System.Windows;
 using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
@@ -30,7 +31,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> SubShareCmd { get; }
         public bool IsModified { get; set; }
 
-        public SubSettingViewModel()
+        public SubSettingViewModel(Window view)
         {
             _config = LazyConfig.Instance.GetConfig();
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
@@ -59,6 +60,8 @@ namespace v2rayN.ViewModels
             {
                 SubShare();
             }, canEditRemove);
+
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
 
         public void RefreshSubItems()

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -49,6 +49,8 @@ namespace v2rayN.Views
             txtGlobalHotkey4.KeyDown += TxtGlobalHotkey_KeyDown;
 
             BindingData(-1);
+
+            Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
         }
 
 

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -451,6 +451,23 @@
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuShareServer}" />
                                 <Separator />
+                                <MenuItem
+                                    x:Name="menuMoveToGroup"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuMoveToGroup}">
+                                    <MenuItem Height="Auto">
+                                        <MenuItem.Header>
+                                            <DockPanel>
+                                                <ComboBox
+                                                    x:Name="cmbMoveToGroup"
+                                                    Width="200"
+                                                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
+                                                    DisplayMemberPath="remarks"
+                                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
+                                            </DockPanel>
+                                        </MenuItem.Header>
+                                    </MenuItem>
+                                </MenuItem>
                                 <MenuItem
                                     x:Name="menuMoveTop"
                                     Height="{StaticResource MenuItemHeight}"

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -66,6 +66,9 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.ShareServerCmd, v => v.menuShareServer).DisposeWith(disposables);
 
                 //servers move
+                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);
                 this.BindCommand(ViewModel, vm => vm.MoveUpCmd, v => v.menuMoveUp).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.MoveDownCmd, v => v.menuMoveDown).DisposeWith(disposables);
@@ -184,6 +187,10 @@ namespace v2rayN.Views
                     }
                 }));
             }
+            else if (action == "ProfilesFocus")
+            {
+                lstProfiles.Focus();
+            }
         }
 
         private void MainWindow_Closing(object? sender, CancelEventArgs e)
@@ -212,10 +219,10 @@ namespace v2rayN.Views
         }
         private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
         {
-            if (e.Row.GetIndex() == 0)
-            {
-                lstProfiles.Focus();
-            }
+            //if (e.Row.GetIndex() == 0)
+            //{
+            //    lstProfiles.Focus();
+            //}
 
             e.Row.Header = e.Row.GetIndex() + 1;
         }
@@ -323,15 +330,15 @@ namespace v2rayN.Views
                 {
                     ViewModel?.MoveServer(EMove.Top);
                 }
-                else if (e.Key == Key.B)
+                else if (e.Key == Key.U)
                 {
                     ViewModel?.MoveServer(EMove.Up);
                 }
-                else if (e.Key == Key.U)
+                else if (e.Key == Key.D)
                 {
                     ViewModel?.MoveServer(EMove.Down);
                 }
-                else if (e.Key == Key.D)
+                else if (e.Key == Key.B)
                 {
                     ViewModel?.MoveServer(EMove.Bottom);
                 }

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -11,6 +11,7 @@ namespace v2rayN.Views
         public RoutingSettingWindow()
         {
             InitializeComponent();
+            this.Closing += RoutingSettingWindow_Closing;
             this.PreviewKeyDown += RoutingSettingWindow_PreviewKeyDown;
             lstRoutings.SelectionChanged += lstRoutings_SelectionChanged;
             lstRoutings.MouseDoubleClick += LstRoutings_MouseDoubleClick;
@@ -61,6 +62,14 @@ namespace v2rayN.Views
             });
         }
 
+        private void RoutingSettingWindow_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (ViewModel?.IsModified == true)
+            {
+                this.DialogResult = true;
+            }
+        }
+
         private void RoutingSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -1,4 +1,5 @@
 using ReactiveUI;
+using System.ComponentModel;
 using System.Reactive.Disposables;
 using System.Windows.Input;
 using v2rayN.ViewModels;
@@ -11,7 +12,8 @@ namespace v2rayN.Views
         {
             InitializeComponent();
 
-            ViewModel = new SubSettingViewModel();
+            ViewModel = new SubSettingViewModel(this);
+            this.Closing += SubSettingWindow_Closing;
             lstSubscription.MouseDoubleClick += LstSubscription_MouseDoubleClick;
 
             this.WhenActivated(disposables =>
@@ -27,10 +29,18 @@ namespace v2rayN.Views
             });
         }
 
+        private void SubSettingWindow_Closing(object? sender, CancelEventArgs e)
+        {
+            if (ViewModel?.IsModified == true)
+            {
+                this.DialogResult = true;
+            }
+        }
+
         private void LstSubscription_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             ViewModel?.EditSub(false);
-        }
+        }         
 
         private void menuClose_Click(object sender, System.Windows.RoutedEventArgs e)
         {

v2rayN/v2rayN/v2rayN.csproj

@@ -9,7 +9,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.0</FileVersion>
+		<FileVersion>6.2</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>		
@@ -96,6 +96,9 @@
 	  <EmbeddedResource Update="Resx\ResUI.zh-Hans.resx">
 	    <Generator>PublicResXFileCodeGenerator</Generator>
 	  </EmbeddedResource>
+	  <EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
+	    <Generator>PublicResXFileCodeGenerator</Generator>
+	  </EmbeddedResource>
 	</ItemGroup>
 
 </Project>