diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml index 9d032efd9..32892768d 100644 --- a/Flow.Launcher/ActionKeywords.xaml +++ b/Flow.Launcher/ActionKeywords.xaml @@ -1,13 +1,54 @@ + Height="365" Width="450" Background="#F3F3F3" BorderBrush="#cecece"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml index a97f90733..23bd89906 100644 --- a/Flow.Launcher/CustomQueryHotkeySetting.xaml +++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml @@ -5,7 +5,8 @@ Icon="Images\app.png" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" - Title="{DynamicResource customeQueryHotkeyTitle}" Height="200" Width="674.766"> + MouseDown="window_MouseDown" + Title="{DynamicResource customeQueryHotkeyTitle}" Height="345" Width="500" Background="#F3F3F3" BorderBrush="#cecece"> @@ -15,29 +16,42 @@ - - + - - - - - - + + + + + + + + + - - - - diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs index b18bbcfad..0109474e1 100644 --- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs +++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs @@ -7,6 +7,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Windows; using System.Windows.Input; +using System.Windows.Controls; namespace Flow.Launcher { @@ -99,5 +100,15 @@ namespace Flow.Launcher { Close(); } + + private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */ + { + TextBox textBox = Keyboard.FocusedElement as TextBox; + if (textBox != null) + { + TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next); + textBox.MoveFocus(tRequest); + } + } } } diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml index ab786fd56..285a282ef 100644 --- a/Flow.Launcher/HotkeyControl.xaml +++ b/Flow.Launcher/HotkeyControl.xaml @@ -9,11 +9,18 @@ d:DesignHeight="300" d:DesignWidth="300"> - - + - - + + + + press key + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 051891a2b..d1dcf14d3 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -49,6 +49,7 @@ Find more plugins On Off + Action keyword Setting Action keyword Current action keyword: New action keyword: @@ -68,7 +69,8 @@ Theme - Browse for more themes + Theme Gallery + How to create a theme Hi There Query Box Font Result Item Font @@ -145,10 +147,11 @@ This new Action Keyword is already assigned to another plugin, please choose a different one Success Completed successfully - Use * if you don't want to specify an action keyword + Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords. - Custom Plugin Hotkey + Custom Query Hotkey + Press the custom hotkey to automatically insert the specified query. Preview Hotkey is unavailable, please select a new hotkey Invalid plugin hotkey diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml index 60a289e61..fbf4394f7 100644 --- a/Flow.Launcher/PriorityChangeWindow.xaml +++ b/Flow.Launcher/PriorityChangeWindow.xaml @@ -6,52 +6,45 @@ xmlns:local="clr-namespace:Flow.Launcher" Loaded="PriorityChangeWindow_Loaded" mc:Ignorable="d" + ResizeMode="NoResize" WindowStartupLocation="CenterScreen" - Title="{DynamicResource changePriorityWindow}" Height="400" Width="350" ResizeMode="NoResize" Background="#f3f3f3"> + Title="{DynamicResource changePriorityWindow}" Height="365" Width="350" Background="#F3F3F3" BorderBrush="#cecece"> - - - - - - - -  - - - - - - - - + + + + + + + + + + + - - + - - + - - - - + + + + - - - - - diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index ac6138644..88a9172b0 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -19,6 +19,7 @@ Height="700" Width="1000" MinWidth="900" MinHeight="600" + MouseDown="window_MouseDown" Loaded="OnLoaded" Closed="OnClosed" d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"> @@ -645,6 +646,7 @@ - + @@ -1582,4 +1584,4 @@ - \ No newline at end of file + diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index 0431c9c78..203248ad6 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -281,5 +281,15 @@ namespace Flow.Launcher API.ShowMainWindow(); } } + + private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */ + { + TextBox textBox = Keyboard.FocusedElement as TextBox; + if (textBox != null) + { + TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next); + textBox.MoveFocus(tRequest); + } + } } } \ No newline at end of file diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index dde540b0c..bfaddb701 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -272,7 +272,7 @@ namespace Flow.Launcher.ViewModel #region theme - public static string Theme => @"http://www.wox.one/theme/builder"; + public static string Theme => @"https://flow-launcher.github.io/docs/#/how-to-create-a-theme"; public string SelectedTheme { diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png new file mode 100644 index 000000000..9d702bcae Binary files /dev/null and b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png differ diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png new file mode 100644 index 000000000..682c005d2 Binary files /dev/null and b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png differ diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml index cc137c3dc..632b6d3a3 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml @@ -2,6 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"> + Search Source Setting Open search in: New Window New Tab @@ -14,9 +15,14 @@ Action Keyword URL Search - Search suggestions + Use Search Query Autocomplete: + Autocomplete Data from: Please select a web search Are you sure you want to delete {0}? + If you have a web search service you want to use, you can add it to Flow. For example, you can follow the url format in the address bar if you want to search 'casino' on Netflix: "https://www.netflix.com/search?q=Casino". To do this, change the search term 'Casino' as follows. + https://www.netflix.com/search?q={q} + Add it to the URL section below. You can now search Netflix with Flow using any search terms. + Title diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml index 02809be3a..fbf12a6b5 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml @@ -4,59 +4,71 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch" - mc:Ignorable="d" - ResizeMode="NoResize" + mc:Ignorable="d" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" - Title="Search Source Setting" Height="400" Width="500" - d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}"> + Title="{DynamicResource flowlauncher_plugin_websearch_window_title}" Height="590" Width="550" + d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}" Background="#F3F3F3" BorderBrush="#cecece"> - - - - - + - - - - - - - - - - - - - - - - - - - -