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 +77 -41
8 changed files with 77 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41e77ba16c - Show all commits

14
DokterApp/Homepage.xaml
View File

@@ -1,14 +0,0 @@
<Page x:Class="DokterApp.Homepage"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DokterApp"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="Homepage">
<Grid>
</Grid>
</Page>

3
DokterApp/MainWindow.xaml
View File

@@ -17,11 +17,12 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0" Orientation="Vertical">
<Label Content="Sensei" Margin="0,0,0,20" HorizontalAlignment="Center"/>
<Label Content="Username" HorizontalContentAlignment="Center"/>
<TextBox x:Name="Username" TextWrapping="Wrap" Width="120"/>
<Label Content="Password" HorizontalContentAlignment="Center"/>
<TextBox x:Name="Password" TextWrapping="Wrap" Width="120"/>
<Button x:Name="Login" Content="Login" Margin="0,20,0,0" />
<Button x:Name="Login" Content="Login" Margin="0,20,0,0" Click="Login_Click_1" />
</StackPanel>
</Grid>

14
DokterApp/MainWindow.xaml.cs
View File

@@ -25,16 +25,16 @@ namespace DokterApp
InitializeComponent();
}
private void Login_Click(object sender, RoutedEventArgs e)
{
}
private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
{
}
private void Login_Click_1(object sender, RoutedEventArgs e)
{
WindowTabs windowTabs = new WindowTabs();
windowTabs.Show();
this.Close();
}
}
}

12
DokterApp/UserControl.xaml
View File

@@ -1,12 +0,0 @@
<UserControl x:Class="DokterApp.UserControl"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DokterApp"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
</Grid>
</UserControl>

42
DokterApp/UserControlForTab.xaml Normal file
View File

@@ -0,0 +1,42 @@
<UserControl x:Class="DokterApp.UserControlForTab"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DokterApp"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="5*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<Label Content="Label"/>
<Label Content="Label"/>
</StackPanel>
<StackPanel Grid.Row="1">
<StackPanel Orientation="Horizontal" Height="50">
<Label Content="Label"/>
<Label Content="Label"/>
<Label Content="Label"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="50">
<TextBox Text="TextBox" TextWrapping="Wrap" Width="120"/>
<TextBox Text="TextBox" TextWrapping="Wrap" Width="120"/>
<TextBox Text="TextBox" TextWrapping="Wrap" Width="120"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="50">
<Label Content="Label"/>
<Label Content="Label"/>
<Label Content="Label"/>
</StackPanel>
</StackPanel>
</Grid>
</UserControl>

6
DokterApp/Homepage.xaml.cs → DokterApp/UserControlForTab.xaml.cs
View File

@@ -14,11 +14,11 @@ using System.Windows.Shapes;
namespace DokterApp
{
/// <summary>
/// Interaction logic for Homepage.xaml
/// Interaction logic for UserControlForTab.xaml
/// </summary>
public partial class Homepage : Page
public partial class UserControlForTab : UserControl
{
public Homepage()
public UserControlForTab()
{
InitializeComponent();
}

20
DokterApp/WindowTabs.xaml Normal file
View File

@@ -0,0 +1,20 @@
<Window x:Class="DokterApp.WindowTabs"
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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:DokterApp"
mc:Ignorable="d"
Title="WindowTabs" Height="450" Width="800">
<Grid>
<TabControl>
<TabItem Header="TabItem">
<Grid Background="#FFE5E5E5"/>
</TabItem>
<TabItem Header="TabItem">
<Grid Background="#FFE5E5E5"/>
</TabItem>
</TabControl>
</Grid>
</Window>

7
DokterApp/UserControl.xaml.cs → DokterApp/WindowTabs.xaml.cs
View File

@@ -8,17 +8,16 @@ using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace DokterApp
{
/// <summary>
/// Interaction logic for UserControl.xaml
/// Interaction logic for WindowTabs.xaml
/// </summary>
public partial class UserControl : UserControl
public partial class WindowTabs : Window
{
public UserControl()
public WindowTabs()
{
InitializeComponent();
}