Revert "Remove rules custom Icon"

This reverts commit d3ebc17.
2dust · Jan 12, 2025 · 2ae43f8 · 2ae43f8
1 parent d3ebc17
commit 2ae43f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -186,7 +186,6 @@
                 Style="{StaticResource DefTextBox}"
                 TextWrapping="Wrap" />
 
-            <!--
             <TextBlock
                 Grid.Row="3"
                 Grid.Column="0"
@@ -211,7 +210,6 @@
                 Margin="{StaticResource MarginLeftRight4}"
                 Content="{x:Static resx:ResUI.TbBrowse}"
                 Style="{StaticResource DefButton}" />
-            -->
 
             <TextBlock
                 Grid.Row="4"

diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -17,7 +17,7 @@ public RoutingRuleSettingWindow(RoutingItem routingItem)
             lstRules.SelectionChanged += lstRules_SelectionChanged;
             lstRules.MouseDoubleClick += LstRules_MouseDoubleClick;
             menuRuleSelectAll.Click += menuRuleSelectAll_Click;
-            //btnBrowseCustomIcon.Click += btnBrowseCustomIcon_Click;
+            btnBrowseCustomIcon.Click += btnBrowseCustomIcon_Click;
             btnBrowseCustomRulesetPath4Singbox.Click += btnBrowseCustomRulesetPath4Singbox_Click;
 
             ViewModel = new RoutingRuleSettingViewModel(routingItem, UpdateViewHandler);
@@ -41,7 +41,7 @@ public RoutingRuleSettingWindow(RoutingItem routingItem)
                 this.Bind(ViewModel, vm => vm.SelectedRouting.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables);
 
                 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.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);
 
@@ -173,16 +173,16 @@ private void menuRuleSelectAll_Click(object sender, System.Windows.RoutedEventAr
             lstRules.SelectAll();
         }
 
-        //private void btnBrowseCustomIcon_Click(object sender, System.Windows.RoutedEventArgs e)
-        //{
-        //    if (UI.OpenFileDialog(out string fileName,
-        //        "PNG,ICO|*.png;*.ico") != true)
-        //    {
-        //        return;
-        //    }
+        private void btnBrowseCustomIcon_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            if (UI.OpenFileDialog(out string fileName,
+                "PNG,ICO|*.png;*.ico") != true)
+            {
+                return;
+            }
 
-        //    txtCustomIcon.Text = fileName;
-        //}
+            txtCustomIcon.Text = fileName;
+        }
 
         private void btnBrowseCustomRulesetPath4Singbox_Click(object sender, RoutedEventArgs e)
         {