UI rework - very WIP, don't merge yet!

.gitignore

@@ -5,4 +5,4 @@ obj
 *.user
 .\packages\*
 /VERSION.txt
-*.opencover.xml
+*.opencover.xml

Wabbajack.App.Wpf/App.xaml.cs

@@ -26,176 +26,180 @@
 using Wabbajack.Util;
 using Ext = Wabbajack.Common.Ext;
 
-namespace Wabbajack
+namespace Wabbajack;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App
-    {
-        private IHost _host;
+    private IHost _host;
 
-        private void OnStartup(object sender, StartupEventArgs e)
+    private void OnStartup(object sender, StartupEventArgs e)
+    {
+        if (IsAdmin())
         {
-            if (IsAdmin())
+            var messageBox = MessageBox.Show("Don't run Wabbajack as Admin!", "Error", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
+            if (messageBox == MessageBoxResult.OK)
             {
-                var messageBox = MessageBox.Show("Don't run Wabbajack as Admin!", "Error", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
-                if (messageBox == MessageBoxResult.OK)
-                {
-                    Environment.Exit(1);
-                }
-                else
-                {
-                    Environment.Exit(1);
-                }
+                Environment.Exit(1);
+            }
+            else
+            {
+                Environment.Exit(1);
             }
+        }
 
-            RxApp.MainThreadScheduler = new DispatcherScheduler(Dispatcher.CurrentDispatcher);
-            _host = Host.CreateDefaultBuilder(Array.Empty<string>())
-                .ConfigureLogging(AddLogging)
-                .ConfigureServices((host, services) =>
-                {
-                    ConfigureServices(services);
-                })
-                .Build();
+        RxApp.MainThreadScheduler = new DispatcherScheduler(Dispatcher.CurrentDispatcher);
+        _host = Host.CreateDefaultBuilder(Array.Empty<string>())
+            .ConfigureLogging(AddLogging)
+            .ConfigureServices((host, services) =>
+            {
+                ConfigureServices(services);
+            })
+            .Build();
 
-            var args = e.Args;
+        var args = e.Args;
 
-            RxApp.MainThreadScheduler.Schedule(0, (_, _) =>
+        RxApp.MainThreadScheduler.Schedule(0, (_, _) =>
+        {
+            if (args.Length == 1)
             {
-                if (args.Length == 1)
-                {
-                    var arg = args[0].ToAbsolutePath();
-                    if (arg.FileExists() && arg.Extension == Ext.Wabbajack)
-                    {
-                        var mainWindow = _host.Services.GetRequiredService<MainWindow>();
-                        mainWindow!.Show();
-                        return Disposable.Empty;
-                    }
-                } else if (args.Length > 0)
-                {
-                    var builder = _host.Services.GetRequiredService<CommandLineBuilder>();
-                    builder.Run(e.Args).ContinueWith(async x =>
-                    {
-                        Environment.Exit(await x);
-                    });
-                    return Disposable.Empty;
-                }
-                else
+                var arg = args[0].ToAbsolutePath();
+                if (arg.FileExists() && arg.Extension == Ext.Wabbajack)
                 {
                     var mainWindow = _host.Services.GetRequiredService<MainWindow>();
                     mainWindow!.Show();
                     return Disposable.Empty;
                 }
-
+            } else if (args.Length > 0)
+            {
+                var builder = _host.Services.GetRequiredService<CommandLineBuilder>();
+                builder.Run(e.Args).ContinueWith(async x =>
+                {
+                    Environment.Exit(await x);
+                });
                 return Disposable.Empty;
-            });
-        }
+            }
+            else
+            {
+                var mainWindow = _host.Services.GetRequiredService<MainWindow>();
+                mainWindow!.Show();
+                return Disposable.Empty;
+            }
 
-        private static bool IsAdmin()
-        {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return false;
+            return Disposable.Empty;
+        });
+    }
 
-            try
-            {
-                var identity = WindowsIdentity.GetCurrent();
-                var owner = identity.Owner;
-                if (owner is not null) return owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid);
+    private static bool IsAdmin()
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return false;
+
+        try
+        {
+            var identity = WindowsIdentity.GetCurrent();
+            var owner = identity.Owner;
+            if (owner is not null) return owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid);
 
-                var principle = new WindowsPrincipal(identity);
-                return principle.IsInRole(WindowsBuiltInRole.Administrator);
+            var principle = new WindowsPrincipal(identity);
+            return principle.IsInRole(WindowsBuiltInRole.Administrator);
 
-            }
-            catch (Exception)
-            {
-                return false;
-            }
         }
-
-        private void AddLogging(ILoggingBuilder loggingBuilder)
+        catch (Exception)
         {
-            var config = new NLog.Config.LoggingConfiguration();
+            return false;
+        }
+    }
 
-            var logFolder = KnownFolders.LauncherAwarePath.Combine("logs");
-            if (!logFolder.DirectoryExists())
-                logFolder.CreateDirectory();
+    private void AddLogging(ILoggingBuilder loggingBuilder)
+    {
+        var config = new NLog.Config.LoggingConfiguration();
 
-            var fileTarget = new FileTarget("file")
-            {
-                FileName = logFolder.Combine("Wabbajack.current.log").ToString(),
-                ArchiveFileName = logFolder.Combine("Wabbajack.{##}.log").ToString(),
-                ArchiveOldFileOnStartup = true,
-                MaxArchiveFiles = 10,
-                Layout = "${processtime} [${level:uppercase=true}] (${logger}) ${message:withexception=true}",
-                Header = "############ Wabbajack log file - ${longdate} ############"
-            };
+        var logFolder = KnownFolders.LauncherAwarePath.Combine("logs");
+        if (!logFolder.DirectoryExists())
+            logFolder.CreateDirectory();
 
-            var consoleTarget = new ConsoleTarget("console");
+        var fileTarget = new FileTarget("file")
+        {
+            FileName = logFolder.Combine("Wabbajack.current.log").ToString(),
+            ArchiveFileName = logFolder.Combine("Wabbajack.{##}.log").ToString(),
+            ArchiveOldFileOnStartup = true,
+            MaxArchiveFiles = 10,
+            Layout = "${processtime} [${level:uppercase=true}] (${logger}) ${message:withexception=true}",
+            Header = "############ Wabbajack log file - ${longdate} ############"
+        };
 
-            var uiTarget = new LogStream
-            {
-                Name = "ui",
-                Layout = "${message:withexception=false}",
-            };
+        var consoleTarget = new ConsoleTarget("console");
+
+        var uiTarget = new LogStream
+        {
+            Name = "ui",
+            Layout = "${message:withexception=false}",
+        };
 
-            loggingBuilder.Services.AddSingleton(uiTarget);
+        loggingBuilder.Services.AddSingleton(uiTarget);
 
-            config.AddRuleForAllLevels(fileTarget);
-            config.AddRuleForAllLevels(consoleTarget);
-            config.AddRuleForAllLevels(uiTarget);
+        config.AddRuleForAllLevels(fileTarget);
+        config.AddRuleForAllLevels(consoleTarget);
+        config.AddRuleForAllLevels(uiTarget);
 
-            loggingBuilder.ClearProviders();
-            loggingBuilder.SetMinimumLevel(LogLevel.Information);
-            loggingBuilder.AddNLog(config);
-        }
+        loggingBuilder.ClearProviders();
+        loggingBuilder.SetMinimumLevel(LogLevel.Information);
+        loggingBuilder.AddNLog(config);
+    }
 
-        private static IServiceCollection ConfigureServices(IServiceCollection services)
-        {
-            services.AddOSIntegrated();
-
-            // Orc.FileAssociation
-            services.AddSingleton<IApplicationRegistrationService>(new ApplicationRegistrationService());
-
-            services.AddSingleton<CefService>();
-            services.AddSingleton<IUserInterventionHandler, UserIntreventionHandler>();
-
-            services.AddTransient<MainWindow>();
-            services.AddTransient<MainWindowVM>();
-            services.AddTransient<BrowserWindow>();
-            services.AddSingleton<SystemParametersConstructor>();
-            services.AddSingleton<LauncherUpdater>();
-            services.AddSingleton<ResourceMonitor>();
-            services.AddSingleton<WebView2>();
-
-            services.AddTransient<CompilerVM>();
-            services.AddTransient<InstallerVM>();
-            services.AddTransient<ModeSelectionVM>();
-            services.AddTransient<ModListGalleryVM>();
-            services.AddTransient<CompilerVM>();
-            services.AddTransient<InstallerVM>();
-            services.AddTransient<SettingsVM>();
-            services.AddTransient<WebBrowserVM>();
-
-            // Login Handlers
-            services.AddTransient<VectorPlexusLoginHandler>();
-            services.AddTransient<NexusLoginHandler>();
-            services.AddTransient<LoversLabLoginHandler>();
-
-            // Login Managers
-
-            //Disabled LL because it is currently not used and broken due to the way LL butchers their API
-            //services.AddAllSingleton<INeedsLogin, LoversLabLoginManager>();
-            services.AddAllSingleton<INeedsLogin, NexusLoginManager>();
-            //Disabled VP due to frequent login issues & because the only file that really got downloaded there has a mirror
-            //services.AddAllSingleton<INeedsLogin, VectorPlexusLoginManager>();
-            services.AddSingleton<ManualDownloadHandler>();
-            services.AddSingleton<ManualBlobDownloadHandler>();
-
-            // Verbs
-            services.AddSingleton<CommandLineBuilder>();
-            services.AddCLIVerbs();
-
-            return services;
-        }
+    private static IServiceCollection ConfigureServices(IServiceCollection services)
+    {
+        services.AddOSIntegrated();
+
+        // Orc.FileAssociation
+        services.AddSingleton<IApplicationRegistrationService>(new ApplicationRegistrationService());
+
+        services.AddSingleton<CefService>();
+        services.AddSingleton<IUserInterventionHandler, UserInterventionHandler>();
+        services.AddSingleton<ImageCacheManager>();
+
+        services.AddTransient<MainWindow>();
+        services.AddTransient<MainWindowVM>();
+        services.AddTransient<NavigationVM>();
+        services.AddTransient<BrowserWindow>();
+        services.AddSingleton<SystemParametersConstructor>();
+        services.AddSingleton<LauncherUpdater>();
+        services.AddSingleton<ResourceMonitor>();
+        services.AddSingleton<WebView2>();
+
+        services.AddTransient<HomeVM>();
+        services.AddTransient<ModListGalleryVM>();
+        services.AddTransient<CompilerHomeVM>();
+        services.AddTransient<CompilerDetailsVM>();
+        services.AddTransient<CompilerFileManagerVM>();
+        services.AddTransient<CompilerMainVM>();
+        services.AddTransient<InstallationVM>();
+        services.AddTransient<SettingsVM>();
+        services.AddTransient<WebBrowserVM>();
+        services.AddTransient<InfoVM>();
+        services.AddTransient<ModListDetailsVM>();
+
+        // Login Handlers
+        services.AddTransient<VectorPlexusLoginHandler>();
+        services.AddTransient<NexusLoginHandler>();
+        services.AddTransient<LoversLabLoginHandler>();
+
+        // Login Managers
+
+        //Disabled LL because it is currently not used and broken due to the way LL butchers their API
+        //services.AddAllSingleton<INeedsLogin, LoversLabLoginManager>();
+        services.AddAllSingleton<INeedsLogin, NexusLoginManager>();
+        //Disabled VP due to frequent login issues & because the only file that really got downloaded there has a mirror
+        //services.AddAllSingleton<INeedsLogin, VectorPlexusLoginManager>();
+        services.AddSingleton<ManualDownloadHandler>();
+        services.AddSingleton<ManualBlobDownloadHandler>();
+
+        // Verbs
+        services.AddSingleton<CommandLineBuilder>();
+        services.AddCLIVerbs();
+
+        return services;
     }
 }

Wabbajack.App.Wpf/Consts.cs

@@ -9,6 +9,11 @@ public static class Consts
     public static RelativePath MO2IniName = "ModOrganizer.ini".ToRelativePath();
     public static string AppName = "Wabbajack";
     public static Uri WabbajackBuildServerUri => new("https://build.wabbajack.org");
+    public static Uri WabbajackModlistWizardUri => new("https://wizard.wabbajack.org");
+    public static Uri WabbajackGithubUri => new("https://github.com/wabbajack-tools/wabbajack");
+    public static Uri WabbajackDiscordUri => new("https://discord.gg/wabbajack");
+    public static Uri WabbajackPatreonUri => new("https://www.patreon.com/user?u=11907933");
+    public static Uri WabbajackWikiUri => new("https://wiki.wabbajack.org");
     public static Version CurrentMinimumWabbajackVersion { get; set; } = Version.Parse("2.3.0.0");
     public static bool UseNetworkWorkaroundMode { get; set; } = false;
     public static AbsolutePath CefCacheLocation { get; } = KnownFolders.WabbajackAppLocal.Combine("Cef");
@@ -18,4 +23,14 @@ public static class Consts
     public static byte SettingsVersion = 0;
 
     public static RelativePath NativeSettingsJson = "native_settings.json".ToRelativePath();
+    public const string AllSavedCompilerSettingsPaths = "compiler_settings_paths";
+
+    // Info - TODO, make rich document?
+    public const string FileManagerInfo = @"
+Your modlist will contain lots of files and Wabbajack needs to know where all those files came from to compile a modlist installer. Most of these should be mods that are sourced from the downloads folder. But you might have folders you do **not** want to ship with the modlist, or folders or config files that are generated and can be inlined into the .wabbajack installer. Here is where these files or folders are managed.
+
+Find more information on the Wabbajack wiki!
+
+https://wiki.wabbajack.org/modlist_author_documentation/Compilation.html
+";
 }

Wabbajack.App.Wpf/Converters/AbsolutePathToStringConverter.cs

@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Windows.Data;
 using ReactiveUI;
-using Wabbajack.Common;
 using Wabbajack.Paths;
 
 namespace Wabbajack

Wabbajack.App.Wpf/Converters/CommandConverter.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using ReactiveUI;
 

Wabbajack.App.Wpf/Converters/ConverterRegistration.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ReactiveUI;
+using ReactiveUI;
 using Splat;
 
 namespace Wabbajack

Wabbajack.App.Wpf/Converters/IntDownCastConverter.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using ReactiveUI;