sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADDED] title change

Browse Source
This commit is contained in:
lars
2020-10-13 15:16:54 +02:00
parent e792d28746
commit f5453d2f56
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Client/Views/GameWindow.xaml
View File

@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Client.Views" xmlns:local="clr-namespace:Client.Views"
mc:Ignorable="d" mc:Ignorable="d"
Title="GameWindow" Height="600" Width="1200"> Title="Scrubl.io" Height="600" Width="1200">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
@@ -30,14 +30,7 @@
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Grid.Row="0" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="1" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="2" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="3" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="4" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="5" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="6" Content="{Binding Path=...}" FontSize="15"/>
<Label Grid.Row="7" Content="{Binding Path=...}" FontSize="15"/>
</Grid> </Grid>
<Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Width="100" Margin="10, 10, 10, 10" Content="RESET" /> <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Width="100" Margin="10, 10, 10, 10" Content="RESET" />

6
Client/Views/MainWindow.xaml
View File

@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Client" xmlns:local="clr-namespace:Client"
mc:Ignorable="d" mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800"> Title="Scrubl.io" Height="450" Width="800">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
@@ -67,8 +67,8 @@
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Grid.Row="0" Content="join a selected lobby" Click="Button_Click" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/> <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Click="Button_Click" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
<Button Grid.Row="1" Content="host a new lobby" Command="{Binding ...}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/> <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding ...}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
</Grid> </Grid>
</Grid> </Grid>

3
Client/Views/MainWindow.xaml.cs
View File

@@ -35,6 +35,9 @@ namespace Client
testLabel.Content = lobbySelected.ID; testLabel.Content = lobbySelected.ID;
usernameTextbox.IsEnabled = false; usernameTextbox.IsEnabled = false;
colorSelection.IsEnabled = false; colorSelection.IsEnabled = false;
joinButton.IsEnabled = false;
hostButton.IsEnabled = false;
GameWindow window = new GameWindow(); GameWindow window = new GameWindow();
window.Show(); window.Show();
} }