From 979a7b8b7b825aa968ffd0e23d0647636fa82b39 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 15 Nov 2021 05:08:01 +0900 Subject: [PATCH 01/37] Change Titlebar to Custom TitleBar (SettingWindow) --- .../Resources/CustomControlTemplate.xaml | 83 + Flow.Launcher/SettingWindow.xaml | 3627 +++++++++-------- Flow.Launcher/SettingWindow.xaml.cs | 142 + 3 files changed, 2084 insertions(+), 1768 deletions(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index 877a97645..bcb20579f 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -4,6 +4,89 @@ xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:ui="http://schemas.modernwpf.com/2019"> + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - -  - - - - - - - - - - - - - - - + SelectedIndex="1" + TabStripPlacement="Left"> + + + + + + + + + + + + + + + + + + + + + + -  +  - - + + + - - - - - - - -  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  - - - - - - - - - - - - -  - - - - - - - - - - - -  - - - - - - - - - - - - -  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  - - - - - + + + + + + + + + + + + + + +  + + + + + Date: Wed, 17 Nov 2021 10:23:12 +0900 Subject: [PATCH 13/37] Change hardcoded style in SelectFileManagerWindow --- .../Resources/CustomControlTemplate.xaml | 12 +- Flow.Launcher/Resources/Dark.xaml | 4 + Flow.Launcher/Resources/Light.xaml | 4 + Flow.Launcher/SelectFileManagerWindow.xaml | 150 +++++++++++------- 4 files changed, 111 insertions(+), 59 deletions(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index f029168f3..c5c71f6d7 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -5,13 +5,19 @@ xmlns:ui="http://schemas.modernwpf.com/2019"> + + + diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index e2b266b29..4c02fde8c 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -33,6 +33,10 @@ + + + + #202020 #2b2b2b #1d1d1d diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index e2eb9070f..c4a3aa139 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -30,6 +30,10 @@ + + + + #f3f3f3 #ffffff #e5e5e5 diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml index eba794c96..2adac5639 100644 --- a/Flow.Launcher/SelectFileManagerWindow.xaml +++ b/Flow.Launcher/SelectFileManagerWindow.xaml @@ -7,25 +7,63 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="http://schemas.modernwpf.com/2019" Title="{DynamicResource fileManagerWindow}" - Background="#f3f3f3" + Width="600" + Background="{DynamicResource PopuBGColor}" DataContext="{Binding RelativeSource={RelativeSource Self}}" + Foreground="{DynamicResource PopupTextColor}" ResizeMode="NoResize" - SizeToContent="WidthAndHeight" + SizeToContent="Height" WindowStartupLocation="CenterScreen" mc:Ignorable="d"> - + + + + + - - + + - + + + + + + + + + + + + + - + @@ -86,7 +120,7 @@ + Fill="{StaticResource Color03B}" /> - + + + + + + + - - - From 0fbec350cb8be5a2af5fc5d24b79a33d49219ee7 Mon Sep 17 00:00:00 2001 From: DB p Date: Wed, 17 Nov 2021 14:17:17 +0900 Subject: [PATCH 14/37] Darkmode CPriority Change Window --- Flow.Launcher/PriorityChangeWindow.xaml | 167 +-- .../Resources/CustomControlTemplate.xaml | 1051 +++++++++-------- Flow.Launcher/Resources/Dark.xaml | 16 +- Flow.Launcher/Resources/Light.xaml | 11 + Flow.Launcher/SettingWindow.xaml | 2 +- 5 files changed, 652 insertions(+), 595 deletions(-) diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml index bbe601010..d8fda81e3 100644 --- a/Flow.Launcher/PriorityChangeWindow.xaml +++ b/Flow.Launcher/PriorityChangeWindow.xaml @@ -7,84 +7,117 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="http://schemas.modernwpf.com/2019" Title="{DynamicResource changePriorityWindow}" - Background="#F3F3F3" - BorderBrush="#cecece" + Width="350" + Background="{DynamicResource PopuBGColor}" + Foreground="{DynamicResource PopupTextColor}" Loaded="PriorityChangeWindow_Loaded" MouseDown="window_MouseDown" ResizeMode="NoResize" - SizeToContent="WidthAndHeight" + SizeToContent="Height" WindowStartupLocation="CenterScreen" mc:Ignorable="d"> - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index c5c71f6d7..ad0340f67 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -123,531 +123,7 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml index 285a282ef..94cdc6703 100644 --- a/Flow.Launcher/HotkeyControl.xaml +++ b/Flow.Launcher/HotkeyControl.xaml @@ -1,26 +1,55 @@ - + - + - - - - press key + + + + Press key - - - + + \ No newline at end of file diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index 7c631bdc2..4933dc021 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -39,9 +39,9 @@ - + - + #202020 #2b2b2b From 7333b571091ec15b786ad3d4f13f78c94376bbb5 Mon Sep 17 00:00:00 2001 From: DB p Date: Wed, 17 Nov 2021 15:04:57 +0900 Subject: [PATCH 16/37] - remove Bookmark/websearch setting panel hardcoded bgcolor - Adjust Colors in settingwindow --- Flow.Launcher/Resources/Dark.xaml | 2 + Flow.Launcher/Resources/Light.xaml | 2 + Flow.Launcher/SettingWindow.xaml | 26 +- .../Views/SettingsControl.xaml | 138 +++++++---- .../SettingsControl.xaml | 229 ++++++++++++------ 5 files changed, 255 insertions(+), 142 deletions(-) diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index 4933dc021..581b1f10e 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -37,6 +37,7 @@ + @@ -72,6 +73,7 @@ #f5f5f5 #464646 #ffffff + #272727 diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index 9dd240f4d..4e8abc1bc 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -34,6 +34,7 @@ + @@ -66,6 +67,7 @@ #f5f5f5 #878787 #1b1b1b + #f6f6f6 diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index f846dd057..17b18acb2 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1118,65 +1118,65 @@ MaxWidth="100" Margin="10,0,0,0" FontSize="11" - Foreground="#8F8F8F" + Foreground="{DynamicResource PluginInfoColor}" Text="{DynamicResource author}" /> @@ -1201,7 +1201,7 @@ VerticalAlignment="Center" Cursor="Hand" FontSize="12" - Foreground="#8f8f8f" + Foreground="{DynamicResource PluginInfoColor}" MouseUp="OnPluginDirecotyClick" Text="{DynamicResource pluginDirectory}" TextDecorations="Underline" /> @@ -1412,7 +1412,7 @@ VerticalAlignment="Stretch" Panel.ZIndex="1"> - + diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml index abe1f0ad5..59bdf222b 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml @@ -1,72 +1,106 @@ - + - - + + - + - - + + - - - + + + + - + - - - + + + - - - - + + - + + + + + + - - - - \ No newline at end of file diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index b8f214538..fe1c5dd91 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -83,6 +83,10 @@ Fail to load theme {0}, fallback to default theme Theme Folder Open Theme Folder + Dark Mode + System Default + Light + Dark Hotkey diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index 581b1f10e..388f329d0 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -39,6 +39,10 @@ + + + + diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index 4e8abc1bc..864cd01ce 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -35,6 +35,7 @@ + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index f6e1f95f1..28707d212 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1354,9 +1354,9 @@ Height="32" Margin="8,0,6,0" VerticalAlignment="Center" - RenderOptions.BitmapScalingMode="HighQuality" - Source="{Binding IcoPath, IsAsync=True}" - Stretch="Uniform" /> + RenderOptions.BitmapScalingMode="HighQuality" + Source="{Binding IcoPath, IsAsync=True}" + Stretch="Uniform" /> - + + + + + + + +  + + + + + From ef71f6dee27b5b441487562ac457871a79e2bbcc Mon Sep 17 00:00:00 2001 From: DB p Date: Wed, 17 Nov 2021 16:59:09 +0900 Subject: [PATCH 18/37] Fix Plugin List Color in Light Mode --- Flow.Launcher/SettingWindow.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 28707d212..b32ba36e8 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -244,7 +244,7 @@ @@ -53,7 +53,7 @@ - + @@ -439,14 +439,14 @@ Margin="4,0,0,0" VerticalAlignment="Center" FontSize="12" - Foreground="{StaticResource Color05B}" + Foreground="{DynamicResource Color05B}" Text="{DynamicResource flowlauncher_settings}" />