Skip to content

Commit 6043930

Browse files
taoocerostaooceros
committed
Fix two binding
1 parent 05c1466 commit 6043930

File tree

2 files changed

+42
-53
lines changed

2 files changed

+42
-53
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public WelcomePage2(Settings settings)
2828
{
2929
InitializeComponent();
3030
this.settings = settings;
31+
HotkeyControl.SetHotkey(new Infrastructure.Hotkey.HotkeyModel(settings.Hotkey));
3132
HotkeyControl.HotkeyChanged += (_, _) =>
3233
{
3334
if (HotkeyControl.CurrentHotkeyAvailable)

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

Lines changed: 41 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<Page
2-
x:Class="Flow.Launcher.Resources.Pages.WelcomePage5"
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-
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
9-
Title="WelcomePage5"
10-
d:DesignHeight="450"
11-
d:DesignWidth="800"
12-
mc:Ignorable="d">
1+
<Page x:Class="Flow.Launcher.Resources.Pages.WelcomePage5"
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+
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
8+
Title="WelcomePage5"
9+
d:DesignHeight="450"
10+
d:DesignWidth="800"
11+
DataContext="{Binding RelativeSource={RelativeSource Self}}"
12+
mc:Ignorable="d">
1313
<Page.Resources>
1414
<Style x:Key="StyleImageFadeIn" TargetType="{x:Type Image}">
1515
<Setter Property="Opacity" Value="0" />
@@ -20,10 +20,7 @@
2020
<BeginStoryboard>
2121
<BeginStoryboard.Storyboard>
2222
<Storyboard x:Name="FadeIn">
23-
<DoubleAnimation
24-
Storyboard.TargetProperty="Opacity"
25-
To="1"
26-
Duration="0:0:2">
23+
<DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:2">
2724
<DoubleAnimation.EasingFunction>
2825
<QuadraticEase EasingMode="EaseOut" />
2926
</DoubleAnimation.EasingFunction>
@@ -54,55 +51,46 @@
5451
</Border.Background>
5552

5653
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
57-
<Image
58-
Name="Logo"
59-
Width="90"
60-
Height="90"
61-
Source="../../images/app.png"
62-
Style="{DynamicResource StyleImageFadeIn}" />
54+
<Image Name="Logo"
55+
Width="90"
56+
Height="90"
57+
Source="../../images/app.png"
58+
Style="{DynamicResource StyleImageFadeIn}" />
6359
</StackPanel>
6460
</Border>
6561

6662
<StackPanel Grid.Row="1" Margin="24,20,24,20">
6763
<StackPanel>
68-
<TextBlock
69-
FontSize="20"
70-
FontWeight="SemiBold"
71-
Text="{DynamicResource Welcome_Page5_Title}" />
72-
<TextBlock
73-
Margin="0,10,0,0"
74-
FontSize="14"
75-
Text="{DynamicResource Welcome_Page5_Text01}"
76-
TextWrapping="WrapWithOverflow" />
64+
<TextBlock FontSize="20" FontWeight="SemiBold" Text="{DynamicResource Welcome_Page5_Title}" />
65+
<TextBlock Margin="0,10,0,0"
66+
FontSize="14"
67+
Text="{DynamicResource Welcome_Page5_Text01}"
68+
TextWrapping="WrapWithOverflow" />
7769
<StackPanel Margin="0,30,0,0" Orientation="Horizontal">
7870
<CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource DefaultCheckBoxStyle}" />
79-
<TextBlock
80-
Margin="0,5,0,0"
81-
FontSize="14"
82-
FontWeight="SemiBold"
83-
Text="{DynamicResource hideOnStartup}" />
71+
<TextBlock Margin="0,5,0,0"
72+
FontSize="14"
73+
FontWeight="SemiBold"
74+
Text="{DynamicResource hideOnStartup}" />
8475

8576
</StackPanel>
8677
<StackPanel Margin="0,0,0,0" Orientation="Horizontal">
87-
<CheckBox
88-
Checked="OnAutoStartupChecked"
89-
IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
90-
Style="{DynamicResource DefaultCheckBoxStyle}"
91-
Unchecked="OnAutoStartupUncheck" />
92-
<TextBlock
93-
Margin="0,5,0,0"
94-
FontSize="14"
95-
FontWeight="SemiBold"
96-
Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
78+
<CheckBox Checked="OnAutoStartupChecked"
79+
IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
80+
Style="{DynamicResource DefaultCheckBoxStyle}"
81+
Unchecked="OnAutoStartupUncheck" />
82+
<TextBlock Margin="0,5,0,0"
83+
FontSize="14"
84+
FontWeight="SemiBold"
85+
Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
9786

9887
</StackPanel>
99-
<Button
100-
Width="150"
101-
Height="40"
102-
Margin="0,60,0,0"
103-
HorizontalAlignment="Right"
104-
Content="{DynamicResource done}"
105-
Style="{DynamicResource AccentButtonStyle}" />
88+
<Button Width="150"
89+
Height="40"
90+
Margin="0,60,0,0"
91+
HorizontalAlignment="Right"
92+
Content="{DynamicResource done}"
93+
Style="{DynamicResource AccentButtonStyle}" />
10694
</StackPanel>
10795

10896
</StackPanel>

0 commit comments

Comments
 (0)