Merge pull request #355 from storybuilder-org/ReportIssuesAndKeybinds

Adds some new keybinds and fixes report issues relating to outertraits
storybuilder-org · Jun 15, 2022 · eda6156 · eda6156
2 parents ad271d6 + 53107d5
commit eda6156
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/StoryBuilder/Views/CharacterPage.xaml.cs b/StoryBuilder/Views/CharacterPage.xaml.cs
@@ -1,13 +1,8 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using StoryBuilder.ViewModels;
 
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
 namespace StoryBuilder.Views;
 
-/// <summary>
-/// An empty page that can be used on its own or navigated to within a Frame.
-/// </summary>
 public sealed partial class CharacterPage : BindablePage
 {
     public CharacterViewModel CharVm => Ioc.Default.GetService<CharacterViewModel>();

diff --git a/StoryBuilder/Views/Shell.xaml b/StoryBuilder/Views/Shell.xaml
@@ -238,7 +238,11 @@
                     </AppBarButton.Icon>
                     <AppBarButton.Flyout>
                         <MenuFlyout>
-                            <MenuFlyoutItem Text="Key Questions" Command="{x:Bind ShellVm.KeyQuestionsCommand, Mode=OneWay}" />
+                            <MenuFlyoutItem Text="Key Questions" Command="{x:Bind ShellVm.KeyQuestionsCommand, Mode=OneWay}">
+                                <MenuFlyoutItem.KeyboardAccelerators>
+                                    <KeyboardAccelerator Key="Q" Modifiers="Control"/>
+                                </MenuFlyoutItem.KeyboardAccelerators>
+                            </MenuFlyoutItem>
                             <MenuFlyoutItem Text="Topic Information" Command="{x:Bind ShellVm.TopicsCommand, Mode=OneWay}" />
                             <MenuFlyoutSubItem Text="Plotting Aids">
                                 <MenuFlyoutItem Text="Master Plots" Command="{x:Bind ShellVm.MasterPlotsCommand, Mode=OneWay}">
@@ -266,8 +270,16 @@
                     </AppBarButton.Icon>
                     <AppBarButton.Flyout>
                         <MenuFlyout>
-                            <MenuFlyoutItem Text="Print Reports" Command="{x:Bind ShellVm.PrintReportsCommand, Mode=OneWay}" />
-                            <MenuFlyoutItem Text="Scrivener Reports" Command="{x:Bind ShellVm.ScrivenerReportsCommand, Mode=OneWay}" />
+                            <MenuFlyoutItem Text="Print Reports" Command="{x:Bind ShellVm.PrintReportsCommand, Mode=OneWay}">
+                                <MenuFlyoutItem.KeyboardAccelerators>
+                                    <KeyboardAccelerator Key="P" Modifiers="Control"/>
+                                </MenuFlyoutItem.KeyboardAccelerators>
+                            </MenuFlyoutItem>
+                            <MenuFlyoutItem Text="Scrivener Reports" Command="{x:Bind ShellVm.ScrivenerReportsCommand, Mode=OneWay}">
+                                <MenuFlyoutItem.KeyboardAccelerators>
+                                    <KeyboardAccelerator Key="R" Modifiers="Control"/>
+                                </MenuFlyoutItem.KeyboardAccelerators>
+                            </MenuFlyoutItem>
                         </MenuFlyout>
                     </AppBarButton.Flyout>
                 </AppBarButton>

diff --git a/StoryBuilderLib/Services/Reports/ReportFormatter.cs b/StoryBuilderLib/Services/Reports/ReportFormatter.cs
@@ -301,7 +301,12 @@ public string FormatCharacterReport(StoryElement element)
             sb.Replace("@Sociability", character.Sociability);
             sb.Replace("@Stability", character.Stability);
             //Outer Traits section
-            sb.Replace("@Traits", character.outerTrait);
+            string traits = "";
+            foreach (var trait in character.TraitList)
+            {
+                traits += trait.ToString() + "\n";
+            }
+            sb.Replace("@Traits", traits);
             // Notes section
             sb.Replace("@Notes", GetText(character.Notes));