Skip to content

Commit a57a91b

Browse files
author
MarkusTegelane
committed
Version 3.1 snapshot 25_07_13b
+ Splash screen now appears much quicker if it's enabled + Additional Verifile checks and more user-friendly error messages instead of the program just randomly closing + Abort/Retry/Ignore instead of OK on the message box when required fonts are missing + Re-added thank you dialog box after finishing an update * Fixed /h command line argument not working * Fixed screen saver configuration dialog not loading settings properly * Fixed prank mode showing warnings/confirmation dialogs when it's not supposed to * Fixed OK/Cancel radio button not working properly in prank mode configuration * Fixed exit by mouse move not working in screensaver mode * Fixed Windows CE countdown going below 0 when autoclose was disabled * Fixed crash when closing a simlator with /h command line argument - Remove unused imports ? Command line args and changelog turned into an array for simpler operation
1 parent 0532418 commit a57a91b

48 files changed

Lines changed: 624 additions & 561 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CLIProcessor.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using System.Threading;
65
using System.Windows.Forms;
76
using SimulatorDatabase;
87

@@ -173,7 +172,7 @@ private void ProcessFlag(string arg)
173172
{
174173
case "?":
175174
ExitSplash();
176-
MessageBox.Show(Program.cmds, "Command line argument usage", MessageBoxButtons.OK, MessageBoxIcon.Information);
175+
MessageBox.Show(string.Join("\n", Program.cmds), "Command line argument usage", MessageBoxButtons.OK, MessageBoxIcon.Information);
177176
Program.gs.ErrorCode = 999;
178177
Program.halt = true;
179178
break;
@@ -220,10 +219,17 @@ private void PostProcess()
220219
//hide main interface if /h flag is set
221220
if (args.Contains("/h"))
222221
{
222+
Program.halt = true;
223223
Program.gs.Log("Info", "Hiding main interface");
224-
Program.F1.WindowState = FormWindowState.Minimized;
225-
Program.F1.ShowInTaskbar = false;
226-
Program.F1.ShowIcon = false;
224+
Form mf = Program.F1;
225+
if (Program.gs.LegacyUI)
226+
{
227+
mf = Program.F2;
228+
}
229+
mf.WindowState = FormWindowState.Minimized;
230+
mf.ShowInTaskbar = false;
231+
mf.ShowIcon = false;
232+
mf.Hide();
227233
Program.gs.PM_CloseMainUI = true;
228234
if (!args.Contains("/c"))
229235
{

Forms/BTS.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
52
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
83
using System.Windows.Forms;
94
using MaterialSkin2Framework;
105
using MaterialSkin2Framework.Controls;

Forms/ClickIt.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
82
using System.Windows.Forms;
93

104
namespace UltimateBlueScreenSimulator

Forms/DictEdit.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
53
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
84
using System.Windows.Forms;
95
using SimulatorDatabase;
106

Forms/Interfaces/AboutSettingsDialog.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using MaterialSkin2Framework;
1212
using System.Text;
1313
using System.Text.Json;
14-
using System.Windows.Media.Animation;
1514
using UltimateBlueScreenSimulator.Forms.Interfaces;
1615

1716
namespace UltimateBlueScreenSimulator
@@ -761,7 +760,7 @@ private void SelectAllBox_CheckedChanged(object sender, EventArgs e)
761760

762761
public static void Changelog(object sender, EventArgs e)
763762
{
764-
MessageBox.Show(Program.changelog + "\n\nYou can find a more detailed changelog in the official BlueScreenSimulatorPlus GitHub page.", "What's new?", MessageBoxButtons.OK, MessageBoxIcon.Information);
763+
MessageBox.Show(string.Join("\r\n", Program.changelog) + "\n\nYou can find a more detailed changelog in the official BlueScreenSimulatorPlus GitHub page.", "What's new?", MessageBoxButtons.OK, MessageBoxIcon.Information);
765764
}
766765

767766
private void DarkDetectCheck_CheckedChanged(object sender, EventArgs e)

Forms/Interfaces/ErrorCodeEditor.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
52
using System.Diagnostics;
63
using System.Drawing;
7-
using System.Linq;
8-
using System.Text;
9-
using System.Threading.Tasks;
104
using System.Windows.Forms;
115
using MaterialSkin2Framework;
126
using MaterialSkin2Framework.Controls;

Forms/Interfaces/MessageTableEditor.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
93
using System.Windows.Forms;
104
using MaterialSkin2Framework;
115
using MaterialSkin2Framework.Controls;

Forms/Interfaces/NTdtor.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
93
using System.Windows.Forms;
10-
using System.Windows.Media.Animation;
114
using MaterialSkin2Framework;
125
using MaterialSkin2Framework.Controls;
136
using SimulatorDatabase;

Forms/Interfaces/NewUI.Designer.cs

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

Forms/Interfaces/NewUI.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ private void HelpTabChange(object sender, EventArgs e)
988988
case "Help":
989989
break;
990990
case "Command line help":
991-
commandLineHelpDisplay.Text = Program.cmds.Replace("\n", Environment.NewLine);
991+
commandLineHelpDisplay.Text = string.Join(Environment.NewLine, Program.cmds);
992992
break;
993993
}
994994
}
@@ -1050,7 +1050,7 @@ private void ResetDeviceButton_Click(object sender, EventArgs e)
10501050

10511051
private void LetCloseBox_CheckedChanged(object sender, EventArgs e)
10521052
{
1053-
PrankModeActions.LetCloseBox_CheckedChanged(letCloseBox);
1053+
PrankModeActions.LetCloseBox_CheckedChanged(letCloseBox, true);
10541054
}
10551055

10561056
private void MaterialTabControl2_SelectedIndexChanged(object sender, EventArgs e)
@@ -1283,5 +1283,15 @@ private void ConfigList_DoubleClick(object sender, EventArgs e)
12831283
osName.Text = string.Format("Selected configuration: {0}", Program.templates.GetAt(configList.SelectedIndex).GetString("friendlyname"));
12841284
}
12851285
}
1286+
1287+
private void LetCloseBox_Click(object sender, EventArgs e)
1288+
{
1289+
PrankModeActions.LetCloseBox_CheckedChanged(letCloseBox, false);
1290+
}
1291+
1292+
private void MatchAllRadio_Click(object sender, EventArgs e)
1293+
{
1294+
PrankModeActions.BestAllMatchCheck(bestMatchRadio, matchAllRadio, letCloseBox, false);
1295+
}
12861296
}
12871297
}

0 commit comments

Comments
 (0)