From 6a92eb76a00b9b2082b31a958a3ded53abd90c04 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Fri, 28 Jun 2024 23:19:47 +0200
Subject: [PATCH] PaymentAdjustmentWindow: Minor layout changes
---
Elwig/Windows/PaymentAdjustmentWindow.xaml | 74 +++++++++++-----------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/Elwig/Windows/PaymentAdjustmentWindow.xaml b/Elwig/Windows/PaymentAdjustmentWindow.xaml
index f3a4333..6af3922 100644
--- a/Elwig/Windows/PaymentAdjustmentWindow.xaml
+++ b/Elwig/Windows/PaymentAdjustmentWindow.xaml
@@ -139,43 +139,8 @@
<GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
<Grid Grid.Column="2" Grid.Row="1">
- <GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="5,10,10,10" Height="180" Width="360"
+ <GroupBox Header="Benutzerdefinierte Zu-/Abschläge" Margin="5,10,10,10" Height="180" Width="365"
VerticalAlignment="Top" HorizontalAlignment="Left">
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition/>
- <ColumnDefinition Width="28*"/>
- </Grid.ColumnDefinitions>
- <Label Content="Absoluter Freibetrag:" Margin="10,10,0,0" Grid.ColumnSpan="2"/>
- <ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="128,10,0,0" Width="70"
- TextChanged="KgInput_TextChanged" Grid.Column="1"/>
- <ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="203,10,0,0" Width="60"
- TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
-
- <Label Content="Relativer Freibetrag:" Margin="10,40,0,0" Grid.ColumnSpan="2"/>
- <ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="128,40,0,0" Width="87"
- TextChanged="KgInput_TextChanged" Grid.Column="1"/>
- <ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="220,40,0,0" Width="60"
- TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
-
- <Label Content="Nur mind. nachz.:" Margin="10,70,0,0" Grid.ColumnSpan="2"/>
- <ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="128,70,0,0" Width="50"
- TextChanged="BsInput_TextChanged" Grid.Column="1"/>
-
- <Button x:Name="SeasonButton" Content="GA-Wert" Margin="0,0,10,42" Width="120"
- HorizontalAlignment="Right" VerticalAlignment="Bottom"
- Click="SeasonButton_Click" Grid.Column="1"/>
- <Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="0,0,135,10" Width="120"
- HorizontalAlignment="Right" VerticalAlignment="Bottom"
- Click="AutoAdjustBsButton_Click" Grid.Column="1"/>
- <Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="0,0,10,10" Width="120"
- HorizontalAlignment="Right" VerticalAlignment="Bottom"
- Click="UnAdjustBsButton_Click" Grid.Column="1"/>
- </Grid>
- </GroupBox>
-
- <GroupBox Header="Benutzerdefinierte Zu-/Abschläge" Margin="5,10,10,10" Height="180" Width="360"
- VerticalAlignment="Bottom" HorizontalAlignment="Left">
<Grid>
<Label Content="Mitglied:" Margin="10,10,10,10"/>
<TextBox x:Name="MgNrInput" Width="48" Margin="70,10,10,10" HorizontalAlignment="Left" TextAlignment="Right"
@@ -203,6 +168,41 @@
Click="CustomButton_Click"/>
</Grid>
</GroupBox>
+
+ <GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="5,10,10,10" Height="180" Width="365"
+ VerticalAlignment="Bottom" HorizontalAlignment="Left">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ <ColumnDefinition Width="28*"/>
+ </Grid.ColumnDefinitions>
+ <Label Content="Absoluter Freibetrag:" Margin="10,10,0,0" Grid.ColumnSpan="2"/>
+ <ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="128,10,0,0" Width="70"
+ TextChanged="KgInput_TextChanged" Grid.Column="1"/>
+ <ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="203,10,0,0" Width="60"
+ TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
+
+ <Label Content="Relativer Freibetrag:" Margin="10,40,0,0" Grid.ColumnSpan="2"/>
+ <ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="128,40,0,0" Width="87"
+ TextChanged="KgInput_TextChanged" Grid.Column="1"/>
+ <ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="220,40,0,0" Width="60"
+ TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
+
+ <Label Content="Nur mind. nachz.:" Margin="10,70,0,0" Grid.ColumnSpan="2"/>
+ <ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="128,70,0,0" Width="50"
+ TextChanged="BsInput_TextChanged" Grid.Column="1"/>
+
+ <Button x:Name="SeasonButton" Content="GA-Wert" Margin="0,0,10,42" Width="120"
+ HorizontalAlignment="Right" VerticalAlignment="Bottom"
+ Click="SeasonButton_Click" Grid.Column="1"/>
+ <Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="0,0,135,10" Width="120"
+ HorizontalAlignment="Right" VerticalAlignment="Bottom"
+ Click="AutoAdjustBsButton_Click" Grid.Column="1"/>
+ <Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="0,0,10,10" Width="120"
+ HorizontalAlignment="Right" VerticalAlignment="Bottom"
+ Click="UnAdjustBsButton_Click" Grid.Column="1"/>
+ </Grid>
+ </GroupBox>
</Grid>
<StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
@@ -248,7 +248,7 @@
<Separator Grid.Column="5"/>
<StatusBarItem Grid.Column="6" HorizontalContentAlignment="Stretch">
<DockPanel>
- <TextBlock Text="Sonst.: "/>
+ <TextBlock Text="Weitere: "/>
<TextBlock x:Name="CustomModifiers" Text="-"/>
</DockPanel>
</StatusBarItem>