Up 6.44

Add open the file location
Bug fix
2024-05-08 13:40:24 +08:00 · 2024-05-08 11:43:03 +08:00 · 2024-05-08 11:42:01 +08:00 · 2024-05-07 14:15:08 +08:00 · 2024-05-06 17:19:29 +08:00 · 2024-05-06 09:55:30 +08:00
37 changed files with 591 additions and 333 deletions
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@@ -11,7 +11,7 @@
 	<ItemGroup>
 		<PackageReference Include="Google.Protobuf" Version="3.26.1" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.62.0">
+		<PackageReference Include="Grpc.Tools" Version="2.63.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -13,7 +13,7 @@
                    BaseTheme="Light"
                    PrimaryColor="Blue"
                    SecondaryColor="Lime" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
            </ResourceDictionary.MergedDictionaries>
            <system:Double x:Key="MenuItemHeight">26</system:Double>
            <system:Double x:Key="StdFontSize">12</system:Double>
@@ -72,10 +72,10 @@
                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                <Style.Triggers>
                    <Trigger Property="IsSelected" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                    </Trigger>
                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
                    </Trigger>
                </Style.Triggers>
            </Style>
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -57,11 +57,14 @@ namespace v2rayN
        /// 取得存储资源
        /// </summary>
        /// <returns></returns>
-        public static string? LoadResource(string res)
+        public static string? LoadResource(string? res)
        {
            try
            {
-                if (!File.Exists(res)) return null;
+                if (!File.Exists(res))
+                {
+                    return null;
+                }
                return File.ReadAllText(res);
            }
            catch (Exception ex)
@@ -741,11 +744,11 @@ namespace v2rayN
            return Guid.TryParse(strSrc, out Guid g);
        }

-        public static void ProcessStart(string fileName)
+        public static void ProcessStart(string fileName, string arguments = "")
        {
            try
            {
-                Process.Start(new ProcessStartInfo(fileName) { UseShellExecute = true });
+                Process.Start(new ProcessStartInfo(fileName, arguments) { UseShellExecute = true });
            }
            catch (Exception ex)
            {
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -50,7 +50,6 @@ namespace v2rayN.Handler
                {
                    logEnabled = false,
                    loglevel = "warning",
-
                    muxEnabled = false,
                };
            }
@@ -180,7 +179,7 @@ namespace v2rayN.Handler
                config.mux4SboxItem = new()
                {
                    protocol = Global.SingboxMuxs[0],
-                    max_connections = 4
+                    max_connections = 8
                };
            }

@@ -241,103 +240,103 @@ namespace v2rayN.Handler
            }
        }

-        public static int ImportOldGuiConfig(Config config, string fileName)
-        {
-            var result = Utils.LoadResource(fileName);
-            if (Utils.IsNullOrEmpty(result))
-            {
-                return -1;
-            }
+        //public static int ImportOldGuiConfig(Config config, string fileName)
+        //{
+        //    var result = Utils.LoadResource(fileName);
+        //    if (Utils.IsNullOrEmpty(result))
+        //    {
+        //        return -1;
+        //    }

-            var configOld = JsonUtils.Deserialize<ConfigOld>(result);
-            if (configOld == null)
-            {
-                return -1;
-            }
+        //    var configOld = JsonUtils.Deserialize<ConfigOld>(result);
+        //    if (configOld == null)
+        //    {
+        //        return -1;
+        //    }

-            var subItem = JsonUtils.Deserialize<List<SubItem>>(JsonUtils.Serialize(configOld.subItem));
-            foreach (var it in subItem)
-            {
-                if (Utils.IsNullOrEmpty(it.id))
-                {
-                    it.id = Utils.GetGUID(false);
-                }
-                SQLiteHelper.Instance.Replace(it);
-            }
+        //    var subItem = JsonUtils.Deserialize<List<SubItem>>(JsonUtils.Serialize(configOld.subItem));
+        //    foreach (var it in subItem)
+        //    {
+        //        if (Utils.IsNullOrEmpty(it.id))
+        //        {
+        //            it.id = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(it);
+        //    }

-            var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(configOld.vmess));
-            foreach (var it in profileItems)
-            {
-                if (Utils.IsNullOrEmpty(it.indexId))
-                {
-                    it.indexId = Utils.GetGUID(false);
-                }
-                SQLiteHelper.Instance.Replace(it);
-            }
+        //    var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(configOld.vmess));
+        //    foreach (var it in profileItems)
+        //    {
+        //        if (Utils.IsNullOrEmpty(it.indexId))
+        //        {
+        //            it.indexId = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(it);
+        //    }

-            foreach (var it in configOld.routings)
-            {
-                if (it.locked)
-                {
-                    continue;
-                }
-                var routing = JsonUtils.Deserialize<RoutingItem>(JsonUtils.Serialize(it));
-                foreach (var it2 in it.rules)
-                {
-                    it2.id = Utils.GetGUID(false);
-                }
-                routing.ruleNum = it.rules.Count;
-                routing.ruleSet = JsonUtils.Serialize(it.rules, false);
+        //    foreach (var it in configOld.routings)
+        //    {
+        //        if (it.locked)
+        //        {
+        //            continue;
+        //        }
+        //        var routing = JsonUtils.Deserialize<RoutingItem>(JsonUtils.Serialize(it));
+        //        foreach (var it2 in it.rules)
+        //        {
+        //            it2.id = Utils.GetGUID(false);
+        //        }
+        //        routing.ruleNum = it.rules.Count;
+        //        routing.ruleSet = JsonUtils.Serialize(it.rules, false);

-                if (Utils.IsNullOrEmpty(routing.id))
-                {
-                    routing.id = Utils.GetGUID(false);
-                }
-                SQLiteHelper.Instance.Replace(routing);
-            }
+        //        if (Utils.IsNullOrEmpty(routing.id))
+        //        {
+        //            routing.id = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(routing);
+        //    }

-            config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));
+        //    config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));

-            if (config.coreBasicItem == null)
-            {
-                config.coreBasicItem = new()
-                {
-                    logEnabled = configOld.logEnabled,
-                    loglevel = configOld.loglevel,
-                    muxEnabled = configOld.muxEnabled,
-                };
-            }
+        //    if (config.coreBasicItem == null)
+        //    {
+        //        config.coreBasicItem = new()
+        //        {
+        //            logEnabled = configOld.logEnabled,
+        //            loglevel = configOld.loglevel,
+        //            muxEnabled = configOld.muxEnabled,
+        //        };
+        //    }

-            if (config.routingBasicItem == null)
-            {
-                config.routingBasicItem = new()
-                {
-                    enableRoutingAdvanced = configOld.enableRoutingAdvanced,
-                    domainStrategy = configOld.domainStrategy
-                };
-            }
+        //    if (config.routingBasicItem == null)
+        //    {
+        //        config.routingBasicItem = new()
+        //        {
+        //            enableRoutingAdvanced = configOld.enableRoutingAdvanced,
+        //            domainStrategy = configOld.domainStrategy
+        //        };
+        //    }

-            if (config.guiItem == null)
-            {
-                config.guiItem = new()
-                {
-                    enableStatistics = configOld.enableStatistics,
-                    keepOlderDedupl = configOld.keepOlderDedupl,
-                    ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore,
-                    autoUpdateInterval = configOld.autoUpdateInterval,
-                    checkPreReleaseUpdate = configOld.checkPreReleaseUpdate,
-                    enableSecurityProtocolTls13 = configOld.enableSecurityProtocolTls13,
-                    trayMenuServersLimit = configOld.trayMenuServersLimit,
-                };
-            }
+        //    if (config.guiItem == null)
+        //    {
+        //        config.guiItem = new()
+        //        {
+        //            enableStatistics = configOld.enableStatistics,
+        //            keepOlderDedupl = configOld.keepOlderDedupl,
+        //            ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore,
+        //            autoUpdateInterval = configOld.autoUpdateInterval,
+        //            checkPreReleaseUpdate = configOld.checkPreReleaseUpdate,
+        //            enableSecurityProtocolTls13 = configOld.enableSecurityProtocolTls13,
+        //            trayMenuServersLimit = configOld.trayMenuServersLimit,
+        //        };
+        //    }

-            GetDefaultServer(config);
-            GetDefaultRouting(config);
-            SaveConfig(config);
-            LoadConfig(ref config);
+        //    GetDefaultServer(config);
+        //    GetDefaultRouting(config);
+        //    SaveConfig(config);
+        //    LoadConfig(ref config);

-            return 0;
-        }
+        //    return 0;
+        //}

        #endregion ConfigHandler

--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -54,7 +54,7 @@ namespace v2rayN.Handler

                GenDns(node, singboxConfig);

-                GenStatistic(singboxConfig);
+                GenExperimental(singboxConfig);

                ConvertGeo2Ruleset(singboxConfig);

@@ -337,16 +337,16 @@ namespace v2rayN.Handler
        {
            try
            {
-                //if (_config.coreBasicItem.muxEnabled)
-                //{
-                //    var mux = new Multiplex4Sbox()
-                //    {
-                //        enabled = true,
-                //        protocol = _config.mux4SboxItem.protocol,
-                //        max_connections = _config.mux4SboxItem.max_connections,
-                //    };
-                //    outbound.multiplex = mux;
-                //}
+                if (_config.coreBasicItem.muxEnabled && !Utils.IsNullOrEmpty(_config.mux4SboxItem.protocol))
+                {
+                    var mux = new Multiplex4Sbox()
+                    {
+                        enabled = true,
+                        protocol = _config.mux4SboxItem.protocol,
+                        max_connections = _config.mux4SboxItem.max_connections,
+                    };
+                    outbound.multiplex = mux;
+                }
            }
            catch (Exception ex)
            {
@@ -539,24 +539,38 @@ namespace v2rayN.Handler
        {
            try
            {
+                var dnsOutbound = "dns_out";
+                if (!_config.inbound[0].sniffingEnabled)
+                {
+                    singboxConfig.route.rules.Add(new()
+                    {
+                        port = [53],
+                        network = "udp",
+                        outbound = dnsOutbound
+                    });
+                }
+
                if (_config.tunModeItem.enableTun)
                {
                    singboxConfig.route.auto_detect_interface = true;

                    var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
-                    singboxConfig.route.rules.AddRange(tunRules);
+                    if (tunRules != null)
+                    {
+                        singboxConfig.route.rules.AddRange(tunRules);
+                    }

                    GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
                    singboxConfig.route.rules.Add(new()
                    {
                        port = new() { 53 },
-                        outbound = "dns_out",
+                        outbound = dnsOutbound,
                        process_name = lstDnsExe
                    });

                    singboxConfig.route.rules.Add(new()
                    {
-                        outbound = "direct",
+                        outbound = Global.DirectTag,
                        process_name = lstDirectExe
                    });
                }
@@ -805,7 +819,7 @@ namespace v2rayN.Handler
                {
                    tag = "local_local",
                    address = "223.5.5.5",
-                    detour = "direct"
+                    detour = Global.DirectTag,
                });
                dns4Sbox.rules.Add(new()
                {
@@ -822,30 +836,26 @@ namespace v2rayN.Handler
            return 0;
        }

-        private int GenStatistic(SingboxConfig singboxConfig)
+        private int GenExperimental(SingboxConfig singboxConfig)
        {
            if (_config.guiItem.enableStatistics)
            {
-                singboxConfig.experimental = new Experimental4Sbox()
+                singboxConfig.experimental ??= new Experimental4Sbox();
+                singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
                {
-                    cache_file = new CacheFile4Sbox()
-                    {
-                        enabled = true
-                    },
-                    //v2ray_api = new V2ray_Api4Sbox()
-                    //{
-                    //    listen = $"{Global.Loopback}:{Global.StatePort}",
-                    //    stats = new Stats4Sbox()
-                    //    {
-                    //        enabled = true,
-                    //    }
-                    //},
-                    clash_api = new Clash_Api4Sbox()
-                    {
-                        external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
-                    }
+                    external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
                };
            }
+
+            if (_config.coreBasicItem.enableCacheFile4Sbox)
+            {
+                singboxConfig.experimental ??= new Experimental4Sbox();
+                singboxConfig.experimental.cache_file = new CacheFile4Sbox()
+                {
+                    enabled = true
+                };
+            }
+
            return 0;
        }

@@ -885,18 +895,45 @@ namespace v2rayN.Handler
                ruleSets.AddRange(dnsRule.rule_set);
            }

+            //load custom ruleset file
+            List<Ruleset4Sbox> customRulesets = [];
+            if (_config.routingBasicItem.enableRoutingAdvanced)
+            {
+                var routing = ConfigHandler.GetDefaultRouting(_config);
+                if (!Utils.IsNullOrEmpty(routing.customRulesetPath4Singbox))
+                {
+                    var result = Utils.LoadResource(routing.customRulesetPath4Singbox);
+                    if (!Utils.IsNullOrEmpty(result))
+                    {
+                        customRulesets = (JsonUtils.Deserialize<List<Ruleset4Sbox>>(result) ?? [])
+                            .Where(t => t.tag != null)
+                            .Where(t => t.type != null)
+                            .Where(t => t.format != null)
+                            .ToList();
+                    }
+                }
+            }
+
            //Add ruleset srs
            singboxConfig.route.rule_set = [];
            foreach (var item in new HashSet<string>(ruleSets))
            {
-                singboxConfig.route.rule_set.Add(new()
+                var customRuleset = customRulesets.FirstOrDefault(t => t.tag != null && t.tag.Equals(item));
+                if (customRuleset != null)
                {
-                    type = "remote",
-                    format = "binary",
-                    tag = item,
-                    url = string.Format(Global.SingboxRulesetUrl, item.StartsWith(geosite) ? geosite : geoip, item),
-                    download_detour = Global.ProxyTag
-                });
+                    singboxConfig.route.rule_set.Add(customRuleset);
+                }
+                else
+                {
+                    singboxConfig.route.rule_set.Add(new()
+                    {
+                        type = "remote",
+                        format = "binary",
+                        tag = item,
+                        url = string.Format(Global.SingboxRulesetUrl, item.StartsWith(geosite) ? geosite : geoip, item),
+                        download_detour = Global.ProxyTag
+                    });
+                }
            }

            return 0;
@@ -1045,6 +1082,12 @@ namespace v2rayN.Handler
                {
                    dnsServer.detour = singboxConfig.route.rules.LastOrDefault()?.outbound;
                }
+                var dnsRule = singboxConfig.dns?.rules.Where(t => t.outbound != null).FirstOrDefault();
+                if (dnsRule != null)
+                {
+                    singboxConfig.dns.rules = [];
+                    singboxConfig.dns.rules.Add(dnsRule);
+                }

                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
                return 0;
--- a/v2rayN/v2rayN/Handler/ProfileExHandler.cs
+++ b/v2rayN/v2rayN/Handler/ProfileExHandler.cs
@@ -7,7 +7,7 @@ namespace v2rayN.Handler
    internal class ProfileExHandler
    {
        private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
-        private ConcurrentBag<ProfileExItem> _lstProfileEx;
+        private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
        private Queue<string> _queIndexIds = new();
        public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
        public static ProfileExHandler Instance => _instance.Value;
@@ -15,6 +15,15 @@ namespace v2rayN.Handler
        public ProfileExHandler()
        {
            Init();
+
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    SaveQueueIndexIds();
+                    await Task.Delay(1000 * 600);
+                }
+            });
        }

        private void Init()
@@ -22,24 +31,6 @@ namespace v2rayN.Handler
            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");

            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
-
-            Task.Run(async () =>
-            {
-                while (true)
-                {
-                    var cnt = _queIndexIds.Count;
-                    for (int i = 0; i < cnt; i++)
-                    {
-                        var id = _queIndexIds.Dequeue();
-                        var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
-                        if (item is not null)
-                        {
-                            SQLiteHelper.Instance.Replace(item);
-                        }
-                    }
-                    await Task.Delay(1000 * 60);
-                }
-            });
        }

        private void IndexIdEnqueue(string indexId)
@@ -50,6 +41,49 @@ namespace v2rayN.Handler
            }
        }

+        private void SaveQueueIndexIds()
+        {
+            var cnt = _queIndexIds.Count;
+            if (cnt > 0)
+            {
+                var lstExists = SQLiteHelper.Instance.Table<ProfileExItem>();
+                List<ProfileExItem> lstInserts = [];
+                List<ProfileExItem> lstUpdates = [];
+
+                for (int i = 0; i < cnt; i++)
+                {
+                    var id = _queIndexIds.Dequeue();
+                    var item = lstExists.FirstOrDefault(t => t.indexId == id);
+                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.indexId == id);
+                    if (itemNew is null)
+                    {
+                        continue;
+                    }
+
+                    if (item is not null)
+                    {
+                        lstUpdates.Add(itemNew);
+                    }
+                    else
+                    {
+                        lstInserts.Add(itemNew);
+                    }
+                }
+                try
+                {
+                    if (lstInserts.Count() > 0)
+                        SQLiteHelper.Instance.InsertAll(lstInserts);
+
+                    if (lstUpdates.Count() > 0)
+                        SQLiteHelper.Instance.UpdateAll(lstUpdates);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ProfileExHandler", ex);
+                }
+            }
+        }
+
        private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
        {
            profileEx = new()
@@ -73,11 +107,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                //foreach (var item in _lstProfileEx)
-                //{
-                //    SQLiteHelper.Instance.Replace(item);
-                //}
-                SQLiteHelper.Instance.UpdateAll(_lstProfileEx);
+                SaveQueueIndexIds();
            }
            catch (Exception ex)
            {
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -264,7 +264,12 @@ namespace v2rayN.Handler

        private static string GetIpv6(string address)
        {
-            return Utils.IsIpv6(address) ? $"[{address}]" : address;
+            if (Utils.IsIpv6(address))
+            {
+                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+            }
+            return address;  // 如果不是IPv6地址，直接返回原地址
        }

        private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
--- a/v2rayN/v2rayN/Models/ConfigItems.cs
+++ b/v2rayN/v2rayN/Models/ConfigItems.cs
@@ -33,6 +33,8 @@ namespace v2rayN.Models
        public string defUserAgent { get; set; }

        public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; } = true;
    }

    [Serializable]
@@ -180,16 +182,11 @@ namespace v2rayN.Models
    [Serializable]
    public class RoutingBasicItem
    {
-        /// <summary>
-        /// 域名解析策略
-        /// </summary>
        public string domainStrategy { get; set; }
-
        public string domainStrategy4Singbox { get; set; }
-
        public string domainMatcher { get; set; }
        public string routingIndexId { get; set; }
-        public bool enableRoutingAdvanced { get; set; }
+        public bool enableRoutingAdvanced { get; set; }        
    }

    [Serializable]
--- a/v2rayN/v2rayN/Models/RoutingItem.cs
+++ b/v2rayN/v2rayN/Models/RoutingItem.cs
@@ -15,6 +15,7 @@ namespace v2rayN.Models
        public bool enabled { get; set; } = true;
        public bool locked { get; set; }
        public string customIcon { get; set; }
+        public string customRulesetPath4Singbox { get; set; }
        public string domainStrategy { get; set; }
        public string domainStrategy4Singbox { get; set; }
        public int sort { get; set; }
--- a/v2rayN/v2rayN/Models/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Models/SingboxConfig.cs
@@ -7,7 +7,7 @@
        public List<Inbound4Sbox> inbounds { get; set; }
        public List<Outbound4Sbox> outbounds { get; set; }
        public Route4Sbox route { get; set; }
-        public Experimental4Sbox experimental { get; set; }
+        public Experimental4Sbox? experimental { get; set; }
    }

    public class Log4Sbox
@@ -41,14 +41,14 @@
    [Serializable]
    public class Rule4Sbox
    {
-        public string outbound { get; set; }
-        public string server { get; set; }
+        public string? outbound { get; set; }
+        public string? server { get; set; }
        public bool? disable_cache { get; set; }
        public List<string>? inbound { get; set; }
        public List<string>? protocol { get; set; }
-        public string type { get; set; }
-        public string mode { get; set; }
-        public string network { get; set; }
+        public string? type { get; set; }
+        public string? mode { get; set; }
+        public string? network { get; set; }
        public bool? ip_is_private { get; set; }
        public List<int>? port { get; set; }
        public List<string>? port_range { get; set; }
@@ -238,7 +238,9 @@
        public string? tag { get; set; }
        public string? type { get; set; }
        public string? format { get; set; }
+        public string? path { get; set; }
        public string? url { get; set; }
        public string? download_detour { get; set; }
+        public string? update_interval { get; set; }  
    }
 }
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -411,6 +411,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Custom the rule-set of sing-box 的本地化字符串。
+        /// </summary>
+        public static string LvCustomRulesetPath4Singbox {
+            get {
+                return ResourceManager.GetString("LvCustomRulesetPath4Singbox", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Enabled Update 的本地化字符串。
        /// </summary>
@@ -969,6 +978,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Open the storage location 的本地化字符串。
+        /// </summary>
+        public static string menuOpenTheFileLocation {
+            get {
+                return ResourceManager.GetString("menuOpenTheFileLocation", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Option Setting 的本地化字符串。
        /// </summary>
@@ -1572,6 +1590,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Successful operation. Click the settings menu to reboot the app. 的本地化字符串。
+        /// </summary>
+        public static string NeedRebootTips {
+            get {
+                return ResourceManager.GetString("NeedRebootTips", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Non-VMess or ss protocol 的本地化字符串。
        /// </summary>
@@ -2608,6 +2635,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Enable cache file for sing-box (ruleset files) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableCacheFile4Sbox {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableCacheFile4Sbox", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Check for pre-release updates 的本地化字符串。
        /// </summary>
--- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
@@ -1003,4 +1003,7 @@
  <data name="TbSettingsEnableHWA" xml:space="preserve">
    <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>فعال کردن کش فایل مجموعه قوانین برای sing-box</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1207,4 +1207,16 @@
  <data name="TbSettingsEnableFragment" xml:space="preserve">
    <value>Enable fragment</value>
  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>Enable cache file for sing-box (ruleset files)</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>Custom the rule-set of sing-box</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>Successful operation. Click the settings menu to reboot the app.</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>Open the storage location</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1204,4 +1204,16 @@
  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
    <value>使用Xray且非Tun模式启用，和分组前置代理冲突</value>
  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>启用sing-box（规则集文件）的缓存文件</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>自定义sing-box rule-set</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>操作成功。请点击设置菜单重启应用。</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>打开存储所在的位置</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1177,4 +1177,16 @@
  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
    <value>使用Xray且非Tun模式啟用，和分組前置代理衝突</value>
  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>啟用sing-box（規則集文件）的緩存文件</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>自訂sing-box rule-set</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>操作成功。 請點選設定選單重啟應用程式。</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>打開儲存所在的位置</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
@@ -56,7 +56,7 @@ namespace v2rayN.ViewModels
                SaveServer();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        private void SaveServer()
--- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -44,7 +44,7 @@ namespace v2rayN.ViewModels
                SaveServer();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        private void SaveServer()
--- a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
@@ -56,7 +56,7 @@ namespace v2rayN.ViewModels
                tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        private void SaveSetting()
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -143,7 +143,8 @@ namespace v2rayN.ViewModels
        public ReactiveCommand<Unit, Unit> GlobalHotkeySettingCmd { get; }
        public ReactiveCommand<Unit, Unit> RebootAsAdminCmd { get; }
        public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
-        public ReactiveCommand<Unit, Unit> ImportOldGuiConfigCmd { get; }
+        public ReactiveCommand<Unit, Unit> OpenTheFileLocationCmd { get; }
+        //public ReactiveCommand<Unit, Unit> ImportOldGuiConfigCmd { get; }

        //CheckUpdate
        public ReactiveCommand<Unit, Unit> CheckUpdateNCmd { get; }
@@ -503,10 +504,14 @@ namespace v2rayN.ViewModels
                _statistics?.ClearAllServerStatistics();
                RefreshServers();
            });
-            ImportOldGuiConfigCmd = ReactiveCommand.Create(() =>
+            OpenTheFileLocationCmd = ReactiveCommand.Create(() =>
            {
-                ImportOldGuiConfig();
+                Utils.ProcessStart("Explorer", $"/select,{Utils.GetConfigPath()}");
            });
+            //ImportOldGuiConfigCmd = ReactiveCommand.Create(() =>
+            //{
+            //    ImportOldGuiConfig();
+            //});

            //CheckUpdate
            CheckUpdateNCmd = ReactiveCommand.Create(() =>
@@ -1422,32 +1427,32 @@ namespace v2rayN.ViewModels
            catch { }
        }

-        private void ImportOldGuiConfig()
-        {
-            if (UI.OpenFileDialog(out string fileName,
-                "guiNConfig|*.json|All|*.*") != true)
-            {
-                return;
-            }
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
+        //private void ImportOldGuiConfig()
+        //{
+        //    if (UI.OpenFileDialog(out string fileName,
+        //        "guiNConfig|*.json|All|*.*") != true)
+        //    {
+        //        return;
+        //    }
+        //    if (Utils.IsNullOrEmpty(fileName))
+        //    {
+        //        return;
+        //    }

-            var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
-            if (ret == 0)
-            {
-                RefreshRoutingsMenu();
-                InitSubscriptionView();
-                RefreshServers();
-                Reload();
-                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
-            }
-            else
-            {
-                _noticeHandler?.Enqueue(ResUI.OperationFailed);
-            }
-        }
+        //    var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
+        //    if (ret == 0)
+        //    {
+        //        RefreshRoutingsMenu();
+        //        InitSubscriptionView();
+        //        RefreshServers();
+        //        Reload();
+        //        _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+        //    }
+        //    else
+        //    {
+        //        _noticeHandler?.Enqueue(ResUI.OperationFailed);
+        //    }
+        //}

        #endregion Setting

@@ -1847,7 +1852,7 @@ namespace v2rayN.ViewModels
        {
            var theme = _paletteHelper.GetTheme();

-            theme.SetBaseTheme(isDarkTheme ? Theme.Dark : Theme.Light);
+            theme.SetBaseTheme(isDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
            _paletteHelper.SetTheme(theme);

            Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -32,6 +32,7 @@ namespace v2rayN.ViewModels
        [Reactive] public string defFingerprint { get; set; }
        [Reactive] public string defUserAgent { get; set; }
        [Reactive] public string mux4SboxProtocol { get; set; }
+        [Reactive] public bool enableCacheFile4Sbox { get; set; }
        [Reactive] public int hyUpMbps { get; set; }
        [Reactive] public int hyDownMbps { get; set; }
        [Reactive] public bool enableFragment { get; set; }
@@ -63,9 +64,9 @@ namespace v2rayN.ViewModels
        [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 trayMenuServersLimit { get; set; }
-        [Reactive] public string currentFontFamily { get; set; }
+        [Reactive] public int AutoUpdateInterval { get; set; }
+        [Reactive] public int TrayMenuServersLimit { get; set; }
+        [Reactive] public string CurrentFontFamily { get; set; }
        [Reactive] public int SpeedTestTimeout { get; set; }
        [Reactive] public string SpeedTestUrl { get; set; }
        [Reactive] public string SpeedPingTestUrl { get; set; }
@@ -128,6 +129,7 @@ namespace v2rayN.ViewModels
            defFingerprint = _config.coreBasicItem.defFingerprint;
            defUserAgent = _config.coreBasicItem.defUserAgent;
            mux4SboxProtocol = _config.mux4SboxItem.protocol;
+            enableCacheFile4Sbox = _config.coreBasicItem.enableCacheFile4Sbox;
            hyUpMbps = _config.hysteriaItem.up_mbps;
            hyDownMbps = _config.hysteriaItem.down_mbps;
            enableFragment = _config.coreBasicItem.enableFragment;
@@ -159,9 +161,9 @@ namespace v2rayN.ViewModels
            EnableCheckPreReleaseUpdate = _config.guiItem.checkPreReleaseUpdate;
            EnableDragDropSort = _config.uiItem.enableDragDropSort;
            DoubleClick2Activate = _config.uiItem.doubleClick2Activate;
-            autoUpdateInterval = _config.guiItem.autoUpdateInterval;
-            trayMenuServersLimit = _config.guiItem.trayMenuServersLimit;
-            currentFontFamily = _config.uiItem.currentFontFamily;
+            AutoUpdateInterval = _config.guiItem.autoUpdateInterval;
+            TrayMenuServersLimit = _config.guiItem.trayMenuServersLimit;
+            CurrentFontFamily = _config.uiItem.currentFontFamily;
            SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
            SpeedTestUrl = _config.speedTestItem.speedTestUrl;
            SpeedPingTestUrl = _config.speedTestItem.speedPingTestUrl;
@@ -194,7 +196,7 @@ namespace v2rayN.ViewModels
                SaveSetting();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        private void InitCoreType()
@@ -257,6 +259,10 @@ namespace v2rayN.ViewModels
                _noticeHandler?.Enqueue(ResUI.FillLocalListeningPort);
                return;
            }
+            var needReboot = (EnableStatistics != _config.guiItem.enableStatistics
+                            || EnableDragDropSort != _config.uiItem.enableDragDropSort
+                            || EnableHWA != _config.guiItem.enableHWA
+                            || CurrentFontFamily != _config.uiItem.currentFontFamily);  

            //if (Utile.IsNullOrEmpty(Kcpmtu.ToString()) || !Utile.IsNumeric(Kcpmtu.ToString())
            //       || Utile.IsNullOrEmpty(Kcptti.ToString()) || !Utile.IsNumeric(Kcptti.ToString())
@@ -289,6 +295,7 @@ namespace v2rayN.ViewModels
            _config.coreBasicItem.defFingerprint = defFingerprint;
            _config.coreBasicItem.defUserAgent = defUserAgent;
            _config.mux4SboxItem.protocol = mux4SboxProtocol;
+            _config.coreBasicItem.enableCacheFile4Sbox = enableCacheFile4Sbox;
            _config.hysteriaItem.up_mbps = hyUpMbps;
            _config.hysteriaItem.down_mbps = hyDownMbps;
            _config.coreBasicItem.enableFragment = enableFragment;
@@ -312,12 +319,12 @@ namespace v2rayN.ViewModels
            _config.uiItem.enableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
            _config.guiItem.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
            _config.uiItem.autoHideStartup = AutoHideStartup;
-            _config.guiItem.autoUpdateInterval = autoUpdateInterval;
+            _config.guiItem.autoUpdateInterval = AutoUpdateInterval;
            _config.guiItem.checkPreReleaseUpdate = EnableCheckPreReleaseUpdate;
            _config.uiItem.enableDragDropSort = EnableDragDropSort;
            _config.uiItem.doubleClick2Activate = DoubleClick2Activate;
-            _config.guiItem.trayMenuServersLimit = trayMenuServersLimit;
-            _config.uiItem.currentFontFamily = currentFontFamily;
+            _config.guiItem.trayMenuServersLimit = TrayMenuServersLimit;
+            _config.uiItem.currentFontFamily = CurrentFontFamily;
            _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
            _config.speedTestItem.speedTestUrl = SpeedTestUrl;
            _config.speedTestItem.speedPingTestUrl = SpeedPingTestUrl;
@@ -340,7 +347,14 @@ namespace v2rayN.ViewModels

            if (ConfigHandler.SaveConfig(_config) == 0)
            {
-                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+                if (needReboot)
+                {
+                    _noticeHandler?.Enqueue(ResUI.NeedRebootTips);
+                }
+                else
+                {
+                    _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+                }
                _view.DialogResult = true;
            }
            else
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
@@ -62,7 +62,7 @@ namespace v2rayN.ViewModels
                SaveRules();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        private void SaveRules()
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -115,7 +115,7 @@ namespace v2rayN.ViewModels
                SaveRouting();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        public void RefreshRulesItems()
--- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
@@ -126,7 +126,7 @@ namespace v2rayN.ViewModels
                SaveRouting();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        #region locked
@@ -192,6 +192,7 @@ namespace v2rayN.ViewModels
                    remarks = item.remarks,
                    url = item.url,
                    customIcon = item.customIcon,
+                    customRulesetPath4Singbox = item.customRulesetPath4Singbox,
                    sort = item.sort,
                };
                _routingItems.Add(it);
--- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
@@ -40,7 +40,7 @@ namespace v2rayN.ViewModels
                SaveSub();
            });

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        private void SaveSub()
--- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
@@ -62,7 +62,7 @@ namespace v2rayN.ViewModels
                SubShare();
            }, canEditRemove);

-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
        }

        public void RefreshSubItems()
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -88,6 +88,7 @@
                            Style="{StaticResource ToolbarTextBlock}">
                            <Hyperlink Click="linkDnsObjectDoc_Click">
                                <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                                <materialDesign:PackIcon Kind="Link" />
                            </Hyperlink>
                        </TextBlock>
                        <Button
@@ -120,6 +121,7 @@
                            Style="{StaticResource ToolbarTextBlock}">
                            <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
                                <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                                <materialDesign:PackIcon Kind="Link" />
                            </Hyperlink>
                        </TextBlock>
                        <Button
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -39,7 +39,7 @@ namespace v2rayN.Views

            HotkeyHandler.Instance.IsPause = true;
            this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
-            Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(this, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
            InitData();
        }

--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -15,6 +15,7 @@
    Title="v2rayN"
    Width="900"
    Height="700"
+    MinWidth="900"
    x:TypeArguments="vms:MainWindowViewModel"
    Background="{DynamicResource MaterialDesignPaper}"
    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@@ -190,9 +191,13 @@
                                    Header="{x:Static resx:ResUI.menuClearServerStatistics}" />
                                <Separator Margin="-40,5" />
                                <MenuItem
+                                    x:Name="menuOpenTheFileLocation"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
+                                <!--<MenuItem
                                    x:Name="menuImportOldGuiConfig"
                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuImportOldGuiConfig}" />
+                                    Header="{x:Static resx:ResUI.menuImportOldGuiConfig}" />-->
                            </MenuItem>
                        </Menu>
                        <Separator />
@@ -669,9 +674,9 @@
                            <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
                                <Style.Triggers>
                                    <DataTrigger Binding="{Binding isActive}" Value="True">
-                                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+                                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                                        <Setter Property="Foreground" Value="Black" />
-                                        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}" />
+                                        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                                    </DataTrigger>
                                </Style.Triggers>
                            </Style>
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -138,7 +138,8 @@ namespace v2rayN.Views
                this.BindCommand(ViewModel, vm => vm.GlobalHotkeySettingCmd, v => v.menuGlobalHotkeySetting).DisposeWith(disposables);
                this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
                this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.ImportOldGuiConfigCmd, v => v.menuImportOldGuiConfig).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.OpenTheFileLocationCmd, v => v.menuOpenTheFileLocation).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.ImportOldGuiConfigCmd, v => v.menuImportOldGuiConfig).DisposeWith(disposables);

                //check update
                this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables);
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -17,7 +17,6 @@
            <TextBlock
                Margin="8,0"
                VerticalAlignment="Center"
-                Foreground="{DynamicResource PrimaryHueLightBrush}"
                Style="{StaticResource ToolbarTextBlock}"
                Text="{x:Static resx:ResUI.MsgInformationTitle}" />
            <ComboBox
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -68,6 +68,7 @@
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                        </Grid.RowDefinitions>
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="Auto" />
@@ -314,10 +315,24 @@
                            Margin="{StaticResource SettingItemMargin}"
                            VerticalAlignment="Center"
                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
+                        <ToggleButton
+                            x:Name="togenableCacheFile4Sbox"
+                            Grid.Row="15"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="16"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
                            Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />

                        <StackPanel
-                            Grid.Row="15"
+                            Grid.Row="16"
                            Grid.Column="1"
                            Orientation="Horizontal">

@@ -336,7 +351,7 @@
                        </StackPanel>

                        <TextBlock
-                            Grid.Row="16"
+                            Grid.Row="17"
                            Grid.Column="0"
                            Margin="{StaticResource SettingItemMargin}"
                            VerticalAlignment="Center"
@@ -344,12 +359,12 @@
                            Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
                        <ToggleButton
                            x:Name="togenableFragment"
-                            Grid.Row="16"
+                            Grid.Row="17"
                            Grid.Column="1"
                            Margin="{StaticResource SettingItemMargin}"
                            HorizontalAlignment="Left" />
                        <TextBlock
-                            Grid.Row="16"
+                            Grid.Row="17"
                            Grid.Column="3"
                            Margin="{StaticResource SettingItemMargin}"
                            Style="{StaticResource ToolbarTextBlock}"
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -30,6 +30,7 @@ namespace v2rayN.Views

            this.Owner = Application.Current.MainWindow;
            _config = LazyConfig.Instance.GetConfig();
+            var lstFonts = GetFonts(Utils.GetFontsPath());

            ViewModel = new OptionSettingViewModel(this);

@@ -89,14 +90,91 @@ namespace v2rayN.Views
                cmbSubConvertUrl.Items.Add(it);
            });

-            //fill fonts
+            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
+            cmbcurrentFontFamily.Items.Add(string.Empty);
+
+            this.WhenActivated(disposables =>
+            {
+                this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.udpEnabled, v => v.togudpEnabled.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.sniffingEnabled, v => v.togsniffingEnabled.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.routeOnly, v => v.togrouteOnly.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.allowLANConn, v => v.togAllowLANConn.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.newPort4LAN, v => v.togNewPort4LAN.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.newPort4LAN, v => v.txtuser.IsEnabled).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.newPort4LAN, v => v.txtpass.IsEnabled).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.user, v => v.txtuser.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.pass, v => v.txtpass.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.muxEnabled, v => v.togmuxEnabled.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.logEnabled, v => v.toglogEnabled.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.loglevel, v => v.cmbloglevel.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.defAllowInsecure, v => v.togdefAllowInsecure.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.defFingerprint, v => v.cmbdefFingerprint.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.defUserAgent, v => v.cmbdefUserAgent.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.mux4SboxProtocol, v => v.cmbmux4SboxProtocol.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.enableCacheFile4Sbox, v => v.togenableCacheFile4Sbox.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.hyUpMbps, v => v.txtUpMbps.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.hyDownMbps, v => v.txtDownMbps.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.enableFragment, v => v.togenableFragment.IsChecked).DisposeWith(disposables);
+
+                //this.Bind(ViewModel, vm => vm.Kcpmtu, v => v.txtKcpmtu.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.Kcptti, v => v.txtKcptti.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.KcpuplinkCapacity, v => v.txtKcpuplinkCapacity.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.KcpdownlinkCapacity, v => v.txtKcpdownlinkCapacity.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.KcpreadBufferSize, v => v.txtKcpreadBufferSize.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.KcpwriteBufferSize, v => v.txtKcpwriteBufferSize.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.Kcpcongestion, v => v.togKcpcongestion.IsChecked).DisposeWith(disposables);
+
+                this.Bind(ViewModel, vm => vm.AutoRun, v => v.togAutoRun.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableStatistics, v => v.togEnableStatistics.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
+                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.TrayMenuServersLimit, v => v.txttrayMenuServersLimit.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
+
+                this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.systemProxyExceptions, v => v.txtsystemProxyExceptions.Text).DisposeWith(disposables);
+
+                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.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
+
+                this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CoreType3, v => v.cmbCoreType3.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables);
+
+                this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+            });
+        }
+
+        private List<string> GetFonts(string path)
+        {
+            var lstFonts = new List<string>();
            try
            {
                string[] searchPatterns = { "*.ttf", "*.ttc" };
                var files = new List<string>();
                foreach (var pattern in searchPatterns)
                {
-                    files.AddRange(Directory.GetFiles(Utils.GetFontsPath(), pattern));
+                    files.AddRange(Directory.GetFiles(path, pattern));
                }
                var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
                var culture2 = "en-us";
@@ -123,7 +201,7 @@ namespace v2rayN.Views
                                    continue;
                                }
                            }
-                            cmbcurrentFontFamily.Items.Add(fontFamily);
+                            lstFonts.Add(fontFamily);
                            break;
                        }
                    }
@@ -133,77 +211,7 @@ namespace v2rayN.Views
            {
                Logging.SaveLog("fill fonts error", ex);
            }
-            cmbcurrentFontFamily.Items.Add(string.Empty);
-
-            this.WhenActivated(disposables =>
-            {
-                this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.udpEnabled, v => v.togudpEnabled.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.sniffingEnabled, v => v.togsniffingEnabled.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.routeOnly, v => v.togrouteOnly.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.allowLANConn, v => v.togAllowLANConn.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.newPort4LAN, v => v.togNewPort4LAN.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.newPort4LAN, v => v.txtuser.IsEnabled).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.newPort4LAN, v => v.txtpass.IsEnabled).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.user, v => v.txtuser.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.pass, v => v.txtpass.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.muxEnabled, v => v.togmuxEnabled.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.logEnabled, v => v.toglogEnabled.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.loglevel, v => v.cmbloglevel.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.defAllowInsecure, v => v.togdefAllowInsecure.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.defFingerprint, v => v.cmbdefFingerprint.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.defUserAgent, v => v.cmbdefUserAgent.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.mux4SboxProtocol, v => v.cmbmux4SboxProtocol.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.hyUpMbps, v => v.txtUpMbps.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.hyDownMbps, v => v.txtDownMbps.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.enableFragment, v => v.togenableFragment.IsChecked).DisposeWith(disposables);
-
-                //this.Bind(ViewModel, vm => vm.Kcpmtu, v => v.txtKcpmtu.Text).DisposeWith(disposables);
-                //this.Bind(ViewModel, vm => vm.Kcptti, v => v.txtKcptti.Text).DisposeWith(disposables);
-                //this.Bind(ViewModel, vm => vm.KcpuplinkCapacity, v => v.txtKcpuplinkCapacity.Text).DisposeWith(disposables);
-                //this.Bind(ViewModel, vm => vm.KcpdownlinkCapacity, v => v.txtKcpdownlinkCapacity.Text).DisposeWith(disposables);
-                //this.Bind(ViewModel, vm => vm.KcpreadBufferSize, v => v.txtKcpreadBufferSize.Text).DisposeWith(disposables);
-                //this.Bind(ViewModel, vm => vm.KcpwriteBufferSize, v => v.txtKcpwriteBufferSize.Text).DisposeWith(disposables);
-                //this.Bind(ViewModel, vm => vm.Kcpcongestion, v => v.togKcpcongestion.IsChecked).DisposeWith(disposables);
-
-                this.Bind(ViewModel, vm => vm.AutoRun, v => v.togAutoRun.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.EnableStatistics, v => v.togEnableStatistics.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
-                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.trayMenuServersLimit, v => v.txttrayMenuServersLimit.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.currentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
-
-                this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.systemProxyExceptions, v => v.txtsystemProxyExceptions.Text).DisposeWith(disposables);
-
-                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.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
-
-                this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CoreType3, v => v.cmbCoreType3.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables);
-
-                this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
-            });
+            return lstFonts;
        }
    }
 }
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -4,6 +4,7 @@
    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"
    xmlns:reactiveui="http://reactiveui.net"
    xmlns:resx="clr-namespace:v2rayN.Resx"
@@ -83,6 +84,7 @@
                Style="{StaticResource ToolbarTextBlock}">
                <Hyperlink Click="linkRuleobjectDoc_Click">
                    <TextBlock Text="{x:Static resx:ResUI.TbRuleobjectDoc}" />
+                    <materialDesign:PackIcon Kind="Link" />
                </Hyperlink>
            </TextBlock>

--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -114,17 +114,36 @@
                VerticalAlignment="Center"
                Style="{StaticResource ToolbarTextBlock}"
                Text="{x:Static resx:ResUI.LvRemarks}" />
-            <TextBox
-                x:Name="txtRemarks"
+            <StackPanel
                Grid.Row="0"
                Grid.Column="1"
-                Width="400"
-                Margin="4"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                AcceptsReturn="True"
-                Style="{StaticResource DefTextBox}"
-                TextWrapping="Wrap" />
+                Orientation="Horizontal">
+
+                <TextBox
+                    x:Name="txtRemarks"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Width="300"
+                    Margin="4"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    AcceptsReturn="True"
+                    Style="{StaticResource DefTextBox}"
+                    TextWrapping="Wrap" />
+
+                <TextBlock
+                    Margin="4"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.LvSort}" />
+                <TextBox
+                    x:Name="txtSort"
+                    Width="100"
+                    Margin="4"
+                    HorizontalAlignment="Left"
+                    AcceptsReturn="True"
+                    Style="{StaticResource DefTextBox}" />
+            </StackPanel>

            <TextBlock
                Grid.Row="1"
@@ -190,11 +209,11 @@
                Style="{StaticResource DefTextBox}"
                TextWrapping="Wrap" />
            <Button
-                x:Name="btnBrowse"
+                x:Name="btnBrowseCustomIcon"
                Grid.Row="3"
                Grid.Column="2"
                Margin="2,0,8,0"
-                Click="btnBrowse_Click"
+                Click="btnBrowseCustomIcon_Click"
                Content="{x:Static resx:ResUI.TbBrowse}"
                Style="{StaticResource DefButton}" />

@@ -203,17 +222,30 @@
                Grid.Column="0"
                Margin="4"
                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.LvSort}" />
+                Style="{StaticResource ToolbarTextBlock}">
+                <Hyperlink Click="linkCustomRulesetPath4Singbox">
+                    <TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
+                    <materialDesign:PackIcon Kind="Link" />
+                </Hyperlink>
+            </TextBlock>
            <TextBox
-                x:Name="txtSort"
+                x:Name="txtCustomRulesetPath4Singbox"
                Grid.Row="4"
                Grid.Column="1"
-                Width="200"
+                Width="600"
                Margin="4"
-                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
                AcceptsReturn="True"
-                Style="{StaticResource DefTextBox}" />
+                Style="{StaticResource DefTextBox}"
+                TextWrapping="Wrap" />
+            <Button
+                x:Name="btnBrowseCustomRulesetPath4Singbox"
+                Grid.Row="4"
+                Grid.Column="2"
+                Margin="2,0,8,0"
+                Click="btnBrowseCustomRulesetPath4Singbox_Click"
+                Content="{x:Static resx:ResUI.TbBrowse}"
+                Style="{StaticResource DefButton}" />
        </Grid>

        <TabControl x:Name="tabAdvanced">
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -51,6 +51,7 @@ namespace v2rayN.Views

                this.Bind(ViewModel, vm => vm.SelectedRouting.url, v => v.txtUrl.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.SelectedRouting.customIcon, v => v.txtCustomIcon.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedRouting.customRulesetPath4Singbox, v => v.txtCustomRulesetPath4Singbox.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.SelectedRouting.sort, v => v.txtSort.Text).DisposeWith(disposables);

                this.BindCommand(ViewModel, vm => vm.RuleAddCmd, v => v.menuRuleAdd).DisposeWith(disposables);
@@ -128,7 +129,7 @@ namespace v2rayN.Views
            lstRules.SelectAll();
        }

-        private void btnBrowse_Click(object sender, System.Windows.RoutedEventArgs e)
+        private void btnBrowseCustomIcon_Click(object sender, System.Windows.RoutedEventArgs e)
        {
            if (UI.OpenFileDialog(out string fileName,
                "PNG,ICO|*.png;*.ico") != true)
@@ -138,5 +139,21 @@ namespace v2rayN.Views

            txtCustomIcon.Text = fileName;
        }
+
+        private void btnBrowseCustomRulesetPath4Singbox_Click(object sender, RoutedEventArgs e)
+        {
+            if (UI.OpenFileDialog(out string fileName,
+                  "Config|*.json|All|*.*") != true)
+            {
+                return;
+            }
+
+            txtCustomRulesetPath4Singbox.Text = fileName;
+        }
+
+        private void linkCustomRulesetPath4Singbox(object sender, RoutedEventArgs e)
+        {
+            Utils.ProcessStart("https://github.com/2dust/v2rayCustomRoutingList/blob/master/singbox_custom_ruleset_example.json");
+        }
    }
 }
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -90,6 +90,7 @@
                    Style="{StaticResource ToolbarTextBlock}">
                    <Hyperlink Click="linkdomainStrategy_Click">
                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                        <materialDesign:PackIcon Kind="Link" />
                    </Hyperlink>
                </TextBlock>
                <ComboBox
@@ -115,6 +116,7 @@
                    Style="{StaticResource ToolbarTextBlock}">
                    <Hyperlink Click="linkdomainStrategy4Singbox_Click">
                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                        <materialDesign:PackIcon Kind="Link" />
                    </Hyperlink>
                </TextBlock>
                <ComboBox
@@ -199,9 +201,9 @@
                            <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
                                <Style.Triggers>
                                    <DataTrigger Binding="{Binding isActive}" Value="True">
-                                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+                                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                                        <Setter Property="Foreground" Value="Black" />
-                                        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}" />
+                                        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                                    </DataTrigger>
                                </Style.Triggers>
                            </Style>
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -10,22 +10,22 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.43</FileVersion>
+		<FileVersion>6.44</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.6" />		
-		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
-		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.124" />
-		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
+		<PackageReference Include="MaterialDesignThemes" Version="5.0.0" />
+		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.131" />
+		<PackageReference Include="QRCoder.Xaml" Version="1.5.1" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
-		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
+		<PackageReference Include="TaskScheduler" Version="2.11.0" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
-		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-		<PackageReference Include="ReactiveUI.WPF" Version="19.6.1" />
-		<PackageReference Include="Splat.NLog" Version="14.8.12" />
+		<PackageReference Include="ReactiveUI.Validation" Version="4.0.6" />
+		<PackageReference Include="ReactiveUI.WPF" Version="20.0.1" />
+		<PackageReference Include="Splat.NLog" Version="15.0.1" />
 	</ItemGroup>
 	
 	<ItemGroup>
Author	SHA1	Message	Date
2dust	5857042963	Up 6.44	2024-05-08 13:40:24 +08:00
2dust	28e41dc621	Add open the file location	2024-05-08 11:43:03 +08:00
2dust	baef3b364b	Bug fix	2024-05-08 11:42:01 +08:00
2dust	4b9ddb803f	Bug fix	2024-05-07 14:15:08 +08:00
2dust	c07c7ad82f	Added reminder that a reboot is required to modify settings	2024-05-06 17:19:29 +08:00
2dust	e223b80b95	Merge pull request #5066 from sincereliu/master Optimize code for better performance	2024-05-06 09:55:30 +08:00
sincere liu	5fe468fa1b	Optimize code for better performance	2024-05-05 22:07:51 +08:00
2dust	60068d8d16	Themes migrate	2024-05-05 16:19:47 +08:00
2dust	b6c5b46afe	Up PackageReference	2024-05-05 10:10:19 +08:00
2dust	124cbfadb4	Add custom sing-box rule-set support	2024-05-04 13:54:22 +08:00
2dust	8d21f9b900	Bug fix	2024-05-04 13:24:13 +08:00
2dust	398dbbd2e5	Bug fix https://github.com/2dust/v2rayN/issues/5035	2024-05-03 10:29:32 +08:00
2dust	e9b392d1c0	Optimized sorted storage	2024-04-30 14:44:02 +08:00
2dust	9d7c7e3225	Adjust the experimental and mux of sing-box	2024-04-27 10:05:13 +08:00
2dust	855fd4f0b7	Merge pull request #5026 from GibMeMyPacket/feat/singbox/exp_cachefile Add `Enable cache file for sing-box`	2024-04-27 09:42:31 +08:00
GibMeMyPacket	807839929d	Add `Enable cache file for sing-box`	2024-04-25 12:07:53 +00:00
2dust	870955fee1	Bug fix	2024-04-11 08:07:21 +08:00