Content bundle load dialog fixes

Change title to say "Loading".

Fix "not a content bundle" error state.

Fixes #146

Author: PJB3005

SS14.Launcher/ViewModels/ConnectingViewModel.cs

@@ -13,6 +13,7 @@ public class ConnectingViewModel : ViewModelBase
     private readonly Connector _connector;
     private readonly Updater _updater;
     private readonly MainWindowViewModel _windowVm;
+    private readonly ConnectionType _connectionType;
 
     private readonly CancellationTokenSource _cancelSource = new CancellationTokenSource();
 
@@ -25,16 +26,18 @@ public class ConnectingViewModel : ViewModelBase
 
     public bool IsErrored => _connectorStatus == Connector.ConnectionStatus.ConnectionFailed ||
                              _connectorStatus == Connector.ConnectionStatus.UpdateError ||
+                             _connectorStatus == Connector.ConnectionStatus.NotAContentBundle ||
                              _connectorStatus == Connector.ConnectionStatus.ClientExited &&
                              _connector.ClientExitedBadly;
 
     public static event Action? StartedConnecting;
 
-    public ConnectingViewModel(Connector connector, MainWindowViewModel windowVm, string? givenReason)
+    public ConnectingViewModel(Connector connector, MainWindowViewModel windowVm, string? givenReason, ConnectionType connectionType)
     {
         _updater = Locator.Current.GetRequiredService<Updater>();
         _connector = connector;
         _windowVm = windowVm;
+        _connectionType = connectionType;
         _reasonSuffix = (givenReason != null) ? ("\n" + givenReason) : "";
 
         this.WhenAnyValue(x => x._updater.Progress)
@@ -134,7 +137,8 @@ public string ProgressText
     public bool ProgressBarVisible => _connectorStatus != Connector.ConnectionStatus.ClientExited &&
                                       _connectorStatus != Connector.ConnectionStatus.ClientRunning &&
                                       _connectorStatus != Connector.ConnectionStatus.ConnectionFailed &&
-                                      _connectorStatus != Connector.ConnectionStatus.UpdateError;
+                                      _connectorStatus != Connector.ConnectionStatus.UpdateError &&
+                                      _connectorStatus != Connector.ConnectionStatus.NotAContentBundle;
 
     public bool SpeedIndeterminate => _connectorStatus != Connector.ConnectionStatus.Updating || _updaterSpeed == null;
 
@@ -182,10 +186,17 @@ public string SpeedText
             _ => ""
         };
 
+    public string TitleText => _connectionType switch
+    {
+        ConnectionType.Server => "Connecting...",
+        ConnectionType.ContentBundle => "Loading...",
+        _ => ""
+    };
+
     public static void StartConnect(MainWindowViewModel windowVm, string address, string? givenReason = null)
     {
         var connector = new Connector();
-        var vm = new ConnectingViewModel(connector, windowVm, givenReason);
+        var vm = new ConnectingViewModel(connector, windowVm, givenReason, ConnectionType.Server);
         windowVm.ConnectingVM = vm;
         vm.Start(address);
         StartedConnecting?.Invoke();
@@ -194,7 +205,7 @@ public static void StartConnect(MainWindowViewModel windowVm, string address, st
     public static void StartContentBundle(MainWindowViewModel windowVm, string fileName)
     {
         var connector = new Connector();
-        var vm = new ConnectingViewModel(connector, windowVm, null);
+        var vm = new ConnectingViewModel(connector, windowVm, null, ConnectionType.ContentBundle);
         windowVm.ConnectingVM = vm;
         vm.StartContentBundle(fileName);
         StartedConnecting?.Invoke();
@@ -224,4 +235,10 @@ public void Cancel()
     {
         _cancelSource.Cancel();
     }
+
+    public enum ConnectionType
+    {
+        Server,
+        ContentBundle
+    }
 }

SS14.Launcher/Views/ConnectingOverlay.xaml

@@ -11,7 +11,7 @@
   </Design.DataContext>
   <ContentControl Classes="OverlayBox">
     <StackPanel Orientation="Vertical">
-      <TextBlock HorizontalAlignment="Center" Classes="NanoHeadingMedium" Text="Connecting..." />
+      <TextBlock HorizontalAlignment="Center" Classes="NanoHeadingMedium" Text="{Binding TitleText}" />
       <TextBlock HorizontalAlignment="Center" Margin="0 10" DockPanel.Dock="Top" Text="{Binding StatusText}"
                  TextWrapping="Wrap"  MaxWidth="400" />
       <ProgressBar DockPanel.Dock="Bottom" Maximum="1" Value="{Binding Progress}"