From 02febfe42f2c9899f91bca62b59d9dd072b5d9ba Mon Sep 17 00:00:00 2001
From: Salvador Cipolla <shivanuo@hotmail.com>
Date: Tue, 28 Jan 2025 20:26:50 -0300
Subject: [PATCH 1/2] Nebula login view rework

---
 .../Templates/NebulaLoginViewModel.cs         | 49 ++++++++++++++++---
 .../Views/Templates/NebulaLoginView.axaml     | 15 ++++--
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs b/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs
index 42da868f..41cd7c5f 100644
--- a/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs
+++ b/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs
@@ -1,7 +1,10 @@
-using Avalonia.Threading;
+using Avalonia.Controls;
+using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Knossos.NET.Models;
 using Knossos.NET.Views;
+using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace Knossos.NET.ViewModels
 {
@@ -26,10 +29,10 @@ public partial class NebulaLoginViewModel : ViewModelBase
         internal string userEmail = string.Empty;
 
         [ObservableProperty]
-        internal string editableIDs = string.Empty;
+        internal ObservableCollection<string> editableIDs = new ObservableCollection<string>();
 
         [ObservableProperty]
-        internal string privateMods = string.Empty;
+        internal ObservableCollection<ListBoxItem> privateMods = new ObservableCollection<ListBoxItem>();
 
         public async void UpdateUI()
         {
@@ -37,16 +40,20 @@ public async void UpdateUI()
             RegisterNewUser = false;
             UserName = Nebula.userName;
             UserPass = Nebula.userPass;
-            PrivateMods = string.Empty;
+            EditableIDs.Clear();
+            PrivateMods.Clear();
             if(UserLoggedIn) 
             { 
                 var ids = await Nebula.GetEditableModIDs().ConfigureAwait(false);
                 if (ids != null)
                 {
-                    Dispatcher.UIThread.Invoke(() =>
+                    foreach (var id in ids)
                     {
-                        EditableIDs = string.Join(", ", ids);
-                    });
+                        Dispatcher.UIThread.Invoke(() =>
+                        {
+                            EditableIDs.Add(id);
+                        });
+                    }
                 }
                 var privMods = await Nebula.GetPrivateMods(true).ConfigureAwait(false);
                 if (privMods != null)
@@ -55,13 +62,39 @@ public async void UpdateUI()
                     {
                         Dispatcher.UIThread.Invoke(() =>
                         {
-                            PrivateMods += mod + ", ";
+                            var item = new ListBoxItem();
+                            item.Tag = mod;
+                            item.Content = mod.ToString();
+                            PrivateMods.Add(item);
                         });
                     }
                 }
             }
         }
 
+        internal async void Install()
+        {
+            var selected = PrivateMods.FirstOrDefault(x => x.IsSelected);
+            if (selected != null)
+            {
+                if (selected.Tag is Mod mod)
+                {
+                    if (CustomLauncher.IsCustomMode && CustomLauncher.ModID != mod.id)
+                    {
+                        await MessageBox.Show(MainWindow.instance, "You can not install different mod id than the defined TC id in custom launcher mode.", "Different mod or tc", MessageBox.MessageBoxButtons.OK);
+                        return;
+                    }
+                    var dialog = new ModInstallView();
+                    dialog.DataContext = new ModInstallViewModel(mod, dialog, mod.version);
+                    await dialog.ShowDialog<ModInstallView?>(MainWindow.instance!);
+                }
+            }
+            else
+            {
+                await MessageBox.Show(MainWindow.instance, "Select a private mod from the list first.", "No selected mod", MessageBox.MessageBoxButtons.OK);
+            }
+        }
+
         internal async void LogIn()
         {
             if (string.IsNullOrEmpty(UserName) || string.IsNullOrEmpty(UserPass) || string.IsNullOrWhiteSpace(UserName) || string.IsNullOrWhiteSpace(UserPass))
diff --git a/Knossos.NET/Views/Templates/NebulaLoginView.axaml b/Knossos.NET/Views/Templates/NebulaLoginView.axaml
index d816e53a..16083494 100644
--- a/Knossos.NET/Views/Templates/NebulaLoginView.axaml
+++ b/Knossos.NET/Views/Templates/NebulaLoginView.axaml
@@ -12,7 +12,7 @@
 	</Design.DataContext>
 
 	<ScrollViewer Background="Transparent">
-		<StackPanel Background="Transparent" HorizontalAlignment="Center">
+		<StackPanel Background="Transparent" HorizontalAlignment="Center" Name="MainPanel">
 			<Label Content="{Binding Title}" HorizontalContentAlignment="Center" FontWeight="Black" FontSize="24"/>
 			<TextBox Text="{Binding UserName}" Watermark="Username" Width="300" Margin="5"></TextBox>
 			<TextBox Text="{Binding UserPass}" Watermark="Password" PasswordChar="*" Width="300" Margin="5"></TextBox>
@@ -26,10 +26,15 @@
 				<Button IsVisible="{Binding RegisterNewUser}" Width="135" Command="{Binding SwitchToLogin}" Margin="5" Classes="Cancel">Cancel</Button>
 				<Button IsVisible="{Binding RegisterNewUser}" Width="135" Command="{Binding Register}" Margin="5" Classes="Accept">Register</Button>
 			</WrapPanel>
-			<Label HorizontalAlignment="Center" IsVisible="{Binding UserLoggedIn}" Margin="20" FontSize="20">Mods IDs you have write access to</Label>
-			<TextBox Background="Transparent" IsReadOnly="True" IsVisible="{Binding UserLoggedIn}" TextWrapping="Wrap" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Text="{Binding EditableIDs}"></TextBox>
-			<Label HorizontalAlignment="Center" IsVisible="{Binding UserLoggedIn}" Margin="20" FontSize="20">Private mods you have access to</Label>
-			<TextBox Background="Transparent" IsReadOnly="True" IsVisible="{Binding UserLoggedIn}" TextWrapping="Wrap" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Text="{Binding PrivateMods}"></TextBox>
+			<Grid HorizontalAlignment="Center" ColumnDefinitions="Auto, Auto" RowDefinitions="Auto,*">
+				<Label HorizontalAlignment="Center" Grid.Row="0" Grid.Column="0" IsVisible="{Binding UserLoggedIn}" Margin="20" FontSize="20">Mods IDs you have write access to</Label>
+				<ListBox MaxHeight="700" Grid.Row="1" Margin="5" Grid.Column="0" Background="Transparent" IsVisible="{Binding UserLoggedIn}" ItemsSource="{Binding EditableIDs}"></ListBox>
+				<Label HorizontalAlignment="Center" Grid.Row="0" Grid.Column="1" IsVisible="{Binding UserLoggedIn}" Margin="20" FontSize="20">Private mods you have access to</Label>
+				<StackPanel Grid.Row="1" Grid.Column="1" IsVisible="{Binding UserLoggedIn}">
+					<ListBox MaxHeight="700" Margin="5" Background="Transparent" ItemsSource="{Binding PrivateMods}"/>
+					<Button Command="{Binding Install}" HorizontalAlignment="Center" Classes="Accept" Margin="5">Install Selected</Button>
+				</StackPanel>
+			</Grid>
 		</StackPanel>
 	</ScrollViewer>
 </UserControl>

From 022c25093b994d9ea24314fd046907bd7419eb72 Mon Sep 17 00:00:00 2001
From: Salvador Cipolla <shivanuo@hotmail.com>
Date: Sat, 1 Feb 2025 20:35:48 -0300
Subject: [PATCH 2/2] change message on incorrect install in custom mode

---
 Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs b/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs
index 41cd7c5f..52ebc85b 100644
--- a/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs
+++ b/Knossos.NET/ViewModels/Templates/NebulaLoginViewModel.cs
@@ -81,7 +81,7 @@ internal async void Install()
                 {
                     if (CustomLauncher.IsCustomMode && CustomLauncher.ModID != mod.id)
                     {
-                        await MessageBox.Show(MainWindow.instance, "You can not install different mod id than the defined TC id in custom launcher mode.", "Different mod or tc", MessageBox.MessageBoxButtons.OK);
+                        await MessageBox.Show(MainWindow.instance, "You cannot install a different mod ID than the defined Total Conversion ID while in Custom Launcher mode.", "Different mod or Total Conversion", MessageBox.MessageBoxButtons.OK);
                         return;
                     }
                     var dialog = new ModInstallView();