From 5e17769128eb3b2d022fe57e267fedef121c4584 Mon Sep 17 00:00:00 2001
From: babakfp <babak.bxf@gmail.com>
Date: Tue, 26 Sep 2023 14:17:16 -0700
Subject: [PATCH] Removed unnecessary "Close" button

---
 v2rayN/v2rayN/Resx/ResUI.Designer.cs         |  9 ---------
 v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx          |  3 ---
 v2rayN/v2rayN/Resx/ResUI.resx                |  3 ---
 v2rayN/v2rayN/Resx/ResUI.ru.resx             |  3 ---
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx        |  3 ---
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx        |  3 ---
 v2rayN/v2rayN/Views/MainWindow.xaml          | 17 -----------------
 v2rayN/v2rayN/Views/MainWindow.xaml.cs       |  6 ------
 v2rayN/v2rayN/Views/SubSettingWindow.xaml    | 12 ------------
 v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs | 12 ------------
 10 files changed, 71 deletions(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 576ff1a3..5fdeaee7 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -672,15 +672,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Close 的本地化字符串。
-        /// </summary>
-        public static string menuClose {
-            get {
-                return ResourceManager.GetString("menuClose", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Clone selected server 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
index 85d8648e..278c790d 100644
--- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
@@ -436,9 +436,6 @@
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>بررسی بروزرسانی</value>
   </data>
-  <data name="menuClose" xml:space="preserve">
-    <value>بستن</value>
-  </data>
   <data name="menuExit" xml:space="preserve">
     <value>خروج</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 0f500264..2de8bc65 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -436,9 +436,6 @@
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>Check Update</value>
   </data>
-  <data name="menuClose" xml:space="preserve">
-    <value>Close</value>
-  </data>
   <data name="menuExit" xml:space="preserve">
     <value>Exit</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.ru.resx b/v2rayN/v2rayN/Resx/ResUI.ru.resx
index e1a6518d..888f32cf 100644
--- a/v2rayN/v2rayN/Resx/ResUI.ru.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.ru.resx
@@ -436,9 +436,6 @@
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>Проверить обновления</value>
   </data>
-  <data name="menuClose" xml:space="preserve">
-    <value>Закрыть</value>
-  </data>
   <data name="menuExit" xml:space="preserve">
     <value>Выход</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 787d3023..3e29fc60 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -436,9 +436,6 @@
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>检查更新</value>
   </data>
-  <data name="menuClose" xml:space="preserve">
-    <value>关闭</value>
-  </data>
   <data name="menuExit" xml:space="preserve">
     <value>退出</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index ee8d8eb8..eb1d9e02 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -435,9 +435,6 @@
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>檢查更新</value>
   </data>
-  <data name="menuClose" xml:space="preserve">
-    <value>關閉</value>
-  </data>
   <data name="menuExit" xml:space="preserve">
     <value>退出</value>
   </data>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 9ae651d9..e9d094df 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -272,23 +272,6 @@
                                 </MenuItem.Header>
                             </MenuItem>
                         </Menu>
-                        <Separator />
-                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem
-                                x:Name="menuClose"
-                                Padding="8,0"
-                                Click="menuClose_Click">
-                                <MenuItem.Header>
-                                    <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
-                                            VerticalAlignment="Center"
-                                            Kind="Minimize" />
-                                        <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
-                                    </StackPanel>
-                                </MenuItem.Header>
-                            </MenuItem>
-                        </Menu>
 
                         <materialDesign:PopupBox
                             Padding="8,0"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index b7ea9afb..adbf35f5 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -410,12 +410,6 @@ namespace v2rayN.Views
             }
         }
 
-        private void menuClose_Click(object sender, RoutedEventArgs e)
-        {
-            StorageUI();
-            ViewModel?.ShowHideWindow(false);
-        }
-
         private void menuPromotion_Click(object sender, RoutedEventArgs e)
         {
             Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
index 301e6269..f83562d2 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@@ -70,18 +70,6 @@
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubShare}" />
                         </StackPanel>
                     </Button>
-                    <Button
-                        x:Name="menuClose"
-                        Click="menuClose_Click"
-                        IsCancel="True">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon
-                                Margin="0,0,8,0"
-                                VerticalAlignment="Center"
-                                Kind="Close" />
-                            <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuClose}" />
-                        </StackPanel>
-                    </Button>
                 </ToolBar>
             </ToolBarTray>
 
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
index 3ebf9e51..48a852d3 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
@@ -60,17 +60,5 @@ namespace v2rayN.Views
         {
             ViewModel.SelectedSources = lstSubscription.SelectedItems.Cast<SubItem>().ToList();
         }
-
-        private void menuClose_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            if (ViewModel?.IsModified == true)
-            {
-                this.DialogResult = true;
-            }
-            else
-            {
-                this.Close();
-            }
-        }
     }
 }
\ No newline at end of file