conflicts
This commit is contained in:
@@ -14,9 +14,8 @@
|
||||
<Label Content="Password" HorizontalContentAlignment="Center"/>
|
||||
<PasswordBox x:Name="Password" Width="120"/>
|
||||
<Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
|
||||
<CheckBox Name = "PCheckBox" Margin = "198,94,208,194" Content = "Checked Me"/>
|
||||
<Popup IsOpen="{Binding LoginStatus}" PopupAnimation = "Slide">
|
||||
<Label Content="Login failed" Foreground="Red"/>
|
||||
<Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Fade" HorizontalAlignment="Left">
|
||||
<Label Content="Login failed" Foreground="Red" Background="#FFFF" />
|
||||
</Popup>
|
||||
</StackPanel>
|
||||
</DockPanel>
|
||||
|
||||
@@ -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}" />
|
||||
<ContentControl HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" Focusable="False" />
|
||||
</DockPanel>
|
||||
</Window>
|
||||
|
||||
Reference in New Issue
Block a user