Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b5fbc82
Bump FSharp.Core from 8.0.301 to 8.0.401
dependabot[bot] Oct 21, 2024
89836cb
Bump System.Data.OleDb from 8.0.0 to 8.0.1
dependabot[bot] Oct 21, 2024
c927709
Merge pull request #3039 from Flow-Launcher/dependabot/nuget/FSharp.C…
jjw24 Oct 22, 2024
009f71a
Merge pull request #3040 from Flow-Launcher/dependabot/nuget/System.D…
jjw24 Oct 22, 2024
ae26cf4
Bump VirtualizingWrapPanel from 2.0.11 to 2.0.12
dependabot[bot] Oct 28, 2024
7237c1b
Bump JetBrains.Annotations from 2024.2.0 to 2024.3.0
dependabot[bot] Oct 28, 2024
a9da2af
fix out of index error when install source is not standard github link
taooceros Oct 29, 2024
350423b
Merge pull request #3054 from Flow-Launcher/fix-install-source-author
jjw24 Oct 31, 2024
e77fab0
Merge pull request #3052 from Flow-Launcher/dependabot/nuget/Virtuali…
jjw24 Nov 1, 2024
943425b
Merge pull request #3053 from Flow-Launcher/dependabot/nuget/JetBrain…
jjw24 Nov 1, 2024
6604710
Fix `inputWithFileBtn` not working in SettingsTemplate.yml
Yusyuriv Nov 3, 2024
1bdfc30
Add `using` when creating a file/folder dialog
Yusyuriv Nov 3, 2024
0cfea2e
Merge pull request #3057 from Flow-Launcher/fix-input-with-button-for…
Yusyuriv Nov 4, 2024
2b2fbd0
Bump VirtualizingWrapPanel from 2.0.12 to 2.1.0
dependabot[bot] Nov 4, 2024
ecfbf32
New Crowdin updates (#3034)
jjw24 Nov 5, 2024
f7a1ec0
Merge branch 'dev' into dependabot/nuget/VirtualizingWrapPanel-2.1.0
jjw24 Nov 5, 2024
56f2c8c
Merge pull request #3058 from Flow-Launcher/dependabot/nuget/Virtuali…
jjw24 Nov 5, 2024
b6e198c
version bump
jjw24 Nov 5, 2024
1bbc104
version bump plugins
jjw24 Nov 5, 2024
50c00f3
Merge pull request #3060 from Flow-Launcher/bump_versions
jjw24 Nov 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Flow.Launcher.Core/Flow.Launcher.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
26 changes: 26 additions & 0 deletions Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -224,6 +231,7 @@ public Control CreateSettingPanel()
break;
}
case "inputWithFileBtn":
case "inputWithFolderBtn":
{
var textBox = new TextBox()
{
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/Flow.Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
136 changes: 68 additions & 68 deletions Flow.Launcher/Languages/de.xaml

Large diffs are not rendered by default.

320 changes: 160 additions & 160 deletions Flow.Launcher/Languages/nb.xaml

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions Flow.Launcher/Languages/nl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>


Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 6 additions & 6 deletions Plugins/Flow.Launcher.Plugin.Calculator/Languages/de.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<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">

<system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Rechner</system:String>
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Stellt mathematische Berechnungen bereit.(Versuche 5*3-2 in Flow Launcher)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Keine Zahl (NaN)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Ausdruck falsch oder nicht vollständig (Klammern vergessen?)</system:String>
<system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Ermöglicht mathematische Berechnungen (z. B. 5*3-2 in Flow Launcher)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Nicht eine Zahl (NaN)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Ausdruck falsch oder unvollständig (Haben Sie einige Klammern vergessen?)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Diese Zahl in die Zwischenablage kopieren</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator">Dezimaltrennzeichen</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator_help">Das Dezimaltrennzeichen, welches bei der Ausgabe verwendet werden soll.</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_use_system_locale">Systemeinstellung nutzen</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator_help">Das Dezimaltrennzeichen, das in der Ausgabe verwendet werden soll.</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_use_system_locale">Systemgebietsschema verwenden</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_comma">Komma (,)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_dot">Punkt (.)</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. Nachkommastellen</system:String>
<system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. Dezimalstellen</system:String>
</ResourceDictionary>
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
</ItemGroup>
Expand Down
Loading
Loading