From 1b7c9d30613a839a95346c3e0125e0cd3571b97d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 16:43:12 +0900
Subject: [PATCH] Add Darkmode item in setting window Darkmode Actionkewords
 popup

---
 Flow.Launcher/ActionKeywords.xaml  | 189 ++++++++++++++++++-----------
 Flow.Launcher/Languages/en.xaml    |   4 +
 Flow.Launcher/Resources/Dark.xaml  |   4 +
 Flow.Launcher/Resources/Light.xaml |   1 +
 Flow.Launcher/SettingWindow.xaml   |  27 ++++-
 5 files changed, 152 insertions(+), 73 deletions(-)

diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 32892768d..3d0e00459 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -1,85 +1,136 @@
-<Window x:Class="Flow.Launcher.ActionKeywords"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="{DynamicResource actionKeywordsTitle}"
-        Icon="Images\app.png"
-        ResizeMode="NoResize"
-        Loaded="ActionKeyword_OnLoaded"
-        WindowStartupLocation="CenterScreen"
-        Height="365" Width="450" Background="#F3F3F3" BorderBrush="#cecece">
+<Window
+    x:Class="Flow.Launcher.ActionKeywords"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="{DynamicResource actionKeywordsTitle}"
+    Width="450"
+    Height="345"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    Icon="Images\app.png"
+    Loaded="ActionKeyword_OnLoaded"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
-            <Grid>
+        <Grid>
+            <StackPanel Grid.Row="0">
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource actionKeywordsTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button
+                            Grid.Column="4"
+                            Click="BtnCancel_OnClick"
+                            Style="{StaticResource TitleBarCloseButtonStyle}">
+                            <Path
+                                Width="46"
+                                Height="32"
+                                Data="M 18,11 27,20 M 18,20 27,11"
+                                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                                StrokeThickness="1">
+                                <Path.Style>
+                                    <Style TargetType="Path">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                                <Setter Property="Opacity" Value="0.5" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Path.Style>
+                            </Path>
+                        </Button>
+                    </Grid>
+                </StackPanel>
+                <StackPanel Margin="26,12,26,0">
+                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource actionKeywordsTitle}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel>
-                        <TextBlock 
-                           Text="{DynamicResource actionkeyword_tips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                        <TextBlock
+                            FontSize="14"
+                            Text="{DynamicResource actionkeyword_tips}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 18 0 0">
-                        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
-                        <TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="14 10 10 10" FontSize="14"
-                   VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="SemiBold"/>
+                    <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource currentActionKeywords}" />
+                        <TextBlock
+                            x:Name="tbOldActionKeyword"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="14,10,10,10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            FontWeight="SemiBold"
+                            Foreground="{DynamicResource Color05B}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
-
-                        <TextBox x:Name="tbAction" Margin="10 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
-
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource newActionKeyword}" />
+                        <TextBox
+                            x:Name="tbAction"
+                            Width="105"
+                            Margin="10,10,15,10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center" />
                     </StackPanel>
                 </StackPanel>
-            </Grid>
+            </StackPanel>
+        </Grid>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="30"
+                    Margin="10,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnDone"
+                    Width="100"
+                    Height="30"
+                    Margin="5,0,10,0"
+                    Click="btnDone_OnClick">
+                    <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
+                </Button>
+            </StackPanel>
         </Border>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="30"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="5 0 10 0" Width="100" Height="30" Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
-        </StackPanel>
     </Grid>
-    <!--
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="60"/>
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150" />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
-        <TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="170 10 10 10" FontSize="14"
-                   VerticalAlignment="Center" HorizontalAlignment="Left" />
-        
-        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
-            <TextBox x:Name="tbAction" Margin="170 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
-        </StackPanel>
-
-        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Foreground="Gray"
-                   Text="{DynamicResource actionkeyword_tips}" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="30"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="30" Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
-        </StackPanel>
-    </Grid>
-        -->
 </Window>
\ 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 @@
     <system:String x:Key="theme_load_failure_parse_error">Fail to load theme {0}, fallback to default theme</system:String>
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
+    <system:String x:Key="DarkMode">Dark Mode</system:String>
+    <system:String x:Key="DarkModeDefault">System Default</system:String>
+    <system:String x:Key="DarkModeLight">Light</system:String>
+    <system:String x:Key="DarkModeDark">Dark</system:String>
 
     <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Hotkey</system:String>
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 @@
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
     <SolidColorBrush x:Key="PluginInfoColor" Color="#878787" />
 
+    <SolidColorBrush x:Key="BasicLabelColor" Color="#ffffff" />
+    <SolidColorBrush x:Key="BasicSeparatorColor" Color="#cecece" />
+    <SolidColorBrush x:Key="BasicLineColor" Color="#cecece" />
+
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
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 @@
     <SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
     <SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
+    <SolidColorBrush x:Key="BasicLabelColor" Color="#1b1b1b" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
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" />
                                                 </StackPanel>
                                                 <StackPanel
                                                     Grid.Column="1"
@@ -1862,7 +1862,26 @@
                                     </Border>
 
                                     <StackPanel>
-                                        <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
+                                        <Border Margin="0,12,0,12" Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource DarkMode}" />
+                                                </StackPanel>
+                                                <ComboBox
+                                                    Grid.Column="2"
+                                                    MaxWidth="200"
+                                                    Margin="10,0,18,0"
+                                                    DisplayMemberPath="Display"
+                                                    ItemsSource="{Binding LastQueryModes}"
+                                                    SelectedValue="{Binding Settings.LastQueryMode}"
+                                                    SelectedValuePath="Value" />
+                                                <TextBlock Style="{StaticResource Glyph}">
+                                                    &#xe708;
+                                                </TextBlock>
+                                            </ItemsControl>
+                                        </Border>
+
+                                        <Border Margin="0,0,0,18" Style="{DynamicResource SettingGroupBox}">
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">
                                                     <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />