mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
View work to get a basic MO2 compilation working again
This commit is contained in:
Justin Swanson
parent
320761fbcd
commit
f8366c838a
@ -33,12 +33,12 @@
|
||||
Grid.RowSpan="2"
|
||||
Grid.Column="4" />
|
||||
<local:DetailImageView
|
||||
Title="{Binding ModListName}"
|
||||
Title="{Binding CurrentModlistSettings.ModListName}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Author="{Binding AuthorText}"
|
||||
Author="{Binding CurrentModlistSettings.AuthorText}"
|
||||
BorderThickness="0"
|
||||
Description="{Binding Description}"
|
||||
Description="{Binding CurrentModlistSettings.Description}"
|
||||
Image="{Binding Image}" />
|
||||
<Rectangle
|
||||
x:Name="ControlVerticalThinSeparator"
|
||||
@ -50,7 +50,7 @@
|
||||
SnapsToDevicePixels="True" />
|
||||
<!-- Comes after image area so shadow can overlay -->
|
||||
<local:TopProgressView
|
||||
Title="{Binding ModListName, Mode=OneWay}"
|
||||
Title="{Binding CurrentModlistSettings.ModListName, Mode=OneWay}"
|
||||
Grid.Row="0"
|
||||
Grid.RowSpan="2"
|
||||
Grid.Column="0"
|
||||
@ -64,11 +64,12 @@
|
||||
Margin="5"
|
||||
Background="Transparent"
|
||||
HorizontalScrollBarVisibility="Disabled"
|
||||
IsEnabled="{Binding Compiling, Converter={StaticResource InverseBooleanConverter}}"
|
||||
IsEnabled="{Binding Compiler.Compiling, Converter={StaticResource InverseBooleanConverter}}"
|
||||
VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel
|
||||
Margin="0,5,0,0"
|
||||
Background="Transparent"
|
||||
DataContext="{Binding CurrentModlistSettings}"
|
||||
Orientation="Vertical">
|
||||
<StackPanel.Resources>
|
||||
<Thickness
|
||||
@ -148,18 +149,14 @@
|
||||
Margin="35,0,35,0"
|
||||
VerticalAlignment="Center"
|
||||
ClipToBounds="False"
|
||||
Visibility="{Binding Compiling, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}">
|
||||
Visibility="{Binding Compiler.Compiling, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="20" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="20" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
@ -180,7 +177,7 @@
|
||||
Margin="4"
|
||||
IsChecked="{Binding SelectedCompilerType, Converter={StaticResource EqualsToBoolConverter}, ConverterParameter={x:Static wabbacommon:ModManager.MO2}}">
|
||||
<local:ImageRadioButtonView.Image>
|
||||
<BitmapImage UriSource="../Resources/MO2Button.png" />
|
||||
<BitmapImage UriSource="../../Resources/MO2Button.png" />
|
||||
</local:ImageRadioButtonView.Image>
|
||||
</local:ImageRadioButtonView>
|
||||
<local:ImageRadioButtonView
|
||||
@ -189,66 +186,25 @@
|
||||
Margin="4"
|
||||
IsChecked="{Binding SelectedCompilerType, Converter={StaticResource EqualsToBoolConverter}, ConverterParameter={x:Static wabbacommon:ModManager.Vortex}}">
|
||||
<local:ImageRadioButtonView.Image>
|
||||
<BitmapImage UriSource="../Resources/VortexButton.png" />
|
||||
<BitmapImage UriSource="../../Resources/VortexButton.png" />
|
||||
</local:ImageRadioButtonView.Image>
|
||||
</local:ImageRadioButtonView>
|
||||
</Grid>
|
||||
<TextBlock
|
||||
<ContentPresenter
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="Modlist Location"
|
||||
TextAlignment="Center"
|
||||
ToolTip="The MO2 modlist.txt file you want to use as your source" />
|
||||
<local:FilePicker
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Height="30"
|
||||
VerticalAlignment="Center"
|
||||
DataContext="{Binding ModlistLocation}"
|
||||
FontSize="14"
|
||||
ToolTip="The MO2 modlist.txt file you want to use as your source" />
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="Download Location"
|
||||
TextAlignment="Center"
|
||||
ToolTip="The folder where MO2 downloads your mods." />
|
||||
<local:FilePicker
|
||||
Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Height="30"
|
||||
VerticalAlignment="Center"
|
||||
DataContext="{Binding DownloadLocation}"
|
||||
FontSize="14"
|
||||
ToolTip="The folder where MO2 downloads your mods." />
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="Output Location"
|
||||
TextAlignment="Center"
|
||||
ToolTip="The folder to place the resulting modlist.wabbajack file" />
|
||||
<local:FilePicker
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Height="30"
|
||||
VerticalAlignment="Center"
|
||||
DataContext="{Binding OutputLocation}"
|
||||
FontSize="14"
|
||||
ToolTip="The folder to place the resulting modlist.wabbajack file" />
|
||||
Content="{Binding Compiler}">
|
||||
<ContentPresenter.Resources>
|
||||
<DataTemplate DataType="{x:Type local:MO2CompilerVM}">
|
||||
<local:MO2CompilerConfigView />
|
||||
</DataTemplate>
|
||||
</ContentPresenter.Resources>
|
||||
</ContentPresenter>
|
||||
<local:BeginButton
|
||||
Grid.Row="0"
|
||||
Grid.RowSpan="5"
|
||||
Grid.RowSpan="3"
|
||||
Grid.Column="5"
|
||||
Command="{Binding BeginCommand}" />
|
||||
Command="{Binding Compiler.BeginCommand}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid
|
||||
@ -256,7 +212,7 @@
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="5"
|
||||
Margin="5"
|
||||
Visibility="{Binding Compiling, Converter={StaticResource bool2VisibilityConverter}, FallbackValue=Hidden}">
|
||||
Visibility="{Binding Compiler.Compiling, Converter={StaticResource bool2VisibilityConverter}, FallbackValue=Hidden}">
|
||||
<local:LogCpuView DataContext="{Binding MWVM}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
75
Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml
Normal file
75
Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml
Normal file
@ -0,0 +1,75 @@
|
||||
<UserControl
|
||||
x:Class="Wabbajack.MO2CompilerConfigView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:Wabbajack"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
d:DataContext="{d:DesignInstance local:MO2CompilerVM}"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
mc:Ignorable="d">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="20" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="40" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="Modlist Location"
|
||||
TextAlignment="Center"
|
||||
ToolTip="The MO2 modlist.txt file you want to use as your source" />
|
||||
<local:FilePicker
|
||||
Grid.Row="0"
|
||||
Grid.Column="2"
|
||||
Height="30"
|
||||
VerticalAlignment="Center"
|
||||
DataContext="{Binding ModlistLocation}"
|
||||
FontSize="14"
|
||||
ToolTip="The MO2 modlist.txt file you want to use as your source" />
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Grid.Column="0"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="Download Location"
|
||||
TextAlignment="Center"
|
||||
ToolTip="The folder where MO2 downloads your mods." />
|
||||
<local:FilePicker
|
||||
Grid.Row="1"
|
||||
Grid.Column="2"
|
||||
Height="30"
|
||||
VerticalAlignment="Center"
|
||||
DataContext="{Binding DownloadLocation}"
|
||||
FontSize="14"
|
||||
ToolTip="The folder where MO2 downloads your mods." />
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Grid.Column="0"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="Output Location"
|
||||
TextAlignment="Center"
|
||||
ToolTip="The folder to place the resulting modlist.wabbajack file" />
|
||||
<local:FilePicker
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
Height="30"
|
||||
VerticalAlignment="Center"
|
||||
DataContext="{Binding OutputLocation}"
|
||||
FontSize="14"
|
||||
ToolTip="The folder to place the resulting modlist.wabbajack file" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
28
Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml.cs
Normal file
28
Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml.cs
Normal file
@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace Wabbajack
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for MO2CompilerConfigView.xaml
|
||||
/// </summary>
|
||||
public partial class MO2CompilerConfigView : UserControl
|
||||
{
|
||||
public MO2CompilerConfigView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -162,6 +162,9 @@
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Compile Include="Converters\EqualsToBoolConverter.cs" />
|
||||
<Compile Include="Views\Compilers\MO2CompilerConfigView.xaml.cs">
|
||||
<DependentUpon>MO2CompilerConfigView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View Models\Compilers\ISubCompilerVM.cs" />
|
||||
<Compile Include="View Models\Compilers\MO2CompilerVM.cs" />
|
||||
<Compile Include="View Models\Compilers\ModlistSettingsEditorVM.cs" />
|
||||
@ -223,6 +226,10 @@
|
||||
<DependentUpon>TextViewer.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Views\UserControlRx.cs" />
|
||||
<Page Include="Views\Compilers\MO2CompilerConfigView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Views\Common\BorderFadeDownView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user