enhance: force dropping user's old settings for shell/terminal

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

Author: love-linger

src/ViewModels/Preferences.cs

@@ -344,12 +344,12 @@ public bool UseLibsecretInsteadOfGCM
             }
         }
 
-        public int ShellOrTerminal
+        public int ShellOrTerminalType
         {
-            get => _shellOrTerminal;
+            get => _shellOrTerminalType;
             set
             {
-                if (SetProperty(ref _shellOrTerminal, value) && !_isLoading)
+                if (SetProperty(ref _shellOrTerminalType, value) && !_isLoading)
                 {
                     if (value >= 0 && value < Models.ShellOrTerminal.Supported.Count)
                         Native.OS.SetShellOrTerminal(Models.ShellOrTerminal.Supported[value]);
@@ -616,15 +616,15 @@ private void PrepareGit()
 
         private void PrepareShellOrTerminal()
         {
-            if (_shellOrTerminal >= 0)
+            if (_shellOrTerminalType >= 0)
                 return;
 
             for (int i = 0; i < Models.ShellOrTerminal.Supported.Count; i++)
             {
                 var shell = Models.ShellOrTerminal.Supported[i];
                 if (Native.OS.TestShellOrTerminal(shell))
                 {
-                    ShellOrTerminal = i;
+                    ShellOrTerminalType = i;
                     break;
                 }
             }
@@ -761,7 +761,7 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         private Models.ChangeViewMode _stashChangeViewMode = Models.ChangeViewMode.List;
 
         private string _gitDefaultCloneDir = string.Empty;
-        private int _shellOrTerminal = -1;
+        private int _shellOrTerminalType = -1;
         private uint _statisticsSampleColor = 0xFF00FF00;
     }
 }

src/Views/Preferences.axaml

@@ -486,7 +486,7 @@
                         Padding="8,0"
                         HorizontalAlignment="Stretch"
                         ItemsSource="{Binding Source={x:Static m:ShellOrTerminal.Supported}}"
-                        SelectedIndex="{Binding ShellOrTerminal, Mode=TwoWay}">
+                        SelectedIndex="{Binding ShellOrTerminalType, Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                   <DataTemplate x:DataType="{x:Type m:ShellOrTerminal}">
                     <Grid ColumnDefinitions="Auto,*">

src/Views/Preferences.axaml.cs

@@ -307,7 +307,7 @@ private async void SelectGPGExecutable(object _, RoutedEventArgs e)
 
         private async void SelectShellOrTerminal(object _, RoutedEventArgs e)
         {
-            var type = ViewModels.Preferences.Instance.ShellOrTerminal;
+            var type = ViewModels.Preferences.Instance.ShellOrTerminalType;
             if (type == -1)
                 return;