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

- Change Text to String

Browse source 
- Add Welcome Window button in about panel
This commit is contained in:
DB p 2021-12-01 06:36:23 +09:00
parent e2ff4c285d
commit 16dc99686f
9 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,4 +231,17 @@
<system:String x:Key="update_flowlauncher_update_files">Update files</system:String>
<system:String x:Key="update_flowlauncher_update_upadte_description">Update description</system:String>
<!-- Welcome Window -->
<system:String x:Key="Skip">Skip</system:String>
<system:String x:Key="Welcome_Page1_Title">Welcome to Flow Launcher</system:String>
<system:String x:Key="Welcome_Page1_Text01">Hello, It's your first time to run a Flow Launcher!</system:String>
<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_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>
</ResourceDictionary>

15
Flow.Launcher/Resources/Pages/WelcomePage1.xaml
View file

@ -65,19 +65,20 @@
<StackPanel Grid.Row="1" Margin="24,20,24,20">
<StackPanel>
<TextBlock FontSize="20" FontWeight="SemiBold">Welcome to Flow Launcher</TextBlock>
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page1_Title}" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow">
Hello, It's your first time to run a Flow Launcher!
</TextBlock>
Text="{DynamicResource Welcome_Page1_Text01}"
TextWrapping="WrapWithOverflow" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow">
Before starting, proceed with a simple setting. Surely, You can skip. Please choose the language you use.
</TextBlock>
Text="{DynamicResource Welcome_Page1_Text02}"
TextWrapping="WrapWithOverflow" />
<TextBlock
Margin="0,30,0,0"
FontSize="14"

10
Flow.Launcher/Resources/Pages/WelcomePage2.xaml
View file

@ -104,13 +104,15 @@
<StackPanel Grid.Row="1" Margin="24,20,24,20">
<StackPanel>
<TextBlock FontSize="20" FontWeight="SemiBold">Search and run everything in everywhere</TextBlock>
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page2_Title}" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow">
To start Flow, start with the hotkey below. To change, select input and press the wanted hotkey in keyboard.
</TextBlock>
Text="{DynamicResource Welcome_Page2_Text01}"
TextWrapping="WrapWithOverflow" />
<TextBlock
Margin="0,30,0,0"
FontSize="14"

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

@ -59,7 +59,10 @@
<StackPanel Grid.Row="1" Margin="24,20,24,20">
<StackPanel>
<TextBlock FontSize="20" FontWeight="SemiBold">Hotkeys and Commands</TextBlock>
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page3_Title}" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"

12
Flow.Launcher/Resources/Pages/WelcomePage4.xaml
View file

@ -31,20 +31,22 @@
Name="Logo"
Width="450"
Height="300"
Margin="0,20,0,0"
Margin="0,22,0,0"
Source="../../images/page_img01.png" />
</StackPanel>
</Border>
<StackPanel Grid.Row="1" Margin="24,20,24,20">
<StackPanel>
<TextBlock FontSize="20" FontWeight="SemiBold">Action Keyword</TextBlock>
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page4_Title}" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow">
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.
</TextBlock>
Text="{DynamicResource Welcome_Page4_Text01}"
TextWrapping="WrapWithOverflow" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"

12
Flow.Launcher/Resources/Pages/WelcomePage5.xaml
View file

@ -65,13 +65,15 @@
<StackPanel Grid.Row="1" Margin="24,20,24,20">
<StackPanel>
<TextBlock FontSize="20" FontWeight="SemiBold">Let's Start Flow Launcher</TextBlock>
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page5_Title}" />
<TextBlock
Margin="0,10,0,0"
FontSize="14"
TextWrapping="WrapWithOverflow">
Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)
</TextBlock>
Text="{DynamicResource Welcome_Page5_Text01}"
TextWrapping="WrapWithOverflow" />
<StackPanel Margin="0,30,0,0" Orientation="Horizontal">
<CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource DefaultCheckBoxStyle}" />
<TextBlock
@ -99,7 +101,7 @@
Height="40"
Margin="0,60,0,0"
HorizontalAlignment="Right"
Content="Done!"
Content="{DynamicResource done}"
Style="{DynamicResource AccentButtonStyle}" />
</StackPanel>

4
Flow.Launcher/SettingWindow.xaml
View file

@ -2482,6 +2482,10 @@
Margin="0,0,-20,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Margin="0,0,12,0"
Click="OpenWelcomeWindow"
Content="Welcome Window" />
<Button
Margin="0,0,12,0"
Click="OpenSettingFolder"

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

@ -275,6 +275,11 @@ namespace Flow.Launcher
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
}
private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
{
Flow.Launcher.WelcomeWindow WelcomeWindow = new Flow.Launcher.WelcomeWindow();
WelcomeWindow.Show();
}
private void OpenLogFolder(object sender, RoutedEventArgs e)
{
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
@ -314,6 +319,7 @@ namespace Flow.Launcher
_ => ThemeManager.Current.ApplicationTheme
};
/* Custom TitleBar */
private void OnMinimizeButtonClick(object sender, RoutedEventArgs e)

2
Flow.Launcher/WelcomeWindow.xaml
View file

@ -119,7 +119,7 @@
Height="40"
Margin="20,5,0,5"
Click="BtnCancel_OnClick"
Content="Skip"
Content="{DynamicResource Skip}"
DockPanel.Dock="Right"
FontSize="14" />
<DockPanel