Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compiler screen order changes

Browse Source
This commit is contained in:
trawzified 2024-04-27 11:15:42 +02:00
parent 9537306046
commit 1dd4a642ef
4 changed files with 33 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Wabbajack.App.Wpf/Themes/Styles.xaml
View File

@ -105,6 +105,10 @@
x:Key="MahApps.Brushes.Accent4" x:Key="MahApps.Brushes.Accent4"
options:Freeze="True" options:Freeze="True"
Color="{StaticResource MahApps.Colors.Accent4}" /> Color="{StaticResource MahApps.Colors.Accent4}" />
<SolidColorBrush
x:Key="MahApps.Brushes.TextBlock.FloatingMessage"
options:Freeze="True"
Color="{StaticResource MahApps.Colors.Accent4}"/>
<!-- Brushes --> <!-- Brushes -->
<SolidColorBrush x:Key="YellowBrush" Color="{StaticResource Yellow}" /> <SolidColorBrush x:Key="YellowBrush" Color="{StaticResource Yellow}" />
@ -245,6 +249,7 @@
<!-- FontStyle --> <!-- FontStyle -->
<Style TargetType="{x:Type TextBlock}"> <Style TargetType="{x:Type TextBlock}">
<Setter Property="FontFamily" Value="{StaticResource PrimaryFont}" /> <Setter Property="FontFamily" Value="{StaticResource PrimaryFont}" />
<Setter Property="FontSize" Value="14"/>
<!--<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>--> <!--<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>-->
</Style> </Style>
<Style TargetType="{x:Type Control}"> <Style TargetType="{x:Type Control}">
@ -840,20 +845,6 @@
</Style> </Style>
<Style BasedOn="{StaticResource MainTextBoxStyle}" TargetType="TextBox" /> <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 --> <!-- ComboBox -->
<Style x:Key="ComboBoxFocusVisual"> <Style x:Key="ComboBoxFocusVisual">
<Setter Property="Control.Template"> <Setter Property="Control.Template">
@ -3516,6 +3507,7 @@
<!-- FilePicker --> <!-- FilePicker -->
<Style x:Key="MainFilePickerStyle" TargetType="{x:Type local:FilePicker}"> <Style x:Key="MainFilePickerStyle" TargetType="{x:Type local:FilePicker}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Background" Value="{StaticResource DarkPrimaryBrush}"/>
</Style> </Style>
<Style BasedOn="{StaticResource MainFilePickerStyle}" TargetType="{x:Type local:FilePicker}" /> <Style BasedOn="{StaticResource MainFilePickerStyle}" TargetType="{x:Type local:FilePicker}" />

47
Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml
View File

@ -18,7 +18,6 @@
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="47" />
<RowDefinition Height="4*" /> <RowDefinition Height="4*" />
<RowDefinition Height="*" MinHeight="150" /> <RowDefinition Height="*" MinHeight="150" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -29,14 +28,17 @@
<ColumnDefinition Width="5*" /> <ColumnDefinition Width="5*" />
<ColumnDefinition Width="5" /> <ColumnDefinition Width="5" />
</Grid.ColumnDefinitions> </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 --> <!-- Comes after image area so shadow can overlay -->
<!-- <!--
<local:TopProgressView Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="5" <local:TopProgressView Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="5"
x:Name="TopProgressBar" x:Name="TopProgressBar"
OverhangShadow="False" /> OverhangShadow="False" />
--> -->
<ScrollViewer Grid.Row="1" Grid.Column="1" <ScrollViewer Grid.Row="0" Grid.Column="1"
x:Name="SettingsScrollViewer" x:Name="SettingsScrollViewer"
Background="Transparent" Background="Transparent"
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
@ -63,40 +65,24 @@
</Style> </Style>
</StackPanel.Resources> </StackPanel.Resources>
<TextBlock Margin="{StaticResource TitleMargin}" Text="Author" /> <TextBlock Margin="{StaticResource TitleMargin}" Text="Author" />
<Grid> <TextBox x:Name="AuthorNameSetting" Style="{StaticResource ValueStyle}" mahapps:TextBoxHelper.Watermark="Author name..." />
<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>
<TextBlock Margin="{StaticResource TitleMargin}" Text="Title" /> <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" /> <TextBlock Margin="{StaticResource TitleMargin}" Text="Version" />
<TextBox x:Name="VersionSetting" MaxLength="9" Style="{StaticResource ValueStyle}" /> <TextBox x:Name="VersionSetting" MaxLength="9" Style="{StaticResource ValueStyle}" mahapps:TextBoxHelper.Watermark="1.0.0" />
<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>
<TextBlock Margin="{StaticResource TitleMargin}" Text="Description" /> <TextBlock Margin="{StaticResource TitleMargin}" Text="Description" />
<TextBox <TextBox
x:Name="DescriptionSetting" x:Name="DescriptionSetting"
Height="150" Height="150"
mahapps:TextBoxHelper.Watermark="(700 characters max)" mahapps:TextBoxHelper.Watermark="A comprehensive overhaul of..."
AcceptsReturn="True" AcceptsReturn="True"
AcceptsTab="False" AcceptsTab="False"
MaxLength="700" MaxLength="700"
Style="{StaticResource ValueStyle}" Style="{StaticResource ValueStyle}"
TextWrapping="Wrap" /> 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" /> <TextBlock Margin="{StaticResource TitleMargin}" Text="Image" />
<local:FilePicker <local:FilePicker
x:Name="ImageFilePicker" x:Name="ImageFilePicker"
@ -107,7 +93,8 @@
<TextBlock <TextBlock
Margin="{StaticResource TitleMargin}" Margin="{StaticResource TitleMargin}"
Text="Readme" 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}" /> <TextBox x:Name="ReadmeSetting" Style="{StaticResource ValueStyle}" />
<CheckBox <CheckBox
x:Name="NSFWSetting" x:Name="NSFWSetting"
@ -203,11 +190,11 @@
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="5" <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
x:Name="BottomBarBackground" x:Name="BottomBarBackground"
Margin="5" Margin="5"
Background="{StaticResource WindowBackgroundBrush}" /> 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"> MaxWidth="1000">
<Grid <Grid
x:Name="BottomCompilerSettingsGrid" x:Name="BottomCompilerSettingsGrid"
@ -247,7 +234,7 @@
Kind="ExclamationTriangleSolid" /> Kind="ExclamationTriangleSolid" />
</Grid> </Grid>
</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" x:Name="MidCompilationGrid"
Margin="5"> Margin="5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

2
Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs
View File

@ -80,9 +80,11 @@ namespace Wabbajack
.DisposeWith(disposables); .DisposeWith(disposables);
*/ */
/*
ViewModel.WhenAnyValue(vm => vm.ReInferSettingsCommand) ViewModel.WhenAnyValue(vm => vm.ReInferSettingsCommand)
.BindToStrict(this, view => view.ReInferSettings.Command) .BindToStrict(this, view => view.ReInferSettings.Command)
.DisposeWith(disposables); .DisposeWith(disposables);
*/
ViewModel.WhenAnyValue(vm => vm.State) ViewModel.WhenAnyValue(vm => vm.State)
.Select(v => v == CompilerState.Configuration ? Visibility.Visible : Visibility.Collapsed) .Select(v => v == CompilerState.Configuration ? Visibility.Visible : Visibility.Collapsed)

16
Wabbajack.App.Wpf/Views/HomeView.xaml
View File

@ -22,19 +22,19 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </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"> <StackPanel Orientation="Horizontal">
<TextBlock Grid.Row="0" Grid.Column="0" FontSize="87" FontWeight="Bold" Foreground="{StaticResource ForegroundBrush}" Text="Welcome to " /> <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> </StackPanel>
</Label> </Label>
<Label Grid.Row="1" FontSize="24" Foreground="{StaticResource ForegroundBrush}" Margin="0"> <Label Grid.Row="1" Foreground="{StaticResource ForegroundBrush}" Margin="0">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="The home of " /> <TextBlock Text="The home of " FontSize="24" />
<TextBlock x:Name="ModlistAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" /> <TextBlock x:Name="ModlistAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" FontSize="24" />
<TextBlock Text=" ready-made modlists spanning " /> <TextBlock Text=" ready-made modlists spanning " FontSize="24" />
<TextBlock x:Name="GameAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" /> <TextBlock x:Name="GameAmountTextBlock" Foreground="{StaticResource PrimaryBrush}" FontSize="24" />
<TextBlock Text=" games." /> <TextBlock Text=" games." FontSize="24" />
</StackPanel> </StackPanel>
</Label> </Label>
<Grid Grid.Row="3" Grid.RowSpan="2" Margin="0, 32, 0, 0"> <Grid Grid.Row="3" Grid.RowSpan="2" Margin="0, 32, 0, 0">