Skip to content

Commit 5654ebb

Browse files
committed
Add wizard image in page 1
Rename "Welcome" button too "Wizard" in setting panel
1 parent 0092805 commit 5654ebb

File tree

3 files changed

+68
-31
lines changed

3 files changed

+68
-31
lines changed

Flow.Launcher/Images/wizard.png

7.87 KB
Loading

Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<system:String x:Key="devtool">DevTools</system:String>
153153
<system:String x:Key="settingfolder">Setting Folder</system:String>
154154
<system:String x:Key="logfolder">Log Folder</system:String>
155-
<system:String x:Key="welcomewindow">Welcome</system:String>
155+
<system:String x:Key="welcomewindow">Wizard</system:String>
156156

157157
<!-- FileManager Setting Dialog -->
158158
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>

Flow.Launcher/Resources/Pages/WelcomePage1.xaml

Lines changed: 67 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,29 @@
7575
</Trigger>
7676
</Style.Triggers>
7777
</Style>
78+
<Style x:Key="WizardMove" TargetType="{x:Type Image}">
79+
<Style.Triggers>
80+
<Trigger Property="IsVisible" Value="True">
81+
<Trigger.EnterActions>
82+
<BeginStoryboard>
83+
<BeginStoryboard.Storyboard>
84+
<Storyboard x:Name="Move">
85+
<DoubleAnimation
86+
Storyboard.TargetProperty="(Canvas.Bottom)"
87+
From="-150"
88+
To="0"
89+
Duration="0:0:2.5">
90+
<DoubleAnimation.EasingFunction>
91+
<QuadraticEase EasingMode="EaseOut" />
92+
</DoubleAnimation.EasingFunction>
93+
</DoubleAnimation>
94+
</Storyboard>
95+
</BeginStoryboard.Storyboard>
96+
</BeginStoryboard>
97+
</Trigger.EnterActions>
98+
</Trigger>
99+
</Style.Triggers>
100+
</Style>
78101
</Page.Resources>
79102
<ScrollViewer>
80103
<Grid>
@@ -116,37 +139,51 @@
116139
</StackPanel>
117140
</Border>
118141

119-
<StackPanel Grid.Row="1" Margin="24,20,24,20">
120-
<StackPanel>
121-
<TextBlock
122-
FontSize="20"
123-
FontWeight="SemiBold"
124-
Text="{DynamicResource Welcome_Page1_Title}" />
125-
<TextBlock
126-
Margin="0,10,0,0"
127-
FontSize="14"
128-
Text="{DynamicResource Welcome_Page1_Text01}"
129-
TextWrapping="WrapWithOverflow" />
130-
<TextBlock
131-
Margin="0,10,0,0"
132-
FontSize="14"
133-
Text="{DynamicResource Welcome_Page1_Text02}"
134-
TextWrapping="WrapWithOverflow" />
135-
<TextBlock
136-
Margin="0,30,0,0"
137-
FontSize="14"
138-
FontWeight="SemiBold"
139-
Text="{DynamicResource language}" />
140-
<ComboBox
141-
Width="200"
142-
Margin="0,10,0,0"
143-
DisplayMemberPath="Display"
144-
ItemsSource="{Binding Languages}"
145-
SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"
146-
SelectedValuePath="LanguageCode" />
147-
</StackPanel>
148142

149-
</StackPanel>
143+
<Canvas Grid.Row="1" Height="288">
144+
<Image
145+
Name="wizard"
146+
Canvas.Right="30"
147+
Canvas.Bottom="0"
148+
Width="60"
149+
Height="60"
150+
Source="../../images/wizard.png"
151+
Style="{DynamicResource WizardMove}" />
152+
153+
154+
<StackPanel Width="550" Margin="24,20,24,20">
155+
<StackPanel Margin="0,0,24,0">
156+
<TextBlock
157+
FontSize="20"
158+
FontWeight="SemiBold"
159+
Text="{DynamicResource Welcome_Page1_Title}" />
160+
<TextBlock
161+
Margin="0,10,24,0"
162+
FontSize="14"
163+
Text="{DynamicResource Welcome_Page1_Text01}"
164+
TextWrapping="WrapWithOverflow" />
165+
<TextBlock
166+
Margin="0,10,24,0"
167+
FontSize="14"
168+
Text="{DynamicResource Welcome_Page1_Text02}"
169+
TextWrapping="WrapWithOverflow" />
170+
<TextBlock
171+
Margin="0,30,0,0"
172+
FontSize="14"
173+
FontWeight="SemiBold"
174+
Text="{DynamicResource language}" />
175+
<ComboBox
176+
Width="200"
177+
Margin="0,10,0,0"
178+
DisplayMemberPath="Display"
179+
ItemsSource="{Binding Languages}"
180+
SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"
181+
SelectedValuePath="LanguageCode" />
182+
183+
</StackPanel>
184+
185+
</StackPanel>
186+
</Canvas>
150187
</Grid>
151188
</ScrollViewer>
152189
</ui:Page>

0 commit comments

Comments
 (0)