Natlinux/Apollon
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up a bit

Browse Source
This commit is contained in:
Natlinux81
2022-08-17 01:36:42 +02:00
parent 4531f31658
commit b10a792aad
15 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Apollon.WPF/Views/Components/AddEditDetails.xaml
View File

@@ -5,37 +5,37 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="180"/>
<ColumnDefinition Width="400"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Veranstalter: "
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="55"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="180"/>
<ColumnDefinition Width="400"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Veranstalter: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="1"
<TextBlock Grid.Row="1"
Text="Turniername: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="2"
Text="Kategorie: "
<TextBlock Grid.Row="2"
Text="Wettkampfart: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="3"
<TextBlock Grid.Row="3"
Text="Startdatum: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="4"
<TextBlock Grid.Row="4"
Text="Enddatum: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="5"
<TextBlock Grid.Row="5"
Text="Veranstaltungsort: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="6"
@@ -49,30 +49,30 @@
Height="30"
Background="LightGray"
VerticalContentAlignment="Center"/>
<TextBox Grid.Row="1"
<TextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tournamentname, UpdateSourceTrigger=PropertyChanged}"
FontFamily="Arial"
FontSize="16"
Height="30"
VerticalContentAlignment="Center"
VerticalContentAlignment="Center"
Background="LightGray"/>
<ComboBox Grid.Row="2"
<ComboBox Grid.Row="2"
Grid.Column="1"
ItemsSource="{Binding Category}"
Height="30"
Width="150"
FontSize="16"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"/>
VerticalContentAlignment="Center"
HorizontalAlignment="Left"/>
<DatePicker Grid.Row="3"
<DatePicker Grid.Row="3"
Grid.Column="1"
Height="30"
FontSize="16"
Width="160"
HorizontalAlignment="Left"/>
<DatePicker Grid.Row="4"
<DatePicker Grid.Row="4"
Grid.Column="1"
Height="30"
FontSize="16"
@@ -121,10 +121,10 @@
Width="120"
Height="35"
FontSize="16"
Grid.Column="1"/>
Grid.Column="1"/>
</Grid>
</Grid>
</Grid>
</UserControl>

9
Apollon.WPF/Views/Components/OverViewListing.xaml
View File

@@ -17,7 +17,7 @@
FontWeight="Bold"
Background="Transparent"
BorderBrush="Transparent"
Padding="20"
Padding="5"
ItemsSource="{Binding OverviewListingItemViewModels}"
SelectedItem="{Binding SelectedOverviewListingItemViewModel}">
<ListView.ItemContainerStyle>
@@ -32,7 +32,12 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{Binding Tournamentname}"/>
<WrapPanel Grid.Column="0">
<TextBlock Text="{Binding Tournamentname}"
Margin="0 0 4 0"/>
<TextBlock Text="{Binding Location}"/>
</WrapPanel>
<Button Grid.Column="1"
Background="Transparent"
BorderThickness="0"

22
Apollon.WPF/Views/Components/OverviewDetails.xaml
View File

@@ -71,8 +71,10 @@
</Style>
</TextBlock.Style>
</TextBlock>
<WrapPanel HorizontalAlignment="Center">
<TextBlock Text="{Binding Category}"
TextAlignment="Center"
VerticalAlignment="Center"
FontFamily="Arial"
FontWeight="Bold"
FontSize="14"
@@ -89,7 +91,25 @@
</Style>
</TextBlock.Style>
</TextBlock>
<WrapPanel Margin="10" HorizontalAlignment="Center">
<Image Grid.Column="2"
Grid.Row="2"
Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\TargetField.png"
Width="50"
Height="50">
<Image.Style>
<Style TargetType="Image">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</WrapPanel>
<WrapPanel Margin="10" HorizontalAlignment="Center">
<TextBlock Text="vom "
TextAlignment="Center"
FontFamily="Arial"