Skip to content

Commit e2ff4c2

Browse files
onesoundsonesounds
committed
Add Welcome Images and Adjust Pages
1 parent 65fe891 commit e2ff4c2

11 files changed

+524
-76
lines changed

‎Flow.Launcher/Images/page_img01.png

32.5 KB
Loading

‎Flow.Launcher/Images/page_img02.png

45.9 KB
Loading

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

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,93 @@
66
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
Title="WelcomePage1"
9-
d:DesignHeight="450"
10-
d:DesignWidth="800"
11-
Background="#cecece"
129
mc:Ignorable="d">
13-
10+
<Page.Resources>
11+
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
12+
<Setter Property="Opacity" Value="0" />
13+
<Style.Triggers>
14+
<!-- Fades-in the image when it becomes visible -->
15+
<Trigger Property="IsVisible" Value="True">
16+
<Trigger.EnterActions>
17+
<BeginStoryboard>
18+
<BeginStoryboard.Storyboard>
19+
<Storyboard x:Name="FadeIn">
20+
<DoubleAnimation
21+
Storyboard.TargetProperty="Opacity"
22+
To="1"
23+
Duration="0:0:2" />
24+
</Storyboard>
25+
</BeginStoryboard.Storyboard>
26+
</BeginStoryboard>
27+
</Trigger.EnterActions>
28+
</Trigger>
29+
</Style.Triggers>
30+
</Style>
31+
</Page.Resources>
1432
<ScrollViewer>
1533
<Grid>
16-
<TextBlock>Page1</TextBlock>
34+
<Grid.RowDefinitions>
35+
<RowDefinition Height="250" />
36+
<RowDefinition />
37+
</Grid.RowDefinitions>
38+
39+
<Border Grid.Row="0" HorizontalAlignment="Stretch">
40+
<Border.Background>
41+
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
42+
<LinearGradientBrush.GradientStops>
43+
<GradientStop Offset="0.0" Color="#1494df" />
44+
<GradientStop Offset="1.0" Color="#1073bd" />
45+
</LinearGradientBrush.GradientStops>
46+
</LinearGradientBrush>
47+
</Border.Background>
48+
49+
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
50+
<Image
51+
Name="Logo"
52+
Width="60"
53+
Height="60"
54+
Source="../../images/app.png"
55+
Style="{DynamicResource StyleImageFadeIn}" />
56+
<TextBlock
57+
Margin="12,0,0,0"
58+
VerticalAlignment="Center"
59+
FontSize="30"
60+
Foreground="White">
61+
Flow Launcher
62+
</TextBlock>
63+
</StackPanel>
64+
</Border>
65+
66+
<StackPanel Grid.Row="1" Margin="24,20,24,20">
67+
<StackPanel>
68+
<TextBlock FontSize="20" FontWeight="SemiBold">Welcome to Flow Launcher</TextBlock>
69+
<TextBlock
70+
Margin="0,10,0,0"
71+
FontSize="14"
72+
TextWrapping="WrapWithOverflow">
73+
Hello, It's your first time to run a Flow Launcher!
74+
</TextBlock>
75+
<TextBlock
76+
Margin="0,10,0,0"
77+
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>
81+
<TextBlock
82+
Margin="0,30,0,0"
83+
FontSize="14"
84+
FontWeight="SemiBold"
85+
Text="{DynamicResource language}" />
86+
<ComboBox
87+
Width="200"
88+
Margin="0,10,0,0"
89+
DisplayMemberPath="Display"
90+
ItemsSource="{Binding Languages}"
91+
SelectedValue="{Binding Language}"
92+
SelectedValuePath="LanguageCode" />
93+
</StackPanel>
94+
95+
</StackPanel>
1796
</Grid>
1897
</ScrollViewer>
1998
</Page>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@
99
using System.Windows.Documents;
1010
using System.Windows.Input;
1111
using System.Windows.Media;
12+
using System.IO;
1213
using System.Windows.Media.Imaging;
1314
using System.Windows.Navigation;
1415
using System.Windows.Shapes;
16+
using Flow.Launcher.Infrastructure.UserSettings;
17+
using System.Windows.Interop;
18+
using Microsoft.Win32;
19+
using Flow.Launcher.Infrastructure;
20+
using Flow.Launcher.ViewModel;
21+
1522

1623
namespace Flow.Launcher.Resources.Pages
1724
{
@@ -22,6 +29,7 @@ public partial class WelcomePage1 : Page
2229
{
2330
public WelcomePage1()
2431
{
32+
2533
InitializeComponent();
2634
}
2735
}

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

Lines changed: 114 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,128 @@
22
x:Class="Flow.Launcher.Resources.Pages.WelcomePage2"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
56
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
68
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
79
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
810
xmlns:ui="http://schemas.modernwpf.com/2019"
911
Title="WelcomePage2"
12+
d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
1013
mc:Ignorable="d">
11-
14+
<Page.Resources>
15+
<converters:BorderClipConverter x:Key="BorderClipConverter" />
16+
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
17+
<Setter Property="Opacity" Value="0" />
18+
<Style.Triggers>
19+
<!-- Fades-in the image when it becomes visible -->
20+
<Trigger Property="IsVisible" Value="True">
21+
<Trigger.EnterActions>
22+
<BeginStoryboard>
23+
<BeginStoryboard.Storyboard>
24+
<Storyboard x:Name="FadeIn">
25+
<DoubleAnimation
26+
Storyboard.TargetProperty="Opacity"
27+
To="1"
28+
Duration="0:0:2" />
29+
</Storyboard>
30+
</BeginStoryboard.Storyboard>
31+
</BeginStoryboard>
32+
</Trigger.EnterActions>
33+
</Trigger>
34+
</Style.Triggers>
35+
</Style>
36+
</Page.Resources>
1237
<ScrollViewer>
1338
<Grid>
14-
<TextBlock>Page2</TextBlock>
39+
<Grid.RowDefinitions>
40+
<RowDefinition Height="250" />
41+
<RowDefinition />
42+
</Grid.RowDefinitions>
43+
44+
<Border Grid.Row="0" HorizontalAlignment="Stretch">
45+
<Border.Background>
46+
<LinearGradientBrush StartPoint="1 0" EndPoint="0 1">
47+
<LinearGradientBrush.GradientStops>
48+
<GradientStop Offset="0.0" Color="#6e34a4" />
49+
<GradientStop Offset="1.0" Color="#ab58f8" />
50+
</LinearGradientBrush.GradientStops>
51+
</LinearGradientBrush>
52+
</Border.Background>
53+
54+
<StackPanel
55+
Grid.Row="1"
56+
Margin="0"
57+
Background="{Binding PreviewBackground}">
58+
<StackPanel
59+
Margin="0,80,0,0"
60+
HorizontalAlignment="Center"
61+
VerticalAlignment="Center"
62+
Orientation="Horizontal">
63+
<Border Width="450" Style="{DynamicResource WindowBorderStyle}">
64+
<Border Style="{DynamicResource WindowRadius}">
65+
<Grid>
66+
<Grid.RowDefinitions>
67+
<RowDefinition Height="54" />
68+
<RowDefinition />
69+
<RowDefinition />
70+
</Grid.RowDefinitions>
71+
<Border Grid.Row="0">
72+
<TextBox
73+
IsReadOnly="True"
74+
Style="{DynamicResource QueryBoxStyle}"
75+
Text="{DynamicResource hiThere}" />
76+
77+
</Border>
78+
<Canvas Style="{DynamicResource SearchIconPosition}">
79+
<Path
80+
Margin="0"
81+
Data="{DynamicResource SearchIconImg}"
82+
Stretch="Fill"
83+
Style="{DynamicResource SearchIconStyle}" />
84+
</Canvas>
85+
<!--
86+
87+
<Border Grid.Row="1" Margin="0,0,0,0">
88+
<Rectangle
89+
Width="Auto"
90+
HorizontalAlignment="Stretch"
91+
Style="{DynamicResource SeparatorStyle}"
92+
Visibility="Visible" />
93+
</Border>
94+
95+
<ContentControl Grid.Row="2">
96+
<flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
97+
</ContentControl>-->
98+
</Grid>
99+
</Border>
100+
</Border>
101+
</StackPanel>
102+
</StackPanel>
103+
</Border>
104+
105+
<StackPanel Grid.Row="1" Margin="24,20,24,20">
106+
<StackPanel>
107+
<TextBlock FontSize="20" FontWeight="SemiBold">Search and run everything in everywhere</TextBlock>
108+
<TextBlock
109+
Margin="0,10,0,0"
110+
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+
<TextBlock
115+
Margin="0,30,0,0"
116+
FontSize="14"
117+
FontWeight="SemiBold"
118+
Text="{DynamicResource flowlauncherHotkey}" />
119+
<flowlauncher:HotkeyControl
120+
x:Name="HotkeyControl"
121+
Width="300"
122+
Height="35"
123+
Margin="-206,10,0,0" />
124+
</StackPanel>
125+
126+
</StackPanel>
15127
</Grid>
16128
</ScrollViewer>
17129
</Page>

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

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,70 @@
99
d:DesignHeight="450"
1010
d:DesignWidth="800"
1111
mc:Ignorable="d">
12+
<Page.Resources>
13+
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
14+
<Setter Property="Opacity" Value="0" />
15+
<Style.Triggers>
16+
<!-- Fades-in the image when it becomes visible -->
17+
<Trigger Property="IsVisible" Value="True">
18+
<Trigger.EnterActions>
19+
<BeginStoryboard>
20+
<BeginStoryboard.Storyboard>
21+
<Storyboard x:Name="FadeIn">
22+
<DoubleAnimation
23+
Storyboard.TargetProperty="Opacity"
24+
To="1"
25+
Duration="0:0:2" />
26+
</Storyboard>
27+
</BeginStoryboard.Storyboard>
28+
</BeginStoryboard>
29+
</Trigger.EnterActions>
30+
</Trigger>
31+
</Style.Triggers>
32+
</Style>
33+
</Page.Resources>
34+
<ScrollViewer>
35+
<Grid>
36+
<Grid.RowDefinitions>
37+
<RowDefinition Height="250" />
38+
<RowDefinition />
39+
</Grid.RowDefinitions>
1240

13-
<Grid />
41+
<Border Grid.Row="0" HorizontalAlignment="Stretch">
42+
<Border.Background>
43+
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
44+
<LinearGradientBrush.GradientStops>
45+
<GradientStop Offset="0.0" Color="#16af7b" />
46+
<GradientStop Offset="1.0" Color="#34c191" />
47+
</LinearGradientBrush.GradientStops>
48+
</LinearGradientBrush>
49+
</Border.Background>
50+
51+
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
52+
<Image
53+
Width="500"
54+
Height="300"
55+
Margin="0,30,0,0"
56+
Source="../../images/page_img02.png" />
57+
</StackPanel>
58+
</Border>
59+
60+
<StackPanel Grid.Row="1" Margin="24,20,24,20">
61+
<StackPanel>
62+
<TextBlock FontSize="20" FontWeight="SemiBold">Hotkeys and Commands</TextBlock>
63+
<TextBlock
64+
Margin="0,10,0,0"
65+
FontSize="14"
66+
TextWrapping="WrapWithOverflow">
67+
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.
68+
</TextBlock>
69+
<TextBlock
70+
Margin="0,10,0,0"
71+
FontSize="14"
72+
TextWrapping="WrapWithOverflow" />
73+
</StackPanel>
74+
75+
</StackPanel>
76+
</Grid>
77+
</ScrollViewer>
1478
</Page>

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

Lines changed: 56 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,57 @@
1-
<Page x:Class="Flow.Launcher.Resources.Pages.WelcomePage4"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
7-
mc:Ignorable="d"
8-
d:DesignHeight="450" d:DesignWidth="800"
9-
Title="WelcomePage4">
10-
11-
<Grid>
12-
13-
</Grid>
1+
<Page
2+
x:Class="Flow.Launcher.Resources.Pages.WelcomePage4"
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="WelcomePage4"
9+
d:DesignHeight="450"
10+
d:DesignWidth="800"
11+
mc:Ignorable="d">
12+
<ScrollViewer>
13+
<Grid>
14+
<Grid.RowDefinitions>
15+
<RowDefinition Height="250" />
16+
<RowDefinition />
17+
</Grid.RowDefinitions>
18+
19+
<Border Grid.Row="0" HorizontalAlignment="Stretch">
20+
<Border.Background>
21+
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
22+
<LinearGradientBrush.GradientStops>
23+
<GradientStop Offset="0.0" Color="#e8457c" />
24+
<GradientStop Offset="1.0" Color="#bc1948" />
25+
</LinearGradientBrush.GradientStops>
26+
</LinearGradientBrush>
27+
</Border.Background>
28+
29+
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
30+
<Image
31+
Name="Logo"
32+
Width="450"
33+
Height="300"
34+
Margin="0,20,0,0"
35+
Source="../../images/page_img01.png" />
36+
</StackPanel>
37+
</Border>
38+
39+
<StackPanel Grid.Row="1" Margin="24,20,24,20">
40+
<StackPanel>
41+
<TextBlock FontSize="20" FontWeight="SemiBold">Action Keyword</TextBlock>
42+
<TextBlock
43+
Margin="0,10,0,0"
44+
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+
<TextBlock
49+
Margin="0,10,0,0"
50+
FontSize="14"
51+
TextWrapping="WrapWithOverflow" />
52+
</StackPanel>
53+
54+
</StackPanel>
55+
</Grid>
56+
</ScrollViewer>
1457
</Page>

0 commit comments

Comments
 (0)