mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
Fixed back navigation from play, added compiler configuration screen
This commit is contained in:
parent
4054a2f51e
commit
04ad4e8f82
11
Wabbajack.App/Screens/CompilerConfigurationView.axaml
Normal file
11
Wabbajack.App/Screens/CompilerConfigurationView.axaml
Normal file
@ -0,0 +1,11 @@
|
||||
<UserControl xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
|
||||
x:Class="Wabbajack.App.Screens.CompilerConfigurationView">
|
||||
<Grid RowDefinitions="40, 5, 5, *, 40">
|
||||
<TextBlock Grid.Row="0" x:Name="StatusText" FontSize="20" FontWeight="Bold">Compiler Configuration</TextBlock>
|
||||
</Grid>
|
||||
</UserControl>
|
14
Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs
Normal file
14
Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs
Normal file
@ -0,0 +1,14 @@
|
||||
|
||||
|
||||
using Wabbajack.App.Views;
|
||||
|
||||
namespace Wabbajack.App.Screens
|
||||
{
|
||||
public partial class CompilerConfigurationView : ScreenBase<CompilerConfigurationViewModel>
|
||||
{
|
||||
public CompilerConfigurationView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
14
Wabbajack.App/Screens/CompilerConfigurationViewModel.cs
Normal file
14
Wabbajack.App/Screens/CompilerConfigurationViewModel.cs
Normal file
@ -0,0 +1,14 @@
|
||||
using ReactiveUI;
|
||||
using Wabbajack.App.Messages;
|
||||
using Wabbajack.App.ViewModels;
|
||||
|
||||
namespace Wabbajack.App.Screens;
|
||||
|
||||
public class CompilerConfigurationViewModel : ViewModelBase, IReceiverMarker
|
||||
{
|
||||
public CompilerConfigurationViewModel()
|
||||
{
|
||||
Activator = new ViewModelActivator();
|
||||
}
|
||||
|
||||
}
|
@ -43,6 +43,7 @@ namespace Wabbajack.App
|
||||
services.AddTransient<FileSelectionBoxViewModel>();
|
||||
services.AddSingleton<IScreenView, ModeSelectionView>();
|
||||
services.AddSingleton<IScreenView, InstallConfigurationView>();
|
||||
services.AddSingleton<IScreenView, CompilerConfigurationView>();
|
||||
services.AddSingleton<IScreenView, StandardInstallationView>();
|
||||
services.AddSingleton<IScreenView, SettingsView>();
|
||||
services.AddSingleton<IScreenView, BrowseView>();
|
||||
@ -53,6 +54,7 @@ namespace Wabbajack.App
|
||||
|
||||
services.AddAllSingleton<IReceiverMarker, StandardInstallationViewModel>();
|
||||
services.AddAllSingleton<IReceiverMarker, InstallConfigurationViewModel>();
|
||||
services.AddAllSingleton<IReceiverMarker, CompilerConfigurationViewModel>();
|
||||
services.AddAllSingleton<IReceiverMarker, MainWindowViewModel>();
|
||||
services.AddAllSingleton<IReceiverMarker, SettingsViewModel>();
|
||||
services.AddAllSingleton<IReceiverMarker, NexusLoginViewModel>();
|
||||
|
@ -78,6 +78,7 @@ namespace Wabbajack.App.ViewModels
|
||||
.DisposeWith(disposables);
|
||||
|
||||
});
|
||||
CurrentScreen = (Control)_screens.First(s => s.ViewModelType == typeof(ModeSelectionViewModel));
|
||||
|
||||
LoadFirstScreen().FireAndForget();
|
||||
|
||||
|
@ -38,6 +38,7 @@
|
||||
<Button Grid.Column="0" x:Name="BackButton">
|
||||
<i:MaterialIcon Kind="ArrowBack"> </i:MaterialIcon>
|
||||
</Button>
|
||||
|
||||
<TextBlock Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" x:Name="ResourceStatus"></TextBlock>
|
||||
|
||||
<Button Grid.Column="2" x:Name="SettingsButton">
|
||||
|
@ -17,7 +17,7 @@
|
||||
<Grid Grid.Row="1" ColumnDefinitions="*, *, *, *" HorizontalAlignment="Center">
|
||||
<controls:LargeIconButton Grid.Column="0" Text="Browse" Icon="CloudDownload" x:Name="BrowseButton"></controls:LargeIconButton>
|
||||
<controls:LargeIconButton Grid.Column="1" Text="Install" Icon="HarddiskPlus" x:Name="InstallButton"></controls:LargeIconButton>
|
||||
<controls:LargeIconButton Grid.Column="2" Text="Compile" Icon="DatabaseImport"></controls:LargeIconButton>
|
||||
<controls:LargeIconButton Grid.Column="2" Text="Compile" Icon="DatabaseImport" x:Name="CompileButton"></controls:LargeIconButton>
|
||||
<controls:LargeIconButton Grid.Column="3" Text="Play" Icon="TelevisionPlay"></controls:LargeIconButton>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
@ -24,6 +24,11 @@ namespace Wabbajack.App.Views
|
||||
{
|
||||
MessageBus.Instance.Send(new NavigateTo(typeof(BrowseViewModel)));
|
||||
}).DisposeWith(disposables);
|
||||
|
||||
CompileButton.Button.Command = ReactiveCommand.Create(() =>
|
||||
{
|
||||
MessageBus.Instance.Send(new NavigateTo(typeof(CompilerConfigurationViewModel)));
|
||||
}).DisposeWith(disposables);
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user