Viewer: Fixed Markdown formatting and added Copy Details context

jonthysell · Feb 5, 2024 · 8aac36e · 8aac36e
1 parent fa199f0
commit 8aac36e
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Mzinga Changelog #
 
+## next ##
+
+Viewer: Fix formatting of Markdown text blocks
+Viewer: Add "Copy Details" to context-menu for dialogs with expandable Details
+
 ## v0.15.0 ##
 
 * Added native ARM64 builds for Windows, MacOS, and Linux

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![CI Build](https://github.com/jonthysell/Mzinga/actions/workflows/ci.yml/badge.svg)](https://github.com/jonthysell/Mzinga/actions/workflows/ci.yml)
 
-Mzinga is a collection of open-source software to play the board game [Hive](https://gen42.com/games/hive), with the primary goal of building a community of developers who create Hive-playing AIs.
+Mzinga is a collection of open-source software to play the abstract board game [Hive](https://gen42.com/games/hive), with the primary goal of building a community of developers who create Hive-playing AIs.
 
 To that end, Mzinga proposes a [Universal Hive Protocol](https://github.com/jonthysell/Mzinga/wiki/UniversalHiveProtocol) to support interoperability for Hive-playing software.
 

diff --git a/src/Mzinga.Viewer/Resources/MarkdownStyles.axaml b/src/Mzinga.Viewer/Resources/MarkdownStyles.axaml
@@ -18,8 +18,10 @@
         <Setter Property="Margin"
                 Value="10,0" />
     </Style>
-    <Style Selector="md|MarkdownScrollViewer ScrollViewer">
-        <Setter Property="VerticalScrollBarVisibility"
-                Value="Disabled" />
+    <Style Selector="md|MarkdownScrollViewer ScrollViewer /template/ ScrollContentPresenter">
+        <Setter Property="Padding"
+                Value="0" />
+        <Setter Property="Margin"
+                Value="0,0,30,0" />
     </Style>
 </Styles>
diff --git a/src/Mzinga.Viewer/ViewModels/AboutViewModel.cs b/src/Mzinga.Viewer/ViewModels/AboutViewModel.cs
@@ -69,7 +69,7 @@ private static string GetAboutText()
         {
             return string.Join(Environment.NewLine + Environment.NewLine,
                 "## Mzinga ##",
-                "Mzinga is a collection of open-source software to play the board game [Hive](https://gen42.com/games/hive), with the primary goal of building a community of developers who create Hive-playing AIs.",
+                "Mzinga is a collection of open-source software to play the abstract board game [Hive](https://gen42.com/games/hive), with the primary goal of building a community of developers who create Hive-playing AIs.",
                 "To that end, Mzinga proposes a [Universal Hive Protocol](https://github.com/jonthysell/Mzinga/wiki/UniversalHiveProtocol) to support interoperability for Hive-playing software.",
                 "For more information on Mzinga and its projects, please check out the [Mzinga Wiki](https://github.com/jonthysell/Mzinga/wiki).",
                 "## MzingaViewer ##",

diff --git a/src/Mzinga.Viewer/ViewModels/ConfirmationViewModel.cs b/src/Mzinga.Viewer/ViewModels/ConfirmationViewModel.cs
@@ -17,15 +17,6 @@ public enum ConfirmationResult
 
     public class ConfirmationViewModel : InformationViewModelBase
     {
-        public static AppViewModel AppVM
-        {
-            get
-            {
-                return AppViewModel.Instance;
-            }
-
-        }
-
         #region Properties
 
         public ConfirmationResult Result { get; private set; } = ConfirmationResult.Cancel;

diff --git a/src/Mzinga.Viewer/ViewModels/InformationViewModel.cs b/src/Mzinga.Viewer/ViewModels/InformationViewModel.cs
@@ -5,20 +5,12 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Mzinga.Core;
 
 namespace Mzinga.Viewer.ViewModels
 {
     public class InformationViewModel : InformationViewModelBase
     {
-        public static AppViewModel AppVM
-        {
-            get
-            {
-                return AppViewModel.Instance;
-            }
-
-        }
-
         #region Commands
 
         public RelayCommand Accept

diff --git a/src/Mzinga.Viewer/ViewModels/InformationViewModelBase.cs b/src/Mzinga.Viewer/ViewModels/InformationViewModelBase.cs
@@ -4,11 +4,21 @@
 using System;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 namespace Mzinga.Viewer.ViewModels
 {
     public abstract class InformationViewModelBase : ObservableObject
     {
+        public static AppViewModel AppVM
+        {
+            get
+            {
+                return AppViewModel.Instance;
+            }
+
+        }
+
         public string Title
         {
             get
@@ -47,6 +57,32 @@ protected set
 
         public bool ShowDetails => !string.IsNullOrWhiteSpace(Details);
 
+        #region Commands
+
+        public RelayCommand CopyDetailsToClipboard
+        {
+            get
+            {
+                return _copyDetailsToClipboard ??= new RelayCommand(() =>
+                {
+                    try
+                    {
+                        AppVM.TextToClipboard(Details);
+                    }
+                    catch (Exception ex)
+                    {
+                        ExceptionUtils.HandleException(ex);
+                    }
+                }, () =>
+                {
+                    return ShowDetails;
+                });
+            }
+        }
+        private RelayCommand _copyDetailsToClipboard = null;
+
+        #endregion
+
         public event EventHandler RequestClose;
 
         public InformationViewModelBase(string message, string title, string details = null)

diff --git a/src/Mzinga.Viewer/Views/AboutWindow.axaml b/src/Mzinga.Viewer/Views/AboutWindow.axaml
@@ -1,8 +1,9 @@
 <Window CanResize="False"
         MinHeight="100"
         MinWidth="100"
-        SizeToContent="WidthAndHeight"
+        SizeToContent="Height"
         Title="{Binding Title}"
+        Width="600"
         WindowStartupLocation="CenterOwner"
         d:DesignHeight="640"
         d:DesignWidth="480"
@@ -39,20 +40,15 @@
                 </TabControl.ItemTemplate>
                 <TabControl.ContentTemplate>
                     <DataTemplate>
-                        <ScrollViewer Margin="0,5"
-                                      Padding="10,0,30,0"
-                                      Width="500">
-                            <md:MarkdownScrollViewer Markdown="{Binding Body, Mode=OneWay}"
-                                                     Width="460"
-                                                     x:DataType="vm:ObservableAboutTabItem">
-                                <md:MarkdownScrollViewer.Styles>
-                                    <StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
-                                </md:MarkdownScrollViewer.Styles>
-                                <md:MarkdownScrollViewer.Engine>
-                                    <md:Markdown HyperlinkCommand="{Binding AppVM.LaunchURL}" />
-                                </md:MarkdownScrollViewer.Engine>
-                            </md:MarkdownScrollViewer>
-                        </ScrollViewer>
+                        <md:MarkdownScrollViewer Markdown="{Binding Body, Mode=OneWay}"
+                                                 x:DataType="vm:ObservableAboutTabItem">
+                            <md:MarkdownScrollViewer.Styles>
+                                <StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
+                            </md:MarkdownScrollViewer.Styles>
+                            <md:MarkdownScrollViewer.Engine>
+                                <md:Markdown HyperlinkCommand="{Binding AppVM.LaunchURL}" />
+                            </md:MarkdownScrollViewer.Engine>
+                        </md:MarkdownScrollViewer>
                     </DataTemplate>
                 </TabControl.ContentTemplate>
             </TabControl>

diff --git a/src/Mzinga.Viewer/Views/ConfirmationWindow.axaml b/src/Mzinga.Viewer/Views/ConfirmationWindow.axaml
@@ -1,7 +1,7 @@
 <Window CanResize="False"
         MinHeight="100"
         MinWidth="480"
-        SizeToContent="WidthAndHeight"
+        SizeToContent="Height"
         Title="{Binding Title}"
         Width="480"
         WindowStartupLocation="CenterOwner"
@@ -38,20 +38,22 @@
                           IsVisible="{Binding ShowDetails}"
                           Margin="5"
                           Padding="0">
-                    <Grid Height="100">
-                        <ScrollViewer Margin="0,5"
-                                      Padding="10,0,30,0"
-                                      Width="440">
-                            <md:MarkdownScrollViewer Markdown="{Binding Details, Mode=OneWay}"
-                                                     Width="400">
-                                <md:MarkdownScrollViewer.Styles>
-                                    <StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
-                                </md:MarkdownScrollViewer.Styles>
-                                <md:MarkdownScrollViewer.Engine>
-                                    <md:Markdown HyperlinkCommand="{Binding (vm:ConfirmationViewModel)$parent[Window].DataContext.AppVM.LaunchURL}" />
-                                </md:MarkdownScrollViewer.Engine>
-                            </md:MarkdownScrollViewer>
-                        </ScrollViewer>
+                    <Grid Height="150"
+                          Margin="5">
+                        <md:MarkdownScrollViewer Markdown="{Binding Details, Mode=OneWay}">
+                            <md:MarkdownScrollViewer.Styles>
+                                <StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
+                            </md:MarkdownScrollViewer.Styles>
+                            <md:MarkdownScrollViewer.Engine>
+                                <md:Markdown HyperlinkCommand="{Binding (vm:ConfirmationViewModel)$parent[Window].DataContext.AppVM.LaunchURL}" />
+                            </md:MarkdownScrollViewer.Engine>
+                        </md:MarkdownScrollViewer>
+                        <Grid.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Command="{Binding CopyDetailsToClipboard}"
+                                          Header="Copy Details" />
+                            </ContextMenu>
+                        </Grid.ContextMenu>
                     </Grid>
                 </Expander>
             </StackPanel>

diff --git a/src/Mzinga.Viewer/Views/InformationWindow.axaml b/src/Mzinga.Viewer/Views/InformationWindow.axaml
@@ -38,20 +38,22 @@
                           IsVisible="{Binding ShowDetails}"
                           Margin="5"
                           Padding="0">
-                    <Grid Height="100">
-                        <ScrollViewer Margin="0,5"
-                                      Padding="10,0,30,0"
-                                      Width="440">
-                            <md:MarkdownScrollViewer Markdown="{Binding Details, Mode=OneWay}"
-                                                     Width="400">
-                                <md:MarkdownScrollViewer.Styles>
-                                    <StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
-                                </md:MarkdownScrollViewer.Styles>
-                                <md:MarkdownScrollViewer.Engine>
-                                    <md:Markdown HyperlinkCommand="{Binding (vm:ConfirmationViewModel)$parent[Window].DataContext.AppVM.LaunchURL}" />
-                                </md:MarkdownScrollViewer.Engine>
-                            </md:MarkdownScrollViewer>
-                        </ScrollViewer>
+                    <Grid Height="150"
+                          Margin="5">
+                        <md:MarkdownScrollViewer Markdown="{Binding Details, Mode=OneWay}">
+                            <md:MarkdownScrollViewer.Styles>
+                                <StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
+                            </md:MarkdownScrollViewer.Styles>
+                            <md:MarkdownScrollViewer.Engine>
+                                <md:Markdown HyperlinkCommand="{Binding (vm:ConfirmationViewModel)$parent[Window].DataContext.AppVM.LaunchURL}" />
+                            </md:MarkdownScrollViewer.Engine>
+                        </md:MarkdownScrollViewer>
+                        <Grid.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Command="{Binding CopyDetailsToClipboard}"
+                                          Header="Copy Details" />
+                            </ContextMenu>
+                        </Grid.ContextMenu>
                     </Grid>
                 </Expander>
             </StackPanel>

diff --git a/src/Mzinga.Viewer/Views/MainWindow.axaml b/src/Mzinga.Viewer/Views/MainWindow.axaml
@@ -360,7 +360,7 @@
                         <ListBox.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Command="{Binding CopyHistoryToClipboard}"
-                                          Header="Copy History to Clipboard" />
+                                          Header="Copy History" />
                             </ContextMenu>
                         </ListBox.ContextMenu>
                     </ListBox>