Update GUI

This commit is contained in:
2023-05-14 00:02:31 +02:00
parent 4d78cdd8a5
commit 92ff8a5dc9
2 changed files with 32 additions and 17 deletions

View File

@ -4,8 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Elwig.Windows"
mc:Ignorable="d"
Title="Elwig" Height="450" Width="800" ResizeMode="CanResize" SizeToContent="Manual"
Title="Elwig" MinHeight="400" MinWidth="325" Height="450" Width="800" ResizeMode="CanResize"
Loaded="Window_Loaded">
<Window.Resources>
<Style TargetType="Button">
@ -16,7 +15,15 @@
</Style>
</Window.Resources>
<Grid>
<Grid Height="100" VerticalAlignment="Top">
<Menu BorderThickness="0,0,0,1" VerticalAlignment="Top" Height="19" BorderBrush="LightGray" Background="White">
<MenuItem Header="Datenbank">
<MenuItem Header="Backup erstellen"/>
</MenuItem>
<MenuItem Header="Hilfe">
<MenuItem Header="Über"/>
</MenuItem>
</Menu>
<Grid Height="100" VerticalAlignment="Top" Margin="0,25,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>

View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Elwig.Windows"
Title="Mitgliederverwaltung - Elwig" Height="650" Width="1200" MinHeight="600" MinWidth="1000"
Title="Mitgliederverwaltung - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
Loaded="Window_Loaded">
<Window.Resources>
<Style TargetType="Label">
@ -39,9 +39,10 @@
<Grid.RowDefinitions>
<RowDefinition Height="19"/>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="0.2*"/>
<RowDefinition Height="1.3*"/>
<RowDefinition Height="0.9*"/>
<RowDefinition Height="0.8*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="370"/>
@ -67,7 +68,7 @@
</MenuItem>
</Menu>
<Grid Grid.RowSpan="4" Grid.Row="1">
<Grid Grid.RowSpan="5" Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="125"/>
<ColumnDefinition Width="120"/>
@ -142,8 +143,8 @@
<TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
<Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1"/>
<TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" TextWrapping="NoWrap" VerticalAlignment="Top"/>
<Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
<Label Content="Adresse:" Margin="10,130,0,0"/>
<TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
@ -157,7 +158,7 @@
Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
</Grid>
</GroupBox>
<GroupBox Header="Kontaktdaten" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
<GroupBox Header="Kontaktdaten" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="115"/>
@ -172,16 +173,20 @@
<TextBox x:Name="PhoneLandlineInput" Margin="0,40,10,0" Grid.Column="1"
TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
<Label Content="Tel.-Nr. (mobil):" Margin="10,70,0,0" Grid.Column="0"/>
<TextBox x:Name="PhoneMobile1Input" Margin="0,70,10,0" Grid.Column="1"
<Label Content="Fax-Nr.:" Margin="10,70,0,0" Grid.Column="0"/>
<TextBox x:Name="FaxInput" Margin="0,70,10,0" Grid.Column="1"
TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
<Label Content="Tel.-Nr. (mobil):" Margin="10,100,0,0" Grid.Column="0"/>
<TextBox x:Name="PhoneMobile2Input" Margin="0,100,10,0" Grid.Column="1"
<TextBox x:Name="PhoneMobile1Input" Margin="0,100,10,0" Grid.Column="1"
TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
<Label Content="Tel.-Nr. (mobil):" Margin="10,130,0,0" Grid.Column="0"/>
<TextBox x:Name="PhoneMobile2Input" Margin="0,130,10,0" Grid.Column="1"
TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
</Grid>
</GroupBox>
<GroupBox Header="Bankverbindung" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10">
<GroupBox Header="Bankverbindung" Grid.Column="1" Grid.Row="5" Margin="5,5,5,10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="65"/>
@ -218,7 +223,7 @@
Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
</Grid>
</GroupBox>
<GroupBox Header="Rechnungsadresse (optional)" Grid.Column="2" Grid.Row="2" Grid.RowSpan="1" Margin="5,5,5,5">
<GroupBox Header="Rechnungsadresse (optional)" Grid.Column="2" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="65"/>
@ -241,7 +246,7 @@
Margin="47,70,10,0" Grid.Column="1"/>
</Grid>
</GroupBox>
<GroupBox Header="Genossenschaft" Grid.Column="2" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
<GroupBox Header="Genossenschaft" Grid.Column="2" Grid.Row="4" Grid.RowSpan="2" Margin="5,5,5,10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/>
@ -303,8 +308,11 @@
<TextBlock x:Name="AreaCommitment" Text="- m²"
Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/>
<Button x:Name="DeliveryButton" Content="Lieferungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
HorizontalAlignment="Right" Margin="10,00,10,42" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
<Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
HorizontalAlignment="Right" Margin="10,10,10,10" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
</Grid>
</GroupBox>
</Grid>