Skip to content

Release 1.14.0 #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
Mar 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
196c359
Add custom firefox browser location
VictoriousRaptor Feb 3, 2023
fe5da58
Use switch expression for loader
VictoriousRaptor Feb 3, 2023
c7f3283
Add UI to select browser engine
VictoriousRaptor Feb 3, 2023
b7e7217
Fix folder path
VictoriousRaptor Feb 3, 2023
a6d3aaf
Add Browser Engine header
VictoriousRaptor Feb 6, 2023
46c8dd8
Fix translation
VictoriousRaptor Feb 9, 2023
70015e2
Merge pull request #1892 from VictoriousRaptor/FixTranslation
VictoriousRaptor Feb 10, 2023
ef16484
Merge branch 'dev' into SelectBrowserCore
onesounds Feb 10, 2023
1c95033
Merge pull request #1875 from VictoriousRaptor/SelectBrowserCore
onesounds Feb 10, 2023
69f4960
- Change Singular Hotkey/Plugin title area to Plural (Hotkeys/Plugins)
onesounds Feb 10, 2023
a2fc7aa
- Change Theme (Sidebar and page title) to Appearance
onesounds Feb 10, 2023
c240f1e
- Added Guide Texts in CustomBrowsePopup
onesounds Feb 10, 2023
2809dd4
Bump FSharp.Core from 6.0.6 to 7.0.0 (#1807)
dependabot[bot] Feb 11, 2023
b2b22dc
Fix UseWindowsForms in csproj
onesounds Feb 11, 2023
083527e
add option for everything search in full path (default true)
taooceros Feb 11, 2023
43b5c06
Bump SharpZipLib from 1.4.1 to 1.4.2 (#1882)
dependabot[bot] Feb 11, 2023
dd61d19
Update desc
VictoriousRaptor Feb 11, 2023
ab0d624
Auto reload all bookmarks when finish editing
VictoriousRaptor Feb 11, 2023
2677c6e
Bump vedantmgoyal2009/winget-releaser from 1 to 2
dependabot[bot] Feb 13, 2023
39c4a2b
Auto reload bookmarks when editing checkboxes
VictoriousRaptor Feb 14, 2023
9b0cf20
update text
VictoriousRaptor Feb 14, 2023
6cfdc30
Merge branch 'dev' into GuideForBookmarkPlugin
onesounds Feb 15, 2023
d3025a6
Merge pull request #1897 from onesounds/GuideForBookmarkPlugin
VictoriousRaptor Feb 15, 2023
13ea226
Bump Microsoft.IO.RecyclableMemoryStream from 2.2.1 to 2.3.1 (#1903)
dependabot[bot] Feb 16, 2023
11573cf
New Crowdin updates (#1766)
jjw24 Feb 16, 2023
e662977
Merge pull request #1902 from Flow-Launcher/dependabot/github_actions…
jjw24 Feb 16, 2023
d87b5af
default false
taooceros Feb 20, 2023
73ba236
update option name
jjw24 Feb 20, 2023
3b05ee2
Merge pull request #1899 from Flow-Launcher/everything_full_path_option
jjw24 Feb 20, 2023
b2516ed
Merge pull request #1895 from onesounds/SingularTextToPlural
VictoriousRaptor Feb 21, 2023
343cdf2
Fix preview hotkey issue
VictoriousRaptor Feb 25, 2023
d227a0a
Fix Key.None logic
VictoriousRaptor Feb 25, 2023
0754568
update comment
jjw24 Feb 26, 2023
af2a194
update plugin version
jjw24 Feb 26, 2023
dbdd756
bump flow version
jjw24 Feb 26, 2023
f78ad1c
Merge pull request #1932 from VictoriousRaptor/FixPreviewHotkey
jjw24 Feb 27, 2023
9429efd
add sponsor
jjw24 Feb 28, 2023
76f12a4
Merge pull request #1941 from Flow-Launcher/add_sponsor
jjw24 Feb 28, 2023
08f250d
update translations from Crowdin
jjw24 Mar 1, 2023
ead2497
Merge pull request #1943 from Flow-Launcher/update_translation
VictoriousRaptor Mar 2, 2023
5dc55b0
update plugin versions
jjw24 Mar 2, 2023
720f88a
Merge pull request #1939 from Flow-Launcher/version_update
jjw24 Mar 2, 2023
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 .github/workflows/winget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
# Action can only be run on windows
runs-on: windows-latest
steps:
- uses: vedantmgoyal2009/winget-releaser@v1
- uses: vedantmgoyal2009/winget-releaser@v2
with:
identifier: Flow-Launcher.Flow-Launcher
token: ${{ secrets.WINGET_TOKEN }}
4 changes: 2 additions & 2 deletions Flow.Launcher.Core/Flow.Launcher.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@

<ItemGroup>
<PackageReference Include="Droplex" Version="1.6.0" />
<PackageReference Include="FSharp.Core" Version="6.0.6" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.1" />
<PackageReference Include="FSharp.Core" Version="7.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.1" />
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
</ItemGroup>

Expand Down
57 changes: 49 additions & 8 deletions Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Windows.Input;
using System.Windows.Navigation;

namespace Flow.Launcher.Infrastructure.Hotkey
{
Expand Down Expand Up @@ -99,7 +99,7 @@ private void Parse(string hotkeyString)
{
try
{
CharKey = (Key) Enum.Parse(typeof (Key), charKey);
CharKey = (Key)Enum.Parse(typeof(Key), charKey);
}
catch (ArgumentException)
{
Expand Down Expand Up @@ -137,8 +137,13 @@ public override string ToString()
}
return string.Join(" + ", keys);
}

public bool Validate()

/// <summary>
/// Validate hotkey
/// </summary>
/// <param name="validateKeyGestrue">Try to validate hotkey as a KeyGesture.</param>
/// <returns></returns>
public bool Validate(bool validateKeyGestrue = false)
{
switch (CharKey)
{
Expand All @@ -150,21 +155,57 @@ public bool Validate()
case Key.RightShift:
case Key.LWin:
case Key.RWin:
case Key.None:
return false;
default:
if (validateKeyGestrue)
{
try
{
KeyGesture keyGesture = new KeyGesture(CharKey, ModifierKeys);
}
catch (System.Exception e) when (e is NotSupportedException || e is InvalidEnumArgumentException)
{
return false;
}
}
if (ModifierKeys == ModifierKeys.None)
{
return !((CharKey >= Key.A && CharKey <= Key.Z) ||
(CharKey >= Key.D0 && CharKey <= Key.D9) ||
(CharKey >= Key.NumPad0 && CharKey <= Key.NumPad9));
return !IsPrintableCharacter(CharKey);
}
else
{
return CharKey != Key.None;
return true;
}
}
}

private static bool IsPrintableCharacter(Key key)
{
// https://stackoverflow.com/questions/11881199/identify-if-a-event-key-is-text-not-only-alphanumeric
return (key >= Key.A && key <= Key.Z) ||
(key >= Key.D0 && key <= Key.D9) ||
(key >= Key.NumPad0 && key <= Key.NumPad9) ||
key == Key.OemQuestion ||
key == Key.OemQuotes ||
key == Key.OemPlus ||
key == Key.OemOpenBrackets ||
key == Key.OemCloseBrackets ||
key == Key.OemMinus ||
key == Key.DeadCharProcessed ||
key == Key.Oem1 ||
key == Key.Oem7 ||
key == Key.OemPeriod ||
key == Key.OemComma ||
key == Key.OemMinus ||
key == Key.Add ||
key == Key.Divide ||
key == Key.Multiply ||
key == Key.Subtract ||
key == Key.Oem102 ||
key == Key.Decimal;
}

public override bool Equals(object obj)
{
if (obj is HotkeyModel other)
Expand Down
11 changes: 8 additions & 3 deletions Flow.Launcher/HotkeyControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ public partial class HotkeyControl : UserControl

public event EventHandler HotkeyChanged;

/// <summary>
/// Designed for Preview Hotkey and KeyGesture.
/// </summary>
public bool ValidateKeyGesture { get; set; } = false;

protected virtual void OnHotkeyChanged() => HotkeyChanged?.Invoke(this, EventArgs.Empty);

public HotkeyControl()
Expand Down Expand Up @@ -68,7 +73,7 @@ public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = tr

if (triggerValidate)
{
bool hotkeyAvailable = CheckHotkeyAvailability(keyModel);
bool hotkeyAvailable = CheckHotkeyAvailability(keyModel, ValidateKeyGesture);
CurrentHotkeyAvailable = hotkeyAvailable;
SetMessage(hotkeyAvailable);
OnHotkeyChanged();
Expand All @@ -91,13 +96,13 @@ public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = tr
CurrentHotkey = keyModel;
}
}

public Task SetHotkeyAsync(string keyStr, bool triggerValidate = true)
{
return SetHotkeyAsync(new HotkeyModel(keyStr), triggerValidate);
}

private static bool CheckHotkeyAvailability(HotkeyModel hotkey) => hotkey.Validate() && HotKeyMapper.CheckAvailability(hotkey);
private static bool CheckHotkeyAvailability(HotkeyModel hotkey, bool validateKeyGesture) => hotkey.Validate(validateKeyGesture) && HotKeyMapper.CheckAvailability(hotkey);

public new bool IsFocused => tbHotkey.IsFocused;

Expand Down
11 changes: 9 additions & 2 deletions Flow.Launcher/Languages/da.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<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">
<?xml version="1.0" ?>
<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">
<!-- MainWindow -->
<system:String x:Key="registerHotkeyFailed">Kunne ikke registrere genvejstast: {0}</system:String>
<system:String x:Key="couldnotStartCmd">Kunne ikke starte {0}</system:String>
Expand Down Expand Up @@ -80,6 +83,7 @@
<system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
<system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
<system:String x:Key="plugin">Plugin</system:String>
<system:String x:Key="plugins">Plugins</system:String>
<system:String x:Key="browserMorePlugins">Find flere plugins</system:String>
<system:String x:Key="enable">On</system:String>
<system:String x:Key="disable">Deaktiver</system:String>
Expand Down Expand Up @@ -120,6 +124,7 @@

<!-- Setting Theme -->
<system:String x:Key="theme">Tema</system:String>
<system:String x:Key="appearance">Appearance</system:String>
<system:String x:Key="browserMoreThemes">Søg efter flere temaer</system:String>
<system:String x:Key="howToCreateTheme">How to create a theme</system:String>
<system:String x:Key="hiThere">Hi There</system:String>
Expand Down Expand Up @@ -152,6 +157,7 @@

<!-- Setting Hotkey -->
<system:String x:Key="hotkey">Genvejstast</system:String>
<system:String x:Key="hotkeys">Genvejstast</system:String>
<system:String x:Key="flowlauncherHotkey">Flow Launcher genvejstast</system:String>
<system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
<system:String x:Key="previewHotkey">Preview Hotkey</system:String>
Expand All @@ -174,6 +180,7 @@
<system:String x:Key="deleteCustomHotkeyWarning">Er du sikker på du vil slette {0} plugin genvejstast?</system:String>
<system:String x:Key="deleteCustomShortcutWarning">Are you sure you want to delete shortcut: {0} with expansion {1}?</system:String>
<system:String x:Key="shortcut_clipboard_description">Get text from clipboard.</system:String>
<system:String x:Key="shortcut_active_explorer_path">Get path from active explorer.</system:String>
<system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
<system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU. Not recommended if your computer performance is limited.</system:String>
<system:String x:Key="windowWidthSize">Window Width Size</system:String>
Expand Down
4 changes: 4 additions & 0 deletions Flow.Launcher/Languages/de.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
<system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
<system:String x:Key="plugin">Erweiterung</system:String>
<system:String x:Key="plugins">Erweiterung</system:String>
<system:String x:Key="browserMorePlugins">Suche nach weiteren Plugins</system:String>
<system:String x:Key="enable">Aktivieren</system:String>
<system:String x:Key="disable">Deaktivieren</system:String>
Expand Down Expand Up @@ -120,6 +121,7 @@

<!-- Setting Theme -->
<system:String x:Key="theme">Design</system:String>
<system:String x:Key="appearance">Appearance</system:String>
<system:String x:Key="browserMoreThemes">Suche nach weiteren Themes</system:String>
<system:String x:Key="howToCreateTheme">Wie man ein Design erstellt</system:String>
<system:String x:Key="hiThere">Hallo!</system:String>
Expand Down Expand Up @@ -152,6 +154,7 @@

<!-- Setting Hotkey -->
<system:String x:Key="hotkey">Tastenkombination</system:String>
<system:String x:Key="hotkeys">Tastenkombination</system:String>
<system:String x:Key="flowlauncherHotkey">Flow Launcher Tastenkombination</system:String>
<system:String x:Key="flowlauncherHotkeyToolTip">Verknüpfung eingeben, um Flow Launcher anzuzeigen/auszublenden.</system:String>
<system:String x:Key="previewHotkey">Preview Hotkey</system:String>
Expand All @@ -174,6 +177,7 @@
<system:String x:Key="deleteCustomHotkeyWarning">Wollen Sie die {0} Plugin Tastenkombination wirklich löschen?</system:String>
<system:String x:Key="deleteCustomShortcutWarning">Are you sure you want to delete shortcut: {0} with expansion {1}?</system:String>
<system:String x:Key="shortcut_clipboard_description">Get text from clipboard.</system:String>
<system:String x:Key="shortcut_active_explorer_path">Get path from active explorer.</system:String>
<system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
<system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU. Not recommended if your computer performance is limited.</system:String>
<system:String x:Key="windowWidthSize">Window Width Size</system:String>
Expand Down
9 changes: 6 additions & 3 deletions Flow.Launcher/Languages/en.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
<system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
<system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
<system:String x:Key="plugin">Plugin</system:String>
<system:String x:Key="plugins">Plugins</system:String>
<system:String x:Key="browserMorePlugins">Find more plugins</system:String>
<system:String x:Key="enable">On</system:String>
<system:String x:Key="disable">Off</system:String>
Expand Down Expand Up @@ -122,6 +123,7 @@

<!-- Setting Theme -->
<system:String x:Key="theme">Theme</system:String>
<system:String x:Key="appearance">Appearance</system:String>
<system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
<system:String x:Key="howToCreateTheme">How to create a theme</system:String>
<system:String x:Key="hiThere">Hi There</system:String>
Expand Down Expand Up @@ -154,6 +156,7 @@

<!-- Setting Hotkey -->
<system:String x:Key="hotkey">Hotkey</system:String>
<system:String x:Key="hotkeys">Hotkeys</system:String>
<system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
<system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
<system:String x:Key="previewHotkey">Preview Hotkey</system:String>
Expand All @@ -162,9 +165,9 @@
<system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
<system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
<system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
<system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
<system:String x:Key="customQueryShortcut">Custom Query Shortcut</system:String>
<system:String x:Key="builtinShortcuts">Built-in Shortcut</system:String>
<system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>
<system:String x:Key="customQueryShortcut">Custom Query Shortcuts</system:String>
<system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
<system:String x:Key="customQuery">Query</system:String>
<system:String x:Key="customShortcut">Shortcut</system:String>
<system:String x:Key="customShortcutExpansion">Expansion</system:String>
Expand Down
6 changes: 5 additions & 1 deletion Flow.Launcher/Languages/es-419.xaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<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">
<!-- MainWindow -->
<system:String x:Key="registerHotkeyFailed">Error al registrar la tecla de acceso directo: {0}</system:String>
Expand Down Expand Up @@ -80,6 +80,7 @@
<system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
<system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
<system:String x:Key="plugin">Plugin</system:String>
<system:String x:Key="plugins">Plugins</system:String>
<system:String x:Key="browserMorePlugins">Encontrar más plugins</system:String>
<system:String x:Key="enable">Activado</system:String>
<system:String x:Key="disable">Desactivado</system:String>
Expand Down Expand Up @@ -120,6 +121,7 @@

<!-- Setting Theme -->
<system:String x:Key="theme">Tema</system:String>
<system:String x:Key="appearance">Appearance</system:String>
<system:String x:Key="browserMoreThemes">Galería de Temas</system:String>
<system:String x:Key="howToCreateTheme">Cómo crear un tema</system:String>
<system:String x:Key="hiThere">Hola</system:String>
Expand Down Expand Up @@ -152,6 +154,7 @@

<!-- Setting Hotkey -->
<system:String x:Key="hotkey">Tecla Rápida</system:String>
<system:String x:Key="hotkeys">Tecla Rápida</system:String>
<system:String x:Key="flowlauncherHotkey">Tecla de acceso a Flow Launcher</system:String>
<system:String x:Key="flowlauncherHotkeyToolTip">Introduzca el acceso directo para mostrar/ocultar Flow Launcher.</system:String>
<system:String x:Key="previewHotkey">Preview Hotkey</system:String>
Expand All @@ -174,6 +177,7 @@
<system:String x:Key="deleteCustomHotkeyWarning">¿Está seguro que desea eliminar la tecla de acceso directo del plugin {0}?</system:String>
<system:String x:Key="deleteCustomShortcutWarning">Are you sure you want to delete shortcut: {0} with expansion {1}?</system:String>
<system:String x:Key="shortcut_clipboard_description">Get text from clipboard.</system:String>
<system:String x:Key="shortcut_active_explorer_path">Get path from active explorer.</system:String>
<system:String x:Key="queryWindowShadowEffect">Efecto de sombra de ventana de búsqueda</system:String>
<system:String x:Key="shadowEffectCPUUsage">El efecto sombra tiene un uso sustancial de GPU. No se recomienda si el rendimiento de su computadora es limitado.</system:String>
<system:String x:Key="windowWidthSize">Tamaño de Ancho de Ventana</system:String>
Expand Down
Loading