prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into PluginSearchTextBox

Browse source
This commit is contained in:
DB p 2021-12-20 02:50:29 +09:00
commit 919ea0d3b3
6 changed files with 113 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
Flow.Launcher/CustomQueryHotkeySetting.xaml
View file

@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:flowlauncher="clr-namespace:Flow.Launcher" xmlns:flowlauncher="clr-namespace:Flow.Launcher"
Title="{DynamicResource customeQueryHotkeyTitle}" Title="{DynamicResource customeQueryHotkeyTitle}"
Width="500" Width="530"
Background="{DynamicResource PopuBGColor}" Background="{DynamicResource PopuBGColor}"
Foreground="{DynamicResource PopupTextColor}" Foreground="{DynamicResource PopupTextColor}"
Icon="Images\app.png" Icon="Images\app.png"
@ -79,56 +79,74 @@
</StackPanel> </StackPanel>
<StackPanel Margin="0,20,0,0" Orientation="Horizontal"> <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
<TextBlock <Grid>
Grid.Row="0" <Grid.RowDefinitions>
Grid.Column="0" <RowDefinition />
Width="60" <RowDefinition />
Margin="10" </Grid.RowDefinitions>
HorizontalAlignment="Left" <Grid.ColumnDefinitions>
VerticalAlignment="Center" <ColumnDefinition />
FontSize="14" <ColumnDefinition />
Text="{DynamicResource hotkey}" /> </Grid.ColumnDefinitions>
<flowlauncher:HotkeyControl <TextBlock
x:Name="ctlHotkey" Grid.Row="0"
Grid.Column="1" Grid.Column="0"
Width="200" Width="Auto"
Height="34" MinWidth="110"
Margin="10,0,10,0" Margin="10"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left" /> FontSize="14"
<TextBlock Text="{DynamicResource hotkey}" />
Grid.Row="1" <StackPanel
Grid.Column="0" Grid.Row="0"
Margin="10" Grid.Column="1"
HorizontalAlignment="Left" Orientation="Horizontal">
VerticalAlignment="Center" <flowlauncher:HotkeyControl
FontSize="14" x:Name="ctlHotkey"
Text="{DynamicResource actionKeyword}" /> Grid.Column="1"
</StackPanel> Width="200"
Height="34"
<StackPanel Margin="0,0,0,0" Orientation="Horizontal"> Margin="10,0,10,0"
<TextBlock HorizontalAlignment="Left"
Grid.Row="0" VerticalAlignment="Center"
Grid.Column="0" HorizontalContentAlignment="Left" />
Width="60" <TextBlock
Margin="10" Grid.Row="1"
HorizontalAlignment="Left" Grid.Column="0"
VerticalAlignment="Center" Margin="10"
FontSize="14" HorizontalAlignment="Left"
Text="{DynamicResource customQuery}" /> VerticalAlignment="Center"
<TextBox FontSize="14"
x:Name="tbAction" Text="{DynamicResource actionKeyword}" />
Width="250" </StackPanel>
Margin="10" <TextBlock
HorizontalAlignment="Left" Grid.Row="1"
VerticalAlignment="Center" /> Grid.Column="0"
<Button Width="Auto"
x:Name="btnTestActionKeyword" MinWidth="110"
Height="30" Margin="10"
Padding="10,5,10,5" HorizontalAlignment="Left"
Click="BtnTestActionKeyword_OnClick" VerticalAlignment="Center"
Content="{DynamicResource preview}" /> FontSize="14"
Text="{DynamicResource customQuery}" />
<StackPanel
Grid.Row="1"
Grid.Column="1"
Orientation="Horizontal">
<TextBox
x:Name="tbAction"
MinWidth="220"
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Center" />
<Button
x:Name="btnTestActionKeyword"
Padding="10,5,10,5"
Click="BtnTestActionKeyword_OnClick"
Content="{DynamicResource preview}" />
</StackPanel>
</Grid>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -151,7 +169,8 @@
Width="100" Width="100"
Height="32" Height="32"
Margin="5,0,10,0" Margin="5,0,10,0"
Click="btnAdd_OnClick"> Click="btnAdd_OnClick"
Style="{StaticResource AccentButtonStyle}">
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" /> <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
</Button> </Button>
</StackPanel> </StackPanel>

1
Flow.Launcher/Languages/en.xaml
View file

@ -267,6 +267,7 @@
<system:String x:Key="HotkeyCtrlShiftEnterDesc">Run as Admin</system:String> <system:String x:Key="HotkeyCtrlShiftEnterDesc">Run as Admin</system:String>
<system:String x:Key="HotkeyCtrlHDesc">Query History</system:String> <system:String x:Key="HotkeyCtrlHDesc">Query History</system:String>
<system:String x:Key="HotkeyESCDesc">Back to Result in Context Menu</system:String> <system:String x:Key="HotkeyESCDesc">Back to Result in Context Menu</system:String>
<system:String x:Key="HotkeyTabDesc">Autocomplete</system:String>
<system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String> <system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String>
<system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String> <system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
<system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String> <system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String>

1
Flow.Launcher/PriorityChangeWindow.xaml
View file

@ -90,7 +90,6 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
CornerRadius="4" CornerRadius="4"
Minimum="0"
SmallChange="1" SmallChange="1"
SpinButtonPlacementMode="Inline" /> SpinButtonPlacementMode="Inline" />
</StackPanel> </StackPanel>

26
Flow.Launcher/Resources/Pages/WelcomePage3.xaml
View file

@ -4,14 +4,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages" xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage3" Title="WelcomePage3"
mc:Ignorable="d"> mc:Ignorable="d">
<Page.Resources> <Page.Resources>
<Style x:Key="KbdLine" TargetType="Border"> <Style x:Key="KbdLine" TargetType="Border">
<Setter Property="CornerRadius" Value="8" /> <Setter Property="CornerRadius" Value="8" />
<Setter Property="Margin" Value="0,4,0,4" /> <Setter Property="Margin" Value="0,3,0,3" />
<Setter Property="Background" Value="{DynamicResource Color01B}" /> <Setter Property="Background" Value="{DynamicResource Color01B}" />
</Style> </Style>
<Style x:Key="Kbd" TargetType="Border"> <Style x:Key="Kbd" TargetType="Border">
@ -60,7 +60,7 @@
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="Auto">
<Grid> <Grid>
<StackPanel Margin="24,20,24,20"> <StackPanel Margin="24,20,24,20">
<StackPanel Margin="0,0,0,20"> <StackPanel Margin="0,0,0,10">
<TextBlock <TextBlock
FontSize="20" FontSize="20"
FontWeight="SemiBold" FontWeight="SemiBold"
@ -155,6 +155,26 @@
</StackPanel> </StackPanel>
</Border> </Border>
<Border Style="{DynamicResource KbdLine}">
<StackPanel Orientation="Horizontal">
<StackPanel
Width="210"
Margin="20,5,4,5"
VerticalAlignment="Center"
Orientation="Horizontal">
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="Tab" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyTabDesc}" />
</StackPanel>
</StackPanel>
</Border>
<Border Style="{DynamicResource KbdLine}"> <Border Style="{DynamicResource KbdLine}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel <StackPanel

2
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -302,7 +302,7 @@ namespace Flow.Launcher
private void OpenWelcomeWindow(object sender, RoutedEventArgs e) private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
{ {
var WelcomeWindow = new WelcomeWindow(settings); var WelcomeWindow = new WelcomeWindow(settings);
WelcomeWindow.Show(); WelcomeWindow.ShowDialog();
} }
private void OpenLogFolder(object sender, RoutedEventArgs e) private void OpenLogFolder(object sender, RoutedEventArgs e)
{ {

33
Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
View file

@ -1,20 +1,21 @@
<UserControl x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings" <UserControl
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450"
<Grid Margin="70 15 0 15"> d:DesignWidth="800"
mc:Ignorable="d">
<Grid Margin="70,15,0,15">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/> <ColumnDefinition Width="400" />
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox
<TextBlock Grid.Column="0" Grid.Column="0"
Text="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}" Padding="8,0,0,0"
VerticalAlignment="Center" Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
FontSize="14"/> IsChecked="{Binding WarnFromUnknownSource}" />
<CheckBox Grid.Column="1" IsChecked="{Binding WarnFromUnknownSource}" />
</Grid> </Grid>
</UserControl> </UserControl>