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

clean up code ready for display modal

Browse Source
This commit is contained in:
Natlinux81
2022-08-13 13:51:03 +02:00
parent 13f70e8c4b
commit 2de986f5b8
2 changed files with 86 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Apollon.WPF/MainWindow.xaml
View File

@@ -6,70 +6,57 @@
xmlns:local="clr-namespace:Apollon.WPF" xmlns:views="clr-namespace:Apollon.WPF.Views"
mc:Ignorable="d"
Title="Apollon Auswertung Bogen"
Height="800"
Width="1120"
Height="680"
Width="1080"
WindowStartupLocation="CenterScreen"
Background="Transparent"
AllowsTransparency="True"
WindowStyle="None"
MouseDown="Window_MouseDown">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
ResizeMode="CanResizeWithGrip">
<ScrollViewer HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto">
</RowDefinition>
<RowDefinition>
</RowDefinition>
<RowDefinition Height="auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<views:OverviewView Grid.RowSpan="2" DataContext="{Binding OverviewViewModel}"/>
<Button Width="25"
Height="25"
Padding="-4"
Background="Transparent"
BorderBrush="Transparent"
Content="🗙"
FontSize="18"
Foreground="#0000a0"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
HorizontalAlignment="Right" Margin="0,2,24,8"
Click="Button_Exit">
</Button>
<Button Width="25"
Height="25"
Padding="-4"
BorderBrush="Transparent"
Content="☐"
FontSize="18"
FontWeight="UltraBold"
Foreground="#0000a0"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
HorizontalAlignment="Right" Margin="0,2,64,8"
Click="Button_Max" Background="#00000000"
<views:OverviewView Grid.RowSpan="2"
DataContext="{Binding OverviewViewModel}"
MouseDown="Window_MouseDown"/>
/>
<WrapPanel HorizontalAlignment="Right"
Margin="0 0 5 0">
<Button Width="25"
Height="25"
Padding="-4"
<Button Width="35"
Height="35"
Background="Transparent"
BorderBrush="Transparent"
Content="🗕"
FontSize="18"
FontWeight="Bold"
Foreground="#0000a0"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
HorizontalAlignment="Right" Margin="0,2,104,8"
Click="Button_Min"
></Button>
Click="Button_Min"/>
<Button Width="35"
Height="35"
Background="Transparent"
BorderBrush="Transparent"
Content="☐"
FontSize="18"
FontWeight="Bold"
Foreground="#0000a0"
Click="Button_Max"/>
<Button Width="35"
Height="35"
Background="Transparent"
BorderBrush="Transparent"
Content="🗙"
FontSize="18"
Foreground="#0000a0"
Click="Button_Exit"/>
</WrapPanel>
</Grid>
</ScrollViewer>
</Window>

39
Apollon.WPF/Views/OverviewView.xaml
View File

@@ -3,21 +3,28 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Apollon.WPF.Views" xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
xmlns:local="clr-namespace:Apollon.WPF.Views"
xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1120"
d:DesignHeight="680" d:DesignWidth="1080"
Background="Transparent">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="150"></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition Height="150"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border CornerRadius="10" Grid.RowSpan="2" Grid.ColumnSpan="3">
<Border BorderThickness="4"
BorderBrush="#0000a0"
CornerRadius="5"
Grid.RowSpan="2"
Grid.ColumnSpan="3">
<Border.Background>
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
<GradientStop Color="#d7e8fd" Offset="0.2"/>
@@ -25,6 +32,7 @@
</LinearGradientBrush>
</Border.Background>
</Border>
<StackPanel Grid.ColumnSpan="3">
<TextBlock
Text="Apollon"
@@ -70,16 +78,16 @@
<StackPanel Grid.Column="1"
Grid.Row="1"
VerticalAlignment="Center">
<TextBlock
Margin="20"
Margin="20">
<TextBlock Margin="20"
Text="Liste der erstellten Turniere"
TextAlignment="Center"
FontFamily="Arial"
FontWeight="Bold"
FontSize="16"
Foreground="#0000a0">
</TextBlock>
Foreground="#0000a0"/>
<components:OverViewListing Height="400"
DataContext="{Binding OverviewListingViewModel}"/>
</StackPanel>
@@ -87,8 +95,8 @@
<StackPanel Grid.Column="2"
Grid.Row="1"
VerticalAlignment="Center">
<TextBlock
Margin="20"
<TextBlock Margin="20"
Text="Turnieredetails"
TextAlignment="Center"
FontFamily="Arial"
@@ -97,6 +105,7 @@
Foreground="#0000a0"/>
<components:OverviewDetails Width="320"
DataContext="{Binding OverviewDetailsViewModel}"/>
<Button Style="{StaticResource ModernButton}"
Content="Turnier bearbeiten"
FontSize="16"