From 05dcc039bd99f458e515734cc4d47c9647e544cf Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 30 Dec 2021 20:48:32 -0800
Subject: [PATCH] Tweak new disc information fields and tabs

---
 CHANGELIST.md                             |  1 +
 MPF.Test/RedumpLib/SubmissionInfoTests.cs | 12 ++++++++++--
 MPF/UserControls/UserInput.xaml.cs        |  2 +-
 MPF/Windows/DiscInformationWindow.xaml    | 16 ++++++++--------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 2b044c34..537cd144 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -7,6 +7,7 @@
 - Fix CSSKey log handling
 - Show most read-only fields in new tab
 - Add horizontal scroll to user input
+- Tweak new disc information fields and tabs
 
 ### 2.2 (2021-12-30)
 - Fix Saturn header finding
diff --git a/MPF.Test/RedumpLib/SubmissionInfoTests.cs b/MPF.Test/RedumpLib/SubmissionInfoTests.cs
index 2a3ac860..8b2485b4 100644
--- a/MPF.Test/RedumpLib/SubmissionInfoTests.cs
+++ b/MPF.Test/RedumpLib/SubmissionInfoTests.cs
@@ -79,8 +79,16 @@ namespace MPF.Test.RedumpLib
                     Barcode = "UPC Barcode",
                     EXEDateBuildDate = "19xx-xx-xx",
                     ErrorsCount = "0",
-                    Comments = "[T:ISBN] ISBN\r\nComment data",
-                    Contents = "Demos:\r\n- Game Demo 1",
+                    Comments = "Comment data line 1\r\nComment data line 2",
+                    CommentsSpecialFields = new Dictionary<SiteCode?, string>()
+                    {
+                        [SiteCode.ISBN] = "ISBN",
+                    },
+                    Contents = "Special contents 1\r\nSpecial contents 2",
+                    ContentsSpecialFields = new Dictionary<SiteCode?, string>()
+                    {
+                        [SiteCode.PlayableDemos] = "Game Demo 1",
+                    },
                 },
 
                 VersionAndEditions = new VersionAndEditionsSection()
diff --git a/MPF/UserControls/UserInput.xaml.cs b/MPF/UserControls/UserInput.xaml.cs
index 8a3470c5..37abef3c 100644
--- a/MPF/UserControls/UserInput.xaml.cs
+++ b/MPF/UserControls/UserInput.xaml.cs
@@ -116,7 +116,7 @@ namespace MPF.UserControls
             TextWrapping = TextWrapping.NoWrap;
             IsEnabledValue = true;
             VerticalContentAlignmentValue = VerticalAlignment.Center;
-            HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden;
             VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
 
             InitializeComponent();
diff --git a/MPF/Windows/DiscInformationWindow.xaml b/MPF/Windows/DiscInformationWindow.xaml
index a1456457..f4db2651 100644
--- a/MPF/Windows/DiscInformationWindow.xaml
+++ b/MPF/Windows/DiscInformationWindow.xaml
@@ -146,13 +146,13 @@
 
                 <TabItem x:Name="AdditionalInformation" Header="Additional Information" Style="{DynamicResource CustomTabItemStyle}">
                     <StackPanel Orientation="Vertical">
+                        <controls:UserInput Label="Generic" Text="{Binding SubmissionInfo.CommonDiscInfo.Comments, Mode=TwoWay}" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top" />
                         <controls:UserInput x:Name="AlternativeTitleTextBox" Label="Alternative Title"/>
                         <controls:UserInput x:Name="AlternativeForeignTitleTextBox" Label="Alternative Foreign Title"/>
                         <controls:UserInput x:Name="GenreTextBox" Label="Genre"/>
                         <controls:UserInput x:Name="PostgapTypeTextBox" Label="Postgap type (Form 2)"/> <!-- Should be boolean -->
                         <controls:UserInput x:Name="SeriesTextBox" Label="Series"/>
                         <controls:UserInput x:Name="VCDTextBox" Label="V-CD"/>  <!-- Should be boolean -->
-                        <controls:UserInput Label="Other" Text="{Binding SubmissionInfo.CommonDiscInfo.Comments, Mode=TwoWay}" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top" />
                     </StackPanel>
                 </TabItem>
 
@@ -193,6 +193,7 @@
                 <TabItem x:Name="ContentInformation" Header="Content Information" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="True" VerticalScrollBarVisibility="Visible" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" PanningMode="VerticalOnly">
                         <StackPanel Orientation="Vertical" MaxHeight="375">
+                            <controls:UserInput Label="Generic" Text="{Binding SubmissionInfo.CommonDiscInfo.Contents, Mode=TwoWay}" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                             <controls:UserInput x:Name="ExtrasTextBox" Label="Extras" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                             <controls:UserInput x:Name="GameFootageTextBox" Label="Game Footage" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                             <controls:UserInput x:Name="NetYarozeGamesTextBox" Label="Net Yaroze Games" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
@@ -202,7 +203,6 @@
                             <controls:UserInput x:Name="SavegamesTextBox" Label="Savegames" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                             <controls:UserInput x:Name="TechDemosTextBox" Label="Tech Demos" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                             <controls:UserInput x:Name="VideosTextBox" Label="Videos" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
-                            <controls:UserInput Label="Other" Text="{Binding SubmissionInfo.CommonDiscInfo.Contents, Mode=TwoWay}" TextHeight="50" Tab="True" Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
@@ -251,15 +251,15 @@
                             <controls:UserInput x:Name="EDC" Label="EDC" IsEnabled="False"/>
                             <controls:UserInput x:Name="ErrorsCount" Label="Error(s) Count" Text="{Binding SubmissionInfo.CommonDiscInfo.ErrorsCount, Mode=TwoWay}" IsEnabled="False"/>
                             <controls:UserInput x:Name="EXEDateBuildDate" Label="EXE/Build Date" Text="{Binding SubmissionInfo.CommonDiscInfo.EXEDateBuildDate, Mode=TwoWay}" IsEnabled="False"/>
-                            <controls:UserInput x:Name="Header" Label="Header" Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" />
+                            <controls:UserInput x:Name="Header" Label="Header" Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto"/>
                             <controls:UserInput x:Name="InternalSerialName" Label="Internal Serial" IsEnabled="False"/>
                             <controls:UserInput x:Name="LibCrypt" Label="LibCrypt" IsEnabled="False"/>
-                            <controls:UserInput x:Name="LibCryptData" Label="LibCrypt Data" Text="{Binding SubmissionInfo.CopyProtection.LibCryptData, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" />
-                            <controls:UserInput x:Name="PIC" Label="PIC" Text="{Binding SubmissionInfo.Extras.PIC, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" />
+                            <controls:UserInput x:Name="LibCryptData" Label="LibCrypt Data" Text="{Binding SubmissionInfo.CopyProtection.LibCryptData, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" />
+                            <controls:UserInput x:Name="PIC" Label="PIC" Text="{Binding SubmissionInfo.Extras.PIC, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" />
                             <controls:UserInput x:Name="Protection" Label="Protection" Text="{Binding SubmissionInfo.CopyProtection.Protection, Mode=TwoWay}" IsEnabled="False"/>
-                            <controls:UserInput x:Name="PVD" Label="PVD" Text="{Binding SubmissionInfo.Extras.PVD, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" />
-                            <controls:UserInput x:Name="SecuROMData" Label="SecuROM Data" Text="{Binding SubmissionInfo.CopyProtection.SecuROMData, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" />
-                            <controls:UserInput x:Name="SecuritySectorRanges" Label="Security Sector Ranges" Text="{Binding SubmissionInfo.Extras.SecuritySectorRanges, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" />
+                            <controls:UserInput x:Name="PVD" Label="PVD" Text="{Binding SubmissionInfo.Extras.PVD, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" />
+                            <controls:UserInput x:Name="SecuROMData" Label="SecuROM Data" Text="{Binding SubmissionInfo.CopyProtection.SecuROMData, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" />
+                            <controls:UserInput x:Name="SecuritySectorRanges" Label="Security Sector Ranges" Text="{Binding SubmissionInfo.Extras.SecuritySectorRanges, Mode=TwoWay}" TextHeight="50" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" />
                             <controls:UserInput x:Name="VolumeLabelTextBox" Label="Volume Label" IsEnabled="False"/>
 
                             <!-- TODO: Add track/checksum data once there's a reasonable way to do so -->