sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +7 -7
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5fcf0d177b - Show all commits

4
ClientApp/Views/LoginView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="ClientApp.Views.LoginView"
<Page x:Class="ClientApp.Views.LoginView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -19,4 +19,4 @@
</Popup>
</StackPanel>
</DockPanel>
</UserControl>
</Page>

2
ClientApp/Views/LoginView.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace ClientApp.Views
/// <summary>
/// Interaction logic for LoginView.xaml
/// </summary>
public partial class LoginView : UserControl
public partial class LoginView : Page
{
public LoginView()
{

4
ClientApp/Views/MainView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="ClientApp.Views.MainView"
<Page x:Class="ClientApp.Views.MainView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -49,4 +49,4 @@
</Grid>
</DockPanel>
</UserControl>
</Page>

2
ClientApp/Views/MainView.xaml.cs
View File

@@ -17,7 +17,7 @@ namespace ClientApp.Views
/// <summary>
/// Interaction logic for MainView.xaml
/// </summary>
public partial class MainView : UserControl
public partial class MainView : Page
{
public MainView()
{

2
ClientApp/Views/MainWindow.xaml
View File

@@ -11,6 +11,6 @@
<DockPanel>
<Label Content="gemaakt door: mensen" DockPanel.Dock="Bottom" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontStyle="Italic" Foreground="Gray"/>
<ContentControl HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" Focusable="False" />
<Frame HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" Focusable="False"/>
</DockPanel>
</Window>