Re-organize MainWindow for upcoming sidemenu, WIP

This commit is contained in:
trawzified 2023-12-04 23:58:53 +01:00
parent 8dfc7a0765
commit 590a6e276f
3 changed files with 67 additions and 61 deletions

View File

@ -8,14 +8,17 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ic="clr-namespace:FluentIcons.WPF;assembly=FluentIcons.WPF"
mc:Ignorable="d">
<Grid Margin="0, 30">
<Grid Margin="0, 0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="300*" />
<ColumnDefinition Width="20*" />
<ColumnDefinition Width="300*" />
<ColumnDefinition Width="20*" />
<ColumnDefinition Width="300*" />
<ColumnDefinition Width="20*" />
<ColumnDefinition Width="300*" />
</Grid.ColumnDefinitions>
<Button Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="Patreon_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Button Style="{StaticResource LargeButtonStyle}" Click="Patreon_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@ -34,7 +37,7 @@
<ic:SymbolIcon Grid.Column="1" FontSize="28" Symbol="Heart" VerticalAlignment="Center" HorizontalAlignment="Right" />
</Grid>
</Button>
<Button Grid.Column="1" Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="GitHub_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Button Grid.Column="2" Style="{StaticResource LargeButtonStyle}" Click="GitHub_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@ -53,7 +56,7 @@
<ic:SymbolIcon Grid.Column="1" FontSize="28" Symbol="CodeCircle" VerticalAlignment="Center" HorizontalAlignment="Right" />
</Grid>
</Button>
<Button Grid.Column="2" Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="Discord_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Button Grid.Column="4" Style="{StaticResource LargeButtonStyle}" Click="Discord_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@ -72,7 +75,7 @@
<ic:SymbolIcon Grid.Column="1" FontSize="28" Symbol="PeopleChat" VerticalAlignment="Center" HorizontalAlignment="Right" />
</Grid>
</Button>
<Button Grid.Column="3" Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="Wiki_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Button Grid.Column="6" Style="{StaticResource LargeButtonStyle}" Click="Wiki_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />

View File

@ -31,9 +31,8 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
@ -59,31 +58,39 @@
<ic:SymbolIcon Symbol="ArrowExit"/>
</Button>
</Grid>
<ContentPresenter Grid.Row="1" Content="{Binding ActivePane}">
<ContentPresenter.Resources>
<DataTemplate DataType="{x:Type local:CompilerVM}">
<local:CompilerView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:InstallerVM}">
<local:InstallationView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:ModeSelectionVM}">
<local:ModeSelectionView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:ModListGalleryVM}">
<local:ModListGalleryView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:WebBrowserVM}">
<local:WebBrowserView />
</DataTemplate>
<DataTemplate DataType="{x:Type local:SettingsVM}">
<local:SettingsView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type viewModels:ModListContentsVM}">
<local:ModListContentsView ViewModel="{Binding}" />
</DataTemplate>
</ContentPresenter.Resources>
</ContentPresenter>
<Grid Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="128" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border Grid.Column="1" Margin="0" Background="Green">
<ContentPresenter Content="{Binding ActivePane}">
<ContentPresenter.Resources>
<DataTemplate DataType="{x:Type local:CompilerVM}">
<local:CompilerView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:InstallerVM}">
<local:InstallationView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:ModeSelectionVM}">
<local:ModeSelectionView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:ModListGalleryVM}">
<local:ModListGalleryView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type local:WebBrowserVM}">
<local:WebBrowserView />
</DataTemplate>
<DataTemplate DataType="{x:Type local:SettingsVM}">
<local:SettingsView ViewModel="{Binding}" />
</DataTemplate>
<DataTemplate DataType="{x:Type viewModels:ModListContentsVM}">
<local:ModListContentsView ViewModel="{Binding}" />
</DataTemplate>
</ContentPresenter.Resources>
</ContentPresenter>
</Border>
</Grid>
</Grid>

View File

@ -20,32 +20,28 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0" Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="10*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="4*" />
<RowDefinition Height="2*" />
<RowDefinition Height="22*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Viewbox Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Top">
<Label Grid.Row="0" FontSize="86.7" FontWeight="Bold" Padding="0" Margin="0">
<StackPanel Orientation="Horizontal">
<TextBlock Foreground="{StaticResource ForegroundBrush}" Text="Welcome to " />
<TextBlock Foreground="{StaticResource PrimaryBrush}" Text="Wabbajack" />
</StackPanel>
</Label>
</Viewbox>
<Viewbox Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top">
<Label FontSize="16" Foreground="{StaticResource ForegroundBrush}" Padding="0, 4, 0, 4" Margin="0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="The home of " />
<TextBlock x:Name="ModlistAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" />
<TextBlock Text=" ready-made modlists spanning " />
<TextBlock x:Name="GameAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" />
<TextBlock Text=" games." />
</StackPanel>
</Label>
</Viewbox>
<Label Grid.Row="0" Grid.Column="0" FontSize="87" FontWeight="Bold" Padding="0" Margin="0">
<StackPanel Orientation="Horizontal">
<TextBlock Grid.Row="0" Grid.Column="0" FontSize="87" FontWeight="Bold" Foreground="{StaticResource ForegroundBrush}" Text="Welcome to " />
<TextBlock Foreground="{StaticResource PrimaryBrush}" Text="Wabbajack" />
</StackPanel>
</Label>
<Label Grid.Row="1" FontSize="24" Foreground="{StaticResource ForegroundBrush}" Padding="0, 4, 0, 4" Margin="0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="The home of " />
<TextBlock x:Name="ModlistAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" />
<TextBlock Text=" ready-made modlists spanning " />
<TextBlock x:Name="GameAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" />
<TextBlock Text=" games." />
</StackPanel>
</Label>
<Grid Grid.Row="3" Grid.RowSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="581*" />
@ -58,7 +54,7 @@
<RowDefinition Height="81*" />
</Grid.RowDefinitions>
<Border Grid.Row="0" Grid.Column="0" BorderBrush="{StaticResource PrimaryVariantBrush}" CornerRadius="8" BorderThickness="16">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}" Margin="-1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />
@ -89,7 +85,7 @@
</Grid>
</Border>
<Border Grid.Row="0" Grid.Column="2" BorderBrush="{StaticResource PrimaryVariantBrush}" CornerRadius="8" BorderThickness="16">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}" Margin="-1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />
@ -120,7 +116,7 @@
</Grid>
</Border>
<Border Grid.Row="2" Grid.Column="0" BorderBrush="{StaticResource PrimaryVariantBrush}" CornerRadius="8" BorderThickness="16">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}" Margin="-1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />
@ -151,7 +147,7 @@
</Grid>
</Border>
<Border Grid.Row="2" Grid.Column="2" BorderBrush="{StaticResource PrimaryVariantBrush}" CornerRadius="8" BorderThickness="16">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}">
<Grid Grid.Row="0" Grid.Column="0" Background="{StaticResource PrimaryVariantBrush}" Margin="-1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />