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

select logo

Browse Source
This commit is contained in:
Natlinux
2022-11-10 22:48:47 +01:00
parent 727d4c7285
commit d4dd7a545a
63 changed files with 247 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,10 @@
FontFamily="Arial"
FontSize="16"
Height="30"
Width="300"
Background="LightGray"
VerticalContentAlignment="Center"/>
VerticalContentAlignment="Center"
HorizontalAlignment="Left"/>
<TextBox Grid.Row="1"
Grid.Column="1"
@@ -67,9 +69,28 @@
FontFamily="Arial"
FontSize="16"
Height="30"
Width="300"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
Background="LightGray"/>
<StackPanel Grid.Column="1"
Grid.RowSpan="2">
<Image
Height="80"
Width="80"
HorizontalAlignment="Right"
Source="{Binding Logo, TargetNullValue={x:Null}}"/>
<Button Style="{StaticResource ModernButton}"
Content="Logo wählen"
Height="20"
Width="80"
HorizontalAlignment="Right"
FontSize="10"
Command="{Binding ChooseLogoCommand}"/>
</StackPanel>
<ComboBox Grid.Row="2"
Text="{Binding Competition}"
IsReadOnly="False"
@@ -90,11 +111,11 @@
<Image x:Name="CompetitionImage"
Grid.Row="2"
Grid.Column="1"
Grid.RowSpan="2"
Grid.RowSpan="3"
Height="80"
Width="80"
HorizontalAlignment="Right"
Margin="0 0 80 0"
Margin="0 0 60 0"
Source="{Binding CompetitionImage, TargetNullValue={x:Null}}" />
<DatePicker SelectedDateFormat="Long"
@@ -119,6 +140,8 @@
FontFamily="Arial"
FontSize="16"
Height="30"
Width="300"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
Background="LightGray"/>
<TextBox Grid.Row="6"

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

@@ -8,12 +8,13 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Border BorderBrush="#0000a0"
BorderThickness="1"
CornerRadius="10">
</Border>
<TextBlock
<TextBlock Grid.RowSpan="6"
TextAlignment="Center"
VerticalAlignment="Center"
FontFamily="Arial"
@@ -34,44 +35,69 @@
</TextBlock.Style>
klicke auf <LineBreak/> Neues Turnier vorbereiten <LineBreak/><LineBreak/> oder wähle ein vorhandenes Turnier aus um es zu bearbeiten!
</TextBlock>
<StackPanel>
<TextBlock Text="{Binding TournamentName}"
TextAlignment="Center"
<StackPanel Margin="10">
<WrapPanel HorizontalAlignment="Center">
<StackPanel>
<TextBlock Text="{Binding TournamentName}"
TextAlignment="Left"
Width="200"
FontFamily="Arial"
FontWeight="Bold"
FontSize="14"
Foreground="#0000a0"
Margin="10">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
TextWrapping="WrapWithOverflow">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<TextBlock Text="{Binding Organisation}"
TextAlignment="Center"
<TextBlock Text="{Binding Organisation}"
TextAlignment="Left"
FontFamily="Arial"
FontWeight="Bold"
FontSize="14"
Foreground="#0000a0"
Width="200"
TextWrapping="WrapWithOverflow"
Margin="10">
<TextBlock.Style>
<Style TargetType="TextBlock">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel>
<Image Grid.Column="2"
Grid.Row="2"
Source="{Binding Logo}"
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>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Image.Style>
</Image>
</WrapPanel>
<WrapPanel HorizontalAlignment="Center">
<TextBlock Text="{Binding Competition}"
TextAlignment="Center"
@@ -224,8 +250,8 @@
Content="Turnier öffnen"
FontSize="16"
Height="40"
Width="210"
Margin="40"
Width="150"
Margin="20"
Cursor="Hand"
Command="{Binding NavigateNavBarCommand}">
<Button.Style>

2
Apollon.WPF/Views/Components/TournamentDetails.xaml
View File

@@ -13,7 +13,7 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Image Grid.Column="0"
Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\Logos\logo_klein_DSB.jpg"
Source="{Binding Logo}"
Width="80"
VerticalAlignment="Center"/>
<StackPanel Grid.Column="1">