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 Pages to ui:Page (modernWPF)

Browse source
This commit is contained in:
DB p 2021-12-03 05:05:11 +09:00
parent a6f1e7ff52
commit 85fbdd1808
11 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,11 @@
<Page
<ui:Page
x:Class="Flow.Launcher.Resources.Pages.WelcomePage1"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage1"
DataContext="{Binding RelativeSource={RelativeSource Self}}"
mc:Ignorable="d">
@ -148,4 +149,4 @@
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
</ui:Page>

2
Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
View file

@ -25,7 +25,7 @@ namespace Flow.Launcher.Resources.Pages
/// <summary>
/// WelcomePage1.xaml에 대한 상호 작용 논리
/// </summary>
public partial class WelcomePage1 : Page
public partial class WelcomePage1
{
public WelcomePage1(Settings settings)

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

@ -1,4 +1,4 @@
<Page
<ui:Page
x:Class="Flow.Launcher.Resources.Pages.WelcomePage2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -119,4 +119,4 @@
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
</ui:Page>

2
Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
View file

@ -20,7 +20,7 @@ namespace Flow.Launcher.Resources.Pages
/// <summary>
/// WelcomePage2.xaml에 대한 상호 작용 논리
/// </summary>
public partial class WelcomePage2 : Page
public partial class WelcomePage2
{
private readonly Settings settings;

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

@ -1,10 +1,11 @@
<Page
<ui:Page
x:Class="Flow.Launcher.Resources.Pages.WelcomePage3"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage3"
mc:Ignorable="d">
<Page.Resources>
@ -303,4 +304,4 @@
</Grid>
</ScrollViewer>
</Page>
</ui:Page>

2
Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
View file

@ -17,7 +17,7 @@ using System.Windows.Shapes;
namespace Flow.Launcher.Resources.Pages
{
public partial class WelcomePage3 : Page
public partial class WelcomePage3
{
public WelcomePage3()
{

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

@ -1,10 +1,11 @@
<Page
<ui:Page
x:Class="Flow.Launcher.Resources.Pages.WelcomePage4"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage4"
d:DesignHeight="450"
d:DesignWidth="800"
@ -132,4 +133,4 @@
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
</ui:Page>

2
Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
View file

@ -18,7 +18,7 @@ namespace Flow.Launcher.Resources.Pages
/// <summary>
/// WelcomePage4.xaml에 대한 상호 작용 논리
/// </summary>
public partial class WelcomePage4 : Page
public partial class WelcomePage4
{
public WelcomePage4()
{

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

@ -1,10 +1,11 @@
<Page
<ui:Page
x:Class="Flow.Launcher.Resources.Pages.WelcomePage5"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
Title="WelcomePage5"
d:DesignHeight="450"
@ -118,4 +119,4 @@
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
</ui:Page>

2
Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
View file

@ -21,7 +21,7 @@ using Flow.Launcher.ViewModel;
namespace Flow.Launcher.Resources.Pages
{
public partial class WelcomePage5 : Page
public partial class WelcomePage5
{
private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
private readonly Settings settings;

3
Flow.Launcher/WelcomeWindow.xaml.cs
View file

@ -83,7 +83,8 @@ namespace Flow.Launcher
{
page--;
UpdateView();
ContentFrame.GoBack();
var pageToNavigateTo = pages[page];
ContentFrame.Navigate(pageToNavigateTo, _transitionInfo);
}
else
{