Merge pull request #3988 from Flow-Launcher/default_browser_explorer_translation

Jack251970 · jjw24 · commit c6961f2561e0 · 2025-09-21T20:54:45.000+10:00
Add Default Browser &amp; File Explorer &amp; New Profile Translation &amp; Ignore index change for -1
diff --git a/Flow.Launcher.Infrastructure/UserSettings/CustomBrowserViewModel.cs b/Flow.Launcher.Infrastructure/UserSettings/CustomBrowserViewModel.cs
@@ -1,11 +1,18 @@
+﻿using System.Text.Json.Serialization;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Plugin;
-using System.Text.Json.Serialization;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public class CustomBrowserViewModel : BaseModel
     {
+        // We should not initialize API in static constructor because it will create another API instance
+        private static IPublicAPI api = null;
+        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
+
         public string Name { get; set; }
+        [JsonIgnore]
+        public string DisplayName => Name == "Default" ? API.GetTranslation("defaultBrowser_default") : Name;
         public string Path { get; set; }
         public string PrivateArg { get; set; }
         public bool EnablePrivate { get; set; }
@@ -26,8 +33,10 @@ public CustomBrowserViewModel Copy()
                 Editable = Editable
             };
         }
+
+        public void OnDisplayNameChanged()
+        {
+            OnPropertyChanged(nameof(DisplayName));
+        }
     }
 }
-
-
-
diff --git a/Flow.Launcher.Infrastructure/UserSettings/CustomExplorerViewModel.cs b/Flow.Launcher.Infrastructure/UserSettings/CustomExplorerViewModel.cs
@@ -1,10 +1,18 @@
-﻿using Flow.Launcher.Plugin;
+﻿using System.Text.Json.Serialization;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Plugin;
 
-namespace Flow.Launcher.ViewModel
+namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public class CustomExplorerViewModel : BaseModel
     {
+        // We should not initialize API in static constructor because it will create another API instance
+        private static IPublicAPI api = null;
+        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
+
         public string Name { get; set; }
+        [JsonIgnore]
+        public string DisplayName => Name == "Explorer" ? API.GetTranslation("fileManagerExplorer") : Name;
         public string Path { get; set; }
         public string FileArgument { get; set; } = "\"%d\"";
         public string DirectoryArgument { get; set; } = "\"%d\"";
@@ -21,5 +29,10 @@ public CustomExplorerViewModel Copy()
                 Editable = Editable
             };
         }
+
+        public void OnDisplayNameChanged()
+        {
+            OnPropertyChanged(nameof(DisplayName));
+        }
     }
 }
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -9,7 +9,6 @@
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
-using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -904,5 +904,19 @@ public static void EnableWin32DarkMode(string colorScheme)
         }
 
         #endregion
+
+        #region File / Folder Dialog
+
+        public static string SelectFile()
+        {
+            var dlg = new OpenFileDialog();
+            var result = dlg.ShowDialog();
+            if (result == true)
+                return dlg.FileName;
+
+            return string.Empty;
+        }
+
+        #endregion
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -485,6 +485,7 @@
     <system:String x:Key="fileManager_file_arg">Arg For File</system:String>
     <system:String x:Key="fileManagerPathNotFound">The file manager '{0}' could not be located at '{1}'. Would you like to continue?</system:String>
     <system:String x:Key="fileManagerPathError">File Manager Path Error</system:String>
+    <system:String x:Key="fileManagerExplorer">File Explorer</system:String>
 
     <!--  DefaultBrowser Setting Dialog  -->
     <system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
@@ -495,6 +496,8 @@
     <system:String x:Key="defaultBrowser_newWindow">New Window</system:String>
     <system:String x:Key="defaultBrowser_newTab">New Tab</system:String>
     <system:String x:Key="defaultBrowser_parameter">Private Mode</system:String>
+    <system:String x:Key="defaultBrowser_default">Default</system:String>
+    <system:String x:Key="defaultBrowser_new_profile">New Profile</system:String>
 
     <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Change Priority</system:String>
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -92,7 +92,7 @@
                         SelectedIndex="{Binding SelectedCustomBrowserIndex}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Name}" />
+                                <TextBlock Text="{Binding DisplayName}" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml.cs b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -1,6 +1,7 @@
 ﻿using System.Windows;
 using System.Windows.Controls;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Infrastructure;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
@@ -31,7 +32,7 @@ private void btnDone_Click(object sender, RoutedEventArgs e)
 
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
-            var selectedFilePath = _viewModel.SelectFile();
+            var selectedFilePath = Win32Helper.SelectFile();
 
             if (!string.IsNullOrEmpty(selectedFilePath))
             {
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -102,7 +102,7 @@
                             SelectedIndex="{Binding SelectedCustomExplorerIndex}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding Name}" />
+                                    <TextBlock Text="{Binding DisplayName}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.Windows.Controls;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Infrastructure;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
@@ -32,13 +33,13 @@ private void btnDone_Click(object sender, RoutedEventArgs e)
 
         private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
         {
-            _viewModel.OpenUrl(e.Uri.AbsoluteUri);
+            App.API.OpenUrl(e.Uri.AbsoluteUri);
             e.Handled = true;
         }
 
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
-            var selectedFilePath = _viewModel.SelectFile();
+            var selectedFilePath = Win32Helper.SelectFile();
 
             if (!string.IsNullOrEmpty(selectedFilePath))
             {
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -219,6 +219,8 @@ private void UpdateEnumDropdownLocalizations()
         DropdownDataGeneric<DialogJumpFileResultBehaviours>.UpdateLabels(DialogJumpFileResultBehaviours);
         // Since we are using Binding instead of DynamicResource, we need to manually trigger the update
         OnPropertyChanged(nameof(AlwaysPreviewToolTip));
+        Settings.CustomExplorer.OnDisplayNameChanged();
+        Settings.CustomBrowser.OnDisplayNameChanged();
     }
 
     public string Language
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -403,7 +403,7 @@
                     MaxWidth="250"
                     Margin="10 0 0 0"
                     Command="{Binding SelectFileManagerCommand}"
-                    Content="{Binding Settings.CustomExplorer.Name}" />
+                    Content="{Binding Settings.CustomExplorer.DisplayName}" />
             </cc:Card>
 
             <cc:Card
@@ -415,7 +415,7 @@
                     MaxWidth="250"
                     Margin="10 0 0 0"
                     Command="{Binding SelectBrowserCommand}"
-                    Content="{Binding Settings.CustomBrowser.Name}" />
+                    Content="{Binding Settings.CustomBrowser.DisplayName}" />
             </cc:Card>
 
             <cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 14 0 0">
diff --git a/Flow.Launcher/ViewModel/SelectBrowserViewModel.cs b/Flow.Launcher/ViewModel/SelectBrowserViewModel.cs
@@ -17,8 +17,13 @@ public int SelectedCustomBrowserIndex
         get => selectedCustomBrowserIndex;
         set
         {
-            selectedCustomBrowserIndex = value;
-            OnPropertyChanged(nameof(CustomBrowser));
+            // When one custom browser is selected and removed, the index will become -1, so we need to ignore this change
+            if (value < 0) return;
+            if (selectedCustomBrowserIndex != value)
+            {
+                selectedCustomBrowserIndex = value;
+                OnPropertyChanged(nameof(CustomBrowser));
+            }
         }
     }
 
@@ -40,22 +45,12 @@ public bool SaveSettings()
         return true;
     }
 
-    internal string SelectFile()
-    {
-        var dlg = new Microsoft.Win32.OpenFileDialog();
-        var result = dlg.ShowDialog();
-        if (result == true)
-            return dlg.FileName;
-
-        return string.Empty;
-    }
-
     [RelayCommand]
     private void Add()
     {
         CustomBrowsers.Add(new()
         {
-            Name = "New Profile"
+            Name = App.API.GetTranslation("defaultBrowser_new_profile")
         });
         SelectedCustomBrowserIndex = CustomBrowsers.Count - 1;
     }
diff --git a/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs b/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs
@@ -21,6 +21,8 @@ public int SelectedCustomExplorerIndex
         get => selectedCustomExplorerIndex;
         set
         {
+            // When one custom file manager is selected and removed, the index will become -1, so we need to ignore this change
+            if (value < 0) return;
             if (selectedCustomExplorerIndex != value)
             {
                 selectedCustomExplorerIndex = value;
@@ -98,27 +100,12 @@ private static bool IsFileManagerValid(string path)
         }
     }
 
-    internal void OpenUrl(string absoluteUri)
-    {
-        App.API.OpenUrl(absoluteUri);
-    }
-
-    internal string SelectFile()
-    {
-        var dlg = new Microsoft.Win32.OpenFileDialog();
-        var result = dlg.ShowDialog();
-        if (result == true)
-            return dlg.FileName;
-
-        return string.Empty;
-    }
-
     [RelayCommand]
     private void Add()
     {
         CustomExplorers.Add(new()
         {
-            Name = "New Profile"
+            Name = App.API.GetTranslation("defaultBrowser_new_profile")
         });
         SelectedCustomExplorerIndex = CustomExplorers.Count - 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using Flow.Launcher.Infrastructure.Storage;`
`10`	`10`	`using Flow.Launcher.Plugin;`
`11`	`11`	`using Flow.Launcher.Plugin.SharedModels;`
`12`		`-using Flow.Launcher.ViewModel;`
`13`	`12`
`14`	`13`	`namespace Flow.Launcher.Infrastructure.UserSettings`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Windows;`
`2`	`2`	`using System.Windows.Controls;`
`3`	`3`	`using CommunityToolkit.Mvvm.DependencyInjection;`
	`4`	`+using Flow.Launcher.Infrastructure;`
`4`	`5`	`using Flow.Launcher.ViewModel;`
`5`	`6`
`6`	`7`	`namespace Flow.Launcher`
`@@ -31,7 +32,7 @@ private void btnDone_Click(object sender, RoutedEventArgs e)`
`31`	`32`
`32`	`33`	`private void btnBrowseFile_Click(object sender, RoutedEventArgs e)`
`33`	`34`	`{`
`34`		`- var selectedFilePath = _viewModel.SelectFile();`
	`35`	`+ var selectedFilePath = Win32Helper.SelectFile();`
`35`	`36`
`36`	`37`	`if (!string.IsNullOrEmpty(selectedFilePath))`
`37`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Windows.Controls;`
`3`	`3`	`using System.Windows.Navigation;`
`4`	`4`	`using CommunityToolkit.Mvvm.DependencyInjection;`
	`5`	`+using Flow.Launcher.Infrastructure;`
`5`	`6`	`using Flow.Launcher.ViewModel;`
`6`	`7`
`7`	`8`	`namespace Flow.Launcher`
`@@ -32,13 +33,13 @@ private void btnDone_Click(object sender, RoutedEventArgs e)`
`32`	`33`
`33`	`34`	`private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)`
`34`	`35`	`{`
`35`		`- _viewModel.OpenUrl(e.Uri.AbsoluteUri);`
	`36`	`+ App.API.OpenUrl(e.Uri.AbsoluteUri);`
`36`	`37`	`e.Handled = true;`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`private void btnBrowseFile_Click(object sender, RoutedEventArgs e)`
`40`	`41`	`{`
`41`		`- var selectedFilePath = _viewModel.SelectFile();`
	`42`	`+ var selectedFilePath = Win32Helper.SelectFile();`
`42`	`43`
`43`	`44`	`if (!string.IsNullOrEmpty(selectedFilePath))`
`44`	`45`	`{`