merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
3 changed files with 10 additions and 1 deletions
Showing only changes of commit 6967fb625d - Show all commits

View File

@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Server"
StartupUri="MainWindow.xaml">
StartupUri="Views/MainWindow.xaml">
<Application.Resources>
</Application.Resources>

View File

@@ -7,6 +7,9 @@
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
<TextBox HorizontalAlignment="center" Margin="0,0,0,0" Text="{Binding ipAddress, Mode=OneWay}" TextWrapping="Wrap" VerticalAlignment="Center" Width="120"/>
<Label Content="IP address:" HorizontalAlignment="Center" Margin="0,176,0,0" VerticalAlignment="Top" Width="120"/>
<Button Content="Connect" HorizontalAlignment="Left" Margin="465,0,0,0" VerticalAlignment="Center" Click="ConnectServer"/>
</Grid>
</Window>

View File

@@ -20,9 +20,15 @@ namespace Server
/// </summary>
public partial class MainWindow : Window
{
private string ipAddress = "test";
public MainWindow()
{
InitializeComponent();
}
private void ConnectServer(object sender, RoutedEventArgs e)
{
}
}
}