prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Release 1.9.4 (#1287)

Browse source 
* Merge pull request #1205 from Flow-Launcher/fix_cmd_command_with_blank

Fix shell cmd command with quote and space

* Bump NuGet.CommandLine from 5.4.0 to 5.7.2 (#1241)

* Merge pull request #1098 from Flow-Launcher/ScrollToSelectedPlugin

Scroll to selected item when expanded or size changed

* fix RemoveOldQueryResults NullPointerException (#1204)

* Merge pull request #1005 from Flow-Launcher/KillProcess

Use Cancellation Token to avoid potential race tracing issue

* Merge pull request #1187 from Flow-Launcher/update_python_download_mirrors

Update Python download mirrors

* Merge pull request #1108 from Flow-Launcher/CalculatorDecimalSeparator

Respect Decimal Separator for query not just result

* Merge pull request #1087 from Flow-Launcher/turnoff_replace_win_r_shell

Set Shell plugin's default replace Win R hotkey to off

* Merge pull request #1077 from Flow-Launcher/fix_explorer_button_visibility

Fix incorrect button visibility in Explorer's expander control

* Merge pull request #1076 from Flow-Launcher/fix_path_search_with_index

Fix the use of index in path search

* Merge pull request #1071 from medlir/fix-browser-bookmarks-plugin-exception

avoid exception in ChromiumBookmarkLoader.cs

* Merge pull request #1056 from Flow-Launcher/fix_context_menu_typo

Fix typo for plugin title in context menu and WindowsSettings name

* Merge pull request #1119 from onesounds/antialising

Remove All Cleartype Rendering

* Version bump

* Remove Calculator plugin CopyText feature for 1.9.4 release
This commit is contained in:
Jeremy Wu 2022-07-24 11:39:31 +10:00 committed by GitHub
parent 84a806bf75
commit 6dedb4fc40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 266 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher.Core/Flow.Launcher.Core.csproj
View file

@ -53,7 +53,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Droplex" Version="1.4.0" /> <PackageReference Include="Droplex" Version="1.4.1" />
<PackageReference Include="FSharp.Core" Version="5.0.2" /> <PackageReference Include="FSharp.Core" Version="5.0.2" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" /> <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
<PackageReference Include="squirrel.windows" Version="1.5.2" /> <PackageReference Include="squirrel.windows" Version="1.5.2" />

7
Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
View file

@ -241,7 +241,7 @@ namespace Flow.Launcher.Core.Plugin
protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, CancellationToken token = default) protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, CancellationToken token = default)
{ {
Process process = null; Process process = null;
bool disposed = false; using var exitTokenSource = new CancellationTokenSource();
try try
{ {
process = Process.Start(startInfo); process = Process.Start(startInfo);
@ -251,6 +251,7 @@ namespace Flow.Launcher.Core.Plugin
return Stream.Null; return Stream.Null;
} }
await using var source = process.StandardOutput.BaseStream; await using var source = process.StandardOutput.BaseStream;
var buffer = BufferManager.GetStream(); var buffer = BufferManager.GetStream();
@ -259,7 +260,7 @@ namespace Flow.Launcher.Core.Plugin
{ {
// ReSharper disable once AccessToModifiedClosure // ReSharper disable once AccessToModifiedClosure
// Manually Check whether disposed // Manually Check whether disposed
if (!disposed && !process.HasExited) if (!exitTokenSource.IsCancellationRequested && !process.HasExited)
process.Kill(); process.Kill();
}); });
@ -302,8 +303,8 @@ namespace Flow.Launcher.Core.Plugin
} }
finally finally
{ {
exitTokenSource.Cancel();
process?.Dispose(); process?.Dispose();
disposed = true;
} }
} }

2
Flow.Launcher/Flow.Launcher.csproj
View file

@ -91,7 +91,7 @@
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" /> <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
<PackageReference Include="ModernWpfUI" Version="0.9.4" /> <PackageReference Include="ModernWpfUI" Version="0.9.4" />
<PackageReference Include="NHotkey.Wpf" Version="2.1.0" /> <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
<PackageReference Include="NuGet.CommandLine" Version="5.4.0"> <PackageReference Include="NuGet.CommandLine" Version="5.7.2">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

2
Flow.Launcher/Languages/en.xaml
View file

@ -55,7 +55,7 @@
<system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String> <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
<!-- Setting Plugin --> <!-- Setting Plugin -->
<system:String x:Key="plugin">Plugins</system:String> <system:String x:Key="plugin">Plugin</system:String>
<system:String x:Key="browserMorePlugins">Find more plugins</system:String> <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
<system:String x:Key="enable">On</system:String> <system:String x:Key="enable">On</system:String>
<system:String x:Key="disable">Off</system:String> <system:String x:Key="disable">Off</system:String>

7
Flow.Launcher/SettingWindow.xaml
View file

@ -927,7 +927,9 @@
ScrollViewer.CanContentScroll="False" ScrollViewer.CanContentScroll="False"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
SelectedItem="{Binding SelectedPlugin}" SelectedItem="{Binding SelectedPlugin}"
SnapsToDevicePixels="True"> SelectionChanged="SelectedPluginChanged"
SnapsToDevicePixels="True"
Name="Plugins">
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Margin="0,0,0,18" /> <StackPanel Margin="0,0,0,18" />
@ -1116,7 +1118,8 @@
Margin="0" Margin="0"
Padding="1" Padding="1"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Content="{Binding SettingControl}" /> Content="{Binding SettingControl}"
SizeChanged="ItemSizeChanged"/>
</StackPanel> </StackPanel>
<StackPanel> <StackPanel>

19
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -13,12 +13,15 @@ using ModernWpf;
using System; using System;
using System.IO; using System.IO;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Interop; using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Navigation; using System.Windows.Navigation;
using Button = System.Windows.Controls.Button; using Button = System.Windows.Controls.Button;
using Control = System.Windows.Controls.Control; using Control = System.Windows.Controls.Control;
using ListViewItem = System.Windows.Controls.ListViewItem;
using MessageBox = System.Windows.MessageBox; using MessageBox = System.Windows.MessageBox;
using TextBox = System.Windows.Controls.TextBox; using TextBox = System.Windows.Controls.TextBox;
using ThemeManager = ModernWpf.ThemeManager; using ThemeManager = ModernWpf.ThemeManager;
@ -44,6 +47,7 @@ namespace Flow.Launcher
} }
#region General #region General
private void OnLoaded(object sender, RoutedEventArgs e) private void OnLoaded(object sender, RoutedEventArgs e)
{ {
RefreshMaximizeRestoreButton(); RefreshMaximizeRestoreButton();
@ -247,6 +251,7 @@ namespace Flow.Launcher
PluginManager.API.OpenDirectory(directory); PluginManager.API.OpenDirectory(directory);
} }
} }
#endregion #endregion
#region Proxy #region Proxy
@ -307,7 +312,7 @@ namespace Flow.Launcher
private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e) private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e)
{ {
if(sender is Button { DataContext: UserPlugin plugin }) if (sender is Button { DataContext: UserPlugin plugin })
{ {
var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7"); var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0]; var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
@ -326,7 +331,7 @@ namespace Flow.Launcher
textBox.MoveFocus(tRequest); textBox.MoveFocus(tRequest);
} }
private void ColorSchemeSelectedIndexChanged(object sender, EventArgs e) private void ColorSchemeSelectedIndexChanged(object sender, EventArgs e)
=> ThemeManager.Current.ApplicationTheme = settings.ColorScheme switch => ThemeManager.Current.ApplicationTheme = settings.ColorScheme switch
{ {
Constant.Light => ApplicationTheme.Light, Constant.Light => ApplicationTheme.Light,
@ -370,5 +375,13 @@ namespace Flow.Launcher
RefreshMaximizeRestoreButton(); RefreshMaximizeRestoreButton();
} }
private void SelectedPluginChanged(object sender, SelectionChangedEventArgs e)
{
Plugins.ScrollIntoView(Plugins.SelectedItem);
}
private void ItemSizeChanged(object sender, SizeChangedEventArgs e)
{
Plugins.ScrollIntoView(Plugins.SelectedItem);
}
} }
} }

197
Flow.Launcher/Themes/Base.xaml
View file

@ -1,15 +1,16 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"> xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure">
<!-- Further font customisations are dynamically loaded in Theme.cs --> <!-- Further font customisations are dynamically loaded in Theme.cs -->
<Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}"> <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="FontSize" Value="28" /> <Setter Property="FontSize" Value="28" />
<Setter Property="FontWeight" Value="Regular" /> <Setter Property="FontWeight" Value="Regular" />
<Setter Property="Margin" Value="16 7 0 7" /> <Setter Property="Margin" Value="16,7,0,7" />
<Setter Property="Padding" Value="0 4 68 0" /> <Setter Property="Padding" Value="0,4,68,0" />
<Setter Property="Background" Value="#2F2F2F" /> <Setter Property="Background" Value="#2F2F2F" />
<Setter Property="Height" Value="48" /> <Setter Property="Height" Value="48" />
<Setter Property="Foreground" Value="#E3E0E3" /> <Setter Property="Foreground" Value="#E3E0E3" />
@ -20,13 +21,22 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}"> <ControlTemplate TargetType="{x:Type TextBox}">
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"> <Border
<ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" x:Name="border"
Background="{TemplateBinding Background}"> Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
SnapsToDevicePixels="True">
<ScrollViewer
x:Name="PART_ContentHost"
Background="{TemplateBinding Background}"
Focusable="false"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden">
<ScrollViewer.ContentTemplate> <ScrollViewer.ContentTemplate>
<DataTemplate> <DataTemplate>
<Grid Background="{Binding Background, ElementName=PART_ContentHost}" RenderOptions.ClearTypeHint="Enabled"> <Grid Background="{Binding Background, ElementName=PART_ContentHost}">
<ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}"></ContentPresenter> <ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}" />
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ScrollViewer.ContentTemplate> </ScrollViewer.ContentTemplate>
@ -37,47 +47,47 @@
</Setter> </Setter>
</Style> </Style>
<!-- Further font customisations are dynamically loaded in Theme.cs --> <!-- Further font customisations are dynamically loaded in Theme.cs -->
<Style x:Key="BaseQuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}"> <Style
x:Key="BaseQuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="DarkGray" /> <Setter Property="Foreground" Value="DarkGray" />
<Setter Property="Height" Value="48" /> <Setter Property="Height" Value="48" />
<Setter Property="Margin" Value="16 7 0 7" /> <Setter Property="Margin" Value="16,7,0,7" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Padding" Value="0 4 68 0" /> <Setter Property="Padding" Value="0,4,68,0" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
</Style> </Style>
<Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}"> <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="Background" Value="#2F2F2F"></Setter> <Setter Property="Background" Value="#2F2F2F" />
<Setter Property="Padding" Value="0 0 0 0" /> <Setter Property="Padding" Value="0,0,0,0" />
<Setter Property="CornerRadius" Value="5" /> <Setter Property="CornerRadius" Value="5" />
</Style> </Style>
<Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}"> <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
<Setter Property="Width" Value="600" /> <Setter Property="Width" Value="600" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
</Style> </Style>
<Style x:Key="WindowRadius" TargetType="{x:Type Border}"> <Style x:Key="WindowRadius" TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="5" /> <Setter Property="CornerRadius" Value="5" />
</Style> </Style>
<Style x:Key="BasePendingLineStyle" TargetType="{x:Type Line}"> <Style x:Key="BasePendingLineStyle" TargetType="{x:Type Line}">
<Setter Property="Stroke" Value="Blue" /> <Setter Property="Stroke" Value="Blue" />
</Style> </Style>
<!-- Item Style --> <!-- Item Style -->
<Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#FFFFF8" /> <Setter Property="Foreground" Value="#FFFFF8" />
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="Medium" /> <Setter Property="FontWeight" Value="Medium" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
</Style> </Style>
<Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}" > <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#D9D9D4" /> <Setter Property="Foreground" Value="#D9D9D4" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="13" />
<Setter Property="FontWeight" Value="Normal" /> <Setter Property="FontWeight" Value="Normal" />
<Style.Triggers> <Style.Triggers>
@ -89,9 +99,8 @@
<Style x:Key="BaseItemNumberStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="BaseItemNumberStyle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Margin" Value="3 0 0 0" /> <Setter Property="Margin" Value="3,0,0,0" />
<Setter Property="FontSize" Value="22" /> <Setter Property="FontSize" Value="22" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
</Style> </Style>
<Style x:Key="BaseGlyphStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="BaseGlyphStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" /> <Setter Property="Foreground" Value="#ffffff" />
@ -99,34 +108,31 @@
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Width" Value="25" /> <Setter Property="Width" Value="25" />
<Setter Property="Height" Value="25" /> <Setter Property="Height" Value="25" />
<Setter Property="FontSize" Value="25"/> <Setter Property="FontSize" Value="25" />
</Style> </Style>
<Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" > <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#FFFFF8" /> <Setter Property="Foreground" Value="#FFFFF8" />
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="Normal" /> <Setter Property="FontWeight" Value="Normal" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
</Style> </Style>
<Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" > <Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#D9D9D4" /> <Setter Property="Foreground" Value="#D9D9D4" />
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="13" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0"> <DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
<Setter Property="Height" Value="0" /> <Setter Property="Height" Value="0" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style x:Key="BaseItemImageSelectedStyle" TargetType="{x:Type Image}" > <Style x:Key="BaseItemImageSelectedStyle" TargetType="{x:Type Image}" />
</Style>
<Style x:Key="BaseListboxStyle" TargetType="{x:Type ListBox}"> <Style x:Key="BaseListboxStyle" TargetType="{x:Type ListBox}">
<Setter Property="BorderBrush" Value="Transparent"/> <Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="Margin" Value="0 0 0 0" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="Padding" Value="0 0 0 0" /> <Setter Property="Padding" Value="0,0,0,0" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="ListBox"> <ControlTemplate TargetType="ListBox">
@ -135,12 +141,12 @@
<Style TargetType="ScrollViewer"> <Style TargetType="ScrollViewer">
<Style.Triggers> <Style.Triggers>
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible"> <Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible">
<Setter Property="Margin" Value="0 0 0 0" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="Padding" Value="0 0 0 0" /> <Setter Property="Padding" Value="0,0,0,0" />
</Trigger> </Trigger>
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Collapsed"> <Trigger Property="ComputedVerticalScrollBarVisibility" Value="Collapsed">
<Setter Property="Margin" Value="0 0 0 0" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="Padding" Value="0 0 0 0" /> <Setter Property="Padding" Value="0,0,0,0" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@ -152,7 +158,7 @@
</Setter> </Setter>
</Style> </Style>
<!-- ScrollViewer Style --> <!-- ScrollViewer Style -->
<ControlTemplate x:Key="ScrollViewerControlTemplate" TargetType="{x:Type ScrollViewer}"> <ControlTemplate x:Key="ScrollViewerControlTemplate" TargetType="{x:Type ScrollViewer}">
<Grid x:Name="Grid" Background="{TemplateBinding Background}"> <Grid x:Name="Grid" Background="{TemplateBinding Background}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -160,44 +166,50 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--content in the left of ScrollViewer, just default--> <!-- content in the left of ScrollViewer, just default -->
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" <ScrollContentPresenter
CanContentScroll="{TemplateBinding CanContentScroll}" x:Name="PART_ScrollContentPresenter"
CanHorizontallyScroll="False" Grid.Row="0"
CanVerticallyScroll="False" Grid.Column="0"
ContentTemplate="{TemplateBinding ContentTemplate}" Margin="0"
Content="{TemplateBinding Content}" CanContentScroll="{TemplateBinding CanContentScroll}"
Grid.Column="0" CanHorizontallyScroll="False"
Margin="0" CanVerticallyScroll="False"
Grid.Row="0" /> Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
<!--Scrollbar in thr rigth of ScrollViewer--> <!-- Scrollbar in thr rigth of ScrollViewer -->
<ScrollBar x:Name="PART_VerticalScrollBar" <ScrollBar
AutomationProperties.AutomationId="VerticalScrollBar" x:Name="PART_VerticalScrollBar"
Cursor="Arrow" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Right" Margin="0,0,0,0"
Margin="0 0 0 0" HorizontalAlignment="Right"
Maximum="{TemplateBinding ScrollableHeight}" AutomationProperties.AutomationId="VerticalScrollBar"
Minimum="0" Cursor="Arrow"
Grid.Row="0" Maximum="{TemplateBinding ScrollableHeight}"
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Minimum="0"
Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{DynamicResource ScrollBarStyle}"
ViewportSize="{TemplateBinding ViewportHeight}" ViewportSize="{TemplateBinding ViewportHeight}"
Style="{DynamicResource ScrollBarStyle}" /> Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
<!-- button style in the middle of the scrollbar --> <!-- button style in the middle of the scrollbar -->
<Style x:Key="BaseThumbStyle" TargetType="{x:Type Thumb}"> <Style x:Key="BaseThumbStyle" TargetType="{x:Type Thumb}">
<Setter Property="SnapsToDevicePixels" Value="True"/> <Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="OverridesDefaultStyle" Value="true"/> <Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="false"/> <Setter Property="IsTabStop" Value="false" />
<Setter Property="Focusable" Value="false"/> <Setter Property="Focusable" Value="false" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}"> <ControlTemplate TargetType="{x:Type Thumb}">
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#898989" BorderBrush="Transparent" /> <Border
Background="#898989"
BorderBrush="Transparent"
CornerRadius="2"
DockPanel.Dock="Right" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -207,16 +219,19 @@
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" /> <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
<Setter Property="Stylus.IsFlicksEnabled" Value="false" /> <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
<Setter Property="Background" Value="Black" /> <Setter Property="Background" Value="Black" />
<!-- must set min width --> <!-- must set min width -->
<Setter Property="MinWidth" Value="0"/> <Setter Property="MinWidth" Value="0" />
<Setter Property="Width" Value="5"/> <Setter Property="Width" Value="5" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ScrollBar}"> <ControlTemplate TargetType="{x:Type ScrollBar}">
<DockPanel> <DockPanel>
<Track x:Name="PART_Track" IsDirectionReversed="true" DockPanel.Dock="Right"> <Track
x:Name="PART_Track"
DockPanel.Dock="Right"
IsDirectionReversed="true">
<Track.Thumb> <Track.Thumb>
<Thumb Style="{DynamicResource ThumbStyle}"/> <Thumb Style="{DynamicResource ThumbStyle}" />
</Track.Thumb> </Track.Thumb>
</Track> </Track>
</DockPanel> </DockPanel>
@ -224,8 +239,7 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="BaseSeparatorStyle" TargetType="Rectangle"> <Style x:Key="BaseSeparatorStyle" TargetType="Rectangle" />
</Style>
<Style x:Key="HighlightStyle"> <Style x:Key="HighlightStyle">
<Setter Property="Inline.FontWeight" Value="Bold" /> <Setter Property="Inline.FontWeight" Value="Bold" />
</Style> </Style>
@ -249,12 +263,12 @@
<Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}"> <Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0 2 18 0" /> <Setter Property="Margin" Value="0,2,18,0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
<!--for classic themes--> <!-- for classic themes -->
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}"> <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#555555" /> <Setter Property="Fill" Value="#555555" />
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
@ -263,19 +277,24 @@
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}"> <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0 2 18 0" /> <Setter Property="Margin" Value="0,2,18,0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemHotkeyStyle}"> <Style
x:Key="ItemHotkeyStyle"
BasedOn="{StaticResource BaseItemHotkeyStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" /> <Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
</Style> </Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"> <Style
x:Key="ItemHotkeySelectedStyle"
BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" /> <Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

2
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -625,7 +625,7 @@ namespace Flow.Launcher.ViewModel
private void RemoveOldQueryResults(Query query) private void RemoveOldQueryResults(Query query)
{ {
if (_lastQuery.ActionKeyword != query.ActionKeyword) if (_lastQuery?.ActionKeyword != query?.ActionKeyword)
{ {
Results.Clear(); Results.Clear();
} }

5
Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
View file

@ -37,7 +37,8 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
return new(); return new();
foreach (var folder in rootElement.EnumerateObject()) foreach (var folder in rootElement.EnumerateObject())
{ {
EnumerateFolderBookmark(folder.Value, bookmarks, source); if (folder.Value.ValueKind == JsonValueKind.Object)
EnumerateFolderBookmark(folder.Value, bookmarks, source);
} }
return bookmarks; return bookmarks;
} }
@ -64,4 +65,4 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
} }
} }
} }

28
Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
View file

@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using Mages.Core; using Mages.Core;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Plugin.Caculator.ViewModels; using Flow.Launcher.Plugin.Caculator.ViewModels;
using Flow.Launcher.Plugin.Caculator.Views; using Flow.Launcher.Plugin.Caculator.Views;
@ -25,6 +24,9 @@ namespace Flow.Launcher.Plugin.Caculator
@")+$", RegexOptions.Compiled); @")+$", RegexOptions.Compiled);
private static readonly Regex RegBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled); private static readonly Regex RegBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled);
private static Engine MagesEngine; private static Engine MagesEngine;
private const string comma = ",";
private const string dot = ".";
private PluginInitContext Context { get; set; } private PluginInitContext Context { get; set; }
private static Settings _settings; private static Settings _settings;
@ -35,7 +37,7 @@ namespace Flow.Launcher.Plugin.Caculator
Context = context; Context = context;
_settings = context.API.LoadSettingJsonStorage<Settings>(); _settings = context.API.LoadSettingJsonStorage<Settings>();
_viewModel = new SettingsViewModel(_settings); _viewModel = new SettingsViewModel(_settings);
MagesEngine = new Engine(new Configuration MagesEngine = new Engine(new Configuration
{ {
Scope = new Dictionary<string, object> Scope = new Dictionary<string, object>
@ -54,7 +56,19 @@ namespace Flow.Launcher.Plugin.Caculator
try try
{ {
var expression = query.Search.Replace(",", "."); string expression;
switch (_settings.DecimalSeparator)
{
case DecimalSeparator.Comma:
case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
expression = query.Search.Replace(",", ".");
break;
default:
expression = query.Search;
break;
}
var result = MagesEngine.Interpret(expression); var result = MagesEngine.Interpret(expression);
if (result?.ToString() == "NaN") if (result?.ToString() == "NaN")
@ -119,6 +133,10 @@ namespace Flow.Launcher.Plugin.Caculator
return false; return false;
} }
if ((query.Search.Contains(dot) && GetDecimalSeparator() != dot) ||
(query.Search.Contains(comma) && GetDecimalSeparator() != comma))
return false;
return true; return true;
} }
@ -142,8 +160,8 @@ namespace Flow.Launcher.Plugin.Caculator
switch (_settings.DecimalSeparator) switch (_settings.DecimalSeparator)
{ {
case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator; case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;
case DecimalSeparator.Dot: return "."; case DecimalSeparator.Dot: return dot;
case DecimalSeparator.Comma: return ","; case DecimalSeparator.Comma: return comma;
default: return systemDecimalSeperator; default: return systemDecimalSeperator;
} }
} }

7
Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
View file

@ -1,9 +1,4 @@
using System; 
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Flow.Launcher.Plugin.Caculator namespace Flow.Launcher.Plugin.Caculator
{ {
public class Settings public class Settings

2
Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
View file

@ -4,7 +4,7 @@
"Name": "Calculator", "Name": "Calculator",
"Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)", "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
"Author": "cxfksword", "Author": "cxfksword",
"Version": "1.1.9", "Version": "1.1.10",
"Language": "csharp", "Language": "csharp",
"Website": "https://github.com/Flow-Launcher/Flow.Launcher", "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
"ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll", "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",

3
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
View file

@ -15,6 +15,7 @@
<system:String x:Key="plugin_explorer_windowsSearchServiceFix">To fix this, start the Windows Search service. Select here to remove this warning</system:String> <system:String x:Key="plugin_explorer_windowsSearchServiceFix">To fix this, start the Windows Search service. Select here to remove this warning</system:String>
<system:String x:Key="plugin_explorer_alternative">The warning message has been switched off. As an alternative for searching files and folders, would you like to install Everything plugin?{0}{0}Select 'Yes' to install Everything plugin, or 'No' to return</system:String> <system:String x:Key="plugin_explorer_alternative">The warning message has been switched off. As an alternative for searching files and folders, would you like to install Everything plugin?{0}{0}Select 'Yes' to install Everything plugin, or 'No' to return</system:String>
<system:String x:Key="plugin_explorer_alternative_title">Explorer Alternative</system:String> <system:String x:Key="plugin_explorer_alternative_title">Explorer Alternative</system:String>
<system:String x:Key="plugin_explorer_directoryinfosearch_error">Error occurred during search: {0}</system:String>
<!--Controls--> <!--Controls-->
<system:String x:Key="plugin_explorer_delete">Delete</system:String> <system:String x:Key="plugin_explorer_delete">Delete</system:String>
@ -23,6 +24,8 @@
<system:String x:Key="plugin_explorer_manageactionkeywords_header">Customise Action Keywords</system:String> <system:String x:Key="plugin_explorer_manageactionkeywords_header">Customise Action Keywords</system:String>
<system:String x:Key="plugin_explorer_quickaccesslinks_header">Quick Access Links</system:String> <system:String x:Key="plugin_explorer_quickaccesslinks_header">Quick Access Links</system:String>
<system:String x:Key="plugin_explorer_indexsearchexcludedpaths_header">Index Search Excluded Paths</system:String> <system:String x:Key="plugin_explorer_indexsearchexcludedpaths_header">Index Search Excluded Paths</system:String>
<system:String x:Key="plugin_explorer_usewindowsindexfordirectorysearch">Use Index Search For Path Search</system:String>
<system:String x:Key="plugin_explorer_usewindowsindexfordirectorysearch_tooltip">Turning this on will return indexed directories/files faster, but if a directory/file is not indexed it will not show up. If a directory/file has been added to Index Search Excluded Path then it will still show up even if this option is on</system:String>
<system:String x:Key="plugin_explorer_manageindexoptions">Indexing Options</system:String> <system:String x:Key="plugin_explorer_manageindexoptions">Indexing Options</system:String>
<system:String x:Key="plugin_explorer_actionkeywordview_search">Search:</system:String> <system:String x:Key="plugin_explorer_actionkeywordview_search">Search:</system:String>
<system:String x:Key="plugin_explorer_actionkeywordview_pathsearch">Path Search:</system:String> <system:String x:Key="plugin_explorer_actionkeywordview_pathsearch">Path Search:</system:String>

18
Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
View file

@ -1,4 +1,4 @@
using Flow.Launcher.Infrastructure.Logger; using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Plugin.SharedCommands; using Flow.Launcher.Plugin.SharedCommands;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -58,8 +58,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
{ {
var directoryInfo = new System.IO.DirectoryInfo(path); var directoryInfo = new System.IO.DirectoryInfo(path);
foreach (var fileSystemInfo in directoryInfo.EnumerateFileSystemInfos(searchCriteria, enumerationOption) foreach (var fileSystemInfo in directoryInfo.EnumerateFileSystemInfos(searchCriteria, enumerationOption))
)
{ {
if (fileSystemInfo is System.IO.DirectoryInfo) if (fileSystemInfo is System.IO.DirectoryInfo)
{ {
@ -76,8 +75,17 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
} }
catch (Exception e) catch (Exception e)
{ {
Log.Exception("Flow.Plugin.Explorer.", nameof(DirectoryInfoSearch), e); Log.Exception(nameof(DirectoryInfoSearch), "Error occured while searching path", e);
results.Add(new Result {Title = e.Message, Score = 501});
results.Add(
new Result
{
Title = string.Format(SearchManager.Context.API.GetTranslation(
"plugin_explorer_directoryinfosearch_error"),
e.Message),
Score = 501,
IcoPath = Constants.ExplorerIconImagePath
});
return results; return results;
} }

2
Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
View file

@ -14,7 +14,7 @@ namespace Flow.Launcher.Plugin.Explorer
// as at v1.7.0 this is to maintain backwards compatibility, need to be removed afterwards. // as at v1.7.0 this is to maintain backwards compatibility, need to be removed afterwards.
public List<AccessLink> QuickFolderAccessLinks { get; set; } = new List<AccessLink>(); public List<AccessLink> QuickFolderAccessLinks { get; set; } = new List<AccessLink>();
public bool UseWindowsIndexForDirectorySearch { get; set; } = true; public bool UseWindowsIndexForDirectorySearch { get; set; } = false;
public List<AccessLink> IndexSearchExcludedSubdirectoryPaths { get; set; } = new List<AccessLink>(); public List<AccessLink> IndexSearchExcludedSubdirectoryPaths { get; set; } = new List<AccessLink>();

11
Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
View file

@ -52,5 +52,16 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
} }
internal bool IsNewActionKeywordGlobal(string newActionKeyword) => newActionKeyword == Query.GlobalPluginWildcardSign; internal bool IsNewActionKeywordGlobal(string newActionKeyword) => newActionKeyword == Query.GlobalPluginWildcardSign;
public bool UseWindowsIndexForDirectorySearch {
get
{
return Settings.UseWindowsIndexForDirectorySearch;
}
set
{
Settings.UseWindowsIndexForDirectorySearch = value;
}
}
} }
} }

22
Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
View file

@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views" xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
@ -89,14 +88,23 @@
<Expander <Expander
x:Name="expExcludedPaths" x:Name="expExcludedPaths"
Margin="0,10,0,0" Margin="0,10,0,0"
Collapsed="expExcludedPaths_Collapsed"
Expanded="expExcludedPaths_Click" Expanded="expExcludedPaths_Click"
Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"> Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}">
<ListView <StackPanel>
x:Name="lbxExcludedPaths" <CheckBox
AllowDrop="True" Name="UseWindowsIndexForDirectorySearch"
DragEnter="lbxAccessLinks_DragEnter" Margin="12,10,0,0"
Drop="lbxAccessLinks_Drop" Content="{DynamicResource plugin_explorer_usewindowsindexfordirectorysearch}"
ItemTemplate="{StaticResource ListViewTemplateExcludedPaths}" /> IsChecked="{Binding UseWindowsIndexForDirectorySearch}"
ToolTip="{DynamicResource plugin_explorer_usewindowsindexfordirectorysearch_tooltip}" />
<ListView
x:Name="lbxExcludedPaths"
AllowDrop="True"
DragEnter="lbxAccessLinks_DragEnter"
Drop="lbxAccessLinks_Drop"
ItemTemplate="{StaticResource ListViewTemplateExcludedPaths}" />
</StackPanel>
</Expander> </Expander>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>

26
Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
View file

@ -29,6 +29,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
this.viewModel = viewModel; this.viewModel = viewModel;
DataContext = viewModel;
lbxAccessLinks.ItemsSource = this.viewModel.Settings.QuickAccessLinks; lbxAccessLinks.ItemsSource = this.viewModel.Settings.QuickAccessLinks;
lbxExcludedPaths.ItemsSource = this.viewModel.Settings.IndexSearchExcludedSubdirectoryPaths; lbxExcludedPaths.ItemsSource = this.viewModel.Settings.IndexSearchExcludedSubdirectoryPaths;
@ -60,9 +62,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending)); lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
btnDelete.Visibility = Visibility.Hidden; SetButtonVisibilityToHidden();
btnEdit.Visibility = Visibility.Hidden;
btnAdd.Visibility = Visibility.Hidden;
if (expAccessLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded) if (expAccessLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded)
{ {
@ -123,8 +123,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e) private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e)
{ {
if (!expActionKeywords.IsExpanded) expActionKeywords.Height = double.NaN;
expActionKeywords.Height = double.NaN; SetButtonVisibilityToHidden();
} }
private void expAccessLinks_Click(object sender, RoutedEventArgs e) private void expAccessLinks_Click(object sender, RoutedEventArgs e)
@ -143,8 +143,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
private void expAccessLinks_Collapsed(object sender, RoutedEventArgs e) private void expAccessLinks_Collapsed(object sender, RoutedEventArgs e)
{ {
if (!expAccessLinks.IsExpanded) expAccessLinks.Height = double.NaN;
expAccessLinks.Height = double.NaN; SetButtonVisibilityToHidden();
} }
private void expExcludedPaths_Click(object sender, RoutedEventArgs e) private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
@ -161,6 +161,11 @@ namespace Flow.Launcher.Plugin.Explorer.Views
RefreshView(); RefreshView();
} }
private void expExcludedPaths_Collapsed(object sender, RoutedEventArgs e)
{
SetButtonVisibilityToHidden();
}
private void btnDelete_Click(object sender, RoutedEventArgs e) private void btnDelete_Click(object sender, RoutedEventArgs e)
{ {
var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink; var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
@ -309,6 +314,13 @@ namespace Flow.Launcher.Plugin.Explorer.Views
{ {
viewModel.OpenWindowsIndexingOptions(); viewModel.OpenWindowsIndexingOptions();
} }
public void SetButtonVisibilityToHidden()
{
btnDelete.Visibility = Visibility.Hidden;
btnEdit.Visibility = Visibility.Hidden;
btnAdd.Visibility = Visibility.Hidden;
}
} }
public class ActionKeywordView public class ActionKeywordView

54
Plugins/Flow.Launcher.Plugin.Shell/Main.cs
View file

@ -61,24 +61,26 @@ namespace Flow.Launcher.Plugin.Shell
if (basedir != null) if (basedir != null)
{ {
var autocomplete = Directory.GetFileSystemEntries(basedir). var autocomplete =
Select(o => dir + Path.GetFileName(o)). Directory.GetFileSystemEntries(basedir)
Where(o => o.StartsWith(cmd, StringComparison.OrdinalIgnoreCase) && .Select(o => dir + Path.GetFileName(o))
!results.Any(p => o.Equals(p.Title, StringComparison.OrdinalIgnoreCase)) && .Where(o => o.StartsWith(cmd, StringComparison.OrdinalIgnoreCase) &&
!results.Any(p => o.Equals(p.Title, StringComparison.OrdinalIgnoreCase))).ToList(); !results.Any(p => o.Equals(p.Title, StringComparison.OrdinalIgnoreCase)) &&
!results.Any(p => o.Equals(p.Title, StringComparison.OrdinalIgnoreCase))).ToList();
autocomplete.Sort(); autocomplete.Sort();
results.AddRange(autocomplete.ConvertAll(m => new Result results.AddRange(autocomplete.ConvertAll(m => new Result
{ {
Title = m, Title = m,
IcoPath = Image, IcoPath = Image,
Action = c => Action = c =>
{ {
var runAsAdministrator = ( var runAsAdministrator =
c.SpecialKeyState.CtrlPressed && c.SpecialKeyState.CtrlPressed &&
c.SpecialKeyState.ShiftPressed && c.SpecialKeyState.ShiftPressed &&
!c.SpecialKeyState.AltPressed && !c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed !c.SpecialKeyState.WinPressed;
);
Execute(Process.Start, PrepareProcessStartInfo(m, runAsAdministrator)); Execute(Process.Start, PrepareProcessStartInfo(m, runAsAdministrator));
return true; return true;
@ -113,12 +115,11 @@ namespace Flow.Launcher.Plugin.Shell
IcoPath = Image, IcoPath = Image,
Action = c => Action = c =>
{ {
var runAsAdministrator = ( var runAsAdministrator =
c.SpecialKeyState.CtrlPressed && c.SpecialKeyState.CtrlPressed &&
c.SpecialKeyState.ShiftPressed && c.SpecialKeyState.ShiftPressed &&
!c.SpecialKeyState.AltPressed && !c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed !c.SpecialKeyState.WinPressed;
);
Execute(Process.Start, PrepareProcessStartInfo(m.Key, runAsAdministrator)); Execute(Process.Start, PrepareProcessStartInfo(m.Key, runAsAdministrator));
return true; return true;
@ -143,12 +144,11 @@ namespace Flow.Launcher.Plugin.Shell
IcoPath = Image, IcoPath = Image,
Action = c => Action = c =>
{ {
var runAsAdministrator = ( var runAsAdministrator =
c.SpecialKeyState.CtrlPressed && c.SpecialKeyState.CtrlPressed &&
c.SpecialKeyState.ShiftPressed && c.SpecialKeyState.ShiftPressed &&
!c.SpecialKeyState.AltPressed && !c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed !c.SpecialKeyState.WinPressed;
);
Execute(Process.Start, PrepareProcessStartInfo(cmd, runAsAdministrator)); Execute(Process.Start, PrepareProcessStartInfo(cmd, runAsAdministrator));
return true; return true;
@ -168,12 +168,11 @@ namespace Flow.Launcher.Plugin.Shell
IcoPath = Image, IcoPath = Image,
Action = c => Action = c =>
{ {
var runAsAdministrator = ( var runAsAdministrator =
c.SpecialKeyState.CtrlPressed && c.SpecialKeyState.CtrlPressed &&
c.SpecialKeyState.ShiftPressed && c.SpecialKeyState.ShiftPressed &&
!c.SpecialKeyState.AltPressed && !c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed !c.SpecialKeyState.WinPressed;
);
Execute(Process.Start, PrepareProcessStartInfo(m.Key, runAsAdministrator)); Execute(Process.Start, PrepareProcessStartInfo(m.Key, runAsAdministrator));
return true; return true;
@ -203,8 +202,21 @@ namespace Flow.Launcher.Plugin.Shell
case Shell.Cmd: case Shell.Cmd:
{ {
info.FileName = "cmd.exe"; info.FileName = "cmd.exe";
info.ArgumentList.Add(_settings.LeaveShellOpen ? "/k" : "/c"); info.Arguments = $"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command}";
info.ArgumentList.Add(command);
//// Use info.Arguments instead of info.ArgumentList to enable users better control over the arguments they are writing.
//// Previous code using ArgumentList, commands needed to be seperated correctly:
//// Incorrect:
// info.ArgumentList.Add(_settings.LeaveShellOpen ? "/k" : "/c");
// info.ArgumentList.Add(command); //<== info.ArgumentList.Add("mkdir \"c:\\test new\"");
//// Correct version should be:
//info.ArgumentList.Add(_settings.LeaveShellOpen ? "/k" : "/c");
//info.ArgumentList.Add("mkdir");
//info.ArgumentList.Add(@"c:\test new");
//https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.processstartinfo.argumentlist?view=net-6.0#remarks
break; break;
} }
@ -366,7 +378,7 @@ namespace Flow.Launcher.Plugin.Shell
Title = context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_different_user"), Title = context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_different_user"),
Action = c => Action = c =>
{ {
Task.Run(() =>Execute(ShellCommand.RunAsDifferentUser, PrepareProcessStartInfo(selectedResult.Title))); Task.Run(() => Execute(ShellCommand.RunAsDifferentUser, PrepareProcessStartInfo(selectedResult.Title)));
return true; return true;
}, },
IcoPath = "Images/user.png" IcoPath = "Images/user.png"
@ -396,4 +408,4 @@ namespace Flow.Launcher.Plugin.Shell
return resultlist; return resultlist;
} }
} }
} }

2
Plugins/Flow.Launcher.Plugin.Shell/Settings.cs
View file

@ -6,7 +6,7 @@ namespace Flow.Launcher.Plugin.Shell
{ {
public Shell Shell { get; set; } = Shell.Cmd; public Shell Shell { get; set; } = Shell.Cmd;
public bool ReplaceWinR { get; set; } = true; public bool ReplaceWinR { get; set; } = false;
public bool LeaveShellOpen { get; set; } public bool LeaveShellOpen { get; set; }

4
Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/Resources.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -1206,7 +1206,7 @@
<value>Plugin to search for Windows settings</value> <value>Plugin to search for Windows settings</value>
</data> </data>
<data name="PluginTitle" xml:space="preserve"> <data name="PluginTitle" xml:space="preserve">
<value>Windows settings</value> <value>Windows Settings</value>
</data> </data>
<data name="PowerAndSleep" xml:space="preserve"> <data name="PowerAndSleep" xml:space="preserve">
<value>Power and sleep</value> <value>Power and sleep</value>

2
Scripts/post_build.ps1
View file

@ -71,7 +71,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
Write-Host "Packing: $spec" Write-Host "Packing: $spec"
Write-Host "Input path: $input" Write-Host "Input path: $input"
# making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced. # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\5.4.0\tools\NuGet.exe -Force New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\5.7.2\tools\NuGet.exe -Force
# dotnet pack is not used because ran into issues, need to test installation and starting up if to use it. # dotnet pack is not used because ran into issues, need to test installation and starting up if to use it.
nuget pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release nuget pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release

4
appveyor.yml
View file

@ -1,4 +1,4 @@
version: '1.9.3.{build}' version: '1.9.4.{build}'
init: init:
- ps: | - ps: |
@ -47,7 +47,7 @@ deploy:
- provider: NuGet - provider: NuGet
artifact: Plugin nupkg artifact: Plugin nupkg
api_key: api_key:
secure: M0FYTgnThhthw9FPAI51CR0l5/te1VSh914YbCtOfDTTLYgbA/Ii9R91sc5l5bAN secure: EwKxUgjI8VGouFq9fdhI68+uj42amAhwE65JixIbqx8VlqLbyEuW97CLjBBOIL0r
on: on:
APPVEYOR_REPO_TAG: true APPVEYOR_REPO_TAG: true