AreaComAdminWindow: Enhance visual appearance
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Test / Run tests (push) Successful in 1m53s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Test / Run tests (push) Successful in 1m53s
				
			This commit is contained in:
		| @@ -7,7 +7,7 @@ | ||||
|         xmlns:local="clr-namespace:Elwig.Windows" | ||||
|         xmlns:ctrl="clr-namespace:Elwig.Controls" | ||||
|         xmlns:vm="clr-namespace:Elwig.ViewModels" | ||||
|         Title="{Binding Title}" Height="550" MinHeight="450" Width="920" MinWidth="860" | ||||
|         Title="{Binding Title}" Height="600" MinHeight="450" Width="1000" MinWidth="860" | ||||
|         Loaded="Window_Loaded"> | ||||
|     <Window.DataContext> | ||||
|         <vm:AreaComAdminViewModel/> | ||||
| @@ -57,7 +57,7 @@ | ||||
|             <RowDefinition Height="24"/> | ||||
|         </Grid.RowDefinitions> | ||||
|         <Grid.ColumnDefinitions> | ||||
|             <ColumnDefinition Width="2*" MinWidth="555"/> | ||||
|             <ColumnDefinition Width="3*" MinWidth="500"/> | ||||
|             <ColumnDefinition Width="5"/> | ||||
|             <ColumnDefinition Width="*" MinWidth="280"/> | ||||
|         </Grid.ColumnDefinitions> | ||||
| @@ -102,25 +102,35 @@ | ||||
|                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1" | ||||
|                       Margin="5,0,5,0" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2"> | ||||
|                 <DataGrid.Columns> | ||||
|                     <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="50"/> | ||||
|                     <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="150"/> | ||||
|                     <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/> | ||||
|                     <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="120"/> | ||||
|                     <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="80"> | ||||
|                     <DataGridTextColumn Header="FbNr." Binding="{Binding FbNr, StringFormat='{}{0} '}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70"> | ||||
|                     <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/> | ||||
|                     <DataGridTextColumn Header="Sorte" Binding="{Binding AreaComType.WineVar.SortId}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.Foreground" Value="{Binding AreaComType.WineVar.Color}"/> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="120"/> | ||||
|                     <DataGridTextColumn Header="Fläche" Binding="{Binding Area, StringFormat='{}{0:N0} m² '}" Width="80"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="100"/> | ||||
|                     <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/> | ||||
|                     <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="130"/> | ||||
|                     <DataGridTextColumn Header="Bewirt."            Binding="{Binding WineCult.Name}" Width="60"/> | ||||
|                     <DataGridTextColumn Header="Von"                Binding="{Binding YearFrom}"      Width="48"/> | ||||
|                     <DataGridTextColumn Header="Bis"                Binding="{Binding YearTo}"        Width="48"/> | ||||
|                 </DataGrid.Columns> | ||||
|             </DataGrid> | ||||
|  | ||||
| @@ -175,28 +185,27 @@ | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="80"/> | ||||
|                         <ColumnDefinition Width="*"/> | ||||
|                         <ColumnDefinition Width="50"/> | ||||
|                         <ColumnDefinition Width="48"/> | ||||
|                         <ColumnDefinition Width="60"/> | ||||
|                         <ColumnDefinition Width="*"/> | ||||
|                     </Grid.ColumnDefinitions> | ||||
|  | ||||
|                     <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/> | ||||
|                     <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/> | ||||
|                     <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False" | ||||
|                              Margin="0,10,0,0" Width="48" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"/> | ||||
|  | ||||
|                     <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="2"/> | ||||
|                     <TextBox x:Name="FbNrInput" Text="{Binding FbNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" | ||||
|                              Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right" | ||||
|                              Margin="0,10,10,0" Width="56" HorizontalAlignment="Left" Grid.Column="3" TextAlignment="Right" | ||||
|                              TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/> | ||||
|  | ||||
|                     <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/> | ||||
|                     <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False" | ||||
|                              Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/> | ||||
|  | ||||
|                     <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/> | ||||
|                     <Label Content="Zeitraum:" Margin="10,40,0,0" Grid.Column="0"/> | ||||
|                     <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" | ||||
|                              Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right" | ||||
|                              Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right" | ||||
|                              TextChanged="IntegerInput_TextChanged"/> | ||||
|  | ||||
|                     <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/> | ||||
|                     <Label Content="–" Grid.Column="1" Grid.ColumnSpan="3" Margin="45,40,0,0"/> | ||||
|                     <TextBox x:Name="YearToInput" Text="{Binding YearToString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" | ||||
|                              Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right" | ||||
|                              Margin="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="3" TextAlignment="Right" | ||||
|                              TextChanged="IntegerInput_TextChanged"/> | ||||
|  | ||||
|                     <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user