Push all changes made to ConnectivityDialog

this was part of b2cfeeb, i dont know how this somehow managed to evade being added
pizzaboxer · Jul 5, 2024 · 6eebb54 · 6eebb54
1 parent 0aaeb9d
commit 6eebb54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Bloxstrap/UI/Elements/Dialogs/ConnectivityDialog.xaml b/Bloxstrap/UI/Elements/Dialogs/ConnectivityDialog.xaml
@@ -1,10 +1,12 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.ConnectivityDialog"
+<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.ConnectivityDialog"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+ xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
  xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
+ xmlns:controls="clr-namespace:Bloxstrap.UI.Elements.Controls"
  xmlns:resources="clr-namespace:Bloxstrap.Resources"
  mc:Ignorable="d"
  Width="480"
@@ -30,7 +32,7 @@
  <Image Grid.Column="0" Width="32" Height="32" Margin="0,0,15,0" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Error.png" />
  <StackPanel Grid.Column="1">
  <TextBlock x:Name="TitleTextBlock" Text="? is unable to connect to ?" FontSize="18" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
- <TextBlock x:Name="DescriptionTextBlock" Text="?" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+ <controls:MarkdownTextBlock x:Name="DescriptionTextBlock" MarkdownText="?" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
  <TextBlock Text="{x:Static resources:Strings.Dialog_Connectivity_MoreInfo}" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
  <RichTextBox x:Name="ErrorRichTextBox" Padding="8" Margin="0,8,0,0" Block.LineHeight="2" FontFamily="Courier New" IsReadOnly="True" />
  </StackPanel>
@@ -42,4 +44,4 @@
  </StackPanel>
  </Border>
  </Grid>
-</ui:UiWindow>
+</base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Elements/Dialogs/ConnectivityDialog.xaml.cs b/Bloxstrap/UI/Elements/Dialogs/ConnectivityDialog.xaml.cs
@@ -14,12 +14,12 @@ namespace Bloxstrap.UI.Elements.Dialogs
  /// </summary>
  public partial class ConnectivityDialog
  {
- public ConnectivityDialog(string targetName, string description, Exception exception)
+ public ConnectivityDialog(string title, string description, Exception exception)
  {
  InitializeComponent();
 
- TitleTextBlock.Text = string.Format(Bloxstrap.Resources.Strings.Dialog_Connectivity_UnableToConnect, targetName);
- DescriptionTextBlock.Text = description;
+ TitleTextBlock.Text = title;
+ DescriptionTextBlock.MarkdownText = description;
 
  AddException(exception);