Skip to content

Commit fb60c5b

Browse files
onesoundsonesounds
committed
Change page image
Add Hotkey List Add Recommend queris
1 parent 39b6267 commit fb60c5b

File tree

5 files changed

+300
-139
lines changed

5 files changed

+300
-139
lines changed

‎Flow.Launcher/Images/page_img02.png

-30.4 KB
Loading

‎Flow.Launcher/Languages/en.xaml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -238,28 +238,22 @@
238238
<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>
239239
<system:String x:Key="Welcome_Page2_Title">Search and run everything in everywhere</system:String>
240240
<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>
241-
<system:String x:Key="Welcome_Page3_Title">Hotkeys and Commands</system:String>
242-
<system:String x:Key="Welcome_Page4_Title">Action Keyword</system:String>
243-
<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>
241+
<system:String x:Key="Welcome_Page3_Title">Hotkeys</system:String>
242+
<system:String x:Key="Welcome_Page4_Title">Action Keyword and Commands</system:String>
243+
<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>
244244
<system:String x:Key="Welcome_Page5_Title">Let's Start Flow Launcher</system:String>
245245
<system:String x:Key="Welcome_Page5_Text01">Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)</system:String>
246246

247247
<!-- General Guide & Hotkey -->
248-
<system:String x:Key="Hotkey01">U+2B60, U+2B62</system:String>
249-
<system:String x:Key="Hotkey01Action">Back / Context Menu</system:String>
250-
<system:String x:Key="Hotkey02">U+2B61, U+2B63</system:String>
251-
<system:String x:Key="Hotkey02Action">Item Navigation</system:String>
252-
<system:String x:Key="Hotkey03">Shift+Enter</system:String>
253-
<system:String x:Key="Hotkey03Action">Open Context Menu</system:String>
254-
<system:String x:Key="Hotkey04">Ctrl+Enter</system:String>
255-
<system:String x:Key="Hotkey04Action">Open Contaning Folder</system:String>
256-
<system:String x:Key="Hotkey05">Ctrl+Shift+Enter</system:String>
257-
<system:String x:Key="Hotkey05Action">Run as Admin</system:String>
258-
<system:String x:Key="Hotkey06">Ctrl+C</system:String>
259-
<system:String x:Key="Hotkey06Action">Copy File Path</system:String>
260-
<system:String x:Key="Hotkey07">Ctrl+H</system:String>
261-
<system:String x:Key="Hotkey07Action">Query History</system:String>
262-
<system:String x:Key="Hotkey08">ESC</system:String>
263-
<system:String x:Key="Hotkey08Action">Back to Result in Context Menu</system:String>
248+
249+
<system:String x:Key="HotkeyUpDownDesc">Back / Context Menu</system:String>
250+
<system:String x:Key="HotkeyLeftRightDesc">Item Navigation</system:String>
251+
<system:String x:Key="HotkeyShiftEnterDesc">Open Context Menu</system:String>
252+
<system:String x:Key="HotkeyCtrlEnterDesc">Open Contaning Folder</system:String>
253+
<system:String x:Key="HotkeyCtrlShiftEnterDesc">Run as Admin</system:String>
254+
<system:String x:Key="HotkeyCtrlHDesc">Query History</system:String>
255+
<system:String x:Key="HotkeyESCDesc">Back to Result in Context Menu</system:String>
256+
<system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String>
257+
<system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
264258

265259
</ResourceDictionary>

‎Flow.Launcher/Resources/Pages/WelcomePage3.xaml

Lines changed: 236 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,68 +10,23 @@
1010
d:DesignWidth="800"
1111
mc:Ignorable="d">
1212
<Page.Resources>
13-
14-
<Style x:Key="HotKeyPopupListStyle" TargetType="{x:Type ListBoxItem}">
15-
<Setter Property="Focusable" Value="False" />
16-
<Setter Property="IsHitTestVisible" Value="False" />
17-
<Setter Property="Template">
18-
<Setter.Value>
19-
<ControlTemplate>
20-
<Border Padding="14,8,4,8">
21-
<DockPanel LastChildFill="True">
22-
<TextBlock
23-
Margin="0,0,12,0"
24-
DockPanel.Dock="Left"
25-
FontSize="13"
26-
FontWeight="SemiBold"
27-
Style="{DynamicResource ItemTitleStyle}"
28-
Text="{Binding Path=strHotkey}"
29-
TextAlignment="Left" />
30-
<TextBlock
31-
Margin="0,0,12,0"
32-
FontSize="13"
33-
Style="{DynamicResource ItemSubTitleStyle}"
34-
Text="{Binding Path=strHotkeyAction}" />
35-
</DockPanel>
36-
</Border>
37-
</ControlTemplate>
38-
</Setter.Value>
39-
</Setter>
40-
<Style.Triggers>
41-
<Trigger Property="ItemsControl.AlternationIndex" Value="0">
42-
<Setter Property="Background" Value="Transparent" />
43-
</Trigger>
44-
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
45-
<Setter Property="Background" Value="#10828282" />
46-
</Trigger>
47-
</Style.Triggers>
13+
<Style x:Key="Kbd" TargetType="Border">
14+
<Setter Property="CornerRadius" Value="4" />
15+
<Setter Property="Padding" Value="12,4,12,4" />
16+
<Setter Property="Background" Value="{DynamicResource Color00B}" />
17+
<Setter Property="BorderBrush" Value="{DynamicResource Color18B}" />
18+
<Setter Property="BorderThickness" Value="1,1,1,2" />
4819
</Style>
49-
50-
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
51-
<Setter Property="Opacity" Value="0" />
52-
<Style.Triggers>
53-
<!-- Fades-in the image when it becomes visible -->
54-
<Trigger Property="IsVisible" Value="True">
55-
<Trigger.EnterActions>
56-
<BeginStoryboard>
57-
<BeginStoryboard.Storyboard>
58-
<Storyboard x:Name="FadeIn">
59-
<DoubleAnimation
60-
Storyboard.TargetProperty="Opacity"
61-
To="1"
62-
Duration="0:0:2" />
63-
</Storyboard>
64-
</BeginStoryboard.Storyboard>
65-
</BeginStoryboard>
66-
</Trigger.EnterActions>
67-
</Trigger>
68-
</Style.Triggers>
20+
<Style x:Key="KbdText" TargetType="TextBlock">
21+
<Setter Property="TextAlignment" Value="Center" />
22+
<Setter Property="FontSize" Value="12" />
23+
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
6924
</Style>
7025
</Page.Resources>
7126
<ScrollViewer>
7227
<Grid>
7328
<Grid.RowDefinitions>
74-
<RowDefinition Height="250" />
29+
<RowDefinition Height="100" />
7530
<RowDefinition />
7631
</Grid.RowDefinitions>
7732

@@ -87,9 +42,9 @@
8742

8843
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
8944
<Image
90-
Width="500"
91-
Height="300"
92-
Margin="0,30,0,0"
45+
Width="300"
46+
Height="80"
47+
Margin="0,0,0,0"
9348
Source="../../images/page_img02.png" />
9449
</StackPanel>
9550
</Border>
@@ -100,17 +55,228 @@
10055
FontSize="20"
10156
FontWeight="SemiBold"
10257
Text="{DynamicResource Welcome_Page3_Title}" />
103-
<ListBox
104-
x:Name="HotkeyList"
105-
Padding="0,0,0,0"
106-
AlternationCount="2"
107-
Background="Transparent"
108-
DockPanel.Dock="Right"
109-
ItemContainerStyle="{DynamicResource HotKeyPopupListStyle}" />
110-
<TextBlock
111-
Margin="0,10,0,0"
112-
FontSize="14"
113-
TextWrapping="WrapWithOverflow" />
58+
</StackPanel>
59+
<StackPanel
60+
Margin="0,10,0,2"
61+
Background="{DynamicResource Color01B}"
62+
Orientation="Horizontal">
63+
<StackPanel
64+
Width="210"
65+
Margin="20,5,4,5"
66+
VerticalAlignment="Center"
67+
Orientation="Horizontal">
68+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
69+
<TextBlock Style="{DynamicResource KbdText}">←</TextBlock>
70+
</Border>
71+
<TextBlock VerticalAlignment="Center">,</TextBlock>
72+
<Border Margin="5,0,0,0" Style="{DynamicResource Kbd}">
73+
<TextBlock Style="{DynamicResource KbdText}">→</TextBlock>
74+
</Border>
75+
</StackPanel>
76+
<StackPanel VerticalAlignment="Center">
77+
<TextBlock
78+
VerticalAlignment="Center"
79+
FontSize="13"
80+
Text="{DynamicResource HotkeyUpDownDesc}" />
81+
</StackPanel>
82+
</StackPanel>
83+
84+
<StackPanel
85+
Margin="0,2,0,2"
86+
Background="{DynamicResource Color01B}"
87+
Orientation="Horizontal">
88+
<StackPanel
89+
Width="210"
90+
Margin="20,5,4,5"
91+
VerticalAlignment="Center"
92+
Orientation="Horizontal">
93+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
94+
<TextBlock Style="{DynamicResource KbdText}">↑</TextBlock>
95+
</Border>
96+
<TextBlock VerticalAlignment="Center">,</TextBlock>
97+
<Border Margin="5,0,0,0" Style="{DynamicResource Kbd}">
98+
<TextBlock Style="{DynamicResource KbdText}">↓</TextBlock>
99+
</Border>
100+
</StackPanel>
101+
<StackPanel VerticalAlignment="Center">
102+
<TextBlock
103+
VerticalAlignment="Center"
104+
FontSize="13"
105+
Text="{DynamicResource HotkeyLeftRightDesc}" />
106+
</StackPanel>
107+
</StackPanel>
108+
109+
110+
<StackPanel
111+
Margin="0,2,0,2"
112+
Background="{DynamicResource Color01B}"
113+
Orientation="Horizontal">
114+
<StackPanel
115+
Width="210"
116+
Margin="20,5,4,5"
117+
VerticalAlignment="Center"
118+
Orientation="Horizontal">
119+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
120+
<TextBlock Style="{DynamicResource KbdText}">Enter</TextBlock>
121+
</Border>
122+
123+
</StackPanel>
124+
<StackPanel VerticalAlignment="Center">
125+
<TextBlock
126+
VerticalAlignment="Center"
127+
FontSize="13"
128+
Text="{DynamicResource HotkeyRunDesc}" />
129+
</StackPanel>
130+
</StackPanel>
131+
132+
<StackPanel
133+
Margin="0,2,0,2"
134+
Background="{DynamicResource Color01B}"
135+
Orientation="Horizontal">
136+
<StackPanel
137+
Width="210"
138+
Margin="20,5,4,5"
139+
VerticalAlignment="Center"
140+
Orientation="Horizontal">
141+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
142+
<TextBlock Style="{DynamicResource KbdText}" Text="ESC" />
143+
</Border>
144+
</StackPanel>
145+
<StackPanel VerticalAlignment="Center">
146+
<TextBlock
147+
VerticalAlignment="Center"
148+
FontSize="13"
149+
Text="{DynamicResource HotkeyESCDesc}" />
150+
</StackPanel>
151+
</StackPanel>
152+
153+
<StackPanel
154+
Margin="0,2,0,2"
155+
Background="{DynamicResource Color01B}"
156+
Orientation="Horizontal">
157+
<StackPanel
158+
Width="210"
159+
Margin="20,5,4,5"
160+
VerticalAlignment="Center"
161+
Orientation="Horizontal">
162+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
163+
<TextBlock Style="{DynamicResource KbdText}" Text="Shift" />
164+
</Border>
165+
<TextBlock VerticalAlignment="Center">+</TextBlock>
166+
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
167+
<TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
168+
</Border>
169+
</StackPanel>
170+
<StackPanel VerticalAlignment="Center">
171+
<TextBlock
172+
VerticalAlignment="Center"
173+
FontSize="13"
174+
Text="{DynamicResource HotkeyShiftEnterDesc}" />
175+
</StackPanel>
176+
</StackPanel>
177+
178+
<StackPanel
179+
Margin="0,2,0,2"
180+
Background="{DynamicResource Color01B}"
181+
Orientation="Horizontal">
182+
<StackPanel
183+
Width="210"
184+
Margin="20,5,4,5"
185+
VerticalAlignment="Center"
186+
Orientation="Horizontal">
187+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
188+
<TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
189+
</Border>
190+
<TextBlock VerticalAlignment="Center">+</TextBlock>
191+
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
192+
<TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
193+
</Border>
194+
</StackPanel>
195+
<StackPanel VerticalAlignment="Center">
196+
<TextBlock
197+
VerticalAlignment="Center"
198+
FontSize="13"
199+
Text="{DynamicResource HotkeyCtrlEnterDesc}" />
200+
</StackPanel>
201+
</StackPanel>
202+
203+
<StackPanel
204+
Margin="0,2,0,2"
205+
Background="{DynamicResource Color01B}"
206+
Orientation="Horizontal">
207+
<StackPanel
208+
Width="210"
209+
Margin="20,5,4,5"
210+
VerticalAlignment="Center"
211+
Orientation="Horizontal">
212+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
213+
<TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
214+
</Border>
215+
<TextBlock VerticalAlignment="Center">+</TextBlock>
216+
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
217+
<TextBlock Style="{DynamicResource KbdText}" Text="Shift" />
218+
</Border>
219+
<TextBlock VerticalAlignment="Center">+</TextBlock>
220+
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
221+
<TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
222+
</Border>
223+
</StackPanel>
224+
<StackPanel VerticalAlignment="Center">
225+
<TextBlock
226+
VerticalAlignment="Center"
227+
FontSize="13"
228+
Text="{DynamicResource HotkeyCtrlShiftEnterDesc}" />
229+
</StackPanel>
230+
</StackPanel>
231+
232+
<StackPanel
233+
Margin="0,2,0,2"
234+
Background="{DynamicResource Color01B}"
235+
Orientation="Horizontal">
236+
<StackPanel
237+
Width="210"
238+
Margin="20,5,4,5"
239+
VerticalAlignment="Center"
240+
Orientation="Horizontal">
241+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
242+
<TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
243+
</Border>
244+
<TextBlock VerticalAlignment="Center">+</TextBlock>
245+
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
246+
<TextBlock Style="{DynamicResource KbdText}" Text="H" />
247+
</Border>
248+
</StackPanel>
249+
<StackPanel VerticalAlignment="Center">
250+
<TextBlock
251+
VerticalAlignment="Center"
252+
FontSize="13"
253+
Text="{DynamicResource HotkeyCtrlHDesc}" />
254+
</StackPanel>
255+
</StackPanel>
256+
257+
<StackPanel
258+
Margin="0,2,0,2"
259+
Background="{DynamicResource Color01B}"
260+
Orientation="Horizontal">
261+
<StackPanel
262+
Width="210"
263+
Margin="20,5,4,5"
264+
VerticalAlignment="Center"
265+
Orientation="Horizontal">
266+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
267+
<TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
268+
</Border>
269+
<TextBlock VerticalAlignment="Center">+</TextBlock>
270+
<Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
271+
<TextBlock Style="{DynamicResource KbdText}" Text="I" />
272+
</Border>
273+
</StackPanel>
274+
<StackPanel VerticalAlignment="Center">
275+
<TextBlock
276+
VerticalAlignment="Center"
277+
FontSize="13"
278+
Text="{DynamicResource HotkeyCtrlIDesc}" />
279+
</StackPanel>
114280
</StackPanel>
115281

116282
</StackPanel>

0 commit comments

Comments
 (0)