up 6.7

修改hysteria 官网

v2rayN/v2rayN/App.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:local="clr-namespace:v2rayN"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
@@ -91,6 +92,7 @@
                 BasedOn="{StaticResource MaterialDesignContextMenu}"
                 TargetType="{x:Type ContextMenu}">
                 <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
 
             <Style
@@ -98,6 +100,7 @@
                 BasedOn="{StaticResource MaterialDesignMenu}"
                 TargetType="{x:Type Menu}">
                 <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
 
             <Style

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -0,0 +1,16 @@
+using System.IO;
+using System.Windows.Media;
+
+namespace v2rayN.Converters
+{
+    public class MaterialDesignFonts
+    {
+        public static FontFamily MyFont { get; }
+
+        static MaterialDesignFonts()
+        {
+            var fontPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Resources\Fonts\");
+            MyFont = new FontFamily(new Uri($"file:///{fontPath}"), "./#Source Han Sans CN");
+        }
+    }
+}

v2rayN/v2rayN/Global.cs

@@ -12,7 +12,7 @@
         public const string NUrl = @"https://github.com/2dust/v2rayN/releases";
         public const string clashCoreUrl = "https://github.com/Dreamacro/clash/releases";
         public const string clashMetaCoreUrl = "https://github.com/MetaCubeX/Clash.Meta/releases";
-        public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases";
+        public const string hysteriaCoreUrl = "https://github.com/apernet/hysteria/releases";
         public const string naiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
         public const string tuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
         public const string singboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -638,7 +638,7 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
             {
-                profileItem.allowInsecure = config.defAllowInsecure.ToString();
+                profileItem.allowInsecure = config.defAllowInsecure.ToString().ToLower();
             }
 
             AddServerCommon(ref config, profileItem);
@@ -690,6 +690,28 @@ namespace v2rayN.Handler
             {
                 lstProfile[i].sort = (i + 1) * 10;
             }
+            if (name == EServerColName.delay)
+            {
+                var maxSort = lstProfile.Max(t => t.sort) + 10;
+                foreach (var item in lstProfile)
+                {
+                    if (item.delay <= 0)
+                    {
+                        item.sort = maxSort;
+                    }
+                }
+            }
+            if (name == EServerColName.speed)
+            {
+                var maxSort = lstProfile.Max(t => t.sort) + 10;
+                foreach (var item in lstProfile)
+                {
+                    if (item.speed <= 0)
+                    {
+                        item.sort = maxSort;
+                    }
+                }
+            }
 
             SqliteHelper.Instance.UpdateAll(lstProfile);
 
@@ -750,7 +772,7 @@ namespace v2rayN.Handler
             profileItem.configVersion = 2;
             if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
             {
-                profileItem.allowInsecure = config.defAllowInsecure.ToString();
+                profileItem.allowInsecure = config.defAllowInsecure.ToString().ToLower();
             }
             if (!Utils.IsNullOrEmpty(profileItem.network) && !Global.networks.Contains(profileItem.network))
             {
@@ -1194,11 +1216,11 @@ namespace v2rayN.Handler
             }
             if (isSub)
             {
-                SqliteHelper.Instance.Execute($"delete from ProfileItem where isSub = 1 and subid = {subid}");
+                SqliteHelper.Instance.Execute($"delete from ProfileItem where isSub = 1 and subid = '{subid}'");
             }
             else
             {
-                SqliteHelper.Instance.Execute($"delete from ProfileItem where subid = {subid}");
+                SqliteHelper.Instance.Execute($"delete from ProfileItem where subid = '{subid}'");
             }
 
             return 0;

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -554,7 +554,7 @@ namespace v2rayN.Handler
 
                     TlsSettings tlsSettings = new TlsSettings
                     {
-                        allowInsecure = Utils.ToBool(node.allowInsecure),
+                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                         alpn = node.GetAlpn(),
                         fingerprint = node.fingerprint
                     };
@@ -576,7 +576,7 @@ namespace v2rayN.Handler
 
                     TlsSettings xtlsSettings = new TlsSettings
                     {
-                        allowInsecure = Utils.ToBool(node.allowInsecure),
+                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                         alpn = node.GetAlpn(),
                         fingerprint = node.fingerprint
                     };

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -195,7 +195,8 @@ namespace v2rayN.Handler
 
                 try
                 {
-                    string status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, 10, out int responseTime);
+                    var config = LazyConfig.Instance.GetConfig();
+                    string status = GetRealPingTime(config.constItem.speedPingTestUrl, webProxy, 10, out int responseTime);
                     bool noError = Utils.IsNullOrEmpty(status);
                     return noError ? responseTime : -1;
                 }

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -85,17 +85,20 @@ namespace v2rayN.Handler
         public List<ProfileItemModel> ProfileItems(string subid, string filter)
         {
             var sql = @$"select a.* 
-                           ,b.remarks subRemarks
-                           ,case when a.indexId = '{_config.indexId}' then true else false end isActive
+                           ,b.remarks subRemarks                           
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id 
                         where 1=1 ";
             if (!Utils.IsNullOrEmpty(subid))
             {
-                sql += $" and a.subid = {subid}";
+                sql += $" and a.subid = '{subid}'";
             }
             if (!Utils.IsNullOrEmpty(filter))
             {
+                if (filter.Contains("'"))
+                {
+                    filter = filter.Replace("'", "");
+                }
                 sql += $" and a.remarks like '%{filter}%'";
             }
             sql += " order by a.sort";
@@ -134,11 +137,6 @@ namespace v2rayN.Handler
             return SqliteHelper.Instance.ExecuteAsync(sql);
         }
 
-        public List<ServerStatItem> ServerStatItems()
-        {
-            return SqliteHelper.Instance.Table<ServerStatItem>().ToList();
-        }
-
         public List<RoutingItem> RoutingItems()
         {
             return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).ToList();

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -12,6 +12,7 @@ namespace v2rayN.Handler
         private Config _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
+        private ESpeedActionType _actionType;
         Action<string, string, string> _updateFunc;
 
         public SpeedtestHandler(Config config)
@@ -23,12 +24,16 @@ namespace v2rayN.Handler
         {
             _config = config;
             _coreHandler = coreHandler;
-            //_selecteds = Utils.DeepCopy(selecteds);
+            _actionType = actionType;
             _updateFunc = update;
 
             _selecteds = new List<ServerTestItem>();
             foreach (var it in selecteds)
             {
+                if (it.configType == EConfigType.Custom)
+                {
+                    continue;
+                }
                 _selecteds.Add(new ServerTestItem()
                 {
                     indexId = it.indexId,
@@ -37,6 +42,25 @@ namespace v2rayN.Handler
                     configType = it.configType
                 });
             }
+            //clear test result
+            foreach (var it in _selecteds)
+            {
+                switch (actionType)
+                {
+                    case ESpeedActionType.Ping:
+                    case ESpeedActionType.Tcping:
+                    case ESpeedActionType.Realping:
+                        UpdateFunc(it.indexId, ResUI.Speedtesting, "");
+                        break;
+                    case ESpeedActionType.Speedtest:
+                        UpdateFunc(it.indexId, "", ResUI.Speedtesting);
+                        break;
+                    case ESpeedActionType.Mixedtest:
+                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.Speedtesting);
+                        break;
+                }
+            }
+
             switch (actionType)
             {
                 case ESpeedActionType.Ping:
@@ -106,7 +130,7 @@ namespace v2rayN.Handler
             });
         }
 
-        private async Task RunRealPing()
+        private Task RunRealPing()
         {
             int pid = -1;
             try
@@ -117,7 +141,7 @@ namespace v2rayN.Handler
                 if (pid < 0)
                 {
                     UpdateFunc("", ResUI.FailedToRunCore);
-                    return;
+                    return Task.CompletedTask;
                 }
 
                 DownloadHandle downloadHandle = new DownloadHandle();
@@ -144,6 +168,8 @@ namespace v2rayN.Handler
 
                             LazyConfig.Instance.SetTestResult(it.indexId, output, "");
                             UpdateFunc(it.indexId, output);
+                            int.TryParse(output, out int delay);
+                            it.delay = delay;
                         }
                         catch (Exception ex)
                         {
@@ -162,11 +188,17 @@ namespace v2rayN.Handler
             {
                 if (pid > 0) _coreHandler.CoreStopPid(pid);
             }
+
+            return Task.CompletedTask;
         }
+
         private async Task RunSpeedTestAsync()
         {
-            string testIndexId = string.Empty;
             int pid = -1;
+            if (_actionType == ESpeedActionType.Mixedtest)
+            {
+                _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
+            }
 
             pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
             if (pid < 0)
@@ -178,11 +210,9 @@ namespace v2rayN.Handler
             string url = _config.constItem.speedTestUrl;
             DownloadHandle downloadHandle = new DownloadHandle();
 
-            var timeout = 10;
+            var timeout = 8;
             foreach (var it in _selecteds)
             {
-                _ = LazyConfig.Instance.SetTestResult(it.indexId, "", "-1");
-                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
                 if (!it.allowTest)
                 {
                     continue;
@@ -191,7 +221,12 @@ namespace v2rayN.Handler
                 {
                     continue;
                 }
-                testIndexId = it.indexId;
+                if (it.delay < 0)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+                _ = LazyConfig.Instance.SetTestResult(it.indexId, "", "-1");
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
@@ -218,6 +253,8 @@ namespace v2rayN.Handler
         {
             await RunRealPing();
 
+            Thread.Sleep(1000);
+
             await RunSpeedTestAsync();
         }
 

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -14,6 +14,8 @@ namespace v2rayN.Handler
         private StatsService.StatsServiceClient client_;
         private bool exitFlag_;
         private ServerStatItem _serverStatItem;
+        private List<ServerStatItem> _lstServerStat;
+        public List<ServerStatItem> ServerStat => _lstServerStat;
 
         Action<ServerSpeedItem> updateFunc_;
 
@@ -83,11 +85,13 @@ namespace v2rayN.Handler
                             GetServerStatItem(config_.indexId);
                             ParseOutput(res.Stat, out ServerSpeedItem server);
 
-                            _serverStatItem.todayUp += server.proxyUp;
-                            _serverStatItem.todayDown += server.proxyDown;
-                            _serverStatItem.totalUp += server.proxyUp;
-                            _serverStatItem.totalDown += server.proxyDown;
-
+                            if (server.proxyUp != 0 || server.proxyDown != 0)
+                            {
+                                _serverStatItem.todayUp += server.proxyUp;
+                                _serverStatItem.todayDown += server.proxyDown;
+                                _serverStatItem.totalUp += server.proxyUp;
+                                _serverStatItem.totalDown += server.proxyDown;
+                            }
                             if (Global.ShowInTaskbar)
                             {
                                 server.indexId = config_.indexId;
@@ -97,11 +101,6 @@ namespace v2rayN.Handler
                                 server.totalDown = _serverStatItem.totalDown;
                                 updateFunc_(server);
                             }
-                            if (server.proxyUp != 0 || server.proxyDown != 0)
-                            {
-                                _ = SqliteHelper.Instance.UpdateAsync(_serverStatItem);
-                            }
-
                         }
                     }
                     var sleep = config_.statisticsFreshRate < 1 ? 1 : config_.statisticsFreshRate;
@@ -118,12 +117,27 @@ namespace v2rayN.Handler
         {
             SqliteHelper.Instance.Execute($"delete from ServerStatItem ");
             _serverStatItem = null;
+            _lstServerStat = new();
+        }
+
+        public void SaveTo()
+        {
+            try
+            {
+                SqliteHelper.Instance.UpdateAll(_lstServerStat);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
         }
 
         private void Init()
         {
             long ticks = DateTime.Now.Date.Ticks;
             SqliteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+
+            _lstServerStat = SqliteHelper.Instance.Table<ServerStatItem>().ToList();
         }
 
         private void GetServerStatItem(string indexId)
@@ -136,7 +150,7 @@ namespace v2rayN.Handler
 
             if (_serverStatItem == null)
             {
-                _serverStatItem = SqliteHelper.Instance.Table<ServerStatItem>().FirstOrDefault(t => t.indexId == indexId);
+                _serverStatItem = _lstServerStat.FirstOrDefault(t => t.indexId == indexId);
                 if (_serverStatItem == null)
                 {
                     _serverStatItem = new ServerStatItem
@@ -149,6 +163,7 @@ namespace v2rayN.Handler
                         dateNow = ticks
                     };
                     _ = SqliteHelper.Instance.Replacesync(_serverStatItem);
+                    _lstServerStat.Add(_serverStatItem);
                 }
             }
 

v2rayN/v2rayN/Handler/TunHandler.cs

@@ -72,7 +72,16 @@ namespace v2rayN.Base
         private bool Init()
         {
             coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
+            //Template
             string configStr = Utils.GetEmbedText(Global.TunSingboxFileName);
+            if (!Utils.IsNullOrEmpty(_config.tunModeItem.customTemplate) && File.Exists(_config.tunModeItem.customTemplate))
+            {
+                var customTemplate = File.ReadAllText(_config.tunModeItem.customTemplate);
+                if (!Utils.IsNullOrEmpty(customTemplate))
+                {
+                    configStr = customTemplate;
+                }
+            }
             if (Utils.IsNullOrEmpty(configStr))
             {
                 return false;
@@ -210,7 +219,7 @@ namespace v2rayN.Base
                         WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = showWindow,
                         CreateNoWindow = !showWindow,
-                        RedirectStandardError = !showWindow,
+                        //RedirectStandardError = !showWindow,
                         Verb = "runas",
                     }
                 };
@@ -219,14 +228,14 @@ namespace v2rayN.Base
                 _isRunning = true;
                 if (p.WaitForExit(1000))
                 {
-                    if (showWindow)
-                    {
-                        throw new Exception("start tun mode fail");
-                    }
-                    else
-                    {
-                        throw new Exception(p.StandardError.ReadToEnd());
-                    }
+                    //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

@@ -232,6 +232,11 @@ namespace v2rayN.Handler
                         }
 
                         int ret = ConfigHandler.AddBatchServers(ref config, result, id, true);
+                        if (ret <= 0)
+                        {
+                            Utils.SaveLog("FailedImportSubscription");
+                            Utils.SaveLog(result);
+                        }
                         _updateFunc(false,
                             ret > 0
                                 ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
@@ -278,6 +283,8 @@ namespace v2rayN.Handler
                                     string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
                                     File.Copy(fileName, targetPath, true);
                                 });
+
+                                File.Delete(fileName);
                                 //_updateFunc(true, "");
                             }
                         }

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -57,9 +57,13 @@ namespace v2rayN.Mode
         public bool enableAutoAdjustMainLvColWidth { get; set; }
         public double mainWidth { get; set; }
         public double mainHeight { get; set; }
+        public double mainGirdHeight1 { get; set; }
+        public double mainGirdHeight2 { get; set; }
         public bool colorModeDark { get; set; }
         public string? colorPrimaryName { get; set; }
         public string currentLanguage { get; set; }
+        public bool enableDragDropSort { get; set; }
+        public bool doubleClick2Activate { get; set; }
         public Dictionary<string, int> mainLvColWidth { get; set; }
     }
 
@@ -102,6 +106,7 @@ namespace v2rayN.Mode
         public bool strictRoute { get; set; }
         public string stack { get; set; }
         public int mtu { get; set; }
+        public string customTemplate { get; set; }
         public List<string> directIP { get; set; }
         public List<string> directProcess { get; set; }
 

v2rayN/v2rayN/Mode/ServerTestItem.cs

@@ -3,25 +3,11 @@
     [Serializable]
     class ServerTestItem
     {
-        public string indexId
-        {
-            get; set;
-        }
-        public string address
-        {
-            get; set;
-        }
-        public int port
-        {
-            get; set;
-        }
-        public EConfigType configType
-        {
-            get; set;
-        }
-        public bool allowTest
-        {
-            get; set;
-        }
+        public string indexId { get; set; }
+        public string address { get; set; }
+        public int port { get; set; }
+        public EConfigType configType { get; set; }
+        public bool allowTest { get; set; }
+        public int delay { get; set; }
     }
 }

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -681,6 +681,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Edit Server (Ctrl+D) 的本地化字符串。
+        /// </summary>
+        public static string menuEditServer {
+            get {
+                return ResourceManager.GetString("menuEditServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exit 的本地化字符串。
         /// </summary>
@@ -1114,7 +1123,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Share Server (Ctrl+D) 的本地化字符串。
+        ///   查找类似 Share Server (Ctrl+F) 的本地化字符串。
         /// </summary>
         public static string menuShareServer {
             get {
@@ -1752,6 +1761,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Skip test 的本地化字符串。
+        /// </summary>
+        public static string SpeedtestingSkip {
+            get {
+                return ResourceManager.GetString("SpeedtestingSkip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PAC failed to start. Please run this program as Administrator. 的本地化字符串。
         /// </summary>
@@ -1861,6 +1879,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 AutoRefresh 的本地化字符串。
+        /// </summary>
+        public static string TbAutoRefresh {
+            get {
+                return ResourceManager.GetString("TbAutoRefresh", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Domain and ip are auto sorted when saving 的本地化字符串。
         /// </summary>
@@ -2374,6 +2401,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Double-click server make active 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDoubleClick2Activate {
+            get {
+                return ResourceManager.GetString("TbSettingsDoubleClick2Activate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Automatically adjust column width after updating subscription 的本地化字符串。
         /// </summary>
@@ -2392,6 +2428,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable Server Drag Drop Sort(Require restart) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableDragDropSort {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableDragDropSort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
@@ -2644,6 +2689,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Custom Template 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunModeCustomTemplate {
+            get {
+                return ResourceManager.GetString("TbSettingsTunModeCustomTemplate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Direct IP CIDR, separated by commas (,) 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx

@@ -899,7 +899,7 @@
     <value>حالت Pac</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>اشتراک گذاری سرور(Ctrl+D)</value>
+    <value>اشتراک گذاری سرور(Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>مسیریابی</value>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -899,7 +899,7 @@
     <value>Pac Mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>Share Server (Ctrl+D)</value>
+    <value>Share Server (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>Routing</value>
@@ -1063,4 +1063,22 @@
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>Move to group</value>
   </data>
+  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
+    <value>Custom Template</value>
+  </data>
+  <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
+    <value>Enable Server Drag Drop Sort(Require restart)</value>
+  </data>
+  <data name="TbAutoRefresh" xml:space="preserve">
+    <value>AutoRefresh</value>
+  </data>
+  <data name="SpeedtestingSkip" xml:space="preserve">
+    <value>Skip test</value>
+  </data>
+  <data name="menuEditServer" xml:space="preserve">
+    <value>Edit Server (Ctrl+D)</value>
+  </data>
+  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
+    <value>Double-click server make active</value>
+  </data>
 </root>

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

@@ -851,7 +851,7 @@
     <value>开机启动(可能会不成功)</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>启用统计(实时网速显示，需要重启)</value>
+    <value>启用统计(实时网速显示，需重启)</value>
   </data>
   <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
     <value>统计刷新频率(单位秒)</value>
@@ -899,7 +899,7 @@
     <value>Pac模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>分享服务器 (Ctrl+D)</value>
+    <value>分享服务器 (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>路由</value>
@@ -1063,4 +1063,22 @@
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>移至订阅分组</value>
   </data>
+  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
+    <value>自定义配置模板</value>
+  </data>
+  <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
+    <value>启用服务器拖放排序(需重启)</value>
+  </data>
+  <data name="TbAutoRefresh" xml:space="preserve">
+    <value>自动刷新</value>
+  </data>
+  <data name="SpeedtestingSkip" xml:space="preserve">
+    <value>跳过测试</value>
+  </data>
+  <data name="menuEditServer" xml:space="preserve">
+    <value>编辑服务器 (Ctrl+D)</value>
+  </data>
+  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
+    <value>主界面双击设为活动服务器</value>
+  </data>
 </root>

v2rayN/v2rayN/Tool/Utils.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using Microsoft.Win32.TaskScheduler;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NLog;
@@ -601,11 +602,22 @@ namespace v2rayN
 
                 //delete first
                 RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+                if (IsAdministrator())
+                {
+                    AutoStart(autoRunName, "", "");
+                }
 
                 if (run)
                 {
                     string exePath = $"\"{GetExePath()}\"";
-                    RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath);
+                    if (IsAdministrator())
+                    {
+                        AutoStart(autoRunName, exePath, "");
+                    }
+                    else
+                    {
+                        RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath);
+                    }
                 }
             }
             catch (Exception ex)
@@ -741,6 +753,47 @@ namespace v2rayN
             }
         }
 
+        /// <summary>
+        /// Auto Start via TaskService
+        /// </summary>
+        /// <param name="taskName"></param>
+        /// <param name="fileName"></param>
+        /// <param name="description"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static void AutoStart(string taskName, string fileName, string description)
+        {
+            if (string.IsNullOrEmpty(taskName))
+            {
+                return;
+            }
+            string TaskName = taskName;
+            var logonUser = WindowsIdentity.GetCurrent().Name;
+            string taskDescription = description;
+            string deamonFileName = fileName;
+
+            using (var taskService = new TaskService())
+            {
+                var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
+                foreach (var t in tasks)
+                {
+                    taskService.RootFolder.DeleteTask(t.Name);
+                }
+                if (string.IsNullOrEmpty(fileName))
+                {
+                    return;
+                }
+
+                var task = taskService.NewTask();
+                task.RegistrationInfo.Description = taskDescription;
+                task.Settings.DisallowStartIfOnBatteries = false;
+                task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromMinutes(1) });
+                task.Principal.RunLevel = TaskRunLevel.Highest;
+                task.Actions.Add(new ExecAction(deamonFileName));
+
+                taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
+            }
+        }
+
         #endregion
 
         #region 测速

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -26,6 +26,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> BrowseServerCmd { get; }
         public ReactiveCommand<Unit, Unit> EditServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SaveServerCmd { get; }
+        public bool IsModified { get; set; }
 
         public AddServer2ViewModel(ProfileItem profileItem, Window view)
         {
@@ -86,6 +87,7 @@ namespace v2rayN.ViewModels
                 item.remarks = SelectedSource.remarks;
                 item.address = SelectedSource.address;
                 item.coreType = SelectedSource.coreType;
+                item.displayLog = SelectedSource.displayLog;
                 item.preSocksPort = SelectedSource.preSocksPort;
             }
 
@@ -127,7 +129,11 @@ namespace v2rayN.ViewModels
             if (ConfigHandler.AddCustomServer(ref _config, item, false) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
-                _view.DialogResult = true;
+                if (!Utils.IsNullOrEmpty(item.indexId))
+                {
+                    SelectedSource = Utils.DeepCopy(item);
+                }
+                IsModified = true;
             }
             else
             {

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -8,6 +8,7 @@ using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Drawing;
+using System.IO;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Text;
@@ -83,6 +84,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
         //servers delete
+        public ReactiveCommand<Unit, Unit> EditServerCmd { get; }
         public ReactiveCommand<Unit, Unit> RemoveServerCmd { get; }
         public ReactiveCommand<Unit, Unit> RemoveDuplicateServerCmd { get; }
         public ReactiveCommand<Unit, Unit> CopyServerCmd { get; }
@@ -111,8 +113,8 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> SubSettingCmd { get; }
         public ReactiveCommand<Unit, Unit> AddSubCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateCmd { get; }
-        public ReactiveCommand<Unit, Unit> SubGroupUpdateCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
+        public ReactiveCommand<Unit, Unit> SubGroupUpdateCmd { get; }
         public ReactiveCommand<Unit, Unit> SubGroupUpdateViaProxyCmd { get; }
 
         //Setting
@@ -226,7 +228,7 @@ namespace v2rayN.ViewModels
             this.WhenAnyValue(
                  x => x.SelectedMoveToGroup,
                  y => y != null && !y.remarks.IsNullOrEmpty())
-                     .Subscribe(c => MoveToGroup(c));            
+                     .Subscribe(c => MoveToGroup(c));
 
             this.WhenAnyValue(
                 x => x.SelectedRouting,
@@ -292,6 +294,10 @@ namespace v2rayN.ViewModels
                 return ScanScreenTaskAsync();
             });
             //servers delete
+            EditServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(false, EConfigType.Custom);
+            }, canEditRemove);
             RemoveServerCmd = ReactiveCommand.Create(() =>
             {
                 RemoveServer();
@@ -387,13 +393,13 @@ namespace v2rayN.ViewModels
             {
                 UpdateSubscriptionProcess("", false);
             });
-            SubGroupUpdateCmd = ReactiveCommand.Create(() =>
-            {
-                UpdateSubscriptionProcess(_subId, true);
-            });
             SubUpdateViaProxyCmd = ReactiveCommand.Create(() =>
             {
-                UpdateSubscriptionProcess("", false);
+                UpdateSubscriptionProcess("", true);
+            });
+            SubGroupUpdateCmd = ReactiveCommand.Create(() =>
+            {
+                UpdateSubscriptionProcess(_subId, false);
             });
             SubGroupUpdateViaProxyCmd = ReactiveCommand.Create(() =>
             {
@@ -554,7 +560,16 @@ namespace v2rayN.ViewModels
                                 item.totalDown = Utils.HumanFy(update.totalDown);
                                 item.totalUp = Utils.HumanFy(update.totalUp);
 
-                                _profileItems.Replace(item, Utils.DeepCopy(item));
+                                if (SelectedProfile?.indexId == item.indexId)
+                                {
+                                    var temp = Utils.DeepCopy(item);
+                                    _profileItems.Replace(item, temp);
+                                    SelectedProfile = temp;
+                                }
+                                else
+                                {
+                                    _profileItems.Replace(item, Utils.DeepCopy(item));
+                                }
                             }
                         }
                     }
@@ -637,6 +652,7 @@ namespace v2rayN.ViewModels
                     SysProxyHandle.UpdateSysProxy(_config, true);
                 }
 
+                _statistics?.SaveTo();
                 _statistics?.Close();
 
                 _coreHandler.CoreStop();
@@ -682,10 +698,12 @@ namespace v2rayN.ViewModels
             List<ProfileItemModel> lstModel = LazyConfig.Instance.ProfileItems(_subId, _serverFilter);
             _lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
 
+            ConfigHandler.SetDefaultServer(_config, _lstProfile);
+
             List<ServerStatItem> lstServerStat = new();
             if (_statistics != null && _statistics.Enable)
             {
-                lstServerStat = LazyConfig.Instance.ServerStatItems();
+                lstServerStat = _statistics.ServerStat;
             }
             lstModel = (from t in lstModel
                         join t2 in lstServerStat
@@ -702,25 +720,31 @@ namespace v2rayN.ViewModels
                             network = t.network,
                             streamSecurity = t.streamSecurity,
                             subRemarks = t.subRemarks,
-                            isActive = t.isActive,
+                            isActive = t.indexId == _config.indexId,
                             delay = t.delay,
-                            delayVal = t.delay > 0 ? $"{t.delay} {Global.DelayUnit}" : string.Empty,
-                            speedVal = t.speed > 0 ? $"{t.speed} {Global.SpeedUnit}" : string.Empty,
+                            delayVal = t.delay != 0 ? $"{t.delay} {Global.DelayUnit}" : string.Empty,
+                            speedVal = t.speed != 0 ? $"{t.speed} {Global.SpeedUnit}" : string.Empty,
                             todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
                             todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
                             totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
                             totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
                         }).ToList();
 
-            ConfigHandler.SetDefaultServer(_config, _lstProfile);
-
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
                 _profileItems.Clear();
                 _profileItems.AddRange(lstModel);
                 if (lstModel.Count > 0)
                 {
-                    SelectedProfile = lstModel[0];
+                    var selected = lstModel.FirstOrDefault(t => t.indexId == _config.indexId);
+                    if (selected != null)
+                    {
+                        SelectedProfile = selected;
+                    }
+                    else
+                    {
+                        SelectedProfile = lstModel[0];
+                    }
                 }
 
                 RefreshServersMenu();
@@ -798,6 +822,7 @@ namespace v2rayN.ViewModels
                 {
                     subid = _subId,
                     configType = eConfigType,
+                    displayLog = false
                 };
             }
             else
@@ -910,7 +935,7 @@ namespace v2rayN.ViewModels
 
         public void SetDefaultServer()
         {
-            if (Utils.IsNullOrEmpty(SelectedProfile.indexId))
+            if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
             {
                 return;
             }
@@ -1062,6 +1087,17 @@ namespace v2rayN.ViewModels
             }
         }
 
+        public void MoveServerTo(int startIndex, ProfileItemModel targetItem)
+        {
+            var targetIndex = _profileItems.IndexOf(targetItem);
+            if (startIndex >= 0 && targetIndex >= 0 && startIndex != targetIndex)
+            {
+                if (ConfigHandler.MoveServer(ref _config, ref _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
+                {
+                    RefreshServers();
+                }
+            }
+        }
 
         public void ServerSpeedtest(ESpeedActionType actionType)
         {
@@ -1074,7 +1110,7 @@ namespace v2rayN.ViewModels
                 return;
             }
             //ClearTestResult();
-            SpeedtestHandler statistics = new SpeedtestHandler(_config, _coreHandler, lstSelecteds, actionType, UpdateSpeedtestHandler);
+            new SpeedtestHandler(_config, _coreHandler, lstSelecteds, actionType, UpdateSpeedtestHandler);
         }
 
         private void Export2ClientConfig()
@@ -1120,7 +1156,7 @@ namespace v2rayN.ViewModels
             if (sb.Length > 0)
             {
                 Utils.SetClipboardData(sb.ToString());
-                _noticeHandler?.Enqueue(ResUI.BatchExportURLSuccessfully);
+                _noticeHandler?.SendMessage(ResUI.BatchExportURLSuccessfully);
             }
         }
 
@@ -1145,7 +1181,7 @@ namespace v2rayN.ViewModels
             if (sb.Length > 0)
             {
                 Utils.SetClipboardData(Utils.Base64Encode(sb.ToString()));
-                _noticeHandler?.Enqueue(ResUI.BatchExportSubscriptionSuccessfully);
+                _noticeHandler?.SendMessage(ResUI.BatchExportSubscriptionSuccessfully);
             }
         }
 
@@ -1284,6 +1320,11 @@ namespace v2rayN.ViewModels
                     Reload();
 
                     _noticeHandler?.SendMessage(ResUI.MsgUpdateV2rayCoreSuccessfully);
+
+                    if (File.Exists(fileName))
+                    {
+                        File.Delete(fileName);
+                    }
                 }
             };
             (new UpdateHandle()).CheckUpdateCore(type, _config, _updateUI, _config.checkPreReleaseUpdate);

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -55,6 +55,8 @@ namespace v2rayN.ViewModels
         [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
         [Reactive] public bool AutoHideStartup { get; set; }
         [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
+        [Reactive] public bool EnableDragDropSort { get; set; }
+        [Reactive] public bool DoubleClick2Activate { get; set; }
         [Reactive] public int autoUpdateInterval { get; set; }
         [Reactive] public int autoUpdateSubInterval { get; set; }
         [Reactive] public int trayMenuServersLimit { get; set; }
@@ -70,6 +72,7 @@ namespace v2rayN.ViewModels
         [Reactive] public bool TunStrictRoute { get; set; }
         [Reactive] public string TunStack { get; set; }
         [Reactive] public int TunMtu { get; set; }
+        [Reactive] public string TunCustomTemplate { get; set; }
         [Reactive] public string TunDirectIP { get; set; }
         [Reactive] public string TunDirectProcess { get; set; }
         #endregion
@@ -134,6 +137,8 @@ namespace v2rayN.ViewModels
             EnableSecurityProtocolTls13 = _config.enableSecurityProtocolTls13;
             AutoHideStartup = _config.autoHideStartup;
             EnableCheckPreReleaseUpdate = _config.checkPreReleaseUpdate;
+            EnableDragDropSort = _config.uiItem.enableDragDropSort;
+            DoubleClick2Activate = _config.uiItem.doubleClick2Activate;
             autoUpdateInterval = _config.autoUpdateInterval;
             autoUpdateSubInterval = _config.autoUpdateSubInterval;
             trayMenuServersLimit = _config.trayMenuServersLimit;
@@ -150,6 +155,7 @@ namespace v2rayN.ViewModels
             TunStrictRoute = _config.tunModeItem.strictRoute;
             TunStack = _config.tunModeItem.stack;
             TunMtu = _config.tunModeItem.mtu;
+            TunCustomTemplate = _config.tunModeItem.customTemplate;
             TunDirectIP = Utils.List2String(_config.tunModeItem.directIP, true);
             TunDirectProcess = Utils.List2String(_config.tunModeItem.directProcess, true);
 
@@ -297,6 +303,8 @@ namespace v2rayN.ViewModels
             _config.autoUpdateInterval = autoUpdateInterval;
             _config.autoUpdateSubInterval = autoUpdateSubInterval;
             _config.checkPreReleaseUpdate = EnableCheckPreReleaseUpdate;
+            _config.uiItem.enableDragDropSort = EnableDragDropSort;
+            _config.uiItem.doubleClick2Activate = DoubleClick2Activate;
             _config.trayMenuServersLimit = trayMenuServersLimit;
 
             //systemProxy
@@ -308,6 +316,7 @@ namespace v2rayN.ViewModels
             _config.tunModeItem.strictRoute = TunStrictRoute;
             _config.tunModeItem.stack = TunStack;
             _config.tunModeItem.mtu = TunMtu;
+            _config.tunModeItem.customTemplate = TunCustomTemplate;
             _config.tunModeItem.directIP = Utils.String2List(TunDirectIP);
             _config.tunModeItem.directProcess = Utils.String2List(TunDirectProcess);
 

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Views="clr-namespace:v2rayN.Views"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:v2rayN"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -15,7 +16,9 @@
     Height="500"
     x:TypeArguments="vms:AddServer2ViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -44,7 +44,14 @@ namespace v2rayN.Views
         }
         private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            this.Close();
+            if (ViewModel?.IsModified == true)
+            {
+                this.DialogResult = true;
+            }
+            else
+            {
+                this.Close();
+            }
         }
 
     }

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="800"
     x:TypeArguments="vms:AddServerViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Views="clr-namespace:v2rayN.Views"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -14,8 +15,10 @@
     Height="500"
     x:TypeArguments="vms:SubEditViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     KeyDown="GlobalHotkeySettingWindow_KeyDown"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:base="clr-namespace:v2rayN.Base"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:v2rayN.Views"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -19,7 +19,9 @@
     MinHeight="600"
     x:TypeArguments="vms:MainWindowViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ShowInTaskbar="True"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"
@@ -31,7 +33,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Popupbox.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
-            <converters:DelayColorConverter x:Key="DelayColorConverter" />
+            <conv:DelayColorConverter x:Key="DelayColorConverter" />
         </ResourceDictionary>
     </Window.Resources>
 
@@ -47,7 +49,7 @@
                         VerticalAlignment="Center"
                         ClipToBounds="True"
                         Style="{StaticResource MaterialDesignToolBar}">
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
@@ -93,7 +95,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
@@ -125,7 +127,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
@@ -163,7 +165,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem x:Name="menuReload" Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
@@ -174,7 +176,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
@@ -215,7 +217,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem x:Name="menuHelp" Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
@@ -226,7 +228,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem
                                 x:Name="menuPromotion"
                                 Padding="8,0"
@@ -240,7 +242,7 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem
                                 x:Name="menuClose"
                                 Padding="8,0"
@@ -350,11 +352,12 @@
                         </StackPanel>
 
                         <StackPanel
+                            x:Name="spEnableTun"
                             Width="auto"
                             Margin="8,0"
                             VerticalAlignment="Center"
                             DockPanel.Dock="Left">
-                            <TextBlock x:Name="txtEnableTun" Text="{x:Static resx:ResUI.TbEnableTunAs}" />
+                            <TextBlock Text="{x:Static resx:ResUI.TbEnableTunAs}" />
                             <ToggleButton
                                 x:Name="togEnableTun"
                                 Margin="4"
@@ -401,7 +404,7 @@
                     </DockPanel>
                 </materialDesign:ColorZone>
 
-                <Grid>
+                <Grid x:Name="gridMain">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="1*" />
                         <RowDefinition Height="10" />
@@ -410,7 +413,7 @@
                     <DataGrid
                         x:Name="lstProfiles"
                         Grid.Row="0"
-                        materialDesign:DataGridAssist.CellPadding="1,0"
+                        materialDesign:DataGridAssist.CellPadding="2,2"
                         AutoGenerateColumns="False"
                         BorderThickness="1"
                         CanUserAddRows="False"
@@ -430,6 +433,10 @@
                         </DataGrid.InputBindings>
                         <DataGrid.ContextMenu>
                             <ContextMenu Style="{StaticResource DefContextMenu}">
+                                <MenuItem
+                                    x:Name="menuEditServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuEditServer}" />
                                 <MenuItem
                                     x:Name="menuSetDefaultServer"
                                     Height="{StaticResource MenuItemHeight}"
@@ -451,6 +458,31 @@
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuShareServer}" />
                                 <Separator />
+                                <MenuItem
+                                    x:Name="menuMixedTestServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuMixedTestServer}" />
+                                <MenuItem
+                                    x:Name="menuPingServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuPingServer}" />
+                                <MenuItem
+                                    x:Name="menuTcpingServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuTcpingServer}" />
+                                <MenuItem
+                                    x:Name="menuRealPingServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuRealPingServer}" />
+                                <MenuItem
+                                    x:Name="menuSpeedServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuSpeedServer}" />
+                                <MenuItem
+                                    x:Name="menuSortServerResult"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuSortServerResult}" />
+                                <Separator />
                                 <MenuItem
                                     x:Name="menuMoveToGroup"
                                     Height="{StaticResource MenuItemHeight}"
@@ -490,31 +522,6 @@
                                     Click="menuSelectAll_Click"
                                     Header="{x:Static resx:ResUI.menuSelectAll}" />
                                 <Separator />
-                                <MenuItem
-                                    x:Name="menuMixedTestServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuMixedTestServer}" />
-                                <MenuItem
-                                    x:Name="menuPingServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuPingServer}" />
-                                <MenuItem
-                                    x:Name="menuTcpingServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuTcpingServer}" />
-                                <MenuItem
-                                    x:Name="menuRealPingServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuRealPingServer}" />
-                                <MenuItem
-                                    x:Name="menuSpeedServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuSpeedServer}" />
-                                <MenuItem
-                                    x:Name="menuSortServerResult"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuSortServerResult}" />
-                                <Separator />
                                 <MenuItem
                                     x:Name="menuExport2ClientConfig"
                                     Height="{StaticResource MenuItemHeight}"

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -1,15 +1,19 @@
 using ReactiveUI;
 using Splat;
 using System.ComponentModel;
+using System.Drawing;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
+using Point = System.Windows.Point;
 using SystemInformation = System.Windows.Forms.SystemInformation;
 
 namespace v2rayN.Views
@@ -29,6 +33,14 @@ namespace v2rayN.Views
             lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
             lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
             lstProfiles.LoadingRow += LstProfiles_LoadingRow;
+            if (_config.uiItem.enableDragDropSort)
+            {
+                lstProfiles.AllowDrop = true;
+                lstProfiles.PreviewMouseLeftButtonDown += LstProfiles_PreviewMouseLeftButtonDown;
+                lstProfiles.MouseMove += LstProfiles_MouseMove;
+                lstProfiles.DragEnter += LstProfiles_DragEnter;
+                lstProfiles.Drop += LstProfiles_Drop;
+            }
 
             ViewModel = new MainWindowViewModel(MainSnackbar.MessageQueue!, UpdateViewHandler);
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
@@ -59,6 +71,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
 
                 //servers delete
+                this.BindCommand(ViewModel, vm => vm.EditServerCmd, v => v.menuEditServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RemoveServerCmd, v => v.menuRemoveServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RemoveDuplicateServerCmd, v => v.menuRemoveDuplicateServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CopyServerCmd, v => v.menuCopyServer).DisposeWith(disposables);
@@ -91,8 +104,8 @@ namespace v2rayN.Views
                 //sub
                 this.BindCommand(ViewModel, vm => vm.SubSettingCmd, v => v.menuSubSetting).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SubUpdateCmd, v => v.menuSubUpdate).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.SubGroupUpdateCmd, v => v.menuSubGroupUpdate).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SubUpdateViaProxyCmd, v => v.menuSubUpdateViaProxy).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.SubGroupUpdateCmd, v => v.menuSubGroupUpdate).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SubGroupUpdateViaProxyCmd, v => v.menuSubGroupUpdateViaProxy).DisposeWith(disposables);
 
                 //setting
@@ -169,8 +182,7 @@ namespace v2rayN.Views
             var IsAdministrator = Utils.IsAdministrator();
             this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
-            togEnableTun.Visibility = IsAdministrator ? Visibility.Visible : Visibility.Hidden;
-            txtEnableTun.Visibility = IsAdministrator ? Visibility.Visible : Visibility.Hidden;
+            spEnableTun.Visibility = IsAdministrator ? Visibility.Visible : Visibility.Collapsed;
         }
 
         #region Event 
@@ -229,7 +241,14 @@ namespace v2rayN.Views
 
         private void LstProfiles_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            ViewModel?.EditServer(false, EConfigType.Custom);
+            if (_config.uiItem.doubleClick2Activate)
+            {
+                ViewModel?.SetDefaultServer();
+            }
+            else
+            {
+                ViewModel?.EditServer(false, EConfigType.Custom);
+            }
         }
 
         private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
@@ -312,6 +331,10 @@ namespace v2rayN.Views
                     ViewModel?.Export2ShareUrl();
                 }
                 else if (e.Key == Key.D)
+                {
+                    ViewModel?.EditServer(false, EConfigType.Custom);
+                }
+                else if (e.Key == Key.F)
                 {
                     ViewModel?.ShareServer();
                 }
@@ -372,18 +395,26 @@ namespace v2rayN.Views
         {
             if (_config.uiItem.mainWidth > 0 && _config.uiItem.mainHeight > 0)
             {
-                if (_config.uiItem.mainWidth > SystemInformation.WorkingArea.Width)
-                {
-                    _config.uiItem.mainWidth = SystemInformation.WorkingArea.Width * 2 / 3;
-                }
-                if (_config.uiItem.mainHeight > SystemInformation.WorkingArea.Height)
-                {
-                    _config.uiItem.mainHeight = SystemInformation.WorkingArea.Height * 2 / 3;
-                }
-
-                this.Width = _config.uiItem.mainWidth;
-                this.Height = _config.uiItem.mainHeight;
+                Width = _config.uiItem.mainWidth;
+                Height = _config.uiItem.mainHeight;
             }
+
+            IntPtr hWnd = new WindowInteropHelper(this).EnsureHandle();
+            Graphics g = Graphics.FromHwnd(hWnd);
+            if (Width > SystemInformation.WorkingArea.Width * 96 / g.DpiX)
+            {
+                Width = SystemInformation.WorkingArea.Width * 96 / g.DpiX;
+            }
+            if (Height > SystemInformation.WorkingArea.Height * 96 / g.DpiY)
+            {
+                Height = SystemInformation.WorkingArea.Height * 96 / g.DpiY;
+            }
+            if (_config.uiItem.mainGirdHeight1 > 0 && _config.uiItem.mainGirdHeight2 > 0)
+            {
+                gridMain.RowDefinitions[0].Height = new GridLength(_config.uiItem.mainGirdHeight1, GridUnitType.Star);
+                gridMain.RowDefinitions[2].Height = new GridLength(_config.uiItem.mainGirdHeight2, GridUnitType.Star);
+            }
+
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
             {
                 var width = ConfigHandler.GetformMainLvColWidth(ref _config, ((EServerColName)k).ToString(), Convert.ToInt32(lstProfiles.Columns[k].Width.Value));
@@ -406,6 +437,8 @@ namespace v2rayN.Views
             {
                 ConfigHandler.AddformMainLvColWidth(ref _config, ((EServerColName)k).ToString(), Convert.ToInt32(lstProfiles.Columns[k].ActualWidth));
             }
+            _config.uiItem.mainGirdHeight1 = Math.Ceiling(gridMain.RowDefinitions[0].ActualHeight + 0.1);
+            _config.uiItem.mainGirdHeight2 = Math.Ceiling(gridMain.RowDefinitions[2].ActualHeight + 0.1);
         }
 
         private void AddHelpMenuItem()
@@ -433,6 +466,100 @@ namespace v2rayN.Views
 
 
         #endregion
+        #region Drag and Drop
+
+        private Point startPoint = new Point();
+        private int startIndex = -1;
+        private string formatData = "ProfileItemModel";
+
+        /// <summary>
+        /// Helper to search up the VisualTree
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="current"></param>
+        /// <returns></returns>
+        private static T? FindAnchestor<T>(DependencyObject current) where T : DependencyObject
+        {
+            do
+            {
+                if (current is T)
+                {
+                    return (T)current;
+                }
+                current = VisualTreeHelper.GetParent(current);
+            }
+            while (current != null);
+            return null;
+        }
+
+
+        private void LstProfiles_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            // Get current mouse position
+            startPoint = e.GetPosition(null);
+        }
+        private void LstProfiles_MouseMove(object sender, MouseEventArgs e)
+        {
+            // Get the current mouse position
+            Point mousePos = e.GetPosition(null);
+            Vector diff = startPoint - mousePos;
+
+            if (e.LeftButton == MouseButtonState.Pressed &&
+                (Math.Abs(diff.X) > SystemParameters.MinimumHorizontalDragDistance ||
+                       Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance))
+            {
+                // Get the dragged Item
+                var listView = sender as DataGrid;
+                if (listView == null) return;
+                var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
+                if (listViewItem == null) return;           // Abort
+                                                            // Find the data behind the ListViewItem
+                ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
+                if (item == null) return;                   // Abort
+                                                            // Initialize the drag & drop operation
+                startIndex = lstProfiles.SelectedIndex;
+                DataObject dragData = new DataObject(formatData, item);
+                DragDrop.DoDragDrop(listViewItem, dragData, DragDropEffects.Copy | DragDropEffects.Move);
+            }
+        }
+
+        private void LstProfiles_DragEnter(object sender, DragEventArgs e)
+        {
+            if (!e.Data.GetDataPresent(formatData) || sender != e.Source)
+            {
+                e.Effects = DragDropEffects.None;
+            }
+        }
+
+        private void LstProfiles_Drop(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(formatData) && sender == e.Source)
+            {
+                // Get the drop Item destination
+                var listView = sender as DataGrid;
+                if (listView == null) return;
+                var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
+                if (listViewItem == null)
+                {
+                    // Abort
+                    e.Effects = DragDropEffects.None;
+                    return;
+                }
+                // Find the data behind the Item
+                ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
+                if (item == null) return;
+                // Move item into observable collection 
+                // (this will be automatically reflected to lstView.ItemsSource)
+                e.Effects = DragDropEffects.Move;
+
+                ViewModel?.MoveServerTo(startIndex, item);
+
+                startIndex = -1;
+            }
+        }
+
+        #endregion
+
 
     }
 }

v2rayN/v2rayN/Views/MsgView.xaml

@@ -27,6 +27,15 @@
                 Margin="8,0"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True" />
+            <TextBlock
+                Margin="8,0"
+                VerticalAlignment="Center"
+                Text="{x:Static resx:ResUI.TbAutoRefresh}" />
+            <ToggleButton
+                x:Name="togAutoRefresh"
+                Margin="8,0"
+                HorizontalAlignment="Left"
+                IsChecked="True" />
         </StackPanel>
         <TextBox
             Name="txtMsg"

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -26,6 +26,10 @@ namespace v2rayN.Views
                 ClearMsg();
                 return;
             }
+            if (!togAutoRefresh.IsChecked.Value)
+            {
+                return;
+            }
             var MsgFilter = txtMsgFilter.Text.TrimEx();
             if (!Utils.IsNullOrEmpty(MsgFilter))
             {

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.OptionSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="700"
     x:TypeArguments="vms:OptionSettingViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"
@@ -415,6 +418,8 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -553,16 +558,44 @@
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableDragDropSort}" />
+                        <ToggleButton
+                            x:Name="togEnableDragDropSort"
+                            Grid.Row="10"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="11"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsDoubleClick2Activate}" />
+                        <ToggleButton
+                            x:Name="togDoubleClick2Activate"
+                            Grid.Row="11"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="12"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAutoUpdateInterval}" />
                         <TextBox
                             x:Name="txtautoUpdateInterval"
-                            Grid.Row="10"
+                            Grid.Row="12"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}" />
 
                         <TextBlock
-                            Grid.Row="11"
+                            Grid.Row="13"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -570,13 +603,13 @@
                             Text="{x:Static resx:ResUI.TbSettingsAutoUpdate}" />
                         <TextBox
                             x:Name="txtautoUpdateSubInterval"
-                            Grid.Row="11"
+                            Grid.Row="13"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}" />
 
                         <TextBlock
-                            Grid.Row="12"
+                            Grid.Row="14"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -584,7 +617,7 @@
                             Text="{x:Static resx:ResUI.TbSettingsTrayMenuServersLimit}" />
                         <TextBox
                             x:Name="txttrayMenuServersLimit"
-                            Grid.Row="12"
+                            Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}" />
@@ -646,6 +679,7 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
@@ -688,7 +722,8 @@
                             Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -702,7 +737,34 @@
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsTunModeCustomTemplate}" />
+                        <TextBox
+                            x:Name="txtCustomTemplate"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Width="600"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Top"
+                            AcceptsReturn="True"
+                            TextWrapping="Wrap" />
+                        <Button
+                            x:Name="btnBrowse"
+                            Grid.Row="5"
+                            Grid.Column="2"
+                            Width="100"
+                            Margin="2,0,8,0"
+                            Click="btnBrowse_Click"
+                            Content="{x:Static resx:ResUI.TbBrowse}"
+                            Style="{StaticResource DefButton}" />
                     </Grid>
 
                     <Grid Margin="{StaticResource SettingItemMargin}">

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -87,6 +87,8 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.EnableSecurityProtocolTls13, v => v.togEnableSecurityProtocolTls13.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableCheckPreReleaseUpdate, v => v.togEnableCheckPreReleaseUpdate.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableDragDropSort, v => v.togEnableDragDropSort.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.autoUpdateInterval, v => v.txtautoUpdateInterval.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.autoUpdateSubInterval, v => v.txtautoUpdateSubInterval.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.trayMenuServersLimit, v => v.txttrayMenuServersLimit.Text).DisposeWith(disposables);
@@ -100,6 +102,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunCustomTemplate, v => v.txtCustomTemplate.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunDirectIP, v => v.txtDirectIP.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunDirectProcess, v => v.txtDirectProcess.Text).DisposeWith(disposables);
 
@@ -124,6 +127,13 @@ namespace v2rayN.Views
         {
             this.Close();
         }
+        private void btnBrowse_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            var openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            openFileDialog1.Filter = "tunConfig|*.json|All|*.*";
+            openFileDialog1.ShowDialog();
 
+            txtCustomTemplate.Text = openFileDialog1.FileName;
+        }
     }
 }

v2rayN/v2rayN/Views/QrcodeView.xaml

@@ -9,7 +9,7 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    <Grid Margin="16">
+    <Grid Margin="30">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="700"
     x:TypeArguments="vms:RoutingRuleDetailsViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="700"
     x:TypeArguments="vms:RoutingRuleSettingViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -75,15 +75,15 @@ namespace v2rayN.Views
                 {
                     ViewModel?.MoveRule(EMove.Top);
                 }
-                else if (e.Key == Key.B)
+                else if (e.Key == Key.U)
                 {
                     ViewModel?.MoveRule(EMove.Up);
                 }
-                else if (e.Key == Key.U)
+                else if (e.Key == Key.D)
                 {
                     ViewModel?.MoveRule(EMove.Down);
                 }
-                else if (e.Key == Key.D)
+                else if (e.Key == Key.B)
                 {
                     ViewModel?.MoveRule(EMove.Bottom);
                 }

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.RoutingSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="700"
     x:TypeArguments="vms:RoutingSettingViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="550"
     x:TypeArguments="vms:SubEditViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.SubSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +14,9 @@
     Height="600"
     x:TypeArguments="vms:SubSettingViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
     TextOptions.TextRenderingMode="Auto"

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -40,7 +40,7 @@ namespace v2rayN.Views
         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.2</FileVersion>
+		<FileVersion>6.7</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>		
@@ -101,4 +101,10 @@
 	  </EmbeddedResource>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="Resources\Fonts\SourceHanSansCN-Regular.ttf">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+
 </Project>