Skip to content

Commit ebbf3fe

Browse files
jjw24jjw24
authored
Merge pull request #1639 from Flow-Launcher/dev
Release 1.10.1
2 parents 7effd44 + 9c369c4 commit ebbf3fe

File tree

47 files changed

+296
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+296
-197
lines changed

‎Flow.Launcher.Test/Plugins/ExplorerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void GivenWindowsIndexSearch_WhenSearchAllFoldersAndFiles_ThenQueryShould
116116
{
117117
// Given
118118
var queryConstructor = new QueryConstructor(new Settings());
119-
var baseQuery = queryConstructor.BaseQueryHelper;
119+
var baseQuery = queryConstructor.CreateBaseQuery();
120120

121121
// system running this test could have different locale than the hard-coded 1033 LCID en-US.
122122
var queryKeywordLocale = baseQuery.QueryKeywordLocale;

‎Flow.Launcher/Converters/OrdinalConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Globalization;
1+
using System.Globalization;
22
using System.Windows.Controls;
33
using System.Windows.Data;
44

‎Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9898
</PackageReference>
9999
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
100-
<PackageReference Include="SharpVectors" Version="1.7.6" />
100+
<PackageReference Include="SharpVectors" Version="1.8.1" />
101101
<PackageReference Include="VirtualizingWrapPanel" Version="1.5.7" />
102102
</ItemGroup>
103103

‎Flow.Launcher/Languages/de.xaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@
174174
<system:String x:Key="flowlauncherPressHotkey">Press Key</system:String>
175175

176176
<!-- Setting Proxy -->
177-
<system:String x:Key="proxy">HTTP Proxy</system:String>
177+
<system:String x:Key="proxy">HTTP-Proxy</system:String>
178178
<system:String x:Key="enableProxy">Aktiviere HTTP Proxy</system:String>
179-
<system:String x:Key="server">HTTP Server</system:String>
179+
<system:String x:Key="server">HTTP-Server</system:String>
180180
<system:String x:Key="port">Port</system:String>
181181
<system:String x:Key="userName">Benutzername</system:String>
182182
<system:String x:Key="password">Passwort</system:String>
@@ -191,9 +191,9 @@
191191

192192
<!-- Setting About -->
193193
<system:String x:Key="about">Über</system:String>
194-
<system:String x:Key="website">Website</system:String>
194+
<system:String x:Key="website">Webseite</system:String>
195195
<system:String x:Key="github">Github</system:String>
196-
<system:String x:Key="docs">Docs</system:String>
196+
<system:String x:Key="docs">Dokumentation</system:String>
197197
<system:String x:Key="version">Version</system:String>
198198
<system:String x:Key="icons">Icons</system:String>
199199
<system:String x:Key="about_activate_times">Sie haben Flow Launcher {0} mal aktiviert</system:String>
@@ -218,24 +218,24 @@
218218
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>
219219
<system:String x:Key="fileManager_tips">Please specify the file location of the file manager you using and add arguments if necessary. The default arguments are &quot;%d&quot;, and a path is entered at that location. For example, If a command is required such as &quot;totalcmd.exe /A c:\windows&quot;, argument is /A &quot;%d&quot;.</system:String>
220220
<system:String x:Key="fileManager_tips2">&quot;%f&quot; is an argument that represent the file path. It is used to emphasize the file/folder name when opening a specific file location in 3rd party file manager. This argument is only available in the &quot;Arg for File&quot; item. If the file manager does not have that function, you can use &quot;%d&quot;.</system:String>
221-
<system:String x:Key="fileManager_name">File Manager</system:String>
222-
<system:String x:Key="fileManager_profile_name">Profile Name</system:String>
221+
<system:String x:Key="fileManager_name">Datei-Manager</system:String>
222+
<system:String x:Key="fileManager_profile_name">Profilname</system:String>
223223
<system:String x:Key="fileManager_path">File Manager Path</system:String>
224224
<system:String x:Key="fileManager_directory_arg">Arg For Folder</system:String>
225225
<system:String x:Key="fileManager_file_arg">Arg For File</system:String>
226226

227227
<!-- DefaultBrowser Setting Dialog -->
228-
<system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
228+
<system:String x:Key="defaultBrowserTitle">Standard-Webbrowser</system:String>
229229
<system:String x:Key="defaultBrowser_tips">The default setting follows the OS default browser setting. If specified separately, flow uses that browser.</system:String>
230230
<system:String x:Key="defaultBrowser_name">Browser</system:String>
231231
<system:String x:Key="defaultBrowser_profile_name">Browser-Name</system:String>
232-
<system:String x:Key="defaultBrowser_path">Browser Path</system:String>
232+
<system:String x:Key="defaultBrowser_path">Browserpfad</system:String>
233233
<system:String x:Key="defaultBrowser_newWindow">New Window</system:String>
234234
<system:String x:Key="defaultBrowser_newTab">New Tab</system:String>
235-
<system:String x:Key="defaultBrowser_parameter">Private Mode</system:String>
235+
<system:String x:Key="defaultBrowser_parameter">Privater Modus</system:String>
236236

237237
<!-- Priority Setting Dialog -->
238-
<system:String x:Key="changePriorityWindow">Change Priority</system:String>
238+
<system:String x:Key="changePriorityWindow">Priorität ändern</system:String>
239239
<system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
240240
<system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
241241

‎Flow.Launcher/Languages/es.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<system:String x:Key="querySearchPrecisionToolTip">Cambia la puntuación mínima requerida para la coincidencia de los resultados.</system:String>
6464
<system:String x:Key="ShouldUsePinyin">Buscar con Pinyin</system:String>
6565
<system:String x:Key="ShouldUsePinyinToolTip">Permite utilizar Pinyin para la búsqueda. Pinyin es el sistema estándar de ortografía romanizado para traducir chino.</system:String>
66-
<system:String x:Key="AlwaysPreview">Always Preview</system:String>
67-
<system:String x:Key="AlwaysPreviewToolTip">Always open preview panel when Flow starts. Press F1 to toggle preview. </system:String>
66+
<system:String x:Key="AlwaysPreview">Mostrar siempre vista previa</system:String>
67+
<system:String x:Key="AlwaysPreviewToolTip">Muestra siempre el panel de vista previa al iniciar Flow. Pulse F1 para mostrar/ocultar la vista previa. </system:String>
6868
<system:String x:Key="shadowEffectNotAllowed">El efecto de sombra no está permitido mientras el tema actual tenga el efecto de desenfoque activado</system:String>
6969

7070
<!-- Setting Plugin -->

‎Flow.Launcher/Languages/pt-br.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<system:String x:Key="iconTraySettings">Configurações</system:String>
1313
<system:String x:Key="iconTrayAbout">Sobre</system:String>
1414
<system:String x:Key="iconTrayExit">Sair</system:String>
15-
<system:String x:Key="closeWindow">Close</system:String>
15+
<system:String x:Key="closeWindow">Fechar</system:String>
1616
<system:String x:Key="copy">Copy</system:String>
17-
<system:String x:Key="cut">Cut</system:String>
18-
<system:String x:Key="paste">Paste</system:String>
17+
<system:String x:Key="cut">Cortar</system:String>
18+
<system:String x:Key="paste">Colar</system:String>
1919
<system:String x:Key="fileTitle">File</system:String>
2020
<system:String x:Key="folderTitle">Folder</system:String>
2121
<system:String x:Key="textTitle">Text</system:String>
22-
<system:String x:Key="GameMode">Game Mode</system:String>
22+
<system:String x:Key="GameMode">Modo Gamer</system:String>
2323
<system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>
2424
<system:String x:Key="PositionReset">Position Reset</system:String>
2525
<system:String x:Key="PositionResetToolTip">Reset search window position</system:String>

‎Flow.Launcher/MainWindow.xaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,20 @@
284284
</Canvas>
285285
</Grid>
286286
</Border>
287+
<Line
288+
x:Name="ProgressBar"
289+
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}, Path=ActualWidth}"
290+
Height="2"
291+
Margin="12,0,12,0"
292+
HorizontalAlignment="Center"
293+
VerticalAlignment="Bottom"
294+
StrokeThickness="2"
295+
Style="{DynamicResource PendingLineStyle}"
296+
Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
297+
X1="-100"
298+
X2="0"
299+
Y1="0"
300+
Y2="0" />
287301
</Grid>
288302

289303
<Grid ClipToBounds="True">
@@ -310,18 +324,7 @@
310324
HorizontalAlignment="Stretch"
311325
Style="{DynamicResource SeparatorStyle}" />
312326
</ContentControl>
313-
<Line
314-
x:Name="ProgressBar"
315-
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}, Path=ActualWidth}"
316-
Height="2"
317-
HorizontalAlignment="Right"
318-
StrokeThickness="1"
319-
Style="{DynamicResource PendingLineStyle}"
320-
Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
321-
X1="-150"
322-
X2="-50"
323-
Y1="0"
324-
Y2="0" />
327+
325328
</Grid>
326329
<Grid>
327330
<Grid.ColumnDefinitions>

‎Flow.Launcher/MainWindow.xaml.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,15 +361,13 @@ private async void PositionReset()
361361
}
362362
private void InitProgressbarAnimation()
363363
{
364-
var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150,
365-
new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
366-
var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 50, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
364+
var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
365+
var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
367366
Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)"));
368367
Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)"));
369368
_progressBarStoryboard.Children.Add(da);
370369
_progressBarStoryboard.Children.Add(da1);
371370
_progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever;
372-
373371
_viewModel.ProgressBarVisibility = Visibility.Hidden;
374372
isProgressBarStoryboardPaused = true;
375373
}

‎Flow.Launcher/ResultListBox.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
99
MaxHeight="{Binding MaxHeight}"
10-
Margin="{DynamicResource ResultMargin}"
1110
HorizontalContentAlignment="Stretch"
1211
d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
1312
d:DesignHeight="100"

‎Flow.Launcher/Themes/Base.xaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,9 @@
248248
<Setter Property="Background" Value="Transparent" />
249249
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
250250
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
251-
<Setter Property="Margin" Value="0,0,0,0" />
251+
<Setter Property="Margin" Value="{DynamicResource ResultMargin}" />
252252
<Setter Property="Padding" Value="0,0,0,0" />
253+
253254
<Setter Property="Template">
254255
<Setter.Value>
255256
<ControlTemplate TargetType="ListBox">
@@ -273,6 +274,11 @@
273274
</ControlTemplate>
274275
</Setter.Value>
275276
</Setter>
277+
<Style.Triggers>
278+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Items.Count}" Value="0">
279+
<Setter Property="Margin" Value="0" />
280+
</DataTrigger>
281+
</Style.Triggers>
276282
</Style>
277283

278284
<!-- ScrollViewer Style -->
@@ -360,8 +366,7 @@
360366
<Style.Triggers>
361367
<MultiDataTrigger>
362368
<MultiDataTrigger.Conditions>
363-
<Condition Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
364-
<Condition Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Collapsed" />
369+
<Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
365370
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
366371
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
367372
</MultiDataTrigger.Conditions>
@@ -446,15 +451,16 @@
446451
<Style.Triggers>
447452
<MultiDataTrigger>
448453
<MultiDataTrigger.Conditions>
454+
<!--
449455
<Condition Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Collapsed" />
450456
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
451-
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
457+
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />-->
458+
<Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
452459
</MultiDataTrigger.Conditions>
453460
<MultiDataTrigger.Setters>
454461
<Setter Property="Height" Value="0" />
455462
</MultiDataTrigger.Setters>
456463
</MultiDataTrigger>
457-
458464
</Style.Triggers>
459465
</Style>
460466
<!-- for classic themes -->

0 commit comments

Comments
 (0)