Merge branch 'dev' into administrator_mode

Author: Jack251970

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -385,7 +385,7 @@ public bool HideNotifyIcon
 
         public bool AlwaysRunAsAdministrator { get; set; } = false;
 
-        private bool _showAtTopmost = true;
+        private bool _showAtTopmost = false;
         public bool ShowAtTopmost
         {
             get => _showAtTopmost;

Flow.Launcher/Languages/en.xaml

@@ -132,8 +132,8 @@
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
-    <system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
-    <system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
+    <system:String x:Key="showAtTopmost">Show Search Window at Foremost</system:String>
+    <system:String x:Key="showAtTopmostToolTip">Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position.</system:String>
     <system:String x:Key="alwaysRunAsAdministrator">Always run as administrator</system:String>
     <system:String x:Key="alwaysRunAsAdministratorToolTip">Run Flow Launcher as administrator on startup</system:String>
     <system:String x:Key="runAsAdministratorChange">Administrator Mode Change</system:String>

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

@@ -81,25 +81,27 @@
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
+
             <cc:Card Title="{DynamicResource hideNotifyIcon}" Sub="{DynamicResource hideNotifyIconToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideNotifyIcon}"
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
+
             <cc:Card
                 Title="{DynamicResource showAtTopmost}"
                 Margin="0 14 0 0"
-                Icon="&#xE923;"
+                Icon="&#xf5ed;"
                 Sub="{DynamicResource showAtTopmostToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.ShowAtTopmost}"
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 14 0 0">
+            <cc:CardGroup Margin="0 4 0 0">
                 <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox

appveyor.yml

@@ -1,5 +1,8 @@
 version: '1.20.1.{build}'
 
+# Do not build on tags because we create a release on merge to master. Otherwise will upload artifacts twice changing the hash, as well as triggering duplicate GitHub release action & NuGet deployments.
+skip_tags: true
+
 init:
 - ps: |
       $version = new-object System.Version $env:APPVEYOR_BUILD_VERSION
@@ -14,7 +17,6 @@ init:
 cache:
   - '%USERPROFILE%\.nuget\packages -> **.sln, **.csproj'  # preserve nuget folder (packages) unless the solution or projects change
 
-
 assembly_info:
   patch: true
   file: SolutionAssemblyInfo.cs