From 50ed3c83b9965c4f3790d51a2571a99ebcb49b52 Mon Sep 17 00:00:00 2001 From: Bitl Date: Sun, 12 Jul 2020 14:19:24 -0700 Subject: [PATCH] 1.2 Snapshot (7498.25322.1) --- .../Forms/ClientScriptTestForm.cs | 5 ++- .../StorageAndFunctions/GlobalVars.cs | 3 +- .../Compact/LauncherFormCompact.cs | 34 +++++--------- .../Extended/LauncherFormExtended.cs | 45 ++++++++----------- 4 files changed, 35 insertions(+), 52 deletions(-) diff --git a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs index 40356e9..f80626d 100644 --- a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs +++ b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs @@ -20,7 +20,10 @@ namespace Novetus.ClientScriptTester { foreach (string str in LocalVars.SharedArgs) { - OutputBox.AppendText(str + LocalVars.DoubleSpacedNewLine); + if (!string.IsNullOrWhiteSpace(str)) + { + OutputBox.AppendText(str + LocalVars.DoubleSpacedNewLine); + } } OutputBox.SelectionStart = 0; diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs index 6572819..f30e82a 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs @@ -2,8 +2,7 @@ * TODO: * * change control names for all forms - * add regions to rest of forms. Launcher forms are left! - * Finish Rise of the Killbots update + * Make launcher form line count smaller */ #region Global Variables diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs index 3919489..08afdbd 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs @@ -1,11 +1,4 @@ -/* - * Created by SharpDevelop. - * User: BITL-Gaming - * Date: 10/7/2016 - * Time: 3:01 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +#region Usings using Mono.Nat; using System; using System.Collections.Generic; @@ -15,29 +8,24 @@ using System.Globalization; using System.IO; using System.Reflection; using System.Windows.Forms; +#endregion namespace NovetusLauncher { - /// - /// Description of MainForm. - /// + #region LauncherForm - Compact public partial class LauncherFormCompact : Form { - DiscordRPC.EventHandlers handlers; + #region Private Variables + private DiscordRPC.EventHandlers handlers; + #endregion + #region Constructor public LauncherFormCompact() { _fieldsTreeCache = new TreeView(); - // - // The InitializeComponent() call is required for Windows Forms designer support. - // - InitializeComponent(); - - // - // TODO: Add constructor code after the InitializeComponent() call. - // } + #endregion #region UPnP public void InitUPnP() @@ -214,6 +202,7 @@ namespace NovetusLauncher } #endregion + #region Form Events async void tabControl1_SelectedIndexChanged(object sender, EventArgs e) { switch (tabControl1.SelectedTab) @@ -262,8 +251,7 @@ namespace NovetusLauncher { if (!string.IsNullOrWhiteSpace(str)) { - textBox3.AppendText(str); - textBox3.AppendText(Environment.NewLine); + textBox3.AppendText(str + Environment.NewLine); } } textBox3.SelectionStart = 0; @@ -1232,5 +1220,7 @@ namespace NovetusLauncher break; } } + #endregion } + #endregion } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs index bb3e699..a984227 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs @@ -1,11 +1,4 @@ -/* - * Created by SharpDevelop. - * User: BITL-Gaming - * Date: 10/7/2016 - * Time: 3:01 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +#region Usings using System; using System.Collections.Generic; using System.Drawing; @@ -16,34 +9,30 @@ using System.ComponentModel; using System.Reflection; using Mono.Nat; using System.Globalization; +#endregion namespace NovetusLauncher { - /// - /// Description of MainForm. - /// - public partial class LauncherFormExtended : Form + #region LauncherForm - Extended + public partial class LauncherFormExtended : Form { - DiscordRPC.EventHandlers handlers; - - public LauncherFormExtended() + #region Private Variables + private DiscordRPC.EventHandlers handlers; + #endregion + + #region Constructor + public LauncherFormExtended() { _fieldsTreeCache = new TreeView(); - // - // The InitializeComponent() call is required for Windows Forms designer support. - // - InitializeComponent(); Size = new Size(745, 377); panel2.Size = new Size(646, 272); - // - // TODO: Add constructor code after the InitializeComponent() call. - // } + #endregion - #region UPnP - public void InitUPnP() + #region UPnP + public void InitUPnP() { if (GlobalVars.UserConfiguration.UPnP) { @@ -217,6 +206,7 @@ namespace NovetusLauncher } #endregion + #region Form Events async void tabControl1_SelectedIndexChanged(object sender, EventArgs e) { switch (tabControl1.SelectedTab) @@ -265,8 +255,7 @@ namespace NovetusLauncher { if (!string.IsNullOrWhiteSpace(str)) { - textBox3.AppendText(str); - textBox3.AppendText(Environment.NewLine); + textBox3.AppendText(str + Environment.NewLine); } } textBox3.SelectionStart = 0; @@ -1292,5 +1281,7 @@ namespace NovetusLauncher break; } } - } + #endregion + } + #endregion }