Merge branch 'dev'

Author: jjw24

Flow.Launcher.Core/Resource/Theme.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -8,6 +8,7 @@
 using System.Windows.Interop;
 using System.Windows.Markup;
 using System.Windows.Media;
+using System.Windows.Media.Effects;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -34,6 +35,9 @@ public Theme()
             var dicts = Application.Current.Resources.MergedDictionaries;
             _oldResource = dicts.First(d =>
             {
+                if (d.Source == null)
+                    return false;
+
                 var p = d.Source.AbsolutePath;
                 var dir = Path.GetDirectoryName(p).NonNull();
                 var info = new DirectoryInfo(dir);
@@ -65,7 +69,7 @@ private void MakesureThemeDirectoriesExist()
 
         public bool ChangeTheme(string theme)
         {
-            const string defaultTheme = "Dark";
+            const string defaultTheme = Constant.DefaultTheme;
 
             string path = GetThemePath(theme);
             try
@@ -75,16 +79,15 @@ public bool ChangeTheme(string theme)
 
                 Settings.Theme = theme;
 
-                var dicts = Application.Current.Resources.MergedDictionaries;
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
-                    dicts.Remove(_oldResource);
-                    var newResource = GetResourceDictionary();
-                    dicts.Add(newResource);
-                    _oldResource = newResource;
+                    UpdateResourceDictionary(GetResourceDictionary());
                     _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
                 }
+
+                if (Settings.UseDropShadowEffect)
+                    AddDropShadowEffectToCurrentTheme();
             }
             catch (DirectoryNotFoundException e)
             {
@@ -109,14 +112,30 @@ public bool ChangeTheme(string theme)
             return true;
         }
 
-        public ResourceDictionary GetResourceDictionary()
+        private void UpdateResourceDictionary(ResourceDictionary dictionaryToUpdate)
+        {
+            var dicts = Application.Current.Resources.MergedDictionaries;
+
+            dicts.Remove(_oldResource);
+            dicts.Add(dictionaryToUpdate);
+            _oldResource = dictionaryToUpdate;
+        }
+
+        private ResourceDictionary CurrentThemeResourceDictionary()
         {
             var uri = GetThemePath(Settings.Theme);
             var dict = new ResourceDictionary
             {
                 Source = new Uri(uri, UriKind.Absolute)
             };
 
+            return dict;
+        }
+
+        public ResourceDictionary GetResourceDictionary()
+        {
+            var dict = CurrentThemeResourceDictionary();
+
             Style queryBoxStyle = dict["QueryBoxStyle"] as Style;
             if (queryBoxStyle != null)
             {
@@ -146,6 +165,7 @@ public ResourceDictionary GetResourceDictionary()
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
                 Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
+
             return dict;
         }
 
@@ -176,6 +196,36 @@ private string GetThemePath(string themeName)
             return string.Empty;
         }
 
+        public void AddDropShadowEffectToCurrentTheme()
+        {
+            var dict = CurrentThemeResourceDictionary();
+
+            var windowBorderStyle = dict["WindowBorderStyle"] as Style;
+
+            var effectSetter = new Setter();
+            effectSetter.Property = Border.EffectProperty;
+            effectSetter.Value = new DropShadowEffect
+            {
+                Opacity = 0.9,
+                ShadowDepth = 2,
+                BlurRadius = 15
+            };
+
+            windowBorderStyle.Setters.Add(effectSetter);
+
+            UpdateResourceDictionary(dict);
+        }
+
+        public void RemoveDropShadowEffectToCurrentTheme()
+        {
+            var dict = CurrentThemeResourceDictionary();
+            var windowBorderStyle = dict["WindowBorderStyle"] as Style;
+
+            dict.Remove(Border.EffectProperty);
+
+            UpdateResourceDictionary(dict);
+        }
+
         #region Blur Handling
         /*
         Found on https://github.com/riverar/sample-win10-aeroglass

Flow.Launcher.Infrastructure/Constant.cs

@@ -27,5 +27,9 @@ public static class Constant
 
         public static string PythonPath;
         public static string EverythingSDKPath;
+
+        public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.png";
+
+        public const string DefaultTheme = "Darker";
     }
 }

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -13,7 +13,8 @@ public class Settings : BaseModel
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
         public bool ShowOpenResultHotkey { get; set; } = true;
         public string Language { get; set; } = "en";
-        public string Theme { get; set; } = "Dark";
+        public string Theme { get; set; } = Constant.DefaultTheme;
+        public bool UseDropShadowEffect { get; set; } = false;
         public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
         public string QueryBoxFontStyle { get; set; }
         public string QueryBoxFontWeight { get; set; }
@@ -61,7 +62,7 @@ public string QuerySearchPrecisionString
 
         public double WindowLeft { get; set; }
         public double WindowTop { get; set; }
-        public int MaxResultsToShow { get; set; } = 6;
+        public int MaxResultsToShow { get; set; } = 5;
         public int ActivateTimes { get; set; }
 
         // Order defaults to 0 or -1, so 1 will let this property appear last

Flow.Launcher/App.xaml

@@ -1,12 +1,15 @@
 <Application x:Class="Flow.Launcher.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ui="http://schemas.modernwpf.com/2019"
              ShutdownMode="OnMainWindowClose"
              Startup="OnStartup">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/Dark.xaml" />
+                <ui:ThemeResources RequestedTheme="Light" />
+                <ui:XamlControlsResources />
+                <ResourceDictionary Source="pack://application:,,,/Themes/Darker.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

@@ -19,7 +19,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
             var queryText = (string)values[0];
 
             if (string.IsNullOrEmpty(queryText))
-                return "Type here to search";
+                return string.Empty;
 
             // second prop is the current selected item result
             var val = values[1];

Flow.Launcher/Flow.Launcher.csproj

@@ -54,10 +54,19 @@
     <Compile Include="..\SolutionAssemblyInfo.cs" Link="Properties\SolutionAssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="Languages\*.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Mages" Version="1.6.0" />
+    <PackageReference Include="ModernWpfUI" Version="0.8.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
@@ -142,6 +151,9 @@
     <None Update="Images\logoff.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Images\mainsearch.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Images\New Message.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Flow.Launcher/Images/mainsearch.png

@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Søg efter flere temaer</system:String>
-    <system:String x:Key="helloFlowLauncher">Hej Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Søgefelt skrifttype</system:String>
     <system:String x:Key="resultItemFont">Resultat skrifttype</system:String>
     <system:String x:Key="windowMode">Vindue mode</system:String>

Flow.Launcher/Languages/da.xaml

@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Suche nach weiteren Themes</system:String>
-    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Abfragebox Schriftart</system:String>
     <system:String x:Key="resultItemFont">Ergebnis Schriftart</system:String>
     <system:String x:Key="windowMode">Fenstermodus</system:String>

Flow.Launcher/Languages/de.xaml

@@ -49,7 +49,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
-    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
+    <system:String x:Key="hiThere">Hi There</system:String>
     <system:String x:Key="queryBoxFont">Query Box Font</system:String>
     <system:String x:Key="resultItemFont">Result Item Font</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
@@ -68,6 +68,9 @@
     <system:String x:Key="add">Add</system:String>
     <system:String x:Key="pleaseSelectAnItem">Please select an item</system:String>
     <system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
+    <system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
+    <system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU.</system:String>
+    <system:String x:Key="shadowEffectPerformance">Not recommended if you computer performance is limited.</system:String>
 
     <!--Setting Proxy-->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
@@ -97,7 +100,7 @@
         Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com, 
         or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
     </system:String>
-    <system:String x:Key="releaseNotes">Release Notes:</system:String>
+    <system:String x:Key="releaseNotes">Release Notes</system:String>
 
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>