From c5891dadb6a76230a50b889c2e199e5bcd83c281 Mon Sep 17 00:00:00 2001 From: Sappharad Date: Sun, 1 Dec 2024 21:33:11 -0600 Subject: [PATCH] Fixed bugs with the new UI - Raw mode was not checked by default in Build/Rebuild - Background thread access mistakes in Build/Rebuild - Mixed up the order of the GDI and Data text boxes and buttons in Rebuild - Loaded the path of the GDI in rebuild from the button instead of the text box - Set default column widths for Size & Modified columns in Browse/Extract window - Set version numbers on Windows build --- GDIBuilderUI/GDIBuilder2.Wpf/GDIBuilder2.Wpf.csproj | 3 +++ GDIBuilderUI/GDIBuilder2/BuildView.cs | 5 ++++- GDIBuilderUI/GDIBuilder2/ExtractView.cs | 2 ++ GDIBuilderUI/GDIBuilder2/RebuildView.cs | 13 ++++++++----- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/GDIBuilderUI/GDIBuilder2.Wpf/GDIBuilder2.Wpf.csproj b/GDIBuilderUI/GDIBuilder2.Wpf/GDIBuilder2.Wpf.csproj index 4a6f983..91b506a 100644 --- a/GDIBuilderUI/GDIBuilder2.Wpf/GDIBuilder2.Wpf.csproj +++ b/GDIBuilderUI/GDIBuilder2.Wpf/GDIBuilder2.Wpf.csproj @@ -5,6 +5,9 @@ net8.0-windows BlankMedia.ico GDIBuilder2.Wpf.Program + True + 2.0.0.0 + 2.0.0.0 diff --git a/GDIBuilderUI/GDIBuilder2/BuildView.cs b/GDIBuilderUI/GDIBuilder2/BuildView.cs index 24bcd0c..7151878 100644 --- a/GDIBuilderUI/GDIBuilder2/BuildView.cs +++ b/GDIBuilderUI/GDIBuilder2/BuildView.cs @@ -76,6 +76,7 @@ private void InitializeComponent() Spacing = 5 }; btnCancel.Enabled = false; + chkRawMode.Checked = true; btnPickDataFolder.Click += btnSelectData_Click; btnPickIpBin.Click += btnSelectIP_Click; btnAddCdda.Click += btnSelCdda_Click; @@ -246,7 +247,9 @@ private void btnMake_Click(object sender, EventArgs e) ReportProgress = UpdateProgress }; _cancelTokenSource = new CancellationTokenSource(); - _worker = new Thread(() => DoDiscBuild(txtDataFolder.Text, txtOutdir.Text)); + string dataFolder = txtDataFolder.Text; + string outDir = txtOutdir.Text; + _worker = new Thread(() => DoDiscBuild(dataFolder, outDir)); _worker.Start(); } else diff --git a/GDIBuilderUI/GDIBuilder2/ExtractView.cs b/GDIBuilderUI/GDIBuilder2/ExtractView.cs index fbce847..6e5b6a4 100644 --- a/GDIBuilderUI/GDIBuilder2/ExtractView.cs +++ b/GDIBuilderUI/GDIBuilder2/ExtractView.cs @@ -88,6 +88,7 @@ private void InitializeComponent() tgvDisc.Columns.Add(new GridColumn() { HeaderText = "Size", + MinWidth = 75, DataCell = new TextBoxCell(2) { Binding = Binding.Property((AdaptedPath p) => p.SizeName) @@ -97,6 +98,7 @@ private void InitializeComponent() tgvDisc.Columns.Add(new GridColumn() { HeaderText = "Modified", + MinWidth = 140, DataCell = new TextBoxCell(3) { Binding = Binding.Property((AdaptedPath p) => p.Modified.ToString()) diff --git a/GDIBuilderUI/GDIBuilder2/RebuildView.cs b/GDIBuilderUI/GDIBuilder2/RebuildView.cs index 2bee972..a238060 100644 --- a/GDIBuilderUI/GDIBuilder2/RebuildView.cs +++ b/GDIBuilderUI/GDIBuilder2/RebuildView.cs @@ -51,9 +51,10 @@ public RebuildView() private void InitializeComponent() { Title = "Rebuild Patched GD-ROM"; - MinimumSize = new Size(540, 220); + MinimumSize = new Size(540, 254); Padding = new Padding(4, 3, 4, 3); btnCancel.Enabled = false; + chkRawMode.Checked = true; btnPickDataFolder.Click += btnSelectData_Click; btnPickGdi.Click += btnPickGdi_Click; btnSelOutput.Click += btnSelOutput_Click; @@ -71,7 +72,7 @@ private void InitializeComponent() gdiRight.Add(btnPickGdi); gdiRight.EndHorizontal(); gdiRight.Spacing = new Size(5, 5); - topTable.Add(gdiRight, 1, 1); + topTable.Add(gdiRight, 1, 0); topTable.Add(new Label { Text = "Modified files:", TextAlignment = TextAlignment.Right }, 0, 1); DynamicLayout dataRight = new DynamicLayout(); dataRight.BeginHorizontal(); @@ -79,7 +80,7 @@ private void InitializeComponent() dataRight.Add(btnPickDataFolder); dataRight.EndHorizontal(); dataRight.Spacing = new Size(5, 5); - topTable.Add(dataRight, 1, 0); + topTable.Add(dataRight, 1, 1); topTable.Add(null, 0, 2); topTable.SetRowScale(2, true); topTable.Add(new Label { Text = "Output dir:", TextAlignment = TextAlignment.Right }, 0, 3); @@ -170,7 +171,7 @@ private void btnMake_Click(object sender, EventArgs e) } List cdTracks = new List(); - string[] gdiLines = File.ReadAllText(btnPickGdi.Text).Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); + string[] gdiLines = File.ReadAllText(txtGdiPath.Text).Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); if (gdiLines.Length > 3 && int.TryParse(gdiLines[0], out int numTracks) && numTracks > 3) { for (int i = 4; i < numTracks && i < gdiLines.Length; i++) @@ -208,7 +209,9 @@ private void btnMake_Click(object sender, EventArgs e) ReportProgress = UpdateProgress }; _cancelTokenSource = new CancellationTokenSource(); - _worker = new Thread(() => DoDiscBuild(gdiLines, gdiDirectory, cdTracks, txtDataFolder.Text, txtOutdir.Text)); + string dataFolder = txtDataFolder.Text; + string outDir = txtOutdir.Text; + _worker = new Thread(() => DoDiscBuild(gdiLines, gdiDirectory, cdTracks, dataFolder, outDir)); _worker.Start(); } else