From 691d4530c81864ba4ba67fbbc9e04d05ae4c0b87 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 11:48:46 +0900
Subject: [PATCH 1/7] Use dotnet8

---
 publish-nix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publish-nix.sh b/publish-nix.sh
index 29709bdcb..b204a526c 100755
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -59,7 +59,7 @@ echo " "
 # Create the build matrix arrays
 UI_FRAMEWORKS=("net9.0-windows")
 UI_RUNTIMES=("win-x86" "win-x64")
-CHECK_FRAMEWORKS=("net9.0")
+CHECK_FRAMEWORKS=("net8.0")
 CHECK_RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
 
 # Use expanded framework lists, if requested

From c6a762f8fd2a9f4427946a1e588a649ee175c49b Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 11:57:47 +0900
Subject: [PATCH 2/7] Use dotnet8 for UI

---
 publish-nix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publish-nix.sh b/publish-nix.sh
index b204a526c..67b1394d0 100755
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -57,7 +57,7 @@ echo "  No archive (-a)                       $NO_ARCHIVE"
 echo " "
 
 # Create the build matrix arrays
-UI_FRAMEWORKS=("net9.0-windows")
+UI_FRAMEWORKS=("net8.0-windows")
 UI_RUNTIMES=("win-x86" "win-x64")
 CHECK_FRAMEWORKS=("net8.0")
 CHECK_RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")

From d3f1bf5110d9018b9812455ea22b2ac362e3796b Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:10:36 +0900
Subject: [PATCH 3/7] Change DIW userinput ratio to 3:7

---
 MPF.UI/UserControls/UserInput.xaml        |  2 +-
 MPF.UI/Windows/DiscInformationWindow.xaml | 12 ++++++------
 publish-nix.sh                            |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MPF.UI/UserControls/UserInput.xaml b/MPF.UI/UserControls/UserInput.xaml
index dc9fc3e0f..6e4e9b38b 100644
--- a/MPF.UI/UserControls/UserInput.xaml
+++ b/MPF.UI/UserControls/UserInput.xaml
@@ -7,7 +7,7 @@
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.75*" />
-            <ColumnDefinition Width="1.50*" />
+            <ColumnDefinition Width="1.75*" />
         </Grid.ColumnDefinitions>
 
         <Label Grid.Row="0" Grid.Column="0"
diff --git a/MPF.UI/Windows/DiscInformationWindow.xaml b/MPF.UI/Windows/DiscInformationWindow.xaml
index 80c39b9c7..fe010b5a1 100644
--- a/MPF.UI/Windows/DiscInformationWindow.xaml
+++ b/MPF.UI/Windows/DiscInformationWindow.xaml
@@ -91,7 +91,7 @@
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
-                                            <ColumnDefinition Width="1.50*" />
+                                            <ColumnDefinition Width="1.75*" />
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="CategoryLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Category" />
@@ -103,7 +103,7 @@
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
-                                            <ColumnDefinition Width="1.50*" />
+                                            <ColumnDefinition Width="1.75*" />
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="RegionLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Region" />
@@ -115,7 +115,7 @@
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
-                                            <ColumnDefinition Width="1.50*" />
+                                            <ColumnDefinition Width="1.75*" />
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="LanguagesLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Languages" />
@@ -133,7 +133,7 @@
                                     <Grid x:Name="LanguageSelectionGrid" Visibility="Collapsed">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
-                                            <ColumnDefinition Width="1.50*" />
+                                            <ColumnDefinition Width="1.75*" />
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="LanguageSelectionLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Language Selection Via" />
@@ -187,7 +187,7 @@
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
-                                            <ColumnDefinition Width="1.50*" />
+                                            <ColumnDefinition Width="1.75*" />
                                         </Grid.ColumnDefinitions>
 
                                         <Label/>
@@ -199,7 +199,7 @@
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
-                                            <ColumnDefinition Width="1.50*" />
+                                            <ColumnDefinition Width="1.75*" />
                                         </Grid.ColumnDefinitions>
 
                                         <Label/>
diff --git a/publish-nix.sh b/publish-nix.sh
index 67b1394d0..29709bdcb 100755
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -57,9 +57,9 @@ echo "  No archive (-a)                       $NO_ARCHIVE"
 echo " "
 
 # Create the build matrix arrays
-UI_FRAMEWORKS=("net8.0-windows")
+UI_FRAMEWORKS=("net9.0-windows")
 UI_RUNTIMES=("win-x86" "win-x64")
-CHECK_FRAMEWORKS=("net8.0")
+CHECK_FRAMEWORKS=("net9.0")
 CHECK_RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
 
 # Use expanded framework lists, if requested

From edc1c71bf00c8d8f0432b55f45ad271f97696185 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:16:48 +0900
Subject: [PATCH 4/7] Add groupboxes around contents and readonly tabs in DIW

---
 MPF.UI/Windows/DiscInformationWindow.xaml | 264 ++++++++++++----------
 1 file changed, 142 insertions(+), 122 deletions(-)

diff --git a/MPF.UI/Windows/DiscInformationWindow.xaml b/MPF.UI/Windows/DiscInformationWindow.xaml
index fe010b5a1..2b7d7b623 100644
--- a/MPF.UI/Windows/DiscInformationWindow.xaml
+++ b/MPF.UI/Windows/DiscInformationWindow.xaml
@@ -293,52 +293,63 @@
                 <TabItem Header="Contents" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MaxHeight="500">
                         <StackPanel Orientation="Vertical">
-                            <controls:UserInput x:Name="GeneralContent" Label="General"
-                                                Text="{Binding SubmissionInfo.CommonDiscInfo.Contents, Mode=TwoWay}" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
-                            
-                            <!-- Applications -->
-                            <controls:UserInput x:Name="ApplicationsTextBox" Label="Applications" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Applications], Mode=TwoWay}"/>
+                            <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
+                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                                <GroupBox.Template>
+                                    <ControlTemplate TargetType="GroupBox">
+                                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                                        </Border>
+                                    </ControlTemplate>
+                                </GroupBox.Template>
+
+                                <controls:UserInput x:Name="GeneralContent" Label="General"
+                                                    Text="{Binding SubmissionInfo.CommonDiscInfo.Contents, Mode=TwoWay}" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
                             
-                            <!-- Games -->
-                            <controls:UserInput x:Name="GamesTextBox" Label="Games" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Games], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="NetYarozeGamesTextBox" Label="Net Yaroze Games" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)NetYarozeGames], Mode=TwoWay}"/>
+                                <!-- Applications -->
+                                <controls:UserInput x:Name="ApplicationsTextBox" Label="Applications" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Applications], Mode=TwoWay}"/>
                             
-                            <!-- Demos -->
-                            <controls:UserInput x:Name="PlayableDemosTextBox" Label="Playable Demos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)PlayableDemos], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="RollingDemosTextBox" Label="Rolling Demos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)RollingDemos], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="TechDemosTextBox" Label="Tech Demos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)TechDemos], Mode=TwoWay}"/>
+                                <!-- Games -->
+                                <controls:UserInput x:Name="GamesTextBox" Label="Games" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Games], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="NetYarozeGamesTextBox" Label="Net Yaroze Games" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)NetYarozeGames], Mode=TwoWay}"/>
+                                
+                                <!-- Demos -->
+                                <controls:UserInput x:Name="PlayableDemosTextBox" Label="Playable Demos" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)PlayableDemos], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="RollingDemosTextBox" Label="Rolling Demos" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)RollingDemos], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="TechDemosTextBox" Label="Tech Demos" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)TechDemos], Mode=TwoWay}"/>
 
-                            <!-- Video -->
-                            <controls:UserInput x:Name="GameFootageTextBox" Label="Game Footage" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)GameFootage], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="VideosTextBox" Label="Videos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Videos], Mode=TwoWay}"/>
+                                <!-- Video -->
+                                <controls:UserInput x:Name="GameFootageTextBox" Label="Game Footage" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)GameFootage], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="VideosTextBox" Label="Videos" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Videos], Mode=TwoWay}"/>
 
-                            <!-- Miscellaneous -->
-                            <controls:UserInput x:Name="PatchesTextBox" Label="Patches" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Patches], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="SavegamesTextBox" Label="Savegames" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Savegames], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="ExtrasTextBox" Label="Extras" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Extras], Mode=TwoWay}"/>
+                                <!-- Miscellaneous -->
+                                <controls:UserInput x:Name="PatchesTextBox" Label="Patches" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Patches], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="SavegamesTextBox" Label="Savegames" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Savegames], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="ExtrasTextBox" Label="Extras" TextHeight="50"
+                                                    Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Extras], Mode=TwoWay}"/>
+                            </GroupBox>
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
@@ -408,87 +419,96 @@
                 <TabItem Header="Read-Only Info" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MaxHeight="500">
                         <StackPanel Orientation="Vertical">
-                            <controls:UserInput x:Name="FullyMatchedID" Label="Fully Matched ID" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.FullyMatchedID, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="PartiallyMatchedIDs" Label="Partially Matched ID(s)" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="HashData" Label="Hash Data" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.TracksAndWriteOffsets.ClrMameProData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="HashDataSize" Label="Size" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.Size, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="HashDataCRC" Label="CRC-32" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.CRC32, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="HashDataMD5" Label="MD5" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.MD5, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="HashDataSHA1" Label="SHA-1" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.SHA1, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="HashDataLayerbreak1" Label="Layerbreak 1" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.Layerbreak, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="HashDataLayerbreak2" Label="Layerbreak 2" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.Layerbreak2, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="HashDataLayerbreak3" Label="Layerbreak 3" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.SizeAndChecksums.Layerbreak3, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="AntiModchip" Label="Anti-Modchip" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.CopyProtection.AntiModchip, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="DiscOffset" Label="Disc Offset" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.TracksAndWriteOffsets.OtherWriteOffsets, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="DMIHash" Label="DMI Hash" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DMIHash], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="EDC" Label="EDC" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.EDC.EDC, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="ErrorsCount" Label="Error(s) Count" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.CommonDiscInfo.ErrorsCount, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="EXEDateBuildDate" Label="EXE/Build Date" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.CommonDiscInfo.EXEDateBuildDate, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="Filename" Label="Filename" IsReadOnly="True"
-                                                TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Filename], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="Header" Label="Header" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="InternalName" Label="Internal Names" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)InternalName], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="InternalSerialName" Label="Internal Serial" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)InternalSerialName], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="Multisession" Label="Multisession" IsReadOnly="True" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Multisession], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="LibCrypt" Label="LibCrypt" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.CopyProtection.LibCrypt, Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="LibCryptData" Label="LibCrypt Data" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.CopyProtection.LibCryptData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="PFIHash" Label="PFI Hash" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)PFIHash], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="PIC" Label="PIC" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.Extras.PIC, Mode=TwoWay}" TextHeight="125" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="PVD" Label="PVD" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.Extras.PVD, Mode=TwoWay}" TextHeight="125" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="RingNonZeroDataStart" Label="Ring Non-Zero Data Start" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)RingNonZeroDataStart], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="SecuROMData" Label="SecuROM Data" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.CopyProtection.SecuROMData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="SSHash" Label="Security Sector Hash" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SSHash], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="SecuritySectorRanges" Label="Security Sector Ranges" IsReadOnly="True"
-                                                Text="{Binding SubmissionInfo.Extras.SecuritySectorRanges, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="SSVersion" Label="Security Sector Version" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SSVersion], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="UniversalHash" Label="Universal Hash (SHA-1)" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)UniversalHash], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="VolumeLabel" Label="Volume Label" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)VolumeLabel], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="XeMID" Label="XeMID" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XeMID], Mode=TwoWay}"/>
-                            <controls:UserInput x:Name="XMID" Label="XMID" IsReadOnly="True"
-                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XMID], Mode=TwoWay}"/>
+                            <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
+                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                                <GroupBox.Template>
+                                    <ControlTemplate TargetType="GroupBox">
+                                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                                        </Border>
+                                    </ControlTemplate>
+                                </GroupBox.Template>
 
-                            <!-- TODO: Add track/checksum data once there's a reasonable way to do so -->
+                                <controls:UserInput x:Name="FullyMatchedID" Label="Fully Matched ID" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.FullyMatchedID, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="PartiallyMatchedIDs" Label="Partially Matched ID(s)" IsReadOnly="True"/>
+                                <controls:UserInput x:Name="HashData" Label="Hash Data" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.TracksAndWriteOffsets.ClrMameProData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="HashDataSize" Label="Size" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.Size, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="HashDataCRC" Label="CRC-32" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.CRC32, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="HashDataMD5" Label="MD5" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.MD5, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="HashDataSHA1" Label="SHA-1" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.SHA1, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="HashDataLayerbreak1" Label="Layerbreak 1" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.Layerbreak, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="HashDataLayerbreak2" Label="Layerbreak 2" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.Layerbreak2, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="HashDataLayerbreak3" Label="Layerbreak 3" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.SizeAndChecksums.Layerbreak3, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="AntiModchip" Label="Anti-Modchip" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.CopyProtection.AntiModchip, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="DiscOffset" Label="Disc Offset" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.TracksAndWriteOffsets.OtherWriteOffsets, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="DMIHash" Label="DMI Hash" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DMIHash], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="EDC" Label="EDC" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.EDC.EDC, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="ErrorsCount" Label="Error(s) Count" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.CommonDiscInfo.ErrorsCount, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="EXEDateBuildDate" Label="EXE/Build Date" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.CommonDiscInfo.EXEDateBuildDate, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="Filename" Label="Filename" IsReadOnly="True"
+                                                    TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Filename], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="Header" Label="Header" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="InternalName" Label="Internal Names" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)InternalName], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="InternalSerialName" Label="Internal Serial" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)InternalSerialName], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="Multisession" Label="Multisession" IsReadOnly="True" TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Multisession], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="LibCrypt" Label="LibCrypt" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.CopyProtection.LibCrypt, Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="LibCryptData" Label="LibCrypt Data" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.CopyProtection.LibCryptData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="PFIHash" Label="PFI Hash" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)PFIHash], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="PIC" Label="PIC" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.Extras.PIC, Mode=TwoWay}" TextHeight="125" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="PVD" Label="PVD" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.Extras.PVD, Mode=TwoWay}" TextHeight="125" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="RingNonZeroDataStart" Label="Ring Non-Zero Data Start" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)RingNonZeroDataStart], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="SecuROMData" Label="SecuROM Data" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.CopyProtection.SecuROMData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="SSHash" Label="Security Sector Hash" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SSHash], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="SecuritySectorRanges" Label="Security Sector Ranges" IsReadOnly="True"
+                                                    Text="{Binding SubmissionInfo.Extras.SecuritySectorRanges, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
+                                                    VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                <controls:UserInput x:Name="SSVersion" Label="Security Sector Version" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SSVersion], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="UniversalHash" Label="Universal Hash (SHA-1)" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)UniversalHash], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="VolumeLabel" Label="Volume Label" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)VolumeLabel], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="XeMID" Label="XeMID" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XeMID], Mode=TwoWay}"/>
+                                <controls:UserInput x:Name="XMID" Label="XMID" IsReadOnly="True"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XMID], Mode=TwoWay}"/>
+                            </GroupBox>
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>

From 91fa4b22b20e837c0b1288b5512274aae46388d1 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:19:44 +0900
Subject: [PATCH 5/7] Use real PVD and PIC in debug data

---
 MPF.Frontend/ViewModels/MainViewModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs
index 41ea00272..f3f96ec44 100644
--- a/MPF.Frontend/ViewModels/MainViewModel.cs
+++ b/MPF.Frontend/ViewModels/MainViewModel.cs
@@ -896,10 +896,10 @@ public static SubmissionInfo CreateDebugSubmissionInfo()
 
                 Extras = new ExtrasSection()
                 {
-                    PVD = "PVD with a stupidly long line and nothing else but a little more\nPVD with a stupidly long line and nothing else but a little more\nPVD with a stupidly long line and nothing else but a little more\nPVD with a stupidly long line and nothing else but a little more\nPVD with a stupidly long line and nothing else but a little more\nPVD with a stupidly long line and nothing else but a little more\n",
+                    PVD = "0320 : 20 20 20 20 20 20 20 20  20 20 20 20 20 32 30 31                201\n0330 : 30 31 30 32 35 31 36 31  39 30 30 30 00 04 32 30   010251619000 .20\n0340 : 31 30 31 30 32 35 31 36  31 39 30 30 30 00 04 30   1010251619000 .0\n0350 : 30 30 30 30 30 30 30 30  30 30 30 30 30 30 30 00   000000000000000 \n0360 : 30 30 30 30 30 30 30 30  30 30 30 30 30 30 30 30   0000000000000000\n0370 : 00 01 00 00 00 00 00 00  00 00 00 00 00 00 00 00    .              ",
                     DiscKey = "Disc key",
                     DiscID = "Disc ID",
-                    PIC = "PIC",
+                    PIC = "10020000444901080000200042444F01\n1101010001000000004F947F00100000\n004F947E000000000000000000000000\n00000000000000000000000000000000\n00000000000000000000000000000000\n00000000000000000000000000000000\n00000000000000000000000000000000\n00000000000000000000000000000000\n00000000",
                     Header = "Header",
                     BCA = "BCA",
                     SecuritySectorRanges = "SSv1 Ranges",

From 563733430c16bbf59e4270df2589b94c6a2417c3 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:24:50 +0900
Subject: [PATCH 6/7] rearrange groupbox / stackpanel

---
 MPF.Frontend/ViewModels/MainViewModel.cs  |  1 +
 MPF.UI/Windows/DiscInformationWindow.xaml | 48 +++++++++++------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs
index f3f96ec44..b200fe961 100644
--- a/MPF.Frontend/ViewModels/MainViewModel.cs
+++ b/MPF.Frontend/ViewModels/MainViewModel.cs
@@ -867,6 +867,7 @@ public static SubmissionInfo CreateDebugSubmissionInfo()
                     CommentsSpecialFields = new Dictionary<SiteCode, string>()
                     {
                         [SiteCode.ISBN] = "ISBN",
+                        [SiteCode.RingNonZeroDataStart] = "+123"
                     },
                     Contents = "Special contents 1\r\nSpecial contents 2",
                     ContentsSpecialFields = new Dictionary<SiteCode, string>()
diff --git a/MPF.UI/Windows/DiscInformationWindow.xaml b/MPF.UI/Windows/DiscInformationWindow.xaml
index 2b7d7b623..359a4c3b7 100644
--- a/MPF.UI/Windows/DiscInformationWindow.xaml
+++ b/MPF.UI/Windows/DiscInformationWindow.xaml
@@ -292,16 +292,16 @@
 
                 <TabItem Header="Contents" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MaxHeight="500">
-                        <StackPanel Orientation="Vertical">
-                            <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
-                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                                <GroupBox.Template>
-                                    <ControlTemplate TargetType="GroupBox">
-                                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
-                                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
-                                        </Border>
-                                    </ControlTemplate>
-                                </GroupBox.Template>
+                    <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <GroupBox.Template>
+                            <ControlTemplate TargetType="GroupBox">
+                                <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                                    <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                                </Border>
+                            </ControlTemplate>
+                        </GroupBox.Template>
+                            <StackPanel Orientation="Vertical">
 
                                 <controls:UserInput x:Name="GeneralContent" Label="General"
                                                     Text="{Binding SubmissionInfo.CommonDiscInfo.Contents, Mode=TwoWay}" TextHeight="50"
@@ -349,8 +349,8 @@
                                 <controls:UserInput x:Name="ExtrasTextBox" Label="Extras" TextHeight="50"
                                                     Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
                                                     Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Extras], Mode=TwoWay}"/>
-                            </GroupBox>
-                        </StackPanel>
+                            </StackPanel>
+                        </GroupBox>
                     </ScrollViewer>
                 </TabItem>
 
@@ -418,16 +418,16 @@
 
                 <TabItem Header="Read-Only Info" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MaxHeight="500">
-                        <StackPanel Orientation="Vertical">
-                            <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
-                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                                <GroupBox.Template>
-                                    <ControlTemplate TargetType="GroupBox">
-                                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
-                                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
-                                        </Border>
-                                    </ControlTemplate>
-                                </GroupBox.Template>
+                        <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
+                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <GroupBox.Template>
+                                <ControlTemplate TargetType="GroupBox">
+                                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                                        <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </GroupBox.Template>
+                            <StackPanel Orientation="Vertical">
 
                                 <controls:UserInput x:Name="FullyMatchedID" Label="Fully Matched ID" IsReadOnly="True"
                                                     Text="{Binding SubmissionInfo.FullyMatchedID, Mode=TwoWay}"/>
@@ -508,8 +508,8 @@
                                                     Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XeMID], Mode=TwoWay}"/>
                                 <controls:UserInput x:Name="XMID" Label="XMID" IsReadOnly="True"
                                                     Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XMID], Mode=TwoWay}"/>
-                            </GroupBox>
-                        </StackPanel>
+                            </StackPanel>
+                        </GroupBox>
                     </ScrollViewer>
                 </TabItem>
             </TabControl>

From 1b0be985cc9d52ab754ad8f498ddd9910869d9b7 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:51:00 +0900
Subject: [PATCH 7/7] group boxes

---
 MPF.UI/Windows/DiscInformationWindow.xaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/MPF.UI/Windows/DiscInformationWindow.xaml b/MPF.UI/Windows/DiscInformationWindow.xaml
index 359a4c3b7..157acf43d 100644
--- a/MPF.UI/Windows/DiscInformationWindow.xaml
+++ b/MPF.UI/Windows/DiscInformationWindow.xaml
@@ -292,17 +292,17 @@
 
                 <TabItem Header="Contents" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MaxHeight="500">
-                    <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
-                                HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <GroupBox.Template>
-                            <ControlTemplate TargetType="GroupBox">
-                                <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
-                                    <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
-                                </Border>
-                            </ControlTemplate>
-                        </GroupBox.Template>
-                            <StackPanel Orientation="Vertical">
+                        <GroupBox Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
+                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <GroupBox.Template>
+                                <ControlTemplate TargetType="GroupBox">
+                                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                                        <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </GroupBox.Template>
 
+                            <StackPanel Orientation="Vertical">
                                 <controls:UserInput x:Name="GeneralContent" Label="General"
                                                     Text="{Binding SubmissionInfo.CommonDiscInfo.Contents, Mode=TwoWay}" TextHeight="50"
                                                     Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
@@ -427,8 +427,8 @@
                                     </Border>
                                 </ControlTemplate>
                             </GroupBox.Template>
-                            <StackPanel Orientation="Vertical">
 
+                            <StackPanel Orientation="Vertical">
                                 <controls:UserInput x:Name="FullyMatchedID" Label="Fully Matched ID" IsReadOnly="True"
                                                     Text="{Binding SubmissionInfo.FullyMatchedID, Mode=TwoWay}"/>
                                 <controls:UserInput x:Name="PartiallyMatchedIDs" Label="Partially Matched ID(s)" IsReadOnly="True"/>