Skip to content

Commit 522d7de

Browse files
dcog989dcog989
authored
Merge branch 'dev' into Fix-'100%-CPU'-BrowserBookmark-issue
2 parents 7084d5a + 3c7f85e commit 522d7de

34 files changed

+222
-181
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
4+
<!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
5+
<CETCompat>false</CETCompat>
46
</PropertyGroup>
57
</Project>

‎Flow.Launcher/Flow.Launcher.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136

137137
<Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
138138
<!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
139-
140139
<ItemGroup>
141140
<FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
142141
<Analyzer Remove="@(Analyzer)" />

‎Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
FontSize="14"
123123
ItemContainerStyle="{StaticResource PluginList}"
124124
ItemsSource="{Binding Source={StaticResource PluginCollectionView}}"
125+
Loaded="PluginListBox_Loaded"
125126
ScrollViewer.CanContentScroll="False"
126127
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
127128
SnapsToDevicePixels="True"

‎Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System.ComponentModel;
2+
using System.Windows;
3+
using System.Windows.Controls;
24
using System.Windows.Data;
35
using System.Windows.Input;
46
using System.Windows.Navigation;
@@ -33,6 +35,14 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
3335
base.OnNavigatedTo(e);
3436
}
3537

38+
private void PluginListBox_Loaded(object sender, RoutedEventArgs e)
39+
{
40+
// After list is loaded, we need to clear selection to make sure all items can be mouse hovered
41+
// because the selected item cannot be hovered.
42+
if (sender is not ListBox listBox) return;
43+
listBox.SelectedIndex = -1;
44+
}
45+
3646
private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
3747
{
3848
if (e.PropertyName == nameof(SettingsPanePluginsViewModel.FilterText))

‎Plugins/Flow.Launcher.Plugin.Calculator/Languages/ar.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">آلة حاسبة</system:String>
5-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">تمكنك من إجراء العمليات الحسابية. (جرب 5*3-2 في Flow Launcher)</system:String>
4+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_name">آلة حاسبة</system:String>
5+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_description">تمكنك من إجراء العمليات الحسابية. (جرب 5*3-2 في Flow Launcher)</system:String>
66
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">ليست رقمًا (NaN)</system:String>
77
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">التعبير خاطئ أو غير مكتمل (هل نسيت بعض الأقواس؟)</system:String>
88
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">نسخ هذا الرقم إلى الحافظة</system:String>

‎Plugins/Flow.Launcher.Plugin.Calculator/Languages/cs.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Kalkulačka</system:String>
5-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Umožňuje provádět matematické výpočty.(Try 5*3-2 v průtokovém spouštěči)</system:String>
4+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_name">Kalkulačka</system:String>
5+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Umožňuje provádět matematické výpočty.(Try 5*3-2 v průtokovém spouštěči)</system:String>
66
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Není číslo (NaN)</system:String>
77
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Nesprávný nebo neúplný výraz (Nezapomněli jste na závorky?)</system:String>
88
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Kopírování výsledku do schránky</system:String>

‎Plugins/Flow.Launcher.Plugin.Calculator/Languages/da.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Calculator</system:String>
5-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Flow Launcher)</system:String>
4+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_name">Calculator</system:String>
5+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Flow Launcher)</system:String>
66
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Not a number (NaN)</system:String>
77
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Expression wrong or incomplete (Did you forget some parentheses?)</system:String>
88
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Copy this number to the clipboard</system:String>

‎Plugins/Flow.Launcher.Plugin.Calculator/Languages/de.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Rechner</system:String>
5-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Ermöglicht mathematische Berechnungen. (Versuchen Sie 5*3-2 in Flow Launcher)</system:String>
4+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_name">Rechner</system:String>
5+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Ermöglicht mathematische Berechnungen. (Versuchen Sie 5*3-2 in Flow Launcher)</system:String>
66
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Nicht eine Zahl (NaN)</system:String>
77
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Ausdruck falsch oder unvollständig (Haben Sie einige Klammern vergessen?)</system:String>
88
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Diese Zahl in die Zwischenablage kopieren</system:String>

‎Plugins/Flow.Launcher.Plugin.Calculator/Languages/en.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:system="clr-namespace:System;assembly=mscorlib">
55

6-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Calculator</system:String>
7-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Flow Launcher)</system:String>
6+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_name">Calculator</system:String>
7+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Perform mathematical calculations (including hexadecimal values). Use ',' or '.' as thousand separator or decimal place.</system:String>
88
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Not a number (NaN)</system:String>
99
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Expression wrong or incomplete (Did you forget some parentheses?)</system:String>
1010
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Copy this number to the clipboard</system:String>

‎Plugins/Flow.Launcher.Plugin.Calculator/Languages/es-419.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Calculadora</system:String>
5-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Permite hacer cálculos matemáticos. (Pruebe con 5*3-2 en Flow Launcher)</system:String>
4+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_name">Calculadora</system:String>
5+
<system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Permite hacer cálculos matemáticos. (Pruebe con 5*3-2 en Flow Launcher)</system:String>
66
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">No es un número (NaN)</system:String>
77
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Expresión incorrecta o incompleta (¿Olvidó algún paréntesis?)</system:String>
88
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Copiar este número al portapapeles</system:String>

0 commit comments

Comments
 (0)