From 1bf95201ccd93bcdfb5f7da1846a59dbd819e41c Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 31 Mar 2023 01:45:52 +0900
Subject: [PATCH 1/9] Add "Channel Select" UI in about section

---
 Flow.Launcher/SettingWindow.xaml | 57 ++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 665d16b8f8e..50fbbd61a08 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -693,7 +693,7 @@
                                 </ItemsControl>
                             </Border>
 
-                            <Border 
+                            <Border
                                 Margin="0,30,0,0"
                                 Padding="0"
                                 Style="{DynamicResource SettingGroupBox}">
@@ -720,7 +720,7 @@
                                                 <ComboBox
                                                     x:Name="SelectScreen"
                                                     MinWidth="160"
-                                                    Margin="0,0,18,0" 
+                                                    Margin="0,0,18,0"
                                                     VerticalAlignment="Center"
                                                     FontSize="14"
                                                     ItemsSource="{Binding ScreenNumbers}"
@@ -738,14 +738,12 @@
                                                 </ComboBox>
                                             </StackPanel>
                                             <TextBlock Style="{StaticResource Glyph}">
-                                            &#xe7f4;
+                                                &#xe7f4;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
 
-                                    <Separator
-                                        Width="Auto"
-                                        BorderThickness="1">
+                                    <Separator Width="Auto" BorderThickness="1">
                                         <Separator.Style>
                                             <Style BasedOn="{StaticResource SettingSeparatorStyle}" TargetType="Separator">
                                                 <Setter Property="Visibility" Value="Visible" />
@@ -758,9 +756,7 @@
                                         </Separator.Style>
                                     </Separator>
 
-                                    <Border
-                                        Margin="0"
-                                        BorderThickness="0">
+                                    <Border Margin="0" BorderThickness="0">
                                         <Border.Style>
                                             <Style BasedOn="{StaticResource SettingGroupBox}" TargetType="Border">
                                                 <Setter Property="Visibility" Value="Visible" />
@@ -786,8 +782,7 @@
                                                     FontSize="14"
                                                     ItemsSource="{Binding SearchWindowAligns}"
                                                     SelectedValue="{Binding Settings.SearchWindowAlign}"
-                                                    SelectedValuePath="Value">
-                                                </ComboBox>
+                                                    SelectedValuePath="Value" />
                                                 <StackPanel Margin="0,0,18,0" Orientation="Horizontal">
                                                     <StackPanel.Style>
                                                         <Style TargetType="StackPanel">
@@ -817,7 +812,7 @@
                                                 </StackPanel>
                                             </StackPanel>
                                             <TextBlock Style="{StaticResource Glyph}">
-                                            &#xe7f4;
+                                                &#xe7f4;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
@@ -3014,7 +3009,10 @@
                                     TextAlignment="left" />
 
 
-                                <Border Margin="0,9,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <Border
+                                    Margin="0,9,0,0"
+                                    CornerRadius="8 8 0 0"
+                                    Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock
@@ -3026,11 +3024,6 @@
                                             <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource version}" />
                                         </StackPanel>
                                         <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                            <Button
-                                                Margin="0,0,10,0"
-                                                HorizontalAlignment="Right"
-                                                Click="OnCheckUpdates"
-                                                Content="{DynamicResource checkUpdates}" />
                                             <Button
                                                 Margin="0,0,14,0"
                                                 Padding="0"
@@ -3054,6 +3047,34 @@
                                     </ItemsControl>
                                 </Border>
 
+
+                                <Border
+                                    Margin="0,0,0,8"
+                                    CornerRadius="0 0 8 8"
+                                    Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Style="{DynamicResource SettingTitleLabel}"
+                                                Text="Update Source" />
+                                        </StackPanel>
+                                        <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                            <ComboBox Margin="0,0,8,0" SelectedIndex="0">
+                                                <ComboBoxItem>Release</ComboBoxItem>
+                                                <ComboBoxItem>Preview</ComboBoxItem>
+                                            </ComboBox>
+                                            <Button
+                                                Margin="0,0,14,0"
+                                                HorizontalAlignment="Right"
+                                                Click="OnCheckUpdates"
+                                                Content="{DynamicResource checkUpdates}" />
+                                        </StackPanel>
+                                        <TextBlock Width="50" Style="{StaticResource Glyph}" />
+                                    </ItemsControl>
+                                </Border>
+
                                 <Border Height="62" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">

From 82a174ff304ddab93d3f03ff4d47597d4b458bc3 Mon Sep 17 00:00:00 2001
From: Hongtao <hzhang784@wisc.edu>
Date: Thu, 30 Mar 2023 17:21:22 -0500
Subject: [PATCH 2/9] Add Prerelease update source

---
 Flow.Launcher.Core/Updater.cs                 | 16 ++--
 .../UserSettings/Settings.cs                  |  8 +-
 Flow.Launcher/App.xaml.cs                     |  4 +-
 Flow.Launcher/Languages/en.xaml               |  3 +
 Flow.Launcher/Properties/Settings.settings    |  3 +
 Flow.Launcher/SettingWindow.xaml              |  7 +-
 .../ViewModel/SettingWindowViewModel.cs       | 87 +++++++++++++++++--
 7 files changed, 108 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index 3f64b273e4c..28232dc6581 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -22,18 +22,20 @@ namespace Flow.Launcher.Core
 {
     public class Updater
     {
-        public string GitHubRepository { get; }
+        public bool UpdateToPrerelease { get; set; }
+
+        public const string ReleaseRepository = "https://github.com/Flow-Launcher/Flow.Launcher";
+        public const string PrereleaseRepository = "https://github.com/Flow-Launcher/Prereleases";
+
+        public string GitHubRepository => UpdateToPrerelease ? PrereleaseRepository : ReleaseRepository;
 
-        public Updater(string gitHubRepository)
-        {
-            GitHubRepository = gitHubRepository;
-        }
 
         private SemaphoreSlim UpdateLock { get; } = new SemaphoreSlim(1);
 
         public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
         {
             await UpdateLock.WaitAsync().ConfigureAwait(false);
+
             try
             {
                 if (!silentUpdate)
@@ -54,6 +56,7 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
                 {
                     if (!silentUpdate)
                         MessageBox.Show(api.GetTranslation("update_flowlauncher_already_on_latest"));
+
                     return;
                 }
 
@@ -94,7 +97,7 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
                     Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
                 else
                     Log.Exception($"|Updater.UpdateApp|Error Occurred", e);
-                
+
                 if (!silentUpdate)
                     api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
                         api.GetTranslation("update_flowlauncher_check_connection"));
@@ -134,6 +137,7 @@ private async Task<UpdateManager> GitHubUpdateManagerAsync(string repository)
             {
                 Proxy = Http.WebProxy
             };
+
             var downloader = new FileDownloader(client);
 
             var manager = new UpdateManager(latestUrl, urlDownloader: downloader);
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 7f62d82c8ef..85c1c3c8659 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -64,8 +64,10 @@ public string Theme
         public double SettingWindowHeight { get; set; } = 700;
         public double SettingWindowTop { get; set; }
         public double SettingWindowLeft { get; set; }
-        public System.Windows.WindowState SettingWindowState { get; set; } = WindowState.Normal;
+        public WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
+        public bool PrereleaseUpdateSource { get; set; }
+        
         public int CustomExplorerIndex { get; set; } = 0;
 
         [JsonIgnore]
@@ -253,8 +255,8 @@ public bool HideNotifyIcon
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public LastQueryMode LastQueryMode { get; set; } = LastQueryMode.Selected;
-
-
+        
+        
         // This needs to be loaded last by staying at the bottom
         public PluginsSettings PluginSettings { get; set; } = new PluginsSettings();
     }
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 1d398276d3c..838eead1cda 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -29,7 +29,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         private Settings _settings;
         private MainViewModel _mainVM;
         private SettingWindowViewModel _settingsVM;
-        private readonly Updater _updater = new Updater(Flow.Launcher.Properties.Settings.Default.GithubRepo);
+        private readonly Updater _updater = new();
         private readonly Portable _portable = new Portable();
         private readonly PinyinAlphabet _alphabet = new PinyinAlphabet();
         private StringMatcher _stringMatcher;
@@ -59,7 +59,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 RegisterDispatcherUnhandledException();
 
                 ImageLoader.Initialize();
-
+                
                 _settingsVM = new SettingWindowViewModel(_updater, _portable);
                 _settings = _settingsVM.Settings;
 
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 103d523a798..90f55ef419d 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -234,6 +234,9 @@
     <system:String x:Key="clearlogfolder">Clear Logs</system:String>
     <system:String x:Key="clearlogfolderMessage">Are you sure you want to delete all logs?</system:String>
     <system:String x:Key="welcomewindow">Wizard</system:String>
+    <system:String x:Key="updateSource">Update Source</system:String>
+    <system:String x:Key="release">Release</system:String>
+    <system:String x:Key="prerelease">Prerelease</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/Properties/Settings.settings b/Flow.Launcher/Properties/Settings.settings
index 800c3cf639f..59f626477e2 100644
--- a/Flow.Launcher/Properties/Settings.settings
+++ b/Flow.Launcher/Properties/Settings.settings
@@ -5,5 +5,8 @@
     <Setting Name="GithubRepo" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://github.com/Flow-Launcher/Flow.Launcher</Value>
     </Setting>
+      <Setting Name="PrereleaseRepo" Type="System.String" Scope="Application">
+          <Value Profile="(Default)">https://github.com/Flow-Launcher/Prereleases</Value>
+      </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 50fbbd61a08..1afe2ad0070 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -3058,12 +3058,13 @@
                                                 Grid.Column="1"
                                                 VerticalAlignment="Center"
                                                 Style="{DynamicResource SettingTitleLabel}"
-                                                Text="Update Source" />
+                                                Text="{DynamicResource updateSource}" />
                                         </StackPanel>
                                         <StackPanel Grid.Column="2" Orientation="Horizontal">
                                             <ComboBox Margin="0,0,8,0" SelectedIndex="0">
-                                                <ComboBoxItem>Release</ComboBoxItem>
-                                                <ComboBoxItem>Preview</ComboBoxItem>
+                                                <ComboBoxItem Content="{DynamicResource release}"/>
+                                                <ComboBoxItem IsSelected="{Binding Settings.PrereleaseUpdateSource}"
+                                                    Content="{DynamicResource prerelease}"/>
                                             </ComboBox>
                                             <Button
                                                 Margin="0,0,14,0"
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 9bdf2db4d0b..e7298e12e98 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -43,29 +43,41 @@ public SettingWindowViewModel(Updater updater, IPortable portable)
                 {
                     case nameof(Settings.ActivateTimes):
                         OnPropertyChanged(nameof(ActivatedTimes));
+
                         break;
                     case nameof(Settings.WindowSize):
                         OnPropertyChanged(nameof(WindowWidthSize));
+
                         break;
                     case nameof(Settings.UseDate):
                     case nameof(Settings.DateFormat):
                         OnPropertyChanged(nameof(DateText));
+
                         break;
                     case nameof(Settings.UseClock):
                     case nameof(Settings.TimeFormat):
                         OnPropertyChanged(nameof(ClockText));
+
                         break;
                     case nameof(Settings.Language):
                         OnPropertyChanged(nameof(ClockText));
                         OnPropertyChanged(nameof(DateText));
                         OnPropertyChanged(nameof(AlwaysPreviewToolTip));
+
                         break;
                     case nameof(Settings.PreviewHotkey):
                         OnPropertyChanged(nameof(AlwaysPreviewToolTip));
+
+                        break;
+                    case nameof(Settings.PrereleaseUpdateSource):
+                        _updater.UpdateToPrerelease = Settings.PrereleaseUpdateSource;
+
                         break;
                 }
             };
 
+            _updater.UpdateToPrerelease = Settings.PrereleaseUpdateSource;
+
         }
 
         public Settings Settings { get; set; }
@@ -160,6 +172,7 @@ public string GetFileFromDialog(string title, string filter = "")
             };
 
             var result = dlg.ShowDialog();
+
             if (result == System.Windows.Forms.DialogResult.OK)
             {
                 return dlg.FileName;
@@ -176,6 +189,7 @@ public string GetFileFromDialog(string title, string filter = "")
         public class LastQueryMode : BaseModel
         {
             public string Display { get; set; }
+
             public Infrastructure.UserSettings.LastQueryMode Value { get; set; }
         }
 
@@ -188,6 +202,7 @@ public List<LastQueryMode> LastQueryModes
                 {
                     _lastQueryModes = InitLastQueryModes();
                 }
+
                 return _lastQueryModes;
             }
         }
@@ -196,6 +211,7 @@ private List<LastQueryMode> InitLastQueryModes()
         {
             var modes = new List<LastQueryMode>();
             var enums = (Infrastructure.UserSettings.LastQueryMode[])Enum.GetValues(typeof(Infrastructure.UserSettings.LastQueryMode));
+
             foreach (var e in enums)
             {
                 var key = $"LastQuery{e}";
@@ -204,8 +220,10 @@ private List<LastQueryMode> InitLastQueryModes()
                 {
                     Display = display, Value = e,
                 };
+
                 modes.Add(m);
             }
+
             return modes;
         }
 
@@ -266,8 +284,11 @@ public List<string> QuerySearchPrecisionStrings
             KeyConstant.Ctrl,
             $"{KeyConstant.Ctrl}+{KeyConstant.Alt}"
         };
+
         private Internationalization _translater => InternationalizationManager.Instance;
+
         public List<Language> Languages => _translater.LoadAvailableLanguages();
+
         public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
 
         public string AlwaysPreviewToolTip => string.Format(_translater.GetTranslation("AlwaysPreviewToolTip"), Settings.PreviewHotkey);
@@ -276,10 +297,12 @@ public string TestProxy()
         {
             var proxyServer = Settings.Proxy.Server;
             var proxyUserName = Settings.Proxy.UserName;
+
             if (string.IsNullOrEmpty(proxyServer))
             {
                 return InternationalizationManager.Instance.GetTranslation("serverCantBeEmpty");
             }
+
             if (Settings.Proxy.Port <= 0)
             {
                 return InternationalizationManager.Instance.GetTranslation("portCantBeEmpty");
@@ -298,9 +321,11 @@ public string TestProxy()
                     Credentials = new NetworkCredential(proxyUserName, Settings.Proxy.Password)
                 };
             }
+
             try
             {
                 var response = (HttpWebResponse)request.GetResponse();
+
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
                     return InternationalizationManager.Instance.GetTranslation("proxyIsCorrect");
@@ -321,6 +346,7 @@ public string TestProxy()
         #region plugin
 
         public static string Plugin => @"https://github.com/Flow-Launcher/Flow.Launcher.PluginsManifest";
+
         public PluginViewModel SelectedPlugin { get; set; }
 
         public IList<PluginViewModel> PluginViewModels
@@ -358,11 +384,13 @@ public Control SettingProvider
             get
             {
                 var settingProvider = SelectedPlugin.PluginPair.Plugin as ISettingProvider;
+
                 if (settingProvider != null)
                 {
                     var control = settingProvider.CreateSettingPanel();
                     control.HorizontalAlignment = HorizontalAlignment.Stretch;
                     control.VerticalAlignment = VerticalAlignment.Stretch;
+
                     return control;
                 }
                 else
@@ -378,8 +406,8 @@ private async Task RefreshExternalPluginsAsync()
             await PluginsManifest.UpdateManifestAsync();
             OnPropertyChanged(nameof(ExternalPlugins));
         }
-        
-        
+
+
 
         internal void DisplayPluginQuery(string queryToDisplay, PluginPair plugin, int actionKeywordPosition = 0)
         {
@@ -396,6 +424,7 @@ internal void DisplayPluginQuery(string queryToDisplay, PluginPair plugin, int a
         #region theme
 
         public static string Theme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme";
+
         public static string ThemeGallery => @"https://github.com/Flow-Launcher/Flow.Launcher/discussions/1438";
 
         public string SelectedTheme
@@ -421,6 +450,7 @@ public bool DropShadowEffect
                 if (ThemeManager.Instance.BlurEnabled && value)
                 {
                     MessageBox.Show(InternationalizationManager.Instance.GetTranslation("shadowEffectNotAllowed"));
+
                     return;
                 }
 
@@ -440,6 +470,7 @@ public bool DropShadowEffect
         public class ColorScheme
         {
             public string Display { get; set; }
+
             public ColorSchemes Value { get; set; }
         }
 
@@ -449,6 +480,7 @@ public List<ColorScheme> ColorSchemes
             {
                 List<ColorScheme> modes = new List<ColorScheme>();
                 var enums = (ColorSchemes[])Enum.GetValues(typeof(ColorSchemes));
+
                 foreach (var e in enums)
                 {
                     var key = $"ColorScheme{e}";
@@ -457,8 +489,10 @@ public List<ColorScheme> ColorSchemes
                     {
                         Display = display, Value = e,
                     };
+
                     modes.Add(m);
                 }
+
                 return modes;
             }
         }
@@ -466,6 +500,7 @@ public List<ColorScheme> ColorSchemes
         public class SearchWindowScreen
         {
             public string Display { get; set; }
+
             public SearchWindowScreens Value { get; set; }
         }
 
@@ -475,17 +510,19 @@ public List<SearchWindowScreen> SearchWindowScreens
             {
                 List<SearchWindowScreen> modes = new List<SearchWindowScreen>();
                 var enums = (SearchWindowScreens[])Enum.GetValues(typeof(SearchWindowScreens));
+
                 foreach (var e in enums)
                 {
                     var key = $"SearchWindowScreen{e}";
                     var display = _translater.GetTranslation(key);
                     var m = new SearchWindowScreen
                     {
-                        Display = display,
-                        Value = e,
+                        Display = display, Value = e,
                     };
+
                     modes.Add(m);
                 }
+
                 return modes;
             }
         }
@@ -493,6 +530,7 @@ public List<SearchWindowScreen> SearchWindowScreens
         public class SearchWindowAlign
         {
             public string Display { get; set; }
+
             public SearchWindowAligns Value { get; set; }
         }
 
@@ -502,6 +540,7 @@ public List<SearchWindowAlign> SearchWindowAligns
             {
                 List<SearchWindowAlign> modes = new List<SearchWindowAlign>();
                 var enums = (SearchWindowAligns[])Enum.GetValues(typeof(SearchWindowAligns));
+
                 foreach (var e in enums)
                 {
                     var key = $"SearchWindowAlign{e}";
@@ -510,8 +549,10 @@ public List<SearchWindowAlign> SearchWindowAligns
                     {
                         Display = display, Value = e,
                     };
+
                     modes.Add(m);
                 }
+
                 return modes;
             }
         }
@@ -522,10 +563,12 @@ public List<int> ScreenNumbers
             {
                 var screens = System.Windows.Forms.Screen.AllScreens;
                 var screenNumbers = new List<int>();
+
                 for (int i = 1; i <= screens.Length; i++)
                 {
                     screenNumbers.Add(i);
                 }
+
                 return screenNumbers;
             }
         }
@@ -643,6 +686,7 @@ public Brush PreviewBackground
             get
             {
                 var wallpaper = WallpaperPathRetrieval.GetWallpaperPath();
+
                 if (wallpaper != null && File.Exists(wallpaper))
                 {
                     var memStream = new MemoryStream(File.ReadAllBytes(wallpaper));
@@ -656,12 +700,14 @@ public Brush PreviewBackground
                     {
                         Stretch = Stretch.UniformToFill
                     };
+
                     return brush;
                 }
                 else
                 {
                     var wallpaperColor = WallpaperPathRetrieval.GetWallpaperColor();
                     var brush = new SolidColorBrush(wallpaperColor);
+
                     return brush;
                 }
             }
@@ -698,8 +744,10 @@ public ResultsViewModel PreviewResults
                         IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.ProcessKiller\Images\app.png")
                     }
                 };
+
                 var vm = new ResultsViewModel(Settings);
                 vm.AddResults(results, "PREVIEW");
+
                 return vm;
             }
         }
@@ -713,11 +761,13 @@ public FontFamily SelectedQueryBoxFont
                         o.FamilyNames.Values.Contains(Settings.QueryBoxFont)) > 0)
                 {
                     var font = new FontFamily(Settings.QueryBoxFont);
+
                     return font;
                 }
                 else
                 {
                     var font = new FontFamily("Segoe UI");
+
                     return font;
                 }
             }
@@ -738,6 +788,7 @@ public FamilyTypeface SelectedQueryBoxFontFaces
                         Settings.QueryBoxFontWeight,
                         Settings.QueryBoxFontStretch
                     ));
+
                 return typeface;
             }
             set
@@ -758,11 +809,13 @@ public FontFamily SelectedResultFont
                         o.FamilyNames.Values.Contains(Settings.ResultFont)) > 0)
                 {
                     var font = new FontFamily(Settings.ResultFont);
+
                     return font;
                 }
                 else
                 {
                     var font = new FontFamily("Segoe UI");
+
                     return font;
                 }
             }
@@ -783,6 +836,7 @@ public FamilyTypeface SelectedResultFontFaces
                         Settings.ResultFontWeight,
                         Settings.ResultFontStretch
                     ));
+
                 return typeface;
             }
             set
@@ -815,16 +869,21 @@ public FamilyTypeface SelectedResultFontFaces
         public void DeleteSelectedCustomShortcut()
         {
             var item = SelectedCustomShortcut;
+
             if (item == null)
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("pleaseSelectAnItem"));
+
                 return;
             }
 
             string deleteWarning = string.Format(
                 InternationalizationManager.Instance.GetTranslation("deleteCustomShortcutWarning"),
-                item.Key, item.Value);
-            if (MessageBox.Show(deleteWarning, InternationalizationManager.Instance.GetTranslation("delete"),
+                item.Key,
+                item.Value);
+
+            if (MessageBox.Show(deleteWarning,
+                    InternationalizationManager.Instance.GetTranslation("delete"),
                     MessageBoxButton.YesNo) == MessageBoxResult.Yes)
             {
                 Settings.CustomShortcuts.Remove(item);
@@ -834,13 +893,16 @@ public void DeleteSelectedCustomShortcut()
         public bool EditSelectedCustomShortcut()
         {
             var item = SelectedCustomShortcut;
+
             if (item == null)
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("pleaseSelectAnItem"));
+
                 return false;
             }
 
             var shortcutSettingWindow = new CustomShortcutSetting(item.Key, item.Value, this);
+
             if (shortcutSettingWindow.ShowDialog() == true)
             {
                 // Fix un-selectable shortcut item after the first selection
@@ -849,14 +911,17 @@ public bool EditSelectedCustomShortcut()
                 item.Key = shortcutSettingWindow.Key;
                 item.Value = shortcutSettingWindow.Value;
                 SelectedCustomShortcut = item;
+
                 return true;
             }
+
             return false;
         }
 
         public void AddCustomShortcut()
         {
             var shortcutSettingWindow = new CustomShortcutSetting(this);
+
             if (shortcutSettingWindow.ShowDialog() == true)
             {
                 var shortcut = new CustomShortcutModel(shortcutSettingWindow.Key, shortcutSettingWindow.Value);
@@ -874,11 +939,17 @@ public bool ShortcutExists(string key)
         #region about
 
         public string Website => Constant.Website;
+
         public string SponsorPage => Constant.SponsorPage;
+
         public string ReleaseNotes => _updater.GitHubRepository + @"/releases/latest";
+
         public string Documentation => Constant.Documentation;
+
         public string Docs => Constant.Docs;
+
         public string Github => Constant.GitHub;
+
         public string Version
         {
             get
@@ -893,6 +964,7 @@ public string Version
                 }
             }
         }
+
         public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
 
         public string CheckLogFolder
@@ -901,6 +973,7 @@ public string CheckLogFolder
             {
                 var logFiles = GetLogFiles();
                 long size = logFiles.Sum(file => file.Length);
+
                 return string.Format("{0} ({1})", _translater.GetTranslation("clearlogfolder"), BytesToReadableString(size));
             }
         }
@@ -942,6 +1015,7 @@ internal static string BytesToReadableString(long bytes)
             {
                 "GB", "MB", "KB", "B"
             };
+
             long max = (long)Math.Pow(scale, orders.Length - 1);
 
             foreach (string order in orders)
@@ -951,6 +1025,7 @@ internal static string BytesToReadableString(long bytes)
 
                 max /= scale;
             }
+
             return "0 B";
         }
 

From 9d7f7d25f2e93286739dbd40938bc971252c1b72 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 31 Mar 2023 15:47:13 +0900
Subject: [PATCH 3/9] Adjust Strings

---
 Flow.Launcher/Languages/en.xaml  | 4 ++--
 Flow.Launcher/SettingWindow.xaml | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 90f55ef419d..46f3ce20ce8 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -234,8 +234,8 @@
     <system:String x:Key="clearlogfolder">Clear Logs</system:String>
     <system:String x:Key="clearlogfolderMessage">Are you sure you want to delete all logs?</system:String>
     <system:String x:Key="welcomewindow">Wizard</system:String>
-    <system:String x:Key="updateSource">Update Source</system:String>
-    <system:String x:Key="release">Release</system:String>
+    <system:String x:Key="updateSource">Release Channel</system:String>
+    <system:String x:Key="release">Stable</system:String>
     <system:String x:Key="prerelease">Prerelease</system:String>
 
     <!--  FileManager Setting Dialog  -->
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 1afe2ad0070..9107fdc8cfc 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -3062,9 +3062,8 @@
                                         </StackPanel>
                                         <StackPanel Grid.Column="2" Orientation="Horizontal">
                                             <ComboBox Margin="0,0,8,0" SelectedIndex="0">
-                                                <ComboBoxItem Content="{DynamicResource release}"/>
-                                                <ComboBoxItem IsSelected="{Binding Settings.PrereleaseUpdateSource}"
-                                                    Content="{DynamicResource prerelease}"/>
+                                                <ComboBoxItem Content="{DynamicResource release}" />
+                                                <ComboBoxItem Content="{DynamicResource prerelease}" IsSelected="{Binding Settings.PrereleaseUpdateSource}" />
                                             </ComboBox>
                                             <Button
                                                 Margin="0,0,14,0"

From a469b65db11045eb6670c67c54b32183c392139d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 31 Mar 2023 15:48:06 +0900
Subject: [PATCH 4/9] Adjust Text

---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 46f3ce20ce8..f2dea3597d8 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -236,7 +236,7 @@
     <system:String x:Key="welcomewindow">Wizard</system:String>
     <system:String x:Key="updateSource">Release Channel</system:String>
     <system:String x:Key="release">Stable</system:String>
-    <system:String x:Key="prerelease">Prerelease</system:String>
+    <system:String x:Key="prerelease">Pre-release</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>

From ad40d3603833a2e92815966426ce9ac907213acd Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 12 Mar 2025 23:18:33 +0800
Subject: [PATCH 5/9] Correct repos

---
 Flow.Launcher.Core/Updater.cs | 17 ++++++++---------
 Flow.Launcher/App.xaml.cs     |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index ec0b8bd5725..86e2a51975d 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -22,21 +22,20 @@ namespace Flow.Launcher.Core
 {
     public class Updater
     {
+        public string GitHubReleaseRepository { get; }
+        public string GitHubPrereleaseRepository { get; }
+
         public bool UpdateToPrerelease { get; set; }
-        
-        // TODO
-        public const string ReleaseRepository = "https://github.com/Flow-Launcher/Flow.Launcher";
-        public const string PrereleaseRepository = "https://github.com/Flow-Launcher/Prereleases";
-        
-        // TODO
-        public string GitHubRepository => UpdateToPrerelease ? PrereleaseRepository : ReleaseRepository;
+
+        public string GitHubRepository => UpdateToPrerelease ? GitHubPrereleaseRepository : GitHubReleaseRepository;
 
         private readonly IPublicAPI _api;
 
-        public Updater(IPublicAPI publicAPI, string gitHubRepository)
+        public Updater(IPublicAPI publicAPI, string gitHubReleaseRepository, string gitHubPrereleaseRepository)
         {
             _api = publicAPI;
-            GitHubRepository = gitHubRepository;
+            GitHubReleaseRepository = gitHubReleaseRepository;
+            GitHubPrereleaseRepository = gitHubPrereleaseRepository;
         }
 
         private SemaphoreSlim UpdateLock { get; } = new SemaphoreSlim(1);
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index fa09f4fa7dc..c862bfde414 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -55,7 +55,7 @@ public App()
                     .UseContentRoot(AppContext.BaseDirectory)
                     .ConfigureServices(services => services
                         .AddSingleton(_ => _settings)
-                        .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
+                        .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo, Launcher.Properties.Settings.Default.PrereleaseRepo))
                         .AddSingleton<Portable>()
                         .AddSingleton<SettingWindowViewModel>()
                         .AddSingleton<IAlphabet, PinyinAlphabet>()

From 798efc079fcc171ab0d47803522556251e71be43 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 12 Mar 2025 23:24:39 +0800
Subject: [PATCH 6/9] Fix formats

---
 Flow.Launcher.Core/Updater.cs                         | 2 --
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +-
 Flow.Launcher/App.xaml.cs                             | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index 86e2a51975d..258a5951dca 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -43,7 +43,6 @@ public Updater(IPublicAPI publicAPI, string gitHubReleaseRepository, string gitH
         public async Task UpdateAppAsync(bool silentUpdate = true)
         {
             await UpdateLock.WaitAsync().ConfigureAwait(false);
-
             try
             {
                 if (!silentUpdate)
@@ -144,7 +143,6 @@ private async Task<UpdateManager> GitHubUpdateManagerAsync(string repository)
             {
                 Proxy = Http.WebProxy
             };
-
             var downloader = new FileDownloader(client);
 
             var manager = new UpdateManager(latestUrl, urlDownloader: downloader);
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index a44570ccbf2..415ab7684ce 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -110,7 +110,7 @@ public string Theme
         public double SettingWindowHeight { get; set; } = 700;
         public double? SettingWindowTop { get; set; } = null;
         public double? SettingWindowLeft { get; set; } = null;
-        public System.Windows.WindowState SettingWindowState { get; set; } = WindowState.Normal;
+        public WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
         public bool PrereleaseUpdateSource { get; set; }
         
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index c862bfde414..058a00662f8 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -121,7 +121,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 RegisterAppDomainExceptions();
                 RegisterDispatcherUnhandledException();
-                
+
                 var imageLoadertask = ImageLoader.InitializeAsync();
 
                 AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);

From 75397f11c67f48bc17ec021efbe456c97799ff6f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 12 Mar 2025 23:26:31 +0800
Subject: [PATCH 7/9] Auto generate settings properties

---
 Flow.Launcher/Flow.Launcher.csproj            | 12 ++++++++++++
 Flow.Launcher/Properties/Settings.Designer.cs | 13 +++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 8f6e47bbba8..4236006f081 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -120,6 +120,18 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Resources\dev.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Flow.Launcher/Properties/Settings.Designer.cs b/Flow.Launcher/Properties/Settings.Designer.cs
index da47c9cbe07..191755050c7 100644
--- a/Flow.Launcher/Properties/Settings.Designer.cs
+++ b/Flow.Launcher/Properties/Settings.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -12,7 +12,7 @@ namespace Flow.Launcher.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.13.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -31,5 +31,14 @@ public string GithubRepo {
                 return ((string)(this["GithubRepo"]));
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Flow-Launcher/Prereleases")]
+        public string PrereleaseRepo {
+            get {
+                return ((string)(this["PrereleaseRepo"]));
+            }
+        }
     }
 }

From 35594be2f0c471ba057c6bf7416903d611174b5a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 13 Mar 2025 12:40:02 +0800
Subject: [PATCH 8/9] Add prerelease combo box

---
 Flow.Launcher.Core/Updater.cs                      |  6 ++++--
 Flow.Launcher/App.xaml.cs                          |  6 +++++-
 .../ViewModels/SettingsPaneAboutViewModel.cs       | 10 ++++++++++
 .../SettingPages/Views/SettingsPaneAbout.xaml      | 14 ++++++++++----
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index 258a5951dca..5db2c2d1481 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -25,14 +25,16 @@ public class Updater
         public string GitHubReleaseRepository { get; }
         public string GitHubPrereleaseRepository { get; }
 
-        public bool UpdateToPrerelease { get; set; }
+        public bool UpdateToPrerelease => _settings.PrereleaseUpdateSource;
 
         public string GitHubRepository => UpdateToPrerelease ? GitHubPrereleaseRepository : GitHubReleaseRepository;
 
+        private readonly Settings _settings;
         private readonly IPublicAPI _api;
 
-        public Updater(IPublicAPI publicAPI, string gitHubReleaseRepository, string gitHubPrereleaseRepository)
+        public Updater(Settings settings, IPublicAPI publicAPI, string gitHubReleaseRepository, string gitHubPrereleaseRepository)
         {
+            _settings = settings;
             _api = publicAPI;
             GitHubReleaseRepository = gitHubReleaseRepository;
             GitHubPrereleaseRepository = gitHubPrereleaseRepository;
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 058a00662f8..c77463dd254 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -55,7 +55,11 @@ public App()
                     .UseContentRoot(AppContext.BaseDirectory)
                     .ConfigureServices(services => services
                         .AddSingleton(_ => _settings)
-                        .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo, Launcher.Properties.Settings.Default.PrereleaseRepo))
+                        .AddSingleton(sp => new Updater(
+                            _settings,
+                            sp.GetRequiredService<IPublicAPI>(),
+                            Launcher.Properties.Settings.Default.GithubRepo,
+                            Launcher.Properties.Settings.Default.PrereleaseRepo))
                         .AddSingleton<Portable>()
                         .AddSingleton<SettingWindowViewModel>()
                         .AddSingleton<IAlphabet, PinyinAlphabet>()
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index ade65028472..21603502936 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -45,6 +45,16 @@ public string LogFolderSize
         _settings.ActivateTimes
     );
 
+    public int PrereleaseSelectedIndex
+    {
+        get => _settings.PrereleaseUpdateSource ? 1 : 0;
+        set
+        {
+            _settings.PrereleaseUpdateSource = value == 1;
+            OnPropertyChanged();
+        }
+    }
+
     public SettingsPaneAboutViewModel(Settings settings, Updater updater)
     {
         _settings = settings;
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index e33fee02b52..a3b3cf533b5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -31,10 +31,6 @@
                 Icon="&#xe946;"
                 Sub="{DynamicResource version}">
                 <StackPanel Orientation="Horizontal">
-                    <Button
-                        Margin="0 0 10 0"
-                        Command="{Binding UpdateAppCommand}"
-                        Content="{DynamicResource checkUpdates}" />
                     <Button Padding="0" Style="{StaticResource AccentButtonStyle}">
                         <Hyperlink
                             NavigateUri="{Binding SponsorPage}"
@@ -49,6 +45,16 @@
                 </StackPanel>
             </cc:Card>
 
+            <cc:Card Title="{DynamicResource updateSource}">
+                <StackPanel Orientation="Horizontal">
+                    <ComboBox Margin="0 0 10 0" SelectedIndex="{Binding PrereleaseSelectedIndex}">
+                        <ComboBoxItem Content="{DynamicResource release}" />
+                        <ComboBoxItem Content="{DynamicResource prerelease}" />
+                    </ComboBox>
+                    <Button Command="{Binding UpdateAppCommand}" Content="{DynamicResource checkUpdates}" />
+                </StackPanel>
+            </cc:Card>
+
             <cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
                 <cc:HyperLink Text="{DynamicResource releaseNotes}" Uri="{Binding ReleaseNotes}" />
             </cc:Card>

From b028f863ee23629aa3bc7b6fd2af9bcda3997170 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 13 Mar 2025 13:30:48 +0800
Subject: [PATCH 9/9] Add update glyph

---
 Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 37aafd94b64..970137af0b6 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -45,7 +45,7 @@
                 </StackPanel>
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource updateSource}">
+            <cc:Card Title="{DynamicResource updateSource}" Icon="&#xE777;">
                 <StackPanel Orientation="Horizontal">
                     <ComboBox Margin="0 0 10 0" SelectedIndex="{Binding PrereleaseSelectedIndex}">
                         <ComboBoxItem Content="{DynamicResource release}" />