From bcb956ad89b944f38e0dae4276a748c18ba177e3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 29 Nov 2021 20:50:22 +1100 Subject: [PATCH 1/4] switch off the default launch on system start up --- Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index b08f8568d..de840cdb1 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -133,7 +133,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public bool DontPromptUpdateMsg { get; set; } public bool EnableUpdateLog { get; set; } - public bool StartFlowLauncherOnSystemStartup { get; set; } = true; + public bool StartFlowLauncherOnSystemStartup { get; set; } = false; public bool HideOnStartup { get; set; } bool _hideNotifyIcon { get; set; } public bool HideNotifyIcon From 5fbf717b4252d5ad0a4851503a1c2923e2189124 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 29 Nov 2021 21:08:49 +0900 Subject: [PATCH 2/4] Rename DarkMode to Color Scheme --- Flow.Launcher/Languages/en.xaml | 2 +- Flow.Launcher/Languages/ko.xaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index c0458b06b..e7ae0218d 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -87,7 +87,7 @@ Fail to load theme {0}, fallback to default theme Theme Folder Open Theme Folder - Dark Mode + Color Scheme System Default Light Dark diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index adcb8fd3d..6fd2eb937 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -87,8 +87,7 @@ {0} 테마 로드에 실패했습니다. 기본 테마로 변경합니다. 테마 폴더 테마 폴더 열기 - 다크 모드 - System settings will take effect from the next run + 앱 색상 시스템 기본 밝게 어둡게 From 0464e14165839d151fc41228d1eeacf5e435c798 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 29 Nov 2021 21:16:08 +0900 Subject: [PATCH 3/4] Change DarkMode Glyph --- Flow.Launcher/SettingWindow.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index e3fc1b334..972a1eda9 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1933,7 +1933,7 @@ SelectedValuePath="Value" SelectionChanged="DarkModeSelectedIndexChanged" /> -  +  From f42a96ebd74fafe122531593dac77209e8930797 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 30 Nov 2021 09:07:52 +1100 Subject: [PATCH 4/4] update variable name --- .../UserSettings/Settings.cs | 4 ++-- Flow.Launcher/Languages/en.xaml | 8 ++++---- Flow.Launcher/Languages/ko.xaml | 8 ++++---- Flow.Launcher/MainWindow.xaml.cs | 8 ++++---- Flow.Launcher/SettingWindow.xaml | 10 +++++----- Flow.Launcher/SettingWindow.xaml.cs | 15 ++++++++------- Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 15 ++++++++------- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index de840cdb1..4c694b55a 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -15,7 +15,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings private string language = "en"; public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}"; public string OpenResultModifiers { get; set; } = KeyConstant.Alt; - public string DarkMode { get; set; } = "System"; + public string ColorScheme { get; set; } = "System"; public bool ShowOpenResultHotkey { get; set; } = true; public double WindowSize { get; set; } = 580; @@ -167,7 +167,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings Preserved } - public enum DarkMode + public enum ColorSchemes { System, Light, diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index e7ae0218d..15bf48838 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -87,10 +87,10 @@ Fail to load theme {0}, fallback to default theme Theme Folder Open Theme Folder - Color Scheme - System Default - Light - Dark + Color Scheme + System Default + Light + Dark Sound Effect Play a small sound when the search window opens Animation diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 6fd2eb937..237d632ae 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -87,10 +87,10 @@ {0} 테마 로드에 실패했습니다. 기본 테마로 변경합니다. 테마 폴더 테마 폴더 열기 - 앱 색상 - 시스템 기본 - 밝게 - 어둡게 + 앱 색상 + 시스템 기본 + 밝게 + 어둡게 소리 효과 검색창을 열 때 작은 소리를 재생합니다. 애니메이션 diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 8afc07439..ba0b63a52 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -68,7 +68,7 @@ namespace Flow.Launcher HideStartup(); // show notify icon when flowlauncher is hidden InitializeNotifyIcon(); - InitializeDarkMode(); + InitializeColorScheme(); WindowsInteropHelper.DisableControlBox(this); InitProgressbarAnimation(); // since the default main window visibility is visible @@ -480,13 +480,13 @@ namespace Flow.Launcher QueryTextBox.CaretIndex = QueryTextBox.Text.Length; } - public void InitializeDarkMode() + public void InitializeColorScheme() { - if (_settings.DarkMode == Constant.Light) + if (_settings.ColorScheme == Constant.Light) { ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light; } - else if (_settings.DarkMode == Constant.Dark) + else if (_settings.ColorScheme == Constant.Dark) { ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark; } diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 972a1eda9..4fac9ec27 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1919,19 +1919,19 @@ - + + SelectionChanged="ColorSchemeSelectedIndexChanged" /> diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index 3505269f2..4c89415c2 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -306,13 +306,14 @@ namespace Flow.Launcher textBox.MoveFocus(tRequest); } - private void DarkModeSelectedIndexChanged(object sender, EventArgs e) => ThemeManager.Current.ApplicationTheme = settings.DarkMode switch - { - Constant.Light => ApplicationTheme.Light, - Constant.Dark => ApplicationTheme.Dark, - Constant.System => null, - _ => ThemeManager.Current.ApplicationTheme - }; + private void ColorSchemeSelectedIndexChanged(object sender, EventArgs e) + => ThemeManager.Current.ApplicationTheme = settings.ColorScheme switch + { + Constant.Light => ApplicationTheme.Light, + Constant.Dark => ApplicationTheme.Dark, + Constant.System => null, + _ => ThemeManager.Current.ApplicationTheme + }; /* Custom TitleBar */ diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 96c14ebe0..342c85da2 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -315,22 +315,23 @@ namespace Flow.Launcher.ViewModel } } - public class DarkMode + public class ColorScheme { public string Display { get; set; } - public Infrastructure.UserSettings.DarkMode Value { get; set; } + public ColorSchemes Value { get; set; } } - public List DarkModes + + public List ColorSchemes { get { - List modes = new List(); - var enums = (Infrastructure.UserSettings.DarkMode[])Enum.GetValues(typeof(Infrastructure.UserSettings.DarkMode)); + List modes = new List(); + var enums = (ColorSchemes[])Enum.GetValues(typeof(ColorSchemes)); foreach (var e in enums) { - var key = $"DarkMode{e}"; + var key = $"ColorScheme{e}"; var display = _translater.GetTranslation(key); - var m = new DarkMode { Display = display, Value = e, }; + var m = new ColorScheme { Display = display, Value = e, }; modes.Add(m); } return modes;