ux: use YES/NO instead of OK/CANCEL to ask confirm about auto-updating submodules (#2045)

Signed-off-by: leo <[email protected]>

Author: love-linger

src/App.axaml.cs

@@ -159,12 +159,12 @@ public static void ShowWindow(object data)
             }
         }
 
-        public static async Task<bool> AskConfirmAsync(string message)
+        public static async Task<bool> AskConfirmAsync(string message, Models.ConfirmButtonType buttonType = Models.ConfirmButtonType.OkCancel)
         {
             if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
             {
                 var confirm = new Views.Confirm();
-                confirm.Message.Text = message;
+                confirm.SetData(message, buttonType);
                 return await confirm.ShowDialog<bool>(owner);
             }
 

src/Models/ConfirmButtonType.cs

@@ -0,0 +1,8 @@
+namespace SourceGit.Models
+{
+    public enum ConfirmButtonType
+    {
+        OkCancel = 0,
+        YesNo,
+    }
+}

src/Resources/Locales/en_US.axaml

@@ -545,6 +545,7 @@
   <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Move Repository Node</x:String>
   <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Select parent node for:</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">Name:</x:String>
+  <x:String x:Key="Text.No" xml:space="preserve">NO</x:String>
   <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git has NOT been configured. Please to go [Preferences] and configure it first.</x:String>
   <x:String x:Key="Text.Open" xml:space="preserve">Open</x:String>
   <x:String x:Key="Text.Open.SystemDefaultEditor" xml:space="preserve">Default Editor (System)</x:String>
@@ -941,4 +942,5 @@
   <x:String x:Key="Text.Worktree.Open" xml:space="preserve">Open</x:String>
   <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Remove</x:String>
   <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Unlock</x:String>
+  <x:String x:Key="Text.Yes" xml:space="preserve">YES</x:String>
 </ResourceDictionary>

src/Resources/Locales/zh_CN.axaml

@@ -549,6 +549,7 @@
   <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">调整仓库分组</x:String>
   <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">请选择目标分组：</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">名称 ：</x:String>
+  <x:String x:Key="Text.No" xml:space="preserve">不用了</x:String>
   <x:String x:Key="Text.NotConfigured" xml:space="preserve">GIT尚未配置。请打开【偏好设置】配置GIT路径。</x:String>
   <x:String x:Key="Text.Open" xml:space="preserve">打开</x:String>
   <x:String x:Key="Text.Open.SystemDefaultEditor" xml:space="preserve">系统默认编辑器</x:String>
@@ -945,4 +946,5 @@
   <x:String x:Key="Text.Worktree.Open" xml:space="preserve">打开工作树</x:String>
   <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">移除工作树</x:String>
   <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">解除工作树锁定</x:String>
+  <x:String x:Key="Text.Yes" xml:space="preserve">好的</x:String>
 </ResourceDictionary>

src/Resources/Locales/zh_TW.axaml

@@ -549,6 +549,7 @@
   <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">調整存放庫分組</x:String>
   <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">請選擇目標分組:</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">名稱:</x:String>
+  <x:String x:Key="Text.No" xml:space="preserve">不，謝謝</x:String>
   <x:String x:Key="Text.NotConfigured" xml:space="preserve">尚未設定 Git。請開啟 [偏好設定] 以設定 Git 路徑。</x:String>
   <x:String x:Key="Text.Open" xml:space="preserve">開啟</x:String>
   <x:String x:Key="Text.Open.SystemDefaultEditor" xml:space="preserve">系統預設編輯器</x:String>
@@ -945,4 +946,5 @@
   <x:String x:Key="Text.Worktree.Open" xml:space="preserve">開啟工作區</x:String>
   <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">移除工作區</x:String>
   <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">解除鎖定工作區</x:String>
+  <x:String x:Key="Text.Yes" xml:space="preserve">好的</x:String>
 </ResourceDictionary>

src/ViewModels/Repository.cs

@@ -1508,7 +1508,7 @@ public async Task TryAutoUpdateSubmodules(Models.ICommandLog log)
                     builder.Append("\n");
 
                     var msg = App.Text("Checkout.WarnUpdatingSubmodules", builder.ToString());
-                    var shouldContinue = await App.AskConfirmAsync(msg);
+                    var shouldContinue = await App.AskConfirmAsync(msg, Models.ConfirmButtonType.YesNo);
                     if (!shouldContinue)
                         break;
                 }

src/Views/Confirm.axaml

@@ -42,21 +42,21 @@
     <!-- Buttons -->
     <StackPanel Grid.Row="2" Margin="0,0,0,16" Orientation="Horizontal" HorizontalAlignment="Center">
       <Button Classes="flat"
+              x:Name="BtnYes"
               Width="80"
               Height="30"
               Margin="4,0"
               Click="Sure"
-              Content="{DynamicResource Text.Sure}"
               HorizontalAlignment="Center"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"/>
 
       <Button Classes="flat primary"
+              x:Name="BtnNo"
               Width="80"
               Height="30"
               Margin="4,0"
               Click="CloseWindow"
-              Content="{DynamicResource Text.Cancel}"
               HorizontalAlignment="Center"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"/>

src/Views/Confirm.axaml.cs

@@ -9,6 +9,23 @@ public Confirm()
             InitializeComponent();
         }
 
+        public void SetData(string message, Models.ConfirmButtonType buttonType)
+        {
+            Message.Text = message;
+
+            switch (buttonType)
+            {
+                case Models.ConfirmButtonType.OkCancel:
+                    BtnYes.Content = App.Text("Sure");
+                    BtnNo.Content = App.Text("Cancel");
+                    break;
+                case Models.ConfirmButtonType.YesNo:
+                    BtnYes.Content = App.Text("Yes");
+                    BtnNo.Content = App.Text("No");
+                    break;
+            }
+        }
+
         private void Sure(object _1, RoutedEventArgs _2)
         {
             Close(true);