Merge pull request #3059 from Flow-Launcher/dev

Release 1.19.4

Author: jjw24

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

@@ -54,7 +54,7 @@
 
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.7.0" />
-    <PackageReference Include="FSharp.Core" Version="8.0.301" />
+    <PackageReference Include="FSharp.Core" Version="8.0.401" />
     <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -4,8 +4,15 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin;
+using CheckBox = System.Windows.Controls.CheckBox;
+using ComboBox = System.Windows.Controls.ComboBox;
+using Control = System.Windows.Controls.Control;
+using Orientation = System.Windows.Controls.Orientation;
+using TextBox = System.Windows.Controls.TextBox;
+using UserControl = System.Windows.Controls.UserControl;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -224,6 +231,7 @@ public Control CreateSettingPanel()
                         break;
                     }
                     case "inputWithFileBtn":
+                    case "inputWithFolderBtn":
                     {
                         var textBox = new TextBox()
                         {
@@ -243,6 +251,24 @@ public Control CreateSettingPanel()
                             Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
                         };
 
+                        Btn.Click += (_, _) =>
+                        {
+                            using CommonDialog dialog = type switch
+                            {
+                                "inputWithFolderBtn" => new FolderBrowserDialog(),
+                                _ => new OpenFileDialog(),
+                            };
+                            if (dialog.ShowDialog() != DialogResult.OK) return;
+
+                            var path = dialog switch
+                            {
+                                FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
+                                OpenFileDialog fileDialog => fileDialog.FileName,
+                            };
+                            textBox.Text = path;
+                            Settings[attribute.Name] = path;
+                        };
+
                         var dockPanel = new DockPanel() { Margin = settingControlMargin };
 
                         DockPanel.SetDock(Btn, Dock.Right);

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

@@ -67,7 +67,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
   </ItemGroup>
 

Flow.Launcher/Flow.Launcher.csproj

@@ -96,7 +96,7 @@
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0-beta2" />
-    <PackageReference Include="VirtualizingWrapPanel" Version="2.0.11" />
+    <PackageReference Include="VirtualizingWrapPanel" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher/Languages/de.xaml

@@ -163,7 +163,7 @@
     <system:String x:Key="resultItemFont">Resultaat titel lettertype</system:String>
     <system:String x:Key="resultSubItemFont">Result Subtitle Font</system:String>
     <system:String x:Key="resetCustomize">Herstellen</system:String>
-    <system:String x:Key="CustomizeToolTip">Customize</system:String>
+    <system:String x:Key="CustomizeToolTip">Aanpassen</system:String>
     <system:String x:Key="windowMode">Venster Modus</system:String>
     <system:String x:Key="opacity">Ondoorzichtigheid</system:String>
     <system:String x:Key="theme_load_failure_path_not_exists">Thema {0} bestaat niet, terugvallen op het standaardthema</system:String>
@@ -183,13 +183,13 @@
     <system:String x:Key="AnimationTip">Animatie gebruiken in UI</system:String>
     <system:String x:Key="AnimationSpeed">Animation Speed</system:String>
     <system:String x:Key="AnimationSpeedTip">The speed of the UI animation</system:String>
-    <system:String x:Key="AnimationSpeedSlow">Slow</system:String>
-    <system:String x:Key="AnimationSpeedMedium">Medium</system:String>
-    <system:String x:Key="AnimationSpeedFast">Fast</system:String>
-    <system:String x:Key="AnimationSpeedCustom">Custom</system:String>
-    <system:String x:Key="Clock">Clock</system:String>
-    <system:String x:Key="Date">Date</system:String>
-    <system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
+    <system:String x:Key="AnimationSpeedSlow">Langzaam</system:String>
+    <system:String x:Key="AnimationSpeedMedium">Normaal</system:String>
+    <system:String x:Key="AnimationSpeedFast">Snel</system:String>
+    <system:String x:Key="AnimationSpeedCustom">Aangepast</system:String>
+    <system:String x:Key="Clock">Klok</system:String>
+    <system:String x:Key="Date">Datum</system:String>
+    <system:String x:Key="TypeIsDarkToolTip">Dit thema ondersteunt twee (licht/donker) modi.</system:String>
     <system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
 
 
@@ -200,30 +200,30 @@
     <system:String x:Key="flowlauncherHotkeyToolTip">Voer snelkoppeling in om Flow Launcher te tonen/verbergen.</system:String>
     <system:String x:Key="previewHotkey">Toggle Preview</system:String>
     <system:String x:Key="previewHotkeyToolTip">Enter shortcut to show/hide preview in search window.</system:String>
-    <system:String x:Key="hotkeyPresets">Hotkey Presets</system:String>
-    <system:String x:Key="hotkeyPresetsToolTip">List of currently registered hotkeys</system:String>
+    <system:String x:Key="hotkeyPresets">Sneltoets voorinstellingen</system:String>
+    <system:String x:Key="hotkeyPresetsToolTip">Lijst met momenteel geregistreerde sneltoetsen</system:String>
     <system:String x:Key="openResultModifiers">Open resultaatmodificatoren</system:String>
     <system:String x:Key="openResultModifiersToolTip">Kies een aanpassingstoets om het geselecteerde resultaat te openen via het toetsenbord.</system:String>
     <system:String x:Key="showOpenResultHotkey">Sneltoets weergeven</system:String>
     <system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
-    <system:String x:Key="autoCompleteHotkey">Auto Complete</system:String>
-    <system:String x:Key="autoCompleteHotkeyToolTip">Runs autocomplete for the selected items.</system:String>
-    <system:String x:Key="SelectNextItemHotkey">Select Next Item</system:String>
-    <system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
-    <system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
-    <system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
+    <system:String x:Key="autoCompleteHotkey">Automatisch Aanvullen</system:String>
+    <system:String x:Key="autoCompleteHotkeyToolTip">Voert automatisch aanvullen uit voor de geselecteerde items.</system:String>
+    <system:String x:Key="SelectNextItemHotkey">Selecteer Volgend Item</system:String>
+    <system:String x:Key="SelectPrevItemHotkey">Selecteer Vorig Item</system:String>
+    <system:String x:Key="SelectNextPageHotkey">Volgende Pagina</system:String>
+    <system:String x:Key="SelectPrevPageHotkey">Vorige Pagina</system:String>
     <system:String x:Key="CycleHistoryUpHotkey">Ga naar vorige zoekopdracht</system:String>
     <system:String x:Key="CycleHistoryDownHotkey">Ga naar volgende zoekopdracht</system:String>
-    <system:String x:Key="OpenContextMenuHotkey">Open Context Menu</system:String>
-    <system:String x:Key="OpenNativeContextMenuHotkey">Open Native Context Menu</system:String>
-    <system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
-    <system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
+    <system:String x:Key="OpenContextMenuHotkey">Open Contextmenu</system:String>
+    <system:String x:Key="OpenNativeContextMenuHotkey">Open Origineel Contextmenu</system:String>
+    <system:String x:Key="SettingWindowHotkey">Open Instellingenvenster</system:String>
+    <system:String x:Key="CopyFilePathHotkey">Kopieer Bestandspad</system:String>
     <system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
     <system:String x:Key="ToggleHistoryHotkey">Toggle History</system:String>
     <system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</system:String>
-    <system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
-    <system:String x:Key="RequeryHotkey">Refresh Search Results</system:String>
-    <system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
+    <system:String x:Key="RunAsAdminHotkey">Uitvoeren Als Administrator</system:String>
+    <system:String x:Key="RequeryHotkey">Vernieuw Zoekresultaten</system:String>
+    <system:String x:Key="ReloadPluginHotkey">Herlaad Gegevens Plugins</system:String>
     <system:String x:Key="QuickWidthHotkey">Snel vensterbreedte aanpassen</system:String>
     <system:String x:Key="QuickHeightHotkey">Snel vensterhoogte aanpassen</system:String>
     <system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>

Flow.Launcher/Languages/nb.xaml

@@ -12,8 +12,8 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_newTab">Neuer Tab</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath">Browser aus Pfad festlegen:</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_choose">Wählen</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_title">Kopiere Url</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_subtitle">Die Url des Lesezeichens in die Zwischenablage kopieren</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_title">URL kopieren</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_subtitle">URL des Lesezeichens in Zwischenablage kopieren</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom">Browser laden aus:</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Browser-Name</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory">URL des Lesezeichens in Zwischenablage kopieren</system:String>

Flow.Launcher/Languages/nl.xaml

@@ -21,8 +21,8 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_editBrowserBookmark">Rediger</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Slett</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browseBrowserBookmark">Bla</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_others">Others</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
-    <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>
-    <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>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_others">Andre</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Nettlesermotor</system:String>
+    <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>
+    <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>
 </ResourceDictionary>

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

@@ -4,7 +4,7 @@
   "Name": "Browser Bookmarks",
   "Description": "Search your browser bookmarks",
   "Author": "qianlifeng, Ioannis G.",
-  "Version": "3.3.2",
+  "Version": "3.3.3",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",