form renaming and layout stuff

Novetus/NovetusFuncs/LauncherFuncs.cs

@@ -126,7 +126,7 @@ public class LauncherFuncs
             ini.IniWriteValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
             ini.IniWriteValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
             ini.IniWriteValue(section, "QualityLevel", Settings.QualityOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
-            ini.IniWriteValue(section, "Layout", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
+            ini.IniWriteValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
             ini.IniWriteValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
         }
         else
@@ -135,7 +135,7 @@ public class LauncherFuncs
             string closeonlaunch, userid, name, selectedclient,
                 map, port, limit, upnp,
                 disablehelpmessage, tripcode, discord, mappath, mapsnip,
-                graphics, reshade, qualitylevel, layout, savebackups;
+                graphics, reshade, qualitylevel, style, savebackups;
 
             INIFile ini = new INIFile(cfgpath);
 
@@ -157,7 +157,7 @@ public class LauncherFuncs
             graphics = ini.IniReadValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
             reshade = ini.IniReadValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
             qualitylevel = ini.IniReadValue(section, "QualityLevel", Settings.QualityOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
-            layout = ini.IniReadValue(section, "Layout", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
+            style = ini.IniReadValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
             savebackups = ini.IniReadValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
 
             try
@@ -206,7 +206,7 @@ public class LauncherFuncs
                 GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.GetModeForInt(Convert.ToInt32(graphics));
                 GlobalVars.UserConfiguration.ReShade = Convert.ToBoolean(reshade);
                 GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.GetLevelForInt(Convert.ToInt32(qualitylevel));
-                GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(layout));
+                GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(style));
                 GlobalVars.UserConfiguration.AssetLocalizerSaveBackups = Convert.ToBoolean(savebackups);
             }
             catch (Exception)

Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs

@@ -10,7 +10,7 @@
 //This ALWAYS gets lost whenever I compile. WTF VS?
 namespace NovetusLauncher
 {
-    partial class MainForm_legacy
+    partial class LauncherFormCompact
     {
         /// <summary>
         /// Designer variable used to keep track of non-visual components.
@@ -43,7 +43,7 @@ namespace NovetusLauncher
 
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm_legacy));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompact));
             this.tabControl1 = new TabControlWithoutHeader(2);
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.label2 = new System.Windows.Forms.Label();

Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs

@@ -16,18 +16,17 @@ using System.ComponentModel;
 using System.Reflection;
 using Mono.Nat;
 using System.Globalization;
-//using LiteNetLib;
 
 namespace NovetusLauncher
 {
     /// <summary>
     /// Description of MainForm.
     /// </summary>
-    public partial class MainForm_legacy : Form
+    public partial class LauncherFormCompact : Form
 	{
 		IDiscordRPC.EventHandlers handlers;
 			
-		public MainForm_legacy()
+		public LauncherFormCompact()
 		{
 			_fieldsTreeCache = new TreeView();
             //
@@ -1488,7 +1487,7 @@ namespace NovetusLauncher
 
 		void SettingsButtonClick(object sender, EventArgs e)
 		{
-			NovetusSettings im = new NovetusSettings();
+			LauncherFormCompactSettings im = new LauncherFormCompactSettings();
 			im.Show();
 		}
 

Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.Designer.cs

@@ -1,6 +1,6 @@
 namespace NovetusLauncher
 {
-    partial class NovetusSettings
+    partial class LauncherFormCompactSettings
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NovetusSettings));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompactSettings));
             this.label3 = new System.Windows.Forms.Label();
             this.comboBox2 = new System.Windows.Forms.ComboBox();
             this.label31 = new System.Windows.Forms.Label();

Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs

@@ -1,17 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace NovetusLauncher
 {
-    public partial class NovetusSettings : Form
+    public partial class LauncherFormCompactSettings : Form
     {
-        public NovetusSettings()
+        public LauncherFormCompactSettings()
         {
             InitializeComponent();
         }
@@ -107,8 +101,15 @@ namespace NovetusLauncher
         }
 
         private void NovetusSettings_Load(object sender, EventArgs e)
+        {
+            if (GlobalVars.UserConfiguration.LauncherLayout == Settings.UIOptions.Style.Compact)
             {
                 ReadConfigValues();
             }
+            else
+            {
+                Close();
+            }
+        }
     }
 }

Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs

@@ -10,7 +10,7 @@
 //This ALWAYS gets lost whenever I compile. WTF VS?
 namespace NovetusLauncher
 {
-	partial class MainForm
+    partial class LauncherFormExtended
     {
         /// <summary>
         /// Designer variable used to keep track of non-visual components.
@@ -23,8 +23,10 @@ namespace NovetusLauncher
         /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         protected override void Dispose(bool disposing)
         {
-			if (disposing) {
+            if (disposing)
-				if (components != null) {
+            {
+                if (components != null)
+                {
                     components.Dispose();
                 }
             }
@@ -41,7 +43,7 @@ namespace NovetusLauncher
 
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormExtended));
             this.tabControl1 = new TabControlWithoutHeader(1);
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.label24 = new System.Windows.Forms.Label();

Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs

@@ -22,11 +22,11 @@ namespace NovetusLauncher
     /// <summary>
     /// Description of MainForm.
     /// </summary>
-    public partial class MainForm : Form
+    public partial class LauncherFormExtended : Form
 	{
 		IDiscordRPC.EventHandlers handlers;
 			
-		public MainForm()
+		public LauncherFormExtended()
 		{
 			_fieldsTreeCache = new TreeView();
             //

Novetus/NovetusLauncher/Novetus.Launcher.csproj

@@ -145,17 +145,17 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Classes\WinForms\TreeNodeHelper.cs" />
-    <Compile Include="MainForm\Compact\MainForm_legacy.cs">
+    <Compile Include="LauncherForm\Compact\LauncherFormCompact.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm\Compact\MainForm_legacy.Designer.cs">
+    <Compile Include="LauncherForm\Compact\LauncherFormCompact.Designer.cs">
-      <DependentUpon>MainForm_legacy.cs</DependentUpon>
+      <DependentUpon>LauncherFormCompact.cs</DependentUpon>
     </Compile>
-    <Compile Include="MainForm\Compact\NovetusSettings.cs">
+    <Compile Include="LauncherForm\Compact\LauncherFormCompactSettings.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm\Compact\NovetusSettings.Designer.cs">
+    <Compile Include="LauncherForm\Compact\LauncherFormCompactSettings.Designer.cs">
-      <DependentUpon>NovetusSettings.cs</DependentUpon>
+      <DependentUpon>LauncherFormCompactSettings.cs</DependentUpon>
     </Compile>
     <Compile Include="SDK\ClientinfoCreator.cs">
       <SubType>Form</SubType>
@@ -210,11 +210,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="MainForm\Extended\MainForm.cs">
+    <Compile Include="LauncherForm\Extended\LauncherFormExtended.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm\Extended\MainForm.Designer.cs">
+    <Compile Include="LauncherForm\Extended\LauncherFormExtended.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
+      <DependentUpon>LauncherFormExtended.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -226,11 +226,11 @@
     <EmbeddedResource Include="CharacterCustomization\CharacterCustomization.resx">
       <DependentUpon>CharacterCustomization.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm\Compact\MainForm_legacy.resx">
+    <EmbeddedResource Include="LauncherForm\Compact\LauncherFormCompact.resx">
-      <DependentUpon>MainForm_legacy.cs</DependentUpon>
+      <DependentUpon>LauncherFormCompact.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm\Compact\NovetusSettings.resx">
+    <EmbeddedResource Include="LauncherForm\Compact\LauncherFormCompactSettings.resx">
-      <DependentUpon>NovetusSettings.cs</DependentUpon>
+      <DependentUpon>LauncherFormCompactSettings.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SDK\ClientinfoCreator.resx">
       <DependentUpon>ClientinfoCreator.cs</DependentUpon>
@@ -250,8 +250,8 @@
     <EmbeddedResource Include="SDK\SplashTester.resx">
       <DependentUpon>SplashTester.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm\Extended\MainForm.resx">
+    <EmbeddedResource Include="LauncherForm\Extended\LauncherFormExtended.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
+      <DependentUpon>LauncherFormExtended.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SDK\NovetusSDK.resx">
       <DependentUpon>NovetusSDK.cs</DependentUpon>

Novetus/NovetusLauncher/Program.cs

@@ -36,10 +36,10 @@ namespace NovetusLauncher
 				switch (GlobalVars.UserConfiguration.LauncherLayout)
                 {
 					case Settings.UIOptions.Style.Compact:
-						Application.Run(new MainForm_legacy());
+						Application.Run(new LauncherFormCompact());
 						break;
 					default:
-						Application.Run(new MainForm());
+						Application.Run(new LauncherFormExtended());
 						break;
 				}
 			}

Novetus/NovetusURI/InstallForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace NovetusURI
 {
-    partial class Form1
+    partial class InstallForm
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallForm));
             this.button1 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 

Novetus/NovetusURI/InstallForm.cs

@@ -3,9 +3,9 @@ using System.Windows.Forms;
 
 namespace NovetusURI
 {
-    public partial class Form1 : Form
+    public partial class InstallForm : Form
     {
-        public Form1()
+        public InstallForm()
         {
             InitializeComponent();
         }

Novetus/NovetusURI/Novetus.URI.csproj

@@ -86,29 +86,29 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Classes\URIReg.cs" />
-    <Compile Include="Form1.cs">
+    <Compile Include="InstallForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
+    <Compile Include="InstallForm.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+      <DependentUpon>InstallForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Classes\LocalVars.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="URI\LoaderForm.cs">
+    <Compile Include="LoaderForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="URI\LoaderForm.Designer.cs">
+    <Compile Include="LoaderForm.Designer.cs">
       <DependentUpon>LoaderForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="URI\QuickConfigure.cs">
+    <Compile Include="QuickConfigure.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="URI\QuickConfigure.Designer.cs">
+    <Compile Include="QuickConfigure.Designer.cs">
       <DependentUpon>QuickConfigure.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="Form1.resx">
+    <EmbeddedResource Include="InstallForm.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+      <DependentUpon>InstallForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -120,10 +120,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="URI\LoaderForm.resx">
+    <EmbeddedResource Include="LoaderForm.resx">
       <DependentUpon>LoaderForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="URI\QuickConfigure.resx">
+    <EmbeddedResource Include="QuickConfigure.resx">
       <DependentUpon>QuickConfigure.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="packages.config" />
@@ -150,6 +150,9 @@
   <ItemGroup>
     <Content Include="NovetusIcon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="URI\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>SET path=$(SolutionDir)build

Novetus/NovetusURI/Program.cs

@@ -24,7 +24,7 @@ namespace NovetusURI
             LauncherFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalVars.ConfigName, false);
             if (args.Length == 0)
             {
-                Application.Run(new Form1());
+                Application.Run(new InstallForm());
             }
             else
             {