Change page image

Add Hotkey List
Add Recommend queris
This commit is contained in:
DB p 2021-12-01 10:27:46 +09:00
parent 39b626749c
commit fb60c5bd74
5 changed files with 300 additions and 139 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -238,28 +238,22 @@
<system:String x:Key="Welcome_Page1_Text02">Before starting, proceed with a simple setting. Surely, You can skip. Please choose the language you use.</system:String>
<system:String x:Key="Welcome_Page2_Title">Search and run everything in everywhere</system:String>
<system:String x:Key="Welcome_Page2_Text01">To start Flow, start with the hotkey below. To change, select input and press the wanted hotkey in keyboard.</system:String>
<system:String x:Key="Welcome_Page3_Title">Hotkeys and Commands</system:String>
<system:String x:Key="Welcome_Page4_Title">Action Keyword</system:String>
<system:String x:Key="Welcome_Page4_Text01">You can search the web or run various functions. Certain functions start with the expression action keyword, and if necessary, they can be used without action keywords. Type &quot;youtube bts&quot; in querybox.</system:String>
<system:String x:Key="Welcome_Page3_Title">Hotkeys</system:String>
<system:String x:Key="Welcome_Page4_Title">Action Keyword and Commands</system:String>
<system:String x:Key="Welcome_Page4_Text01">You can search the web or run various functions. Certain functions start with the expression action keyword, and if necessary, they can be used without action keywords. Try these queries in Flow Launcher.</system:String>
<system:String x:Key="Welcome_Page5_Title">Let's Start Flow Launcher</system:String>
<system:String x:Key="Welcome_Page5_Text01">Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)</system:String>
<!-- General Guide & Hotkey -->
<system:String x:Key="Hotkey01">U+2B60, U+2B62</system:String>
<system:String x:Key="Hotkey01Action">Back / Context Menu</system:String>
<system:String x:Key="Hotkey02">U+2B61, U+2B63</system:String>
<system:String x:Key="Hotkey02Action">Item Navigation</system:String>
<system:String x:Key="Hotkey03">Shift+Enter</system:String>
<system:String x:Key="Hotkey03Action">Open Context Menu</system:String>
<system:String x:Key="Hotkey04">Ctrl+Enter</system:String>
<system:String x:Key="Hotkey04Action">Open Contaning Folder</system:String>
<system:String x:Key="Hotkey05">Ctrl+Shift+Enter</system:String>
<system:String x:Key="Hotkey05Action">Run as Admin</system:String>
<system:String x:Key="Hotkey06">Ctrl+C</system:String>
<system:String x:Key="Hotkey06Action">Copy File Path</system:String>
<system:String x:Key="Hotkey07">Ctrl+H</system:String>
<system:String x:Key="Hotkey07Action">Query History</system:String>
<system:String x:Key="Hotkey08">ESC</system:String>
<system:String x:Key="Hotkey08Action">Back to Result in Context Menu</system:String>
<system:String x:Key="HotkeyUpDownDesc">Back / Context Menu</system:String>
<system:String x:Key="HotkeyLeftRightDesc">Item Navigation</system:String>
<system:String x:Key="HotkeyShiftEnterDesc">Open Context Menu</system:String>
<system:String x:Key="HotkeyCtrlEnterDesc">Open Contaning Folder</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="HotkeyESCDesc">Back to Result in Context Menu</system:String>
<system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String>
<system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
</ResourceDictionary>

View file

@ -10,68 +10,23 @@
d:DesignWidth="800"
mc:Ignorable="d">
<Page.Resources>
<Style x:Key="HotKeyPopupListStyle" TargetType="{x:Type ListBoxItem}">
<Setter Property="Focusable" Value="False" />
<Setter Property="IsHitTestVisible" Value="False" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Border Padding="14,8,4,8">
<DockPanel LastChildFill="True">
<TextBlock
Margin="0,0,12,0"
DockPanel.Dock="Left"
FontSize="13"
FontWeight="SemiBold"
Style="{DynamicResource ItemTitleStyle}"
Text="{Binding Path=strHotkey}"
TextAlignment="Left" />
<TextBlock
Margin="0,0,12,0"
FontSize="13"
Style="{DynamicResource ItemSubTitleStyle}"
Text="{Binding Path=strHotkeyAction}" />
</DockPanel>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="0">
<Setter Property="Background" Value="Transparent" />
</Trigger>
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
<Setter Property="Background" Value="#10828282" />
</Trigger>
</Style.Triggers>
<Style x:Key="Kbd" TargetType="Border">
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Padding" Value="12,4,12,4" />
<Setter Property="Background" Value="{DynamicResource Color00B}" />
<Setter Property="BorderBrush" Value="{DynamicResource Color18B}" />
<Setter Property="BorderThickness" Value="1,1,1,2" />
</Style>
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
<Setter Property="Opacity" Value="0" />
<Style.Triggers>
<!-- Fades-in the image when it becomes visible -->
<Trigger Property="IsVisible" Value="True">
<Trigger.EnterActions>
<BeginStoryboard>
<BeginStoryboard.Storyboard>
<Storyboard x:Name="FadeIn">
<DoubleAnimation
Storyboard.TargetProperty="Opacity"
To="1"
Duration="0:0:2" />
</Storyboard>
</BeginStoryboard.Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
</Trigger>
</Style.Triggers>
<Style x:Key="KbdText" TargetType="TextBlock">
<Setter Property="TextAlignment" Value="Center" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style>
</Page.Resources>
<ScrollViewer>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="250" />
<RowDefinition Height="100" />
<RowDefinition />
</Grid.RowDefinitions>
@ -87,9 +42,9 @@
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Image
Width="500"
Height="300"
Margin="0,30,0,0"
Width="300"
Height="80"
Margin="0,0,0,0"
Source="../../images/page_img02.png" />
</StackPanel>
</Border>
@ -100,17 +55,228 @@
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page3_Title}" />
<ListBox
x:Name="HotkeyList"
Padding="0,0,0,0"
AlternationCount="2"
Background="Transparent"
DockPanel.Dock="Right"
ItemContainerStyle="{DynamicResource HotKeyPopupListStyle}" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow" />
</StackPanel>
<StackPanel
Margin="0,10,0,2"
Background="{DynamicResource Color01B}"
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}">←</TextBlock>
</Border>
<TextBlock VerticalAlignment="Center">,</TextBlock>
<Border Margin="5,0,0,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}">→</TextBlock>
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyUpDownDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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}">↑</TextBlock>
</Border>
<TextBlock VerticalAlignment="Center">,</TextBlock>
<Border Margin="5,0,0,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}">↓</TextBlock>
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyLeftRightDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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}">Enter</TextBlock>
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyRunDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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="ESC" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyESCDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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="Shift" />
</Border>
<TextBlock VerticalAlignment="Center">+</TextBlock>
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyShiftEnterDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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="Ctrl" />
</Border>
<TextBlock VerticalAlignment="Center">+</TextBlock>
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyCtrlEnterDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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="Ctrl" />
</Border>
<TextBlock VerticalAlignment="Center">+</TextBlock>
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="Shift" />
</Border>
<TextBlock VerticalAlignment="Center">+</TextBlock>
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyCtrlShiftEnterDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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="Ctrl" />
</Border>
<TextBlock VerticalAlignment="Center">+</TextBlock>
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="H" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyCtrlHDesc}" />
</StackPanel>
</StackPanel>
<StackPanel
Margin="0,2,0,2"
Background="{DynamicResource Color01B}"
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="Ctrl" />
</Border>
<TextBlock VerticalAlignment="Center">+</TextBlock>
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
<TextBlock Style="{DynamicResource KbdText}" Text="I" />
</Border>
</StackPanel>
<StackPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="13"
Text="{DynamicResource HotkeyCtrlIDesc}" />
</StackPanel>
</StackPanel>
</StackPanel>

View file

@ -16,57 +16,15 @@ using System.Windows.Shapes;
namespace Flow.Launcher.Resources.Pages
{
public partial class WelcomePage3 : Page
{
public WelcomePage3()
{
InitializeComponent();
}
public string strHotkey { get; set; }
public string strHotkeyAction { get; set; }
private List<WelcomePage3> HotkeyListData()
{
List<WelcomePage3> list = new List<WelcomePage3>();
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey01")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey01Action"))
});
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey02")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey02Action"))
});
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey03")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey03Action"))
});
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey04")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey04Action"))
});
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey05")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey05Action"))
});
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey07")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey07Action"))
});
list.Add(new WelcomePage3()
{
strHotkey = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey08")),
strHotkeyAction = string.Format(InternationalizationManager.Instance.GetTranslation("Hotkey08Action"))
});
return list;
}
}
}

View file

@ -9,6 +9,21 @@
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<Page.Resources>
<Style x:Key="RecommendQuery" TargetType="Border">
<Setter Property="CornerRadius" Value="8" />
<Setter Property="Width" Value="600" />
<Setter Property="Padding" Value="20,7,12,7" />
<Setter Property="Margin" Value="4,4,4,4" />
<Setter Property="Background" Value="{DynamicResource Color01B}" />
</Style>
<Style x:Key="QueryText" TargetType="TextBlock">
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style>
</Page.Resources>
<ScrollViewer>
<Grid>
<Grid.RowDefinitions>
@ -43,14 +58,42 @@
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page4_Title}" />
<TextBlock
Margin="0,10,0,0"
Margin="0,10,0,10"
FontSize="14"
Text="{DynamicResource Welcome_Page4_Text01}"
TextWrapping="WrapWithOverflow" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow" />
<UniformGrid
Margin="0,14,0,0"
Columns="3"
Rows="4">
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="g Weather" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="42+3*8" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="Bluetooth" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="pm install" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="Shutdown" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="Settings" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="youtube BTS" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="&gt; ping 8.8.8.8" />
</Border>
<Border Style="{DynamicResource RecommendQuery}">
<TextBlock Style="{DynamicResource QueryText}" Text="mail" />
</Border>
</UniformGrid>
</StackPanel>
</StackPanel>