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

Merge pull request #1709 from wabbajack-tools/style-play-buttons

Browse Source 
Style play buttons
This commit is contained in:
Timothy Baldridge 2021-11-08 06:55:17 -07:00 committed by GitHub
commit 09667841e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 212 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Wabbajack.App/Assets/Wabbajack.axaml
View File

@ -62,6 +62,22 @@
<Setter Property="CornerRadius" Value="4"></Setter>
</Style>
<Style Selector=".InstalledList Border">
<Setter Property="BorderThickness" Value="2"></Setter>
<Setter Property="BorderBrush" Value="DarkGray"></Setter>
<Setter Property="CornerRadius" Value="4"></Setter>
</Style>
<Style Selector=".InstalledList TextBlock">
<Setter Property="FontWeight" Value="Bold"></Setter>
<Setter Property="FontSize" Value="18"></Setter>
<Setter Property="Margin" Value="4"/>
</Style>
<Style Selector="Button.InstalledList">
<Setter Property="Margin" Value="4"></Setter>
</Style>
</Styles>

18
Wabbajack.App/Controls/InstalledListView.axaml
View File

@ -5,11 +5,15 @@
xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Wabbajack.App.Controls.InstalledListView">
<Grid RowDefinitions="Auto, Auto" ColumnDefinitions="*, Auto">
<TextBlock Grid.Row="0" Grid.Column="0" x:Name="Title" />
<TextBlock Grid.Row="1" Grid.Column="0" x:Name="InstallationPath" />
<Button Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" x:Name="PlayButton">
<i:MaterialIcon Kind="PlayArrow" />
</Button>
</Grid>
<Button Name="ListButton" Classes="InstalledList" HorizontalAlignment="Stretch">
<Border Classes="InstalledList">
<Grid RowDefinitions="Auto, Auto Auto, Auto" ColumnDefinitions="Auto, *">
<Image x:Name="ListImage" Grid.RowSpan="4" Grid.Row="0" Grid.Column="0" Width="270" Height="150"></Image>
<TextBlock Grid.Row="0" Grid.Column="1" x:Name="Title" />
<TextBlock Grid.Row="1" Grid.Column="1" x:Name="Version" />
<TextBlock Grid.Row="2" Grid.Column="1" x:Name="Author"></TextBlock>
<TextBlock Grid.Row="3" Grid.Column="1" x:Name="InstallationPath" />
</Grid>
</Border>
</Button>
</UserControl>

13
Wabbajack.App/Controls/InstalledListView.axaml.cs
View File

@ -12,14 +12,23 @@ public partial class InstalledListView : ReactiveUserControl<InstalledListViewMo
this.WhenActivated(disposables =>
{
this.OneWayBind(ViewModel, vm => vm.Image, view => view.ListImage.Source)
.DisposeWith(disposables);
this.OneWayBind(ViewModel, vm => vm.Name, view => view.Title.Text)
.DisposeWith(disposables);
this.OneWayBind(ViewModel, vm => vm.InstallPath, view => view.Title.Text,
this.OneWayBind(ViewModel, vm => vm.Author, view => view.Author.Text)
.DisposeWith(disposables);
this.OneWayBind(ViewModel, vm => vm.Version, view => view.Version.Text)
.DisposeWith(disposables);
this.OneWayBind(ViewModel, vm => vm.InstallPath, view => view.InstallationPath.Text,
p => p.ToString())
.DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.Play, view => view.PlayButton)
this.BindCommand(ViewModel, vm => vm.Play, view => view.ListButton)
.DisposeWith(disposables);
});
}

26
Wabbajack.App/Controls/InstalledListViewModel.cs
View File

@ -1,8 +1,14 @@
using System.Reactive;
using System.Threading.Tasks;
using Avalonia.Media.Imaging;
using Avalonia.Threading;
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Wabbajack.App.Messages;
using Wabbajack.App.Models;
using Wabbajack.App.Screens;
using Wabbajack.App.ViewModels;
using Wabbajack.Common;
using Wabbajack.DTOs.SavedSettings;
using Wabbajack.Paths;
@ -12,7 +18,7 @@ public class InstalledListViewModel : ViewModelBase
{
private readonly InstallationConfigurationSetting _setting;
public InstalledListViewModel(InstallationConfigurationSetting setting)
public InstalledListViewModel(InstallationConfigurationSetting setting, ImageCache imageCache)
{
Activator = new ViewModelActivator();
_setting = setting;
@ -22,10 +28,28 @@ public class InstalledListViewModel : ViewModelBase
MessageBus.Current.SendMessage(new ConfigureLauncher(InstallPath));
MessageBus.Current.SendMessage(new NavigateTo(typeof(LauncherViewModel)));
});
LoadImage(imageCache).FireAndForget();
}
public async Task LoadImage(ImageCache cache)
{
var img = await cache.From(_setting.Install.Combine("modlist-image.png"), 270, 150);
Dispatcher.UIThread.Post(() =>
{
Image = img;
});
}
public AbsolutePath InstallPath => _setting.Install;
public string Name => _setting.Metadata?.Title ?? "";
public string Version => _setting.Metadata?.Version?.ToString() ?? "";
public string Author => _setting.Metadata?.Author ?? "";
public ReactiveCommand<Unit, Unit> Play { get; }
[Reactive]
public IBitmap Image { get; set; }
}

25
Wabbajack.App/Controls/LogView.axaml
View File

@ -9,21 +9,16 @@
<Grid RowDefinitions="Auto, *, Auto" Classes="LogView">
<TextBlock Grid.Row="0" Classes="Title">Current Log Contents</TextBlock>
<Border Grid.Row="1">
<ScrollViewer ScrollChanged="ScrollViewer_OnScrollChanged" x:Name="ScrollViewer"
HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
<ItemsControl x:Name="Messages">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<controls:LogViewItem />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
<ItemsRepeater x:Name="Messages">
<ItemsRepeater.Layout>
<StackLayout></StackLayout>
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<controls:LogViewItem />
</DataTemplate>
</ItemsRepeater.ItemTemplate>
</ItemsRepeater>
</Border>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button x:Name="CopyLog">

9
Wabbajack.App/Controls/LogView.axaml.cs
View File

@ -1,3 +1,4 @@
using System.Linq;
using Avalonia.Controls;
using Avalonia.Controls.Mixins;
using Avalonia.ReactiveUI;
@ -14,15 +15,11 @@ public partial class LogView : ReactiveUserControl<LogViewModel>
InitializeComponent();
this.WhenActivated(disposables =>
{
this.OneWayBind(ViewModel, vm => vm.Messages, view => view.Messages.Items)
this.OneWayBind(ViewModel, vm => vm.Messages, view => view.Messages.Items,
items => items.Reverse().ToArray())
.DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.CopyLogFile, view => view.CopyLog)
.DisposeWith(disposables);
});
}
private void ScrollViewer_OnScrollChanged(object? sender, ScrollChangedEventArgs e)
{
ScrollViewer.ScrollToEnd();
}
}

20
Wabbajack.App/Extensions/IObservableExtensions.cs
View File

@ -6,6 +6,8 @@ using System.Reactive.Subjects;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using ReactiveUI;
using Wabbajack.App.Controls;
using Wabbajack.Paths;
namespace Wabbajack.App.Extensions;
@ -40,4 +42,22 @@ public static class IObservableExtensions
return Disposable.Create(() => d.Dispose());
}
public static IDisposable BindFileSelectionBox<TViewModel>(this FileSelectionBox box, TViewModel viewModel,
Expression<Func<TViewModel, AbsolutePath>> vmProperty)
where TViewModel: class?
{
var disposables = new CompositeDisposable();
box.WhenAnyValue(view => view.SelectedPath)
.BindTo(viewModel, vmProperty)
.DisposeWith(disposables);
viewModel.WhenAnyValue(vmProperty)
.Where(p => p != default)
.Subscribe(box.Load)
.DisposeWith(disposables);
return disposables;
}
}

20
Wabbajack.App/Models/ImageCache.cs
View File

@ -9,8 +9,10 @@ using Avalonia.Media;
using Avalonia.Media.Imaging;
using SkiaSharp;
using Wabbajack.Hashing.xxHash64;
using Wabbajack.Paths;
using Wabbajack.Paths.IO;
using Wabbajack.RateLimiter;
using Wabbajack.VFS;
namespace Wabbajack.App.Models;
@ -19,13 +21,15 @@ public class ImageCache
private readonly Configuration _configuration;
private readonly HttpClient _client;
private readonly IResource<HttpClient> _limiter;
private readonly FileHashCache _hashCache;
public ImageCache(Configuration configuration, HttpClient client, IResource<HttpClient> limiter)
public ImageCache(Configuration configuration, HttpClient client, IResource<HttpClient> limiter, FileHashCache hashCache)
{
_configuration = configuration;
_configuration.ImageCacheLocation.CreateDirectory();
_client = client;
_limiter = limiter;
_hashCache = hashCache;
}
public async Task<IBitmap> From(Uri uri, int width, int height)
@ -46,4 +50,18 @@ public class ImageCache
return new Bitmap(new MemoryStream(data));
}
public async Task<IBitmap> From(AbsolutePath image, int width, int height)
{
var hash = await _hashCache.FileHashCachedAsync(image, CancellationToken.None);
var file = _configuration.ImageCacheLocation.Combine(hash + $"_{width}_{height}");
if (!file.FileExists())
{
var resized = SKBitmap.Decode(image.ToString()).Resize(new SKSizeI(width, height), SKFilterQuality.High);
await file.WriteAllBytesAsync(resized.Encode(SKEncodedImageFormat.Webp, 90).ToArray());
}
var data = await file.ReadAllBytesAsync();
return new Bitmap(new MemoryStream(data));
}
}

2
Wabbajack.App/Screens/CompilationViewModel.cs
View File

@ -62,7 +62,7 @@ public class CompilationViewModel : ViewModelBase
{
try
{
await _compiler.Begin(CancellationToken.None);
var result = await Task.Run(async () => await _compiler.Begin(CancellationToken.None));
}
catch (Exception ex)
{

29
Wabbajack.App/Screens/CompilerConfigurationView.axaml
View File

@ -6,9 +6,9 @@
xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:controls="clr-namespace:Wabbajack.App.Controls"
x:Class="Wabbajack.App.Screens.CompilerConfigurationView">
<Grid RowDefinitions="40, *, 40">
<Grid RowDefinitions="40, *, 40" Margin="8">
<TextBlock Grid.Row="0" x:Name="StatusText" FontSize="20" FontWeight="Bold">Compiler Configuration</TextBlock>
<Grid Grid.Row="1" ColumnDefinitions="Auto, *" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto"
<Grid Grid.Row="1" ColumnDefinitions="Auto, *" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
Margin="4">
<Label Grid.Column="0" Grid.Row="0" HorizontalAlignment="Right">Title:</Label>
<TextBox Grid.Column="1" Grid.Row="0" x:Name="Title" />
@ -29,9 +29,28 @@
</ComboBox>
<Label Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right">Output Folder:</Label>
<controls:FileSelectionBox Grid.Column="1" Grid.Row="5" x:Name="OutputFolder" SelectFolder="True" />
<Label Grid.Column="0" Grid.Row="6" HorizontalAlignment="Right" VerticalAlignment="Top">Always Enabled:</Label>
<Label Grid.Column="0" Grid.Row="6" HorizontalAlignment="Right" VerticalAlignment="Top">Other Profiles:</Label>
<StackPanel Grid.Column="1" Grid.Row="6" Orientation="Vertical">
<Button x:Name="AddOtherProfile">
<i:MaterialIcon Kind="AddCircle" />
</Button>
<ItemsControl x:Name="OtherProfilesList">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<controls:RemovableListItem />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
<Label Grid.Column="0" Grid.Row="7" HorizontalAlignment="Right" VerticalAlignment="Top">Always Enabled:</Label>
<StackPanel Grid.Column="1" Grid.Row="7" Orientation="Vertical">
<Button x:Name="AddAlwaysEnabled">
<i:MaterialIcon Kind="AddCircle" />
</Button>
@ -48,6 +67,8 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</Grid>

36
Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs
View File

@ -7,6 +7,7 @@ using Avalonia.Interactivity;
using Avalonia.Threading;
using ReactiveUI;
using Wabbajack.App.Controls;
using Wabbajack.App.Extensions;
using Wabbajack.App.Views;
using Wabbajack.Common;
using Wabbajack.Paths;
@ -19,25 +20,23 @@ public partial class CompilerConfigurationView : ScreenBase<CompilerConfiguratio
{
InitializeComponent();
AddAlwaysEnabled.Command = ReactiveCommand.Create(() => AddAlwaysEnabled_Command().FireAndForget());
AddOtherProfile.Command = ReactiveCommand.Create(() => AddOtherProfile_Command().FireAndForget());
this.WhenActivated(disposables =>
{
this.Bind(ViewModel, vm => vm.SettingsFile, view => view.SettingsFile.SelectedPath)
.DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.Title, view => view.Title.Text)
.DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SettingsFile, view => view.SettingsFile.SelectedPath)
SettingsFile.BindFileSelectionBox(ViewModel, vm => vm.SettingsFile)
.DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.Source, view => view.Source.SelectedPath)
Source.BindFileSelectionBox(ViewModel, vm => vm.Source)
.DisposeWith(disposables);
DownloadsFolder.BindFileSelectionBox(ViewModel, vm => vm.Downloads)
.DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.Downloads, view => view.DownloadsFolder.SelectedPath)
.DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.OutputFolder, view => view.OutputFolder.SelectedPath)
OutputFolder.BindFileSelectionBox(ViewModel, vm => vm.OutputFolder)
.DisposeWith(disposables);
this.OneWayBind(ViewModel, vm => vm.AllGames, view => view.BaseGame.Items)
@ -56,8 +55,27 @@ public partial class CompilerConfigurationView : ScreenBase<CompilerConfiguratio
DeleteCommand = ReactiveCommand.Create(() => { ViewModel?.RemoveAlwaysExcluded(itm); })
}))
.DisposeWith(disposables);
this.OneWayBind(ViewModel, vm => vm.OtherProfiles, view => view.OtherProfilesList.Items,
d => d!.Select(itm => new RemovableItemViewModel
{
Text = itm.ToString(),
DeleteCommand = ReactiveCommand.Create(() => { ViewModel?.RemoveOtherProfile(itm); })
}))
.DisposeWith(disposables);
});
}
private async Task AddOtherProfile_Command()
{
var dialog = new OpenFolderDialog
{
Title = "Select a profile folder"
};
var result = await dialog.ShowAsync(App.MainWindow);
if (!string.IsNullOrWhiteSpace(result))
ViewModel!.AddOtherProfile(result.ToAbsolutePath());
}
private async Task AddAlwaysEnabled_Command()
{

32
Wabbajack.App/Screens/CompilerConfigurationViewModel.cs
View File

@ -71,6 +71,9 @@ public class CompilerConfigurationViewModel : ViewModelBase
[Reactive] public IEnumerable<RelativePath> AlwaysEnabled { get; set; } = Array.Empty<RelativePath>();
[Reactive]
public string[] OtherProfiles { get; set; } = Array.Empty<string>();
public AbsolutePath SettingsOutputLocation => Source.Combine(Title)
.WithExtension(IsMO2Compilation ? Ext.MO2CompilerSettings : Ext.CompilerSettings);
@ -102,16 +105,31 @@ public class CompilerConfigurationViewModel : ViewModelBase
{
return new MO2CompilerSettings
{
ModListName = Title,
Downloads = Downloads,
Source = Source,
Game = BaseGame.Game,
Profile = SelectedProfile,
UseGamePaths = true,
OutputFile = OutputFolder.Combine(SelectedProfile).WithExtension(Ext.Wabbajack),
AlwaysEnabled = AlwaysEnabled.ToArray()
AlwaysEnabled = AlwaysEnabled.ToArray(),
OtherProfiles = OtherProfiles.ToArray()
};
}
public bool AddOtherProfile(AbsolutePath path)
{
if (!path.InFolder(Source.Combine(Consts.MO2Profiles))) return false;
var relative = path.RelativeTo(Source.Combine(Consts.MO2Profiles)).ToString();
OtherProfiles = OtherProfiles.Append(relative).Distinct().ToArray();
return true;
}
public void RemoveOtherProfile(string profile)
{
OtherProfiles = OtherProfiles.Where(p => p != profile).ToArray();
}
public bool AddAlwaysExcluded(AbsolutePath path)
{
if (!path.InFolder(Source)) return false;
@ -149,6 +167,8 @@ public class CompilerConfigurationViewModel : ViewModelBase
IsMO2Compilation = true;
AlwaysEnabled = Array.Empty<RelativePath>();
// Find Always Enabled mods
foreach (var modFolder in mo2Folder.Combine("mods").EnumerateDirectories())
{
@ -162,6 +182,12 @@ public class CompilerConfigurationViewModel : ViewModelBase
AlwaysEnabled = AlwaysEnabled.Append(modFolder.RelativeTo(mo2Folder)).ToArray();
}
var otherProfilesFile = settingsFile.Parent.Combine("otherprofiles.txt");
if (otherProfilesFile.FileExists())
{
OtherProfiles = await otherProfilesFile.ReadAllLinesAsync().ToArray();
}
if (mo2Folder.Depth > 1)
OutputFolder = mo2Folder.Parent;
@ -171,6 +197,8 @@ public class CompilerConfigurationViewModel : ViewModelBase
}
}
private async Task SaveSettingsFile()
{
await using var st = SettingsOutputLocation.Open(FileMode.Create, FileAccess.Write, FileShare.None);
@ -187,6 +215,7 @@ public class CompilerConfigurationViewModel : ViewModelBase
{
var mo2 = await LoadSettingsFile<MO2CompilerSettings>(path);
AlwaysEnabled = mo2.AlwaysEnabled;
OtherProfiles = mo2.OtherProfiles;
SelectedProfile = mo2.Profile;
s = mo2;
}
@ -195,6 +224,7 @@ public class CompilerConfigurationViewModel : ViewModelBase
throw new NotImplementedException();
}
Title = s.ModListName;
Source = s.Source;
Downloads = s.Downloads;
OutputFolder = s.OutputFile.Depth > 1 ? s.OutputFile.Parent : s.OutputFile;

16
Wabbajack.App/Screens/PlaySelectView.axaml
View File

@ -6,17 +6,15 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Wabbajack.App.Screens.PlaySelectView">
<Grid RowDefinitions="*">
<ItemsControl x:Name="Lists">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<ItemsRepeater x:Name="Lists">
<ItemsRepeater.Layout>
<StackLayout></StackLayout>
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<controls:InstalledListView />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ItemsRepeater.ItemTemplate>
</ItemsRepeater>
</Grid>
</UserControl>

6
Wabbajack.App/Screens/PlaySelectViewModel.cs
View File

@ -14,9 +14,11 @@ namespace Wabbajack.App.Screens;
public class PlaySelectViewModel : ViewModelBase, IActivatableViewModel
{
private readonly InstallationStateManager _manager;
private readonly ImageCache _imageCache;
public PlaySelectViewModel(InstallationStateManager manager)
public PlaySelectViewModel(InstallationStateManager manager, ImageCache imageCache)
{
_imageCache = imageCache;
_manager = manager;
Activator = new ViewModelActivator();
@ -32,6 +34,6 @@ public class PlaySelectViewModel : ViewModelBase, IActivatableViewModel
public async Task LoadAndSetItems()
{
var items = await _manager.GetAll();
Items = items.Settings.Select(a => new InstalledListViewModel(a)).ToArray();
Items = items.Settings.Select(a => new InstalledListViewModel(a, _imageCache)).ToArray();
}
}

1
Wabbajack.Compiler/MO2CompilerSettings.cs
View File

@ -7,4 +7,5 @@ public class MO2CompilerSettings : CompilerSettings
{
public string Profile { get; set; } = "";
public RelativePath[] AlwaysEnabled { get; set; } = Array.Empty<RelativePath>();
public string[] OtherProfiles { get; set; }
}

1
Wabbajack.DTOs/SavedSettings/InstallationSettings.cs
View File

@ -20,4 +20,5 @@ public class InstallationConfigurationSetting
public ModlistMetadata? Metadata { get; set; }
public AbsolutePath Image { get; set; }
}