Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Commit 5f575a3

Browse files
taoocerostaooceros
committed
Merge remote-tracking branch 'origin/master' into 1.9Upgrade
2 parents 49a20c7 + 15967b6 commit 5f575a3

2 files changed

Lines changed: 82 additions & 40 deletions

File tree

‎EverythingSettings.xaml‎

Lines changed: 81 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,102 @@
1-
<UserControl x:Class="Flow.Launcher.Plugin.Everything.EverythingSettings"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:helper="clr-namespace:Flow.Launcher.Plugin.Everything.Helper"
7-
xmlns:vm="clr-namespace:Flow.Launcher.Plugin.Everything.ViewModels"
8-
mc:Ignorable="d"
9-
Loaded="View_Loaded"
10-
d:DesignHeight="300" d:DesignWidth="426.4">
11-
<Grid Margin="7,50" VerticalAlignment="Top" >
1+
<UserControl
2+
x:Class="Flow.Launcher.Plugin.Everything.EverythingSettings"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:helper="clr-namespace:Flow.Launcher.Plugin.Everything.Helper"
7+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
d:DesignHeight="300"
9+
d:DesignWidth="426.4"
10+
Loaded="View_Loaded"
11+
mc:Ignorable="d">
12+
<Grid Margin="60,10,0,15" VerticalAlignment="Top">
1213
<Grid.RowDefinitions>
13-
<RowDefinition/>
14-
<RowDefinition/>
15-
<RowDefinition/>
16-
<RowDefinition Height="50"/>
14+
<RowDefinition />
15+
<RowDefinition />
16+
<RowDefinition />
17+
<RowDefinition />
18+
<RowDefinition Height="Auto" />
1719
</Grid.RowDefinitions>
1820
<Grid.ColumnDefinitions>
1921
<ColumnDefinition />
20-
<ColumnDefinition />
22+
<ColumnDefinition Width="2*" />
2123
<ColumnDefinition />
2224
</Grid.ColumnDefinitions>
2325
<Grid.Resources>
24-
<helper:EnumNameConverter x:Key="enumNameConverter"/>
26+
<helper:EnumNameConverter x:Key="enumNameConverter" />
2527
</Grid.Resources>
26-
<CheckBox Grid.Row="0" Grid.ColumnSpan="3" x:Name="UseLocationAsWorkingDir" Content="{DynamicResource
27-
flowlauncher_plugin_everything_use_location_as_working_dir}"
28-
Margin="10" HorizontalAlignment="Left" />
29-
<CheckBox Grid.Row="1" Grid.ColumnSpan="3" x:Name="LaunchHidden" Content="{DynamicResource flowlauncher_plugin_everything_launch_hidden}"
30-
Margin="10" HorizontalAlignment="Left" />
28+
<CheckBox
29+
x:Name="UseLocationAsWorkingDir"
30+
Grid.Row="0"
31+
Grid.ColumnSpan="3"
32+
Margin="10,6,18,6"
33+
HorizontalAlignment="Left"
34+
Content="{DynamicResource flowlauncher_plugin_everything_use_location_as_working_dir}" />
35+
<CheckBox
36+
x:Name="LaunchHidden"
37+
Grid.Row="1"
38+
Grid.ColumnSpan="3"
39+
Margin="10,6,18,6"
40+
HorizontalAlignment="Left"
41+
Content="{DynamicResource flowlauncher_plugin_everything_launch_hidden}" />
3142

32-
<Label Grid.Row="2" Margin="10" Content="{DynamicResource flowlauncher_plugin_everything_editor_path}"
33-
HorizontalAlignment="Left"/>
34-
<Label Grid.Row="2" Grid.Column="1" x:Name="EditorPath" Margin="10" HorizontalAlignment="Left" />
35-
<Button Grid.Row="2" Grid.Column="2" x:Name="OpenEditorPath" Content="..." Margin="10"
36-
HorizontalAlignment="Left" Click="EditorPath_Clicked"/>
37-
<TextBlock Margin="10 15 10 10" Text="{DynamicResource flowlauncher_plugin_everything_sort_by}" Grid.Row="3"/>
43+
<Label
44+
Grid.Row="2"
45+
Margin="10,6,6,6"
46+
HorizontalAlignment="Left"
47+
VerticalAlignment="Center"
48+
Content="{DynamicResource flowlauncher_plugin_everything_editor_path}" />
49+
<Label
50+
x:Name="EditorPath"
51+
Grid.Row="2"
52+
Grid.Column="1"
53+
Margin="10"
54+
HorizontalAlignment="Left"
55+
VerticalAlignment="Center" />
56+
<Button
57+
x:Name="OpenEditorPath"
58+
Grid.Row="2"
59+
Grid.Column="2"
60+
MinWidth="80"
61+
Margin="10"
62+
HorizontalAlignment="Left"
63+
Click="EditorPath_Clicked"
64+
Content="..." />
65+
<TextBlock
66+
Grid.Row="3"
67+
Margin="10"
68+
VerticalAlignment="Center"
69+
Text="{DynamicResource flowlauncher_plugin_everything_sort_by}" />
3870

39-
<ComboBox Grid.Row="3"
40-
Grid.Column="1"
41-
Width="200"
42-
Margin="0 10 0 0"
43-
SelectedItem="{Binding SortOption}"
71+
<ComboBox
72+
Grid.Row="3"
73+
Grid.Column="1"
74+
Width="200"
75+
Margin="10"
76+
ItemsSource="{Binding GetSortOptions, Mode=OneWay}"
77+
SelectedItem="{Binding SortOption}"
78+
SelectionChanged="onSelectionChange">
4479
ItemsSource="{Binding GetSortOptions, Mode=OneWay}"
45-
SelectionChanged="onSelectionChange" d:DataContext="{d:DesignInstance vm:SettingsViewModel}">
4680
<ComboBox.ItemTemplate>
4781
<DataTemplate>
4882
<Grid>
49-
<TextBlock Text="{Binding Converter={StaticResource enumNameConverter}}"/>
83+
<TextBlock Text="{Binding Converter={StaticResource enumNameConverter}}" />
5084
</Grid>
5185
</DataTemplate>
5286
</ComboBox.ItemTemplate>
5387
</ComboBox>
5488

55-
<TextBlock Name ="tbFastSortWarning" Grid.Row="4" Grid.Column="2" Margin="10 5 10 0" TextAlignment="Left"
56-
Text="{Binding GetSortOptionWarningMessage}"
57-
Visibility ="{Binding FastSortWarningVisibility}"
58-
Foreground="Orange" TextWrapping="Wrap" />
89+
<TextBlock
90+
Name="tbFastSortWarning"
91+
Grid.Row="4"
92+
Grid.Column="0"
93+
Grid.ColumnSpan="3"
94+
Margin="10,20,10,20"
95+
VerticalAlignment="Center"
96+
Foreground="Orange"
97+
Text="{Binding GetSortOptionWarningMessage}"
98+
TextAlignment="Left"
99+
TextWrapping="Wrap"
100+
Visibility="{Binding FastSortWarningVisibility}" />
59101
</Grid>
60102
</UserControl>

‎ViewModels/SettingsViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public Visibility FastSortWarningVisibility
2424
{
2525
try
2626
{
27-
return api.IsFastSortOption(settings.SortOption) ? Visibility.Hidden : Visibility.Visible;
27+
return api.IsFastSortOption(settings.SortOption) ? Visibility.Collapsed : Visibility.Visible;
2828
}
2929
catch (IPCErrorException)
3030
{

0 commit comments

Comments
 (0)