diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml index 0bfc4d25..9f32042d 100644 --- a/FModel/MainWindow.xaml +++ b/FModel/MainWindow.xaml @@ -94,51 +94,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -411,6 +366,24 @@ + + + + + + + + + + + + + + + + + + @@ -566,6 +539,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index abc4468f..5074460d 100644 --- a/FModel/MainWindow.xaml.cs +++ b/FModel/MainWindow.xaml.cs @@ -69,6 +69,7 @@ public partial class MainWindow await _applicationView.CUE4Parse.InitMappings(); await _applicationView.InitImGuiSettings(); await _applicationView.InitVgmStream(); + await _applicationView.InitOodle(); if (UserSettings.Default.DiscordRpc == EDiscordRpc.Always) _discordHandler.Initialize(_applicationView.CUE4Parse.Game); diff --git a/FModel/ViewModels/Commands/TabCommand.cs b/FModel/ViewModels/Commands/TabCommand.cs index c0237c8c..5a62a2f2 100644 --- a/FModel/ViewModels/Commands/TabCommand.cs +++ b/FModel/ViewModels/Commands/TabCommand.cs @@ -32,30 +32,30 @@ public class TabCommand : ViewModelCommand case "Close_Other_Tabs": _applicationView.CUE4Parse.TabControl.RemoveOtherTabs(contextViewModel); break; - case "Assets_Export_Data": + case "Asset_Export_Data": await _threadWorkerView.Begin(_ => _applicationView.CUE4Parse.ExportData(fullPath)); break; - case "Assets_Save_Properties": + case "Asset_Save_Properties": await _threadWorkerView.Begin(cancellationToken => { _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Properties); _applicationView.CUE4Parse.TabControl.SelectedTab.SaveProperty(false); }); break; - case "Assets_Save_Textures": + case "Asset_Save_Textures": await _threadWorkerView.Begin(cancellationToken => { _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Textures); _applicationView.CUE4Parse.TabControl.SelectedTab.SaveImages(false); }); break; - case "Assets_Save_Models": + case "Asset_Save_Models": await _threadWorkerView.Begin(cancellationToken => { _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Meshes); }); break; - case "Assets_Save_Animations": + case "Asset_Save_Animations": await _threadWorkerView.Begin(cancellationToken => { _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Animations); diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml index ac301836..fefe46ae 100644 --- a/FModel/Views/Resources/Resources.xaml +++ b/FModel/Views/Resources/Resources.xaml @@ -853,7 +853,7 @@ - + @@ -862,7 +862,7 @@ - + @@ -871,7 +871,7 @@ - + @@ -880,7 +880,7 @@ - + @@ -889,7 +889,7 @@ - +