Skip to content

Commit 16dc996

Browse files
onesoundsonesounds
committed
- Change Text to String
- Add Welcome Window button in about panel
1 parent e2ff4c2 commit 16dc996

File tree

9 files changed

+56
-23
lines changed

9 files changed

+56
-23
lines changed

‎Flow.Launcher/Languages/en.xaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,17 @@
231231
<system:String x:Key="update_flowlauncher_update_files">Update files</system:String>
232232
<system:String x:Key="update_flowlauncher_update_upadte_description">Update description</system:String>
233233

234+
<!-- Welcome Window -->
235+
<system:String x:Key="Skip">Skip</system:String>
236+
<system:String x:Key="Welcome_Page1_Title">Welcome to Flow Launcher</system:String>
237+
<system:String x:Key="Welcome_Page1_Text01">Hello, It's your first time to run a Flow Launcher!</system:String>
238+
<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>
239+
<system:String x:Key="Welcome_Page2_Title">Search and run everything in everywhere</system:String>
240+
<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>
244+
<system:String x:Key="Welcome_Page5_Title">Let's Start Flow Launcher</system:String>
245+
<system:String x:Key="Welcome_Page5_Text01">Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)</system:String>
246+
234247
</ResourceDictionary>

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,20 @@
6565

6666
<StackPanel Grid.Row="1" Margin="24,20,24,20">
6767
<StackPanel>
68-
<TextBlock FontSize="20" FontWeight="SemiBold">Welcome to Flow Launcher</TextBlock>
68+
<TextBlock
69+
FontSize="20"
70+
FontWeight="SemiBold"
71+
Text="{DynamicResource Welcome_Page1_Title}" />
6972
<TextBlock
7073
Margin="0,10,0,0"
7174
FontSize="14"
72-
TextWrapping="WrapWithOverflow">
73-
Hello, It's your first time to run a Flow Launcher!
74-
</TextBlock>
75+
Text="{DynamicResource Welcome_Page1_Text01}"
76+
TextWrapping="WrapWithOverflow" />
7577
<TextBlock
7678
Margin="0,10,0,0"
7779
FontSize="14"
78-
TextWrapping="WrapWithOverflow">
79-
Before starting, proceed with a simple setting. Surely, You can skip. Please choose the language you use.
80-
</TextBlock>
80+
Text="{DynamicResource Welcome_Page1_Text02}"
81+
TextWrapping="WrapWithOverflow" />
8182
<TextBlock
8283
Margin="0,30,0,0"
8384
FontSize="14"

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,15 @@
104104

105105
<StackPanel Grid.Row="1" Margin="24,20,24,20">
106106
<StackPanel>
107-
<TextBlock FontSize="20" FontWeight="SemiBold">Search and run everything in everywhere</TextBlock>
107+
<TextBlock
108+
FontSize="20"
109+
FontWeight="SemiBold"
110+
Text="{DynamicResource Welcome_Page2_Title}" />
108111
<TextBlock
109112
Margin="0,10,0,0"
110113
FontSize="14"
111-
TextWrapping="WrapWithOverflow">
112-
To start Flow, start with the hotkey below. To change, select input and press the wanted hotkey in keyboard.
113-
</TextBlock>
114+
Text="{DynamicResource Welcome_Page2_Text01}"
115+
TextWrapping="WrapWithOverflow" />
114116
<TextBlock
115117
Margin="0,30,0,0"
116118
FontSize="14"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@
5959

6060
<StackPanel Grid.Row="1" Margin="24,20,24,20">
6161
<StackPanel>
62-
<TextBlock FontSize="20" FontWeight="SemiBold">Hotkeys and Commands</TextBlock>
62+
<TextBlock
63+
FontSize="20"
64+
FontWeight="SemiBold"
65+
Text="{DynamicResource Welcome_Page3_Title}" />
6366
<TextBlock
6467
Margin="0,10,0,0"
6568
FontSize="14"

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,22 @@
3131
Name="Logo"
3232
Width="450"
3333
Height="300"
34-
Margin="0,20,0,0"
34+
Margin="0,22,0,0"
3535
Source="../../images/page_img01.png" />
3636
</StackPanel>
3737
</Border>
3838

3939
<StackPanel Grid.Row="1" Margin="24,20,24,20">
4040
<StackPanel>
41-
<TextBlock FontSize="20" FontWeight="SemiBold">Action Keyword</TextBlock>
41+
<TextBlock
42+
FontSize="20"
43+
FontWeight="SemiBold"
44+
Text="{DynamicResource Welcome_Page4_Title}" />
4245
<TextBlock
4346
Margin="0,10,0,0"
4447
FontSize="14"
45-
TextWrapping="WrapWithOverflow">
46-
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.
47-
</TextBlock>
48+
Text="{DynamicResource Welcome_Page4_Text01}"
49+
TextWrapping="WrapWithOverflow" />
4850
<TextBlock
4951
Margin="0,10,0,0"
5052
FontSize="14"

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@
6565

6666
<StackPanel Grid.Row="1" Margin="24,20,24,20">
6767
<StackPanel>
68-
<TextBlock FontSize="20" FontWeight="SemiBold">Let's Start Flow Launcher</TextBlock>
68+
<TextBlock
69+
FontSize="20"
70+
FontWeight="SemiBold"
71+
Text="{DynamicResource Welcome_Page5_Title}" />
6972
<TextBlock
7073
Margin="0,10,0,0"
7174
FontSize="14"
72-
TextWrapping="WrapWithOverflow">
73-
Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)
74-
</TextBlock>
75+
Text="{DynamicResource Welcome_Page5_Text01}"
76+
TextWrapping="WrapWithOverflow" />
7577
<StackPanel Margin="0,30,0,0" Orientation="Horizontal">
7678
<CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource DefaultCheckBoxStyle}" />
7779
<TextBlock
@@ -99,7 +101,7 @@
99101
Height="40"
100102
Margin="0,60,0,0"
101103
HorizontalAlignment="Right"
102-
Content="Done!"
104+
Content="{DynamicResource done}"
103105
Style="{DynamicResource AccentButtonStyle}" />
104106
</StackPanel>
105107

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,6 +2482,10 @@
24822482
Margin="0,0,-20,0"
24832483
HorizontalAlignment="Right"
24842484
Orientation="Horizontal">
2485+
<Button
2486+
Margin="0,0,12,0"
2487+
Click="OpenWelcomeWindow"
2488+
Content="Welcome Window" />
24852489
<Button
24862490
Margin="0,0,12,0"
24872491
Click="OpenSettingFolder"

‎Flow.Launcher/SettingWindow.xaml.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,11 @@ private void OpenSettingFolder(object sender, RoutedEventArgs e)
275275
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
276276
}
277277

278+
private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
279+
{
280+
Flow.Launcher.WelcomeWindow WelcomeWindow = new Flow.Launcher.WelcomeWindow();
281+
WelcomeWindow.Show();
282+
}
278283
private void OpenLogFolder(object sender, RoutedEventArgs e)
279284
{
280285
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
@@ -314,6 +319,7 @@ private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e)
314319
_ => ThemeManager.Current.ApplicationTheme
315320
};
316321

322+
317323
/* Custom TitleBar */
318324

319325
private void OnMinimizeButtonClick(object sender, RoutedEventArgs e)

‎Flow.Launcher/WelcomeWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
Height="40"
120120
Margin="20,5,0,5"
121121
Click="BtnCancel_OnClick"
122-
Content="Skip"
122+
Content="{DynamicResource Skip}"
123123
DockPanel.Dock="Right"
124124
FontSize="14" />
125125
<DockPanel

0 commit comments

Comments
 (0)