diff --git a/WGneu/Windows/MemberListWindow.xaml b/WGneu/Windows/MemberListWindow.xaml
index 17e50a3..b67e15b 100644
--- a/WGneu/Windows/MemberListWindow.xaml
+++ b/WGneu/Windows/MemberListWindow.xaml
@@ -10,8 +10,8 @@
<Style TargetType="Label">
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Top"/>
- <Setter Property="Padding" Value="2"/>
- <Setter Property="Height" Value="20"/>
+ <Setter Property="Padding" Value="2,4,2,4"/>
+ <Setter Property="Height" Value="25"/>
</Style>
<Style TargetType="TextBox">
<Setter Property="HorizontalAlignment" Value="Stretch"/>
@@ -29,6 +29,11 @@
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="VerticalAlignment" Value="Top"/>
</Style>
+ <Style TargetType="Button">
+ <Setter Property="FontSize" Value="14"/>
+ <Setter Property="Padding" Value="3"/>
+ <Setter Property="Height" Value="27"/>
+ </Style>
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
@@ -82,18 +87,18 @@
</DataGrid>
<Button x:Name="NewMemberButton" Content="Neu" Click="NewMemberButton_Click"
- HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,10,0,10" FontSize="14" Padding="3,3,3,3" Width="100" Height="27" Grid.Column="0"/>
+ HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,10,0,10" Width="100" Grid.Column="0"/>
<Button x:Name="EditMemberButton" Content="Bearbeiten" Click="EditMemberButton_Click" IsEnabled="False"
- HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,10,0,10" FontSize="14" Padding="3,3,3,3" Width="100" Height="27" Grid.Column="1"/>
+ HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,10,0,10" Width="100" Grid.Column="1"/>
<Button x:Name="DeleteMemberButton" Content="Löschen" Click="DeleteMemberButton_Click" IsEnabled="False"
- HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,10,10" FontSize="14" Padding="3,3,3,3" Width="100" Height="27" Grid.Column="2"/>
+ HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,10,10" Width="100" Grid.Column="2"/>
<Button x:Name="SaveButton" Content="Speichern" Click="SaveButton_Click" IsEnabled="False" Visibility="Hidden"
- HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,10,0,10" FontSize="14" Padding="3,3,3,3" Width="100" Height="27" Grid.Column="0"/>
+ HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,10,0,10" Width="100" Grid.Column="0"/>
<Button x:Name="ResetButton" Content="Zurücksetzen" Click="ResetButton_Click" IsEnabled="False" Visibility="Hidden"
- HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,10,0,10" FontSize="14" Padding="3,3,3,3" Width="100" Height="27" Grid.Column="1"/>
+ HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,10,0,10" Width="100" Grid.Column="1"/>
<Button x:Name="CancelButton" Content="Abbrechen" Click="CancelButton_Click" IsEnabled="False" Visibility="Hidden"
- HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,10,10" FontSize="14" Padding="3,3,3,3" Width="100" Height="27" Grid.Column="2"/>
+ HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,10,10" Width="100" Grid.Column="2"/>
</Grid>
<GroupBox Header="Persönliche Daten" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
@@ -105,36 +110,36 @@
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
- <Label Content="MgNr.:" Margin="10,12,0,0" Grid.Column="0"/>
+ <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
- <Label Content="Vorg.:" Margin="10,12,0,0" Grid.Column="2"/>
+ <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
<TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"/>
- <Label Content="Vorname:" Margin="10,42,0,0" Grid.Column="0"/>
+ <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
TextChanged="TextBox_TextChanged"/>
- <Label Content="Präfix:" Margin="10,42,0,0" Grid.Column="2"/>
+ <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
<TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
TextChanged="TextBox_TextChanged"/>
- <Label Content="Nachname:" Margin="10,72,0,0" Grid.Column="0"/>
+ <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
<TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
TextChanged="TextBox_TextChanged"/>
- <Label Content="Suffix:" Margin="10,72,0,0" Grid.Column="2"/>
+ <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
<TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
TextChanged="TextBox_TextChanged"/>
- <Label Content="Geburtstag:" Margin="10,102,0,0" Grid.Column="0"/>
+ <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
<TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"/>
- <Label Content="Adresse:" Margin="10,132,0,0" Height="20"/>
+ <Label Content="Adresse:" Margin="10,130,0,0"/>
<TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
TextChanged="TextBox_TextChanged"/>
- <Label Content="PLZ/Ort:" Margin="10,162,0,0" Grid.Column="0"/>
+ <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
<TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus"/>
<ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestComboBoxTemplate}" TextSearch.TextPath="Ort.Name"
@@ -149,19 +154,19 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <Label Content="E-Mail-Adresse:" Margin="10,12,0,0" Grid.Column="0"/>
+ <Label Content="E-Mail-Adresse:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="EmailInput" Margin="0,10,10,0" Grid.Column="1"
TextChanged="EmailInput_TextChanged" LostFocus="EmailInput_LostFocus"/>
- <Label Content="Tel.-Nr. (Festnetz):" Margin="10,42,0,0" Grid.Column="0"/>
+ <Label Content="Tel.-Nr. (Festnetz):" Margin="10,40,0,0" Grid.Column="0"/>
<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,72,0,0" Grid.Column="0"/>
+ <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"
TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
- <Label Content="Tel.-Nr. (mobil):" Margin="10,102,0,0" Grid.Column="0"/>
+ <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"
TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
</Grid>
@@ -173,11 +178,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <Label Content="IBAN:" Margin="10,12,0,0" Grid.Column="0"/>
+ <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
- <Label Content="BIC:" Margin="10,42,0,0" Grid.Column="0"/>
+ <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
</Grid>
@@ -190,10 +195,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <Label Content="UID:" Margin="10,12,0,0" Grid.Column="0"/>
+ <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="UstIdInput" Margin="0,10,10,0" Grid.Column="1" Width="120" HorizontalAlignment="Left"/>
- <Label Content="BetriebsNr.:" Margin="10,42,0,0" Grid.Column="0"/>
+ <Label Content="BetriebsNr.:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
@@ -209,15 +214,15 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <Label Content="Name:" Margin="10,12,0,0" Grid.Column="0"/>
+ <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="BillingName" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
TextChanged="TextBox_TextChanged"/>
- <Label Content="Adresse:" Margin="10,42,0,0" Grid.Column="0"/>
+ <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
TextChanged="TextBox_TextChanged"/>
- <Label Content="PLZ/Ort:" Margin="10,72,0,0" Grid.Column="0"/>
+ <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
<TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
TextChanged="BillingPlzInput_TextChanged" LostFocus="BillingPlzInput_LostFocus"/>
<ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestComboBoxTemplate}" TextSearch.TextPath="Ort.Name"
@@ -233,16 +238,16 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <Label Content="Eintritt:" Margin="10,12,0,0" Grid.Column="0"/>
+ <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="76" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"/>
- <Label Content="Austritt:" Margin="10,42,0,0" Grid.Column="0"/>
+ <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="76" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"/>
- <Label Content="Geschäftsanteile:" Margin="10,72,0,0" Grid.Column="0"/>
+ <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
<TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"/>
- <Label Content="BH-Konto:" Margin="10,102,0,0" Grid.Column="0"/>
+ <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
<TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
TextChanged="TextBox_TextChanged"/>
@@ -258,21 +263,21 @@
Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
- <Label Content="StammZwst.:" Margin="10,132,0,0" Grid.Column="0"/>
+ <Label Content="StammZwst.:" Margin="10,130,0,0" Grid.Column="0"/>
<ComboBox x:Name="BranchInput" ItemTemplate="{StaticResource BranchTemplate}" TextSearch.TextPath="Name"
SelectionChanged="ComboBox_SelectionChanged"
Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
- <Label Content="Stammgemeinde:" Margin="10,162,0,0" Grid.Column="0"/>
+ <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
<ComboBox x:Name="DefaultKgInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name"
SelectionChanged="ComboBox_SelectionChanged"
Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
- <Label Content="Anmerkung:" Margin="10,192,0,0" Grid.Column="0"/>
+ <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
<TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"
TextChanged="TextBox_TextChanged"/>
- <Label Content="Kontaktart:" Margin="10,222,0,0" Grid.Column="0"/>
+ <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
<RadioButton x:Name="ContactPostInput" GroupName="DefaultContact" Content="Post" IsEnabled="False"
Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"
HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>