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

99
Apollon.WPF/MainWindow.xaml
View File

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

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

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