From a724d8852cfc2e342ac1c72023179424910731cb Mon Sep 17 00:00:00 2001
From: Samuel Lambert <fanmc34@gmail.com>
Date: Sun, 15 Jan 2023 19:25:00 -0500
Subject: [PATCH] Script Add/Remove Support and editor fixes

---
 BrilliantShiningScriptEditor.csproj |   9 +++
 Forms/FormMain.Designer.cs          |   1 +
 Forms/FormMain.cs                   |  48 ++++++++++-
 Forms/FormTextBox.Designer.cs       | 104 ++++++++++++++++++++++++
 Forms/FormTextBox.cs                |  34 ++++++++
 Forms/FormTextBox.resx              | 120 ++++++++++++++++++++++++++++
 Monaco/editor_init.js               |   6 ++
 7 files changed, 319 insertions(+), 3 deletions(-)
 create mode 100644 Forms/FormTextBox.Designer.cs
 create mode 100644 Forms/FormTextBox.cs
 create mode 100644 Forms/FormTextBox.resx

diff --git a/BrilliantShiningScriptEditor.csproj b/BrilliantShiningScriptEditor.csproj
index ba3a954..7ae47f4 100644
--- a/BrilliantShiningScriptEditor.csproj
+++ b/BrilliantShiningScriptEditor.csproj
@@ -115,11 +115,20 @@
     <Compile Include="Forms\FormMain.Designer.cs">
       <DependentUpon>FormMain.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FormTextBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FormTextBox.Designer.cs">
+      <DependentUpon>FormTextBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Forms\FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\FormTextBox.resx">
+      <DependentUpon>FormTextBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
diff --git a/Forms/FormMain.Designer.cs b/Forms/FormMain.Designer.cs
index 57695b9..8121ecf 100644
--- a/Forms/FormMain.Designer.cs
+++ b/Forms/FormMain.Designer.cs
@@ -301,6 +301,7 @@ private void InitializeComponent()
             this.Name = "FormMain";
             this.Text = "Brilliant Shining Script Editor";
             this.Load += new System.EventHandler(this.FormMain_Load);
+            this.SizeChanged += new System.EventHandler(this.FormMain_SizeChanged);
             this.stripMain.ResumeLayout(false);
             this.stripMain.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.webEditor)).EndInit();
diff --git a/Forms/FormMain.cs b/Forms/FormMain.cs
index 0c86bed..b0abd15 100644
--- a/Forms/FormMain.cs
+++ b/Forms/FormMain.cs
@@ -41,7 +41,7 @@ private void FormMain_Load(object sender, EventArgs e)
             LoadPage();
         }
 
-        private void webEditor_NavigationCompleted(object sender, Microsoft.Web.WebView2.Core.CoreWebView2NavigationCompletedEventArgs e)
+        private void webEditor_NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e)
         {
             stripMain.Enabled = true;
         }
@@ -65,6 +65,7 @@ private string GetEditorValue()
             string code = ExecuteEditorScript("editor.getValue()");
             code = code.Replace("\"", "");
             code = code.Replace("\\n", "\n");
+            code = code.Replace("\\r", "");
             return code;
         }
 
@@ -97,6 +98,11 @@ private static string EditorWait(Task<string> task)
 
             return wait;
         }
+
+        private void FormMain_SizeChanged(object sender, EventArgs e)
+        {
+            ExecuteEditorScript("editor.layout()");
+        }
         #endregion
 
         private void AddToolTips()
@@ -122,8 +128,9 @@ private void UpdateScriptList(List<Script> scripts)
         }
 
         private void UpdateScriptBox(Script script)
-        { 
+        {
             SetEditorValue(scriptEditorEngine.DecompileScript(script));
+            ExecuteEditorScript("editor.updateOptions({readOnly: false})");
         }
 
         private void UpdateCommandInfo(CommandInfo command)
@@ -163,11 +170,45 @@ private void comboScript_SelectedIndexChanged(object sender, EventArgs e)
         private void btnScriptAdd_Click(object sender, EventArgs e)
         {
             // Add Script
+
+            FormTextBox newScriptForm = new FormTextBox("Add Script", "Enter the name for the script:", "Confirm", "Cancel");
+
+            if (newScriptForm.ShowDialog() == DialogResult.OK)
+            {
+                string result = newScriptForm.Result;
+                List<Script> list = ((ScriptFile)comboScriptFile.SelectedItem).Scripts;
+                if (string.IsNullOrWhiteSpace(result))
+                {
+                    MessageBox.Show("The given Script name is empty.", "Invalid Script Name", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+                else if (list.Select(s => s.Name).Contains(result))
+                {
+                    MessageBox.Show("The given Script name already exists in this file.", "Invalid Script Name", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+                else
+                {
+                    int endId = FileConstants.Commands.Where(c => c.Name == "_END").Select(c => c.Id).DefaultIfEmpty(0).First();
+                    Argument endArgument = new Argument(ArgumentType.Command, endId);
+                    Script script = new Script(result, new List<Command>() { new Command(new List<Argument>() { endArgument }) });
+                    list.Add(script);
+                    MessageBox.Show("Added the new script in memory successfully! Don't forget to export all your changes.", "Success!", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    comboScriptFile_SelectedIndexChanged(this, new EventArgs());
+                }
+            }
         }
 
         private void btnScriptRemove_Click(object sender, EventArgs e)
         {
             // Remove Script
+
+            if (MessageBox.Show("Are you sure you want to delete this script from memory? The script will be completely gone when you export your changes.", "Script Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
+            {
+                List<Script> list = ((ScriptFile)comboScriptFile.SelectedItem).Scripts;
+                Script script = (Script)comboScript.SelectedItem;
+                list.Remove(script);
+                MessageBox.Show("Removed the new script from memory successfully! Don't forget to export all your changes.", "Success!", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                comboScriptFile_SelectedIndexChanged(this, new EventArgs());
+            }
         }
 
         private void btnScriptCompile_Click(object sender, EventArgs e)
@@ -237,7 +278,8 @@ private void tbtnOpen_Click(object sender, EventArgs e)
                         tbtnOpen.Enabled = false;
                         btnScriptCompile.Enabled = true;
                         btnScriptSave.Enabled = true;
-                        ExecuteEditorScript("editor.updateOptions({readOnly: false})");
+                        btnScriptAdd.Enabled = true;
+                        btnScriptRemove.Enabled = true;
                     }
                 }
                 else
diff --git a/Forms/FormTextBox.Designer.cs b/Forms/FormTextBox.Designer.cs
new file mode 100644
index 0000000..eb77631
--- /dev/null
+++ b/Forms/FormTextBox.Designer.cs
@@ -0,0 +1,104 @@
+
+namespace BrilliantShiningScriptEditor.Forms
+{
+    partial class FormTextBox
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnYes = new System.Windows.Forms.Button();
+            this.txtAnswer = new System.Windows.Forms.TextBox();
+            this.lbInfo = new System.Windows.Forms.Label();
+            this.btnNo = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // btnYes
+            // 
+            this.btnYes.Location = new System.Drawing.Point(12, 90);
+            this.btnYes.Name = "btnYes";
+            this.btnYes.Size = new System.Drawing.Size(131, 28);
+            this.btnYes.TabIndex = 0;
+            this.btnYes.Text = "button1";
+            this.btnYes.UseVisualStyleBackColor = true;
+            this.btnYes.Click += new System.EventHandler(this.btnYes_Click);
+            // 
+            // txtAnswer
+            // 
+            this.txtAnswer.Location = new System.Drawing.Point(12, 64);
+            this.txtAnswer.Name = "txtAnswer";
+            this.txtAnswer.Size = new System.Drawing.Size(268, 20);
+            this.txtAnswer.TabIndex = 1;
+            // 
+            // lbInfo
+            // 
+            this.lbInfo.Location = new System.Drawing.Point(12, 9);
+            this.lbInfo.Name = "lbInfo";
+            this.lbInfo.Size = new System.Drawing.Size(268, 52);
+            this.lbInfo.TabIndex = 2;
+            this.lbInfo.Text = "label1";
+            this.lbInfo.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+            // 
+            // btnNo
+            // 
+            this.btnNo.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnNo.Location = new System.Drawing.Point(149, 90);
+            this.btnNo.Name = "btnNo";
+            this.btnNo.Size = new System.Drawing.Size(131, 28);
+            this.btnNo.TabIndex = 3;
+            this.btnNo.Text = "button2";
+            this.btnNo.UseVisualStyleBackColor = true;
+            // 
+            // FormTextBox
+            // 
+            this.AcceptButton = this.btnYes;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnNo;
+            this.ClientSize = new System.Drawing.Size(292, 130);
+            this.Controls.Add(this.lbInfo);
+            this.Controls.Add(this.btnNo);
+            this.Controls.Add(this.btnYes);
+            this.Controls.Add(this.txtAnswer);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FormTextBox";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "FormTextBox";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnYes;
+        private System.Windows.Forms.TextBox txtAnswer;
+        private System.Windows.Forms.Label lbInfo;
+        private System.Windows.Forms.Button btnNo;
+    }
+}
\ No newline at end of file
diff --git a/Forms/FormTextBox.cs b/Forms/FormTextBox.cs
new file mode 100644
index 0000000..d94a964
--- /dev/null
+++ b/Forms/FormTextBox.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BrilliantShiningScriptEditor.Forms
+{
+    public partial class FormTextBox : Form
+    {
+        public string Result { get; set; }
+
+        public FormTextBox(string title, string description, string yesButton, string noButton)
+        {
+            InitializeComponent();
+
+            Name = title;
+            lbInfo.Text = description;
+            btnYes.Text = yesButton;
+            btnNo.Text = noButton;
+        }
+
+        private void btnYes_Click(object sender, EventArgs e)
+        {
+            Result = txtAnswer.Text;
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+    }
+}
diff --git a/Forms/FormTextBox.resx b/Forms/FormTextBox.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Forms/FormTextBox.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Monaco/editor_init.js b/Monaco/editor_init.js
index c952835..62411a4 100644
--- a/Monaco/editor_init.js
+++ b/Monaco/editor_init.js
@@ -5,4 +5,10 @@
 	scrollBeyondLastLine: false,
 	readOnly: true,
 	theme: 'vs-dark'
+});
+var outputElem = document.getElementById('output');
+var model = editor.getModel();
+model.setEOL(monaco.editor.EndOfLineSequence.LF);
+editor.onDidChangeModelContent(async (e) => {
+	outputElem.innerHTML = JSON.stringify(editor.getValue());
 });
\ No newline at end of file