mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
Compiler screen order changes
This commit is contained in:
trawzified
parent
9537306046
commit
1dd4a642ef
@ -105,6 +105,10 @@
|
||||
x:Key="MahApps.Brushes.Accent4"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource MahApps.Colors.Accent4}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MahApps.Brushes.TextBlock.FloatingMessage"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource MahApps.Colors.Accent4}"/>
|
||||
|
||||
<!-- Brushes -->
|
||||
<SolidColorBrush x:Key="YellowBrush" Color="{StaticResource Yellow}" />
|
||||
@ -245,6 +249,7 @@
|
||||
<!-- FontStyle -->
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="FontFamily" Value="{StaticResource PrimaryFont}" />
|
||||
<Setter Property="FontSize" Value="14"/>
|
||||
<!--<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>-->
|
||||
</Style>
|
||||
<Style TargetType="{x:Type Control}">
|
||||
@ -840,20 +845,6 @@
|
||||
</Style>
|
||||
<Style BasedOn="{StaticResource MainTextBoxStyle}" TargetType="TextBox" />
|
||||
|
||||
<!-- TextBlock -->
|
||||
<!--
|
||||
<Style x:Key="WatermarkTextblock" TargetType="TextBlock">
|
||||
<Setter Property="Visibility" Value="Collapsed" />
|
||||
<Setter Property="IsHitTestVisible" Value="False" />
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="FontSize" Value="14"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextBoxDisabledForeground}"/>
|
||||
<Setter Property="Margin" Value="5, 0, 0, 0"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding Text, RelativeSource=Prev}}"
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
-->
|
||||
<!-- ComboBox -->
|
||||
<Style x:Key="ComboBoxFocusVisual">
|
||||
<Setter Property="Control.Template">
|
||||
@ -3516,6 +3507,7 @@
|
||||
<!-- FilePicker -->
|
||||
<Style x:Key="MainFilePickerStyle" TargetType="{x:Type local:FilePicker}">
|
||||
<Setter Property="FontSize" Value="14" />
|
||||
<Setter Property="Background" Value="{StaticResource DarkPrimaryBrush}"/>
|
||||
</Style>
|
||||
<Style BasedOn="{StaticResource MainFilePickerStyle}" TargetType="{x:Type local:FilePicker}" />
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
mc:Ignorable="d">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="47" />
|
||||
<RowDefinition Height="4*" />
|
||||
<RowDefinition Height="*" MinHeight="150" />
|
||||
</Grid.RowDefinitions>
|
||||
@ -29,14 +28,17 @@
|
||||
<ColumnDefinition Width="5*" />
|
||||
<ColumnDefinition Width="5" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<local:DetailImageView Grid.Row="1" Grid.Column="3" x:Name="DetailImage" BorderThickness="0" />
|
||||
<Grid Grid.Row="1" Grid.Column="3">
|
||||
|
||||
<local:DetailImageView x:Name="DetailImage" BorderThickness="0" />
|
||||
</Grid>
|
||||
<!-- Comes after image area so shadow can overlay -->
|
||||
<!--
|
||||
<local:TopProgressView Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
x:Name="TopProgressBar"
|
||||
OverhangShadow="False" />
|
||||
-->
|
||||
<ScrollViewer Grid.Row="1" Grid.Column="1"
|
||||
<ScrollViewer Grid.Row="0" Grid.Column="1"
|
||||
x:Name="SettingsScrollViewer"
|
||||
Background="Transparent"
|
||||
HorizontalScrollBarVisibility="Disabled"
|
||||
@ -63,40 +65,24 @@
|
||||
</Style>
|
||||
</StackPanel.Resources>
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="Author" />
|
||||
<Grid>
|
||||
<TextBox
|
||||
x:Name="AuthorNameSetting"
|
||||
Style="{StaticResource ValueStyle}" />
|
||||
<TextBlock IsHitTestVisible="False" Text="Author name..." VerticalAlignment="Center" Foreground="{StaticResource TextBoxDisabledForeground}">
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Visibility" Value="Collapsed" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding Text, ElementName=AuthorNameSetting}" Value="">
|
||||
<Setter Property="Visibility" Value="Visible" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</TextBlock.Style>
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<TextBox x:Name="AuthorNameSetting" Style="{StaticResource ValueStyle}" mahapps:TextBoxHelper.Watermark="Author name..." />
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="Title" />
|
||||
<TextBox x:Name="ModListNameSetting" Style="{StaticResource ValueStyle}" />
|
||||
<TextBox x:Name="ModListNameSetting" Style="{StaticResource ValueStyle}" mahapps:TextBoxHelper.Watermark="Modlist name..." />
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="Version" />
|
||||
<TextBox x:Name="VersionSetting" MaxLength="9" Style="{StaticResource ValueStyle}" />
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="Selected Profile (if using MO2)" />
|
||||
<TextBox x:Name="SelectedProfile" Style="{StaticResource ValueStyle}" />
|
||||
<Button Margin="5" x:Name="ReInferSettings"> Re-infer Settings </Button>
|
||||
<TextBox x:Name="VersionSetting" MaxLength="9" Style="{StaticResource ValueStyle}" mahapps:TextBoxHelper.Watermark="1.0.0" />
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="Description" />
|
||||
<TextBox
|
||||
x:Name="DescriptionSetting"
|
||||
Height="150"
|
||||
mahapps:TextBoxHelper.Watermark="(700 characters max)"
|
||||
mahapps:TextBoxHelper.Watermark="A comprehensive overhaul of..."
|
||||
AcceptsReturn="True"
|
||||
AcceptsTab="False"
|
||||
MaxLength="700"
|
||||
Style="{StaticResource ValueStyle}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="MO2 Profile name" />
|
||||
<TextBox x:Name="SelectedProfile" Style="{StaticResource ValueStyle}" mahapps:TextBoxHelper.Watermark="Default" />
|
||||
<!--<Button Margin="5" x:Name="ReInferSettings"> Re-infer Settings </Button>-->
|
||||
<TextBlock Margin="{StaticResource TitleMargin}" Text="Image" />
|
||||
<local:FilePicker
|
||||
x:Name="ImageFilePicker"
|
||||
@ -107,7 +93,8 @@
|
||||
<TextBlock
|
||||
Margin="{StaticResource TitleMargin}"
|
||||
Text="Readme"
|
||||
ToolTip="Link to the Readme." />
|
||||
ToolTip="Link to the Readme."
|
||||
mahapps:TextBoxHelper.Watermark="https://www.wabbajack.org"/>
|
||||
<TextBox x:Name="ReadmeSetting" Style="{StaticResource ValueStyle}" />
|
||||
<CheckBox
|
||||
x:Name="NSFWSetting"
|
||||
@ -203,11 +190,11 @@
|
||||
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
<Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
<Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
x:Name="BottomBarBackground"
|
||||
Margin="5"
|
||||
Background="{StaticResource WindowBackgroundBrush}" />
|
||||
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
<Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
MaxWidth="1000">
|
||||
<Grid
|
||||
x:Name="BottomCompilerSettingsGrid"
|
||||
@ -247,7 +234,7 @@
|
||||
Kind="ExclamationTriangleSolid" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
<Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
|
||||
x:Name="MidCompilationGrid"
|
||||
Margin="5">
|
||||
<Grid.ColumnDefinitions>
|
||||
|
||||
@ -80,9 +80,11 @@ namespace Wabbajack
|
||||
.DisposeWith(disposables);
|
||||
*/
|
||||
|
||||
/*
|
||||
ViewModel.WhenAnyValue(vm => vm.ReInferSettingsCommand)
|
||||
.BindToStrict(this, view => view.ReInferSettings.Command)
|
||||
.DisposeWith(disposables);
|
||||
*/
|
||||
|
||||
ViewModel.WhenAnyValue(vm => vm.State)
|
||||
.Select(v => v == CompilerState.Configuration ? Visibility.Visible : Visibility.Collapsed)
|
||||
|
||||
@ -22,19 +22,19 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Label Grid.Row="0" Grid.Column="0" FontSize="87" FontWeight="Bold" Padding="0" Margin="0">
|
||||
<Label Grid.Row="0" Grid.Column="0" 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" />
|
||||
<TextBlock Foreground="{StaticResource PrimaryBrush}" Text="Wabbajack" FontSize="87" />
|
||||
</StackPanel>
|
||||
</Label>
|
||||
<Label Grid.Row="1" FontSize="24" Foreground="{StaticResource ForegroundBrush}" Margin="0">
|
||||
<Label Grid.Row="1" Foreground="{StaticResource ForegroundBrush}" 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." />
|
||||
<TextBlock Text="The home of " FontSize="24" />
|
||||
<TextBlock x:Name="ModlistAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" FontSize="24" />
|
||||
<TextBlock Text=" ready-made modlists spanning " FontSize="24" />
|
||||
<TextBlock x:Name="GameAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" FontSize="24" />
|
||||
<TextBlock Text=" games." FontSize="24" />
|
||||
</StackPanel>
|
||||
</Label>
|
||||
<Grid Grid.Row="3" Grid.RowSpan="2" Margin="0, 32, 0, 0">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user