Skip to content

Commit aa8f472

Browse files
jjw24jjw24
authored
Merge pull request #3059 from Flow-Launcher/dev
Release 1.19.4
2 parents c4afeab + 50c00f3 commit aa8f472

File tree

39 files changed

+1102
-1071
lines changed

39 files changed

+1102
-1071
lines changed

‎Flow.Launcher.Core/Flow.Launcher.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<ItemGroup>
5656
<PackageReference Include="Droplex" Version="1.7.0" />
57-
<PackageReference Include="FSharp.Core" Version="8.0.301" />
57+
<PackageReference Include="FSharp.Core" Version="8.0.401" />
5858
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
5959
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
6060
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />

‎Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@
44
using System.Windows;
55
using System.Windows.Controls;
66
using System.Windows.Documents;
7+
using System.Windows.Forms;
78
using Flow.Launcher.Infrastructure.Storage;
89
using Flow.Launcher.Plugin;
10+
using CheckBox = System.Windows.Controls.CheckBox;
11+
using ComboBox = System.Windows.Controls.ComboBox;
12+
using Control = System.Windows.Controls.Control;
13+
using Orientation = System.Windows.Controls.Orientation;
14+
using TextBox = System.Windows.Controls.TextBox;
15+
using UserControl = System.Windows.Controls.UserControl;
916

1017
namespace Flow.Launcher.Core.Plugin
1118
{
@@ -224,6 +231,7 @@ public Control CreateSettingPanel()
224231
break;
225232
}
226233
case "inputWithFileBtn":
234+
case "inputWithFolderBtn":
227235
{
228236
var textBox = new TextBox()
229237
{
@@ -243,6 +251,24 @@ public Control CreateSettingPanel()
243251
Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
244252
};
245253

254+
Btn.Click += (_, _) =>
255+
{
256+
using CommonDialog dialog = type switch
257+
{
258+
"inputWithFolderBtn" => new FolderBrowserDialog(),
259+
_ => new OpenFileDialog(),
260+
};
261+
if (dialog.ShowDialog() != DialogResult.OK) return;
262+
263+
var path = dialog switch
264+
{
265+
FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
266+
OpenFileDialog fileDialog => fileDialog.FileName,
267+
};
268+
textBox.Text = path;
269+
Settings[attribute.Name] = path;
270+
};
271+
246272
var dockPanel = new DockPanel() { Margin = settingControlMargin };
247273

248274
DockPanel.SetDock(Btn, Dock.Right);

‎Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6868
</PackageReference>
6969
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
70-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
70+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
7171
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
7272
</ItemGroup>
7373

‎Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
9797
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
9898
<PackageReference Include="SemanticVersioning" Version="3.0.0-beta2" />
99-
<PackageReference Include="VirtualizingWrapPanel" Version="2.0.11" />
99+
<PackageReference Include="VirtualizingWrapPanel" Version="2.1.0" />
100100
</ItemGroup>
101101

102102
<ItemGroup>

‎Flow.Launcher/Languages/de.xaml

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎Flow.Launcher/Languages/nb.xaml

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

‎Flow.Launcher/Languages/nl.xaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
<system:String x:Key="resultItemFont">Resultaat titel lettertype</system:String>
164164
<system:String x:Key="resultSubItemFont">Result Subtitle Font</system:String>
165165
<system:String x:Key="resetCustomize">Herstellen</system:String>
166-
<system:String x:Key="CustomizeToolTip">Customize</system:String>
166+
<system:String x:Key="CustomizeToolTip">Aanpassen</system:String>
167167
<system:String x:Key="windowMode">Venster Modus</system:String>
168168
<system:String x:Key="opacity">Ondoorzichtigheid</system:String>
169169
<system:String x:Key="theme_load_failure_path_not_exists">Thema {0} bestaat niet, terugvallen op het standaardthema</system:String>
@@ -183,13 +183,13 @@
183183
<system:String x:Key="AnimationTip">Animatie gebruiken in UI</system:String>
184184
<system:String x:Key="AnimationSpeed">Animation Speed</system:String>
185185
<system:String x:Key="AnimationSpeedTip">The speed of the UI animation</system:String>
186-
<system:String x:Key="AnimationSpeedSlow">Slow</system:String>
187-
<system:String x:Key="AnimationSpeedMedium">Medium</system:String>
188-
<system:String x:Key="AnimationSpeedFast">Fast</system:String>
189-
<system:String x:Key="AnimationSpeedCustom">Custom</system:String>
190-
<system:String x:Key="Clock">Clock</system:String>
191-
<system:String x:Key="Date">Date</system:String>
192-
<system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
186+
<system:String x:Key="AnimationSpeedSlow">Langzaam</system:String>
187+
<system:String x:Key="AnimationSpeedMedium">Normaal</system:String>
188+
<system:String x:Key="AnimationSpeedFast">Snel</system:String>
189+
<system:String x:Key="AnimationSpeedCustom">Aangepast</system:String>
190+
<system:String x:Key="Clock">Klok</system:String>
191+
<system:String x:Key="Date">Datum</system:String>
192+
<system:String x:Key="TypeIsDarkToolTip">Dit thema ondersteunt twee (licht/donker) modi.</system:String>
193193
<system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
194194

195195

@@ -200,30 +200,30 @@
200200
<system:String x:Key="flowlauncherHotkeyToolTip">Voer snelkoppeling in om Flow Launcher te tonen/verbergen.</system:String>
201201
<system:String x:Key="previewHotkey">Toggle Preview</system:String>
202202
<system:String x:Key="previewHotkeyToolTip">Enter shortcut to show/hide preview in search window.</system:String>
203-
<system:String x:Key="hotkeyPresets">Hotkey Presets</system:String>
204-
<system:String x:Key="hotkeyPresetsToolTip">List of currently registered hotkeys</system:String>
203+
<system:String x:Key="hotkeyPresets">Sneltoets voorinstellingen</system:String>
204+
<system:String x:Key="hotkeyPresetsToolTip">Lijst met momenteel geregistreerde sneltoetsen</system:String>
205205
<system:String x:Key="openResultModifiers">Open resultaatmodificatoren</system:String>
206206
<system:String x:Key="openResultModifiersToolTip">Kies een aanpassingstoets om het geselecteerde resultaat te openen via het toetsenbord.</system:String>
207207
<system:String x:Key="showOpenResultHotkey">Sneltoets weergeven</system:String>
208208
<system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
209-
<system:String x:Key="autoCompleteHotkey">Auto Complete</system:String>
210-
<system:String x:Key="autoCompleteHotkeyToolTip">Runs autocomplete for the selected items.</system:String>
211-
<system:String x:Key="SelectNextItemHotkey">Select Next Item</system:String>
212-
<system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
213-
<system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
214-
<system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
209+
<system:String x:Key="autoCompleteHotkey">Automatisch Aanvullen</system:String>
210+
<system:String x:Key="autoCompleteHotkeyToolTip">Voert automatisch aanvullen uit voor de geselecteerde items.</system:String>
211+
<system:String x:Key="SelectNextItemHotkey">Selecteer Volgend Item</system:String>
212+
<system:String x:Key="SelectPrevItemHotkey">Selecteer Vorig Item</system:String>
213+
<system:String x:Key="SelectNextPageHotkey">Volgende Pagina</system:String>
214+
<system:String x:Key="SelectPrevPageHotkey">Vorige Pagina</system:String>
215215
<system:String x:Key="CycleHistoryUpHotkey">Ga naar vorige zoekopdracht</system:String>
216216
<system:String x:Key="CycleHistoryDownHotkey">Ga naar volgende zoekopdracht</system:String>
217-
<system:String x:Key="OpenContextMenuHotkey">Open Context Menu</system:String>
218-
<system:String x:Key="OpenNativeContextMenuHotkey">Open Native Context Menu</system:String>
219-
<system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
220-
<system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
217+
<system:String x:Key="OpenContextMenuHotkey">Open Contextmenu</system:String>
218+
<system:String x:Key="OpenNativeContextMenuHotkey">Open Origineel Contextmenu</system:String>
219+
<system:String x:Key="SettingWindowHotkey">Open Instellingenvenster</system:String>
220+
<system:String x:Key="CopyFilePathHotkey">Kopieer Bestandspad</system:String>
221221
<system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
222222
<system:String x:Key="ToggleHistoryHotkey">Toggle History</system:String>
223223
<system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</system:String>
224-
<system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
225-
<system:String x:Key="RequeryHotkey">Refresh Search Results</system:String>
226-
<system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
224+
<system:String x:Key="RunAsAdminHotkey">Uitvoeren Als Administrator</system:String>
225+
<system:String x:Key="RequeryHotkey">Vernieuw Zoekresultaten</system:String>
226+
<system:String x:Key="ReloadPluginHotkey">Herlaad Gegevens Plugins</system:String>
227227
<system:String x:Key="QuickWidthHotkey">Snel vensterbreedte aanpassen</system:String>
228228
<system:String x:Key="QuickHeightHotkey">Snel vensterhoogte aanpassen</system:String>
229229
<system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<system:String x:Key="flowlauncher_plugin_browserbookmark_settings_newTab">Neuer Tab</system:String>
1313
<system:String x:Key="flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath">Browser aus Pfad festlegen:</system:String>
1414
<system:String x:Key="flowlauncher_plugin_browserbookmark_settings_choose">Wählen</system:String>
15-
<system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_title">Kopiere Url</system:String>
16-
<system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_subtitle">Die Url des Lesezeichens in die Zwischenablage kopieren</system:String>
15+
<system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_title">URL kopieren</system:String>
16+
<system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_subtitle">URL des Lesezeichens in Zwischenablage kopieren</system:String>
1717
<system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom">Browser laden aus:</system:String>
1818
<system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Browser-Name</system:String>
1919
<system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory">URL des Lesezeichens in Zwischenablage kopieren</system:String>

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/nb.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<system:String x:Key="flowlauncher_plugin_browserbookmark_editBrowserBookmark">Rediger</system:String>
2222
<system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Slett</system:String>
2323
<system:String x:Key="flowlauncher_plugin_browserbookmark_browseBrowserBookmark">Bla</system:String>
24-
<system:String x:Key="flowlauncher_plugin_browserbookmark_others">Others</system:String>
25-
<system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
26-
<system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are not using Chrome, Firefox or Edge, or you are using their portable version, you need to add bookmarks data directory and select correct browser engine to make this plugin work.</system:String>
27-
<system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmarks data location is: &quot;%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData&quot;. For Firefox engine, the bookmarks directory is the userdata folder contains the places.sqlite file.</system:String>
24+
<system:String x:Key="flowlauncher_plugin_browserbookmark_others">Andre</system:String>
25+
<system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Nettlesermotor</system:String>
26+
<system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">Hvis du ikke bruker Chrome, Firefox eller Edge, eller hvis du bruker den bærbare versjonen, må du legge til bokmerkedatakatalog og velge riktig nettlesermotor for å få dette programtillegget til å fungere.</system:String>
27+
<system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For eksempel: Brave's motor er Chromium; og standardplasseringen av bokmerker er: &quot;%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData&quot;. For Firefox-motoren er bokmerkekatalogen brukerdatamappen som inneholder places.sqlite-filen.</system:String>
2828
</ResourceDictionary>

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Browser Bookmarks",
55
"Description": "Search your browser bookmarks",
66
"Author": "qianlifeng, Ioannis G.",
7-
"Version": "3.3.2",
7+
"Version": "3.3.3",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
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

44
<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Rechner</system:String>
5-
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Stellt mathematische Berechnungen bereit.(Versuche 5*3-2 in Flow Launcher)</system:String>
6-
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Keine Zahl (NaN)</system:String>
7-
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Ausdruck falsch oder nicht vollständig (Klammern vergessen?)</system:String>
5+
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Ermöglicht mathematische Berechnungen (z. B. 5*3-2 in Flow Launcher)</system:String>
6+
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Nicht eine Zahl (NaN)</system:String>
7+
<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>
99
<system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator">Dezimaltrennzeichen</system:String>
10-
<system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator_help">Das Dezimaltrennzeichen, welches bei der Ausgabe verwendet werden soll.</system:String>
11-
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_use_system_locale">Systemeinstellung nutzen</system:String>
10+
<system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator_help">Das Dezimaltrennzeichen, das in der Ausgabe verwendet werden soll.</system:String>
11+
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_use_system_locale">Systemgebietsschema verwenden</system:String>
1212
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_comma">Komma (,)</system:String>
1313
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_dot">Punkt (.)</system:String>
14-
<system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. Nachkommastellen</system:String>
14+
<system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. Dezimalstellen</system:String>
1515
</ResourceDictionary>

‎Plugins/Flow.Launcher.Plugin.Calculator/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Calculator",
55
"Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
66
"Author": "cxfksword",
7-
"Version": "3.1.3",
7+
"Version": "3.1.4",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.Calculator.dll",

‎Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
48+
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
4949
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
5050
<PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
5151
</ItemGroup>

0 commit comments

Comments
 (0)