Skip to content

Commit 25f71e8

Browse files
onesoundsonesounds
committed
Change Text to String
Adjust Animation
1 parent 2bfbba9 commit 25f71e8

File tree

6 files changed

+395
-285
lines changed

6 files changed

+395
-285
lines changed

‎Flow.Launcher/Languages/en.xaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,13 @@
258258
<system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
259259
<system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String>
260260

261+
<system:String x:Key="RecommendWeather">g Weather</system:String>
262+
<system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
263+
<system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
264+
<system:String x:Key="RecommendShellDesc">Shell Command</system:String>
265+
<system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
266+
<system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Setting</system:String>
267+
<system:String x:Key="RecommendAcronyms">vs</system:String>
268+
<system:String x:Key="RecommendAcronymsDesc">Visual Studio</system:String>
269+
261270
</ResourceDictionary>

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

Lines changed: 105 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,72 @@
1-
<Page x:Class="Flow.Launcher.Resources.Pages.WelcomePage1"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
Title="WelcomePage1"
8-
DataContext="{Binding RelativeSource={RelativeSource Self}}"
9-
mc:Ignorable="d">
1+
<Page
2+
x:Class="Flow.Launcher.Resources.Pages.WelcomePage1"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
7+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
Title="WelcomePage1"
9+
DataContext="{Binding RelativeSource={RelativeSource Self}}"
10+
mc:Ignorable="d">
1011
<Page.Resources>
1112
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
12-
<Setter Property="Opacity" Value="0" />
1313
<Style.Triggers>
1414
<!-- Fades-in the image when it becomes visible -->
1515
<Trigger Property="IsVisible" Value="True">
1616
<Trigger.EnterActions>
1717
<BeginStoryboard>
1818
<BeginStoryboard.Storyboard>
1919
<Storyboard x:Name="FadeIn">
20-
<DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:2" />
20+
<DoubleAnimation
21+
Storyboard.TargetProperty="(Canvas.Top)"
22+
From="105"
23+
To="95"
24+
Duration="0:0:1">
25+
<DoubleAnimation.EasingFunction>
26+
<QuadraticEase EasingMode="EaseOut" />
27+
</DoubleAnimation.EasingFunction>
28+
</DoubleAnimation>
29+
<DoubleAnimation
30+
Storyboard.TargetProperty="Opacity"
31+
From="0"
32+
To="1"
33+
Duration="0:0:1">
34+
<DoubleAnimation.EasingFunction>
35+
<QuadraticEase EasingMode="EaseOut" />
36+
</DoubleAnimation.EasingFunction>
37+
</DoubleAnimation>
38+
</Storyboard>
39+
</BeginStoryboard.Storyboard>
40+
</BeginStoryboard>
41+
</Trigger.EnterActions>
42+
</Trigger>
43+
</Style.Triggers>
44+
</Style>
45+
<Style x:Key="StyleImageFadeInText" TargetType="{x:Type TextBlock}">
46+
<Style.Triggers>
47+
<Trigger Property="IsVisible" Value="True">
48+
<Trigger.EnterActions>
49+
<BeginStoryboard>
50+
<BeginStoryboard.Storyboard>
51+
<Storyboard x:Name="FadeIn">
52+
<DoubleAnimation
53+
Storyboard.TargetProperty="(Canvas.Top)"
54+
From="110"
55+
To="100"
56+
Duration="0:0:1">
57+
<DoubleAnimation.EasingFunction>
58+
<QuadraticEase EasingMode="EaseOut" />
59+
</DoubleAnimation.EasingFunction>
60+
</DoubleAnimation>
61+
<DoubleAnimation
62+
Storyboard.TargetProperty="Opacity"
63+
From="0"
64+
To="1"
65+
Duration="0:0:1">
66+
<DoubleAnimation.EasingFunction>
67+
<QuadraticEase EasingMode="EaseOut" />
68+
</DoubleAnimation.EasingFunction>
69+
</DoubleAnimation>
2170
</Storyboard>
2271
</BeginStoryboard.Storyboard>
2372
</BeginStoryboard>
@@ -44,41 +93,56 @@
4493
</Border.Background>
4594

4695
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
47-
<Image Name="Logo"
48-
Width="60"
49-
Height="60"
50-
Source="../../images/app.png"
51-
Style="{DynamicResource StyleImageFadeIn}" />
52-
<TextBlock Margin="12,0,0,0"
53-
VerticalAlignment="Center"
54-
FontSize="30"
55-
Foreground="White">
56-
Flow Launcher
57-
</TextBlock>
96+
<Canvas Width="550" Height="250">
97+
<Image
98+
Name="Logo"
99+
Canvas.Left="140"
100+
Width="60"
101+
Height="60"
102+
Source="../../images/app.png"
103+
Style="{DynamicResource StyleImageFadeIn}" />
104+
<TextBlock
105+
Canvas.Left="205"
106+
Margin="12,0,0,0"
107+
VerticalAlignment="Center"
108+
FontSize="30"
109+
Foreground="White"
110+
Opacity="0"
111+
Style="{DynamicResource StyleImageFadeInText}">
112+
Flow Launcher
113+
</TextBlock>
114+
</Canvas>
58115
</StackPanel>
59116
</Border>
60117

61118
<StackPanel Grid.Row="1" Margin="24,20,24,20">
62119
<StackPanel>
63-
<TextBlock FontSize="20" FontWeight="SemiBold" Text="{DynamicResource Welcome_Page1_Title}" />
64-
<TextBlock Margin="0,10,0,0"
65-
FontSize="14"
66-
Text="{DynamicResource Welcome_Page1_Text01}"
67-
TextWrapping="WrapWithOverflow" />
68-
<TextBlock Margin="0,10,0,0"
69-
FontSize="14"
70-
Text="{DynamicResource Welcome_Page1_Text02}"
71-
TextWrapping="WrapWithOverflow" />
72-
<TextBlock Margin="0,30,0,0"
73-
FontSize="14"
74-
FontWeight="SemiBold"
75-
Text="{DynamicResource language}" />
76-
<ComboBox Width="200"
77-
Margin="0,10,0,0"
78-
DisplayMemberPath="Display"
79-
ItemsSource="{Binding Languages}"
80-
SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"
81-
SelectedValuePath="LanguageCode" />
120+
<TextBlock
121+
FontSize="20"
122+
FontWeight="SemiBold"
123+
Text="{DynamicResource Welcome_Page1_Title}" />
124+
<TextBlock
125+
Margin="0,10,0,0"
126+
FontSize="14"
127+
Text="{DynamicResource Welcome_Page1_Text01}"
128+
TextWrapping="WrapWithOverflow" />
129+
<TextBlock
130+
Margin="0,10,0,0"
131+
FontSize="14"
132+
Text="{DynamicResource Welcome_Page1_Text02}"
133+
TextWrapping="WrapWithOverflow" />
134+
<TextBlock
135+
Margin="0,30,0,0"
136+
FontSize="14"
137+
FontWeight="SemiBold"
138+
Text="{DynamicResource language}" />
139+
<ComboBox
140+
Width="200"
141+
Margin="0,10,0,0"
142+
DisplayMemberPath="Display"
143+
ItemsSource="{Binding Languages}"
144+
SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"
145+
SelectedValuePath="LanguageCode" />
82146
</StackPanel>
83147

84148
</StackPanel>

0 commit comments

Comments
 (0)