Merge pull request #2674 from onesounds/040427SplitSettingWindow

Code separation in the settings window

Author: onesounds

Flow.Launcher/App.xaml

@@ -24,6 +24,7 @@
                 </ui:ThemeResources>
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>

Flow.Launcher/CustomShortcutSetting.xaml.cs

@@ -8,7 +8,6 @@ namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        private SettingWindowViewModel viewModel;
         public string Key { get; set; } = String.Empty;
         public string Value { get; set; } = String.Empty;
         private string originalKey { get; init; } = null;
@@ -17,13 +16,11 @@ public partial class CustomShortcutSetting : Window
 
         public CustomShortcutSetting(SettingWindowViewModel vm)
         {
-            viewModel = vm;
             InitializeComponent();
         }
 
-        public CustomShortcutSetting(string key, string value, SettingWindowViewModel vm)
+        public CustomShortcutSetting(string key, string value)
         {
-            viewModel = vm;
             Key = key;
             Value = value;
             originalKey = key;
@@ -46,8 +43,7 @@ private void BtnAdd_OnClick(object sender, RoutedEventArgs e)
                 return;
             }
             // Check if key is modified or adding a new one
-            if (((update && originalKey != Key) || !update)
-                && viewModel.ShortcutExists(Key))
+            if ((update && originalKey != Key) || !update)
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("duplicateShortcut"));
                 return;

Flow.Launcher/Images/info.png

@@ -20,6 +20,7 @@
                         <Setter Property="BorderThickness" Value="1" />
                         <Setter Property="CornerRadius" Value="5" />
                         <Setter Property="MinHeight" Value="68" />
+                        <Setter Property="Padding" Value="0,15,0,15" />
                         <Setter Property="Margin" Value="0,4,0,0" />
                         <Setter Property="SnapsToDevicePixels" Value="True" />
                         <Style.Triggers>
@@ -36,6 +37,27 @@
                                 <Setter Property="Padding" Value="38,0,26,0" />
                                 <Setter Property="Background" Value="Transparent" />
                             </DataTrigger>
+
+                            <DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
+                                <Setter Property="Margin" Value="0" />
+                                <Setter Property="CornerRadius" Value="0" />
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="BorderThickness" Value="0" />
+                            </DataTrigger>
+
+                            <DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
+                                <Setter Property="Margin" Value="0" />
+                                <Setter Property="CornerRadius" Value="0" />
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="BorderThickness" Value="0 1 0 0" />
+                            </DataTrigger>
+
+                            <DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
+                                <Setter Property="Margin" Value="0" />
+                                <Setter Property="CornerRadius" Value="0" />
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="BorderThickness" Value="0 1 0 0" />
+                            </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </Border.Style>

Flow.Launcher/Images/keyboard.png

@@ -16,6 +16,7 @@ public Card()
         {
             InitializeComponent();
         }
+
         public string Title
         {
             get { return (string)GetValue(TitleProperty); }