Skip to content

Commit 2a48ac3

Browse files
author
MarkusTegelane
committed
Version 3.1 Release Candidate 2
* Fixed typing on a text field in additional options menu moving text caret * Fixed scaling issues * Fixed no thank you message when upgrading from 2.x or earlier * Fixed unhandled exception that can sometimes occur when upgrading from 1.x versions
1 parent 8dcf5b4 commit 2a48ac3

7 files changed

Lines changed: 205 additions & 164 deletions

File tree

Forms/Interfaces/NewUI.Designer.cs

Lines changed: 87 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Forms/Interfaces/NewUI.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
132132
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
133133
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
134-
OgAAAk1TRnQBSQFMAgEBBwEAAdABAAHQAQABIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
134+
OgAAAk1TRnQBSQFMAgEBBwEAAdgBAAHYAQABIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
135135
AwABQAMAAQEBAAEQBgABQDYAAd4BewHeAXsB/wF/Ad4BewQAAf8BfwHeAXsB3gF7Af8BfxwAAf8BfwHe
136136
AXsB3gF7Ad4BewH/AX8B/wF/Af8BfwH/AX8B3gF7Ad4BewHeAXsB/wF/KgAB/wF/Ad4BewHeAXsB3gF7
137137
Ad4BewHeAXsB3gF7Ad4BewHeAXsB/wF/egAB3gF7Af8BfwH/AX8B3gF7BAAB3gF7Af8BfwH/AX8B3gF7
@@ -395,7 +395,7 @@
395395
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
396396
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
397397
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
398-
OgAAAk1TRnQBSQFMAgEBBwEAAcgBAAHIAQABIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
398+
OgAAAk1TRnQBSQFMAgEBBwEAAdABAAHQAQABIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
399399
AwABQAMAAQEBAAEQBgABQDYAAd4BewHeAXsB/wF/Ad4BewQAAf8BfwHeAXsB3gF7Af8BfxwAAf8BfwHe
400400
AXsB3gF7Ad4BewH/AX8B/wF/Af8BfwH/AX8B3gF7Ad4BewHeAXsB/wF/KgAB/wF/Ad4BewHeAXsB3gF7
401401
Ad4BewHeAXsB3gF7Ad4BewHeAXsB/wF/egAB3gF7Af8BfwH/AX8B3gF7BAAB3gF7Af8BfwH/AX8B3gF7

Forms/Interfaces/StringEdit.Designer.cs

Lines changed: 86 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Forms/Interfaces/StringEdit.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,10 @@ private void MessageView_SelectedIndexChanged(object sender, EventArgs e)
429429
private void TextBox1_TextChanged(object sender, EventArgs e)
430430
{
431431
// remove zero width space to avoid problems...
432-
stringEditor.Text = stringEditor.Text.Replace("​", "");
432+
if (stringEditor.Text.Contains("​"))
433+
{
434+
stringEditor.Text = stringEditor.Text.Replace("​", "");
435+
}
433436
if (stringProps.Visible)
434437
{
435438
if (type == "title")

Forms/Interfaces/StringEdit.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
126126
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
127127
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABc
128-
DAAAAk1TRnQBSQFMAgEBBwEAASABAgEgAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
128+
DAAAAk1TRnQBSQFMAgEBBwEAASgBAgEoAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
129129
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
130130
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
131131
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

Forms/Interfaces/UpdateInterface.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,13 @@ private void CleanWait_Tick(object sender, EventArgs e)
242242
File.Move("Blue.screen.simulator.plus.exe", "Blue screen simulator plus.exe");
243243
}
244244
}
245-
File.SetAttributes("Blue screen simulator plus.exe", FileAttributes.Hidden);
246-
File.Delete("Blue screen simulator plus.exe");
245+
if (File.Exists("Blue screen simulator plus.exe"))
246+
{
247+
File.SetAttributes("Blue screen simulator plus.exe", FileAttributes.Hidden);
248+
File.Delete("Blue screen simulator plus.exe");
249+
}
247250
File.Move("BSSP_new.exe", "Blue screen simulator plus.exe");
248-
System.IO.File.WriteAllText("finish.bat", Properties.Resources.final);
251+
File.WriteAllText("finish.bat", Properties.Resources.final);
249252
Process p = new Process();
250253
p.StartInfo.UseShellExecute = true;
251254
p.StartInfo.CreateNoWindow = true;

UIActions.cs

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,20 @@ private static bool IsFileInUseGeneric(FileInfo file)
10761076
return false;
10771077
}
10781078

1079+
private static void ShowChangelogPostUpdate()
1080+
{
1081+
Program.clip = new CLIProcessor(new string[] { });
1082+
// Spawn the message box with the main UI as the parent
1083+
Form ifrm = Program.F1;
1084+
if (Program.gs.LegacyUI)
1085+
{
1086+
ifrm = Program.F2;
1087+
}
1088+
ifrm.BeginInvoke(new MethodInvoker(delegate {
1089+
MessageBox.Show("Thank you for installing the latest version of Blue screen simulator plus :)\n\nWhat's new?\n" + string.Join("\r\n", Program.changelog) + "\n\nYou can find a more detailed changelog in the official BlueScreenSimulatorPlus GitHub page.", "Update was successful", MessageBoxButtons.OK, MessageBoxIcon.Information);
1090+
}));
1091+
}
1092+
10791093
/// <summary>
10801094
/// Performs an update check
10811095
/// </summary>
@@ -1087,16 +1101,7 @@ public static void CheckUpdates(Form f, Control updateCheckButton = null)
10871101
new Thread(() => {
10881102
if (Program.clip.args.Contains("/doneupdate"))
10891103
{
1090-
Program.clip = new CLIProcessor(new string[] { });
1091-
// Spawn the message box with the main UI as the parent
1092-
Form ifrm = Program.F1;
1093-
if (Program.gs.LegacyUI)
1094-
{
1095-
ifrm = Program.F2;
1096-
}
1097-
ifrm.BeginInvoke(new MethodInvoker(delegate {
1098-
MessageBox.Show("Thank you for installing the latest version of Blue screen simulator plus :)\n\nWhat's new?\n" + string.Join("\r\n", Program.changelog) + "\n\nYou can find a more detailed changelog in the official BlueScreenSimulatorPlus GitHub page.", "Update was successful", MessageBoxButtons.OK, MessageBoxIcon.Information);
1099-
}));
1104+
ShowChangelogPostUpdate();
11001105
}
11011106
if (File.Exists("BSSP.exe"))
11021107
{
@@ -1118,6 +1123,10 @@ public static void CheckUpdates(Form f, Control updateCheckButton = null)
11181123
break;
11191124
}
11201125
}
1126+
if (!Program.clip.args.Contains("/doneupdate"))
1127+
{
1128+
ShowChangelogPostUpdate();
1129+
}
11211130
return;
11221131
}
11231132
try

0 commit comments

Comments
 (0)