From 8e6af08b4df3f8b7c3bd01038e0338f071e6a7fb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 5 Sep 2022 13:47:16 +0900
Subject: [PATCH] Add Clock/Date Format Combobox UI in settingswindow

---
 Flow.Launcher/SettingWindow.xaml    | 38 +++++++++++++++++++++++++----
 Flow.Launcher/SettingWindow.xaml.cs |  5 ++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 88b80a89f..ca310fce8 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1897,13 +1897,27 @@
                                                         <StackPanel Style="{StaticResource TextPanel}">
                                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Clock}" />
                                                         </StackPanel>
-                                                        <ui:ToggleSwitch
-                                                            Grid.Row="0"
-                                                            Grid.Column="2"
+                                                        <StackPanel Grid.Row="0"
+                                                            Grid.Column="2" Orientation="Horizontal">
+                                                        <ComboBox
+                                                    x:Name="TimeFormat"
+                                                    Grid.Column="2"
+                                                    MinWidth="180"
+                                                            VerticalAlignment="Center"
+                                                    Margin="0,0,18,0"
+                                                    DisplayMemberPath="Display"
+                                                    FontSize="14"
+                                                    ItemsSource="{Binding ColorSchemes}"
+                                                    SelectedValue="{Binding Settings.ColorScheme}"
+                                                    SelectedValuePath="Value"
+                                                    SelectionChanged="ColorSchemeSelectedIndexChanged" />
+                                                            <ui:ToggleSwitch
+                                                            
                                                             IsOn="{Binding UseClock, Mode=TwoWay}"
                                                             OffContent="{DynamicResource disable}"
                                                             OnContent="{DynamicResource enable}"
                                                             Style="{DynamicResource SideToggleSwitch}" />
+                                                        </StackPanel>
                                                         <TextBlock Style="{StaticResource Glyph}">
                                                             &#xec92;
                                                         </TextBlock>
@@ -1921,13 +1935,27 @@
                                                         <StackPanel Style="{StaticResource TextPanel}">
                                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Date}" />
                                                         </StackPanel>
+                                                        <StackPanel     Grid.Row="0"
+                                                            Grid.Column="2" Orientation="Horizontal">
+                                                        <ComboBox
+                                                    x:Name="DateFormat"
+                                                    Grid.Column="2"
+                                                    MinWidth="180"
+                                                            VerticalAlignment="Center"
+                                                    Margin="0,0,18,0"
+                                                    DisplayMemberPath="Display"
+                                                    FontSize="14"
+                                                    ItemsSource="{Binding ColorSchemes}"
+                                                    SelectedValue="{Binding Settings.ColorScheme}"
+                                                    SelectedValuePath="Value"
+                                                    SelectionChanged="ColorSchemeSelectedIndexChanged" />
                                                         <ui:ToggleSwitch
-                                                            Grid.Row="0"
-                                                            Grid.Column="2"
+                                                        
                                                             IsOn="{Binding UseDate, Mode=TwoWay}"
                                                             OffContent="{DynamicResource disable}"
                                                             OnContent="{DynamicResource enable}"
                                                             Style="{DynamicResource SideToggleSwitch}" />
+                                                        </StackPanel>
                                                         <TextBlock Style="{StaticResource Glyph}">
                                                             &#xe787;
                                                         </TextBlock>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 10c9aeffe..452538485 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -348,5 +348,10 @@ namespace Flow.Launcher
         {
             Plugins.ScrollIntoView(Plugins.SelectedItem);
         }
+
+        private void ColorSchemeSelectedIndexChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+        }
     }
 }