From b2f7322f3072ff90c8e6039ec4b3219d3c3fb919 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 15 Oct 2017 20:25:37 +0100 Subject: It's broken. --- ShiftOS.Engine/ShiftOS.Engine.csproj | 3 --- 1 file changed, 3 deletions(-) (limited to 'ShiftOS.Engine/ShiftOS.Engine.csproj') diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj index 6740db1..8d3d003 100644 --- a/ShiftOS.Engine/ShiftOS.Engine.csproj +++ b/ShiftOS.Engine/ShiftOS.Engine.csproj @@ -52,9 +52,6 @@ True Resources.resx - - - UserControl -- cgit v1.2.3 From 6faabfbbd86d70c99e197a3d8cfcf7db0680d17f Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 18 Nov 2017 16:33:30 +0000 Subject: Fixed fork? --- ShiftOS.Engine/ShiftOS.Engine.csproj | 3 - ShiftOS.Engine/Terminal/Commands/Hello.cs | 9 -- ShiftOS.Engine/Terminal/TerminalBackend.cs | 46 -------- ShiftOS.Engine/Terminal/TerminalCommand.cs | 182 ----------------------------- 4 files changed, 240 deletions(-) delete mode 100644 ShiftOS.Engine/Terminal/Commands/Hello.cs delete mode 100644 ShiftOS.Engine/Terminal/TerminalBackend.cs delete mode 100644 ShiftOS.Engine/Terminal/TerminalCommand.cs (limited to 'ShiftOS.Engine/ShiftOS.Engine.csproj') diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj index 218daf4..6b810fa 100644 --- a/ShiftOS.Engine/ShiftOS.Engine.csproj +++ b/ShiftOS.Engine/ShiftOS.Engine.csproj @@ -70,9 +70,6 @@ - - - UserControl diff --git a/ShiftOS.Engine/Terminal/Commands/Hello.cs b/ShiftOS.Engine/Terminal/Commands/Hello.cs deleted file mode 100644 index 7d4b82f..0000000 --- a/ShiftOS.Engine/Terminal/Commands/Hello.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ShiftOS.Engine.Terminal.Commands -{ - public class Hello : TerminalCommand - { - public override string GetName() => "Hello"; - - public override string Run(params string[] parameters) => "Oh, HELLO, " + string.Join(" ", parameters); - } -} \ No newline at end of file diff --git a/ShiftOS.Engine/Terminal/TerminalBackend.cs b/ShiftOS.Engine/Terminal/TerminalBackend.cs deleted file mode 100644 index e079d22..0000000 --- a/ShiftOS.Engine/Terminal/TerminalBackend.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; - -namespace ShiftOS.Engine.Terminal -{ - public static class TerminalBackend - { - // The line below gets all the terminal commands in... well... the entire ShiftOS.Engine - public static IEnumerable instances = Assembly.GetExecutingAssembly().GetTypes() - .Where(t => t.IsSubclassOf(typeof(TerminalCommand)) && t.GetConstructor(Type.EmptyTypes) != null) - .Select(t => Activator.CreateInstance(t) as TerminalCommand); - - /// - /// Runs a terminal command. - /// - /// - /// Returns all the output from that command. - public static string RunCommand(string command) - { - string name; - try - { - name = command.Split(' ')[0]; - } - catch - { - name = command; - } - - var theParams = new string[command.Split(' ').Length - 1]; - Array.Copy(command.Split(' '), 1, theParams, 0, command.Split(' ').Length - 1); - - foreach (var instance in Instances) - { - if (instance.GetName() == name) - { - return instance.Run(theParams); - } - } - - return "The command cannot be found."; - } - } -} \ No newline at end of file diff --git a/ShiftOS.Engine/Terminal/TerminalCommand.cs b/ShiftOS.Engine/Terminal/TerminalCommand.cs deleted file mode 100644 index 110d1d2..0000000 --- a/ShiftOS.Engine/Terminal/TerminalCommand.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System; - -using System.Collections.Generic; - -using System.Drawing; - -using System.Linq; - -using System.Text; - -using System.Threading.Tasks; - -using System.Windows.Forms; - - - -namespace ShiftOS.Main.Terminal -{ - - public class TerminalCommand - - { - - public int TermID { get; set; } - - - - public virtual string Name { get; } - - public virtual string Summary { get; } - - public virtual string Usage { get; } - - public virtual bool Unlocked { get; set; } - - - - public virtual void Run(params string[] parameters) { } - - - - /// - - /// Writes a blank line in the terminal. - - /// - - public virtual void WriteLine() - - { - - WriteLine(""); - - } - - - - /// - - /// Writes specified text in the terminal and starts a new line. - - /// - - /// The text to write before the new line is made. - - public virtual void WriteLine(string value) - - { - - Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"{value} \n"); - - } - - - - /// - - /// Writes specified text in the terminal in the specified color and starts a new line. - - /// - - /// The text to write before the new line is made. - - /// The color the text is written in. - - public virtual void WriteLine(string value, Color textClr) - - { - - ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID); - - - - int startPoint = trm.termmain.Text.Length; - - trm.termmain.AppendText($"{value} \n"); - - trm.termmain.Select(startPoint, $"{value} \n".Length); - - trm.termmain.SelectionColor = textClr; - - } - - - - /// - - /// Writes specified text in the terminal. - - /// - - /// The text to write. - - /// The color the text is written in. - - public virtual void Write(string value, Color textClr) - - { - - - - ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID); - - - - int startPoint = trm.termmain.Text.Length; - - trm.termmain.AppendText($"{value}"); - - trm.termmain.Select(startPoint, $"{value}".Length); - - trm.termmain.SelectionColor = textClr; - - } - - - - /// - - /// Writes specified text in the terminal. - - /// - - /// The text to say before requesting text. - - public virtual Task Input(string value = "") - - { - - ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID); - - trm.Input(value); - - - - Task Input = new Task(() => - - { - - while (true) - - if (trm.InputReturnText != "") break; - - - - // The terminal has finally decided! - - - - return trm.InputReturnText; - - }); - - Input.Start(); - - return Input; - - } - - } - -} \ No newline at end of file -- cgit v1.2.3 From 179ec19e6b49dd6c0f5de5dc6f69128338a28e12 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 18 Nov 2017 16:46:45 +0000 Subject: I don't know WHAT git did but I fixed it. --- .vs/ShiftOS/v15/sqlite3/storage.ide | Bin 1413120 -> 1622016 bytes ShiftOS.Engine/ShiftOS.Engine.csproj | 1 - ShiftOS.Main/ShiftOS.Main.csproj | 3 -- ShiftOS.Main/ShiftOS/Apps/Terminal.cs | 94 +++++++++++----------------------- ShiftOS.Main/ShiftOS/Desktop.cs | 7 --- 5 files changed, 29 insertions(+), 76 deletions(-) (limited to 'ShiftOS.Engine/ShiftOS.Engine.csproj') diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide index 4ff5119..1ddce4d 100644 Binary files a/.vs/ShiftOS/v15/sqlite3/storage.ide and b/.vs/ShiftOS/v15/sqlite3/storage.ide differ diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj index 6b810fa..88ad0cf 100644 --- a/ShiftOS.Engine/ShiftOS.Engine.csproj +++ b/ShiftOS.Engine/ShiftOS.Engine.csproj @@ -63,7 +63,6 @@ True Resources.resx - diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index f7d8dc0..35d7761 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -102,9 +102,6 @@ - - HijackScreen.cs - ResXFileCodeGenerator Resources.Designer.cs diff --git a/ShiftOS.Main/ShiftOS/Apps/Terminal.cs b/ShiftOS.Main/ShiftOS/Apps/Terminal.cs index a5c5a11..5976cab 100644 --- a/ShiftOS.Main/ShiftOS/Apps/Terminal.cs +++ b/ShiftOS.Main/ShiftOS/Apps/Terminal.cs @@ -14,52 +14,48 @@ namespace ShiftOS.Main.ShiftOS.Apps public bool RunningCommand = false; public bool WaitingResponse = false; public string InputReturnText = ""; -using ShiftOS.Engine.Terminal; - -namespace ShiftOS.Main.ShiftOS.Apps -{ - public partial class Terminal : UserControl - { - public string DefaulttextBefore = "user> "; - string DefaulttextResult = "user@shiftos> "; // NOT YET IMPLEMENTED!!! - bool DoClear = false; // The below variables makes the terminal... a terminal! string OldText = ""; int TrackingPosition; - termmain.ContextMenuStrip = new ContextMenuStrip(); // Disables the right click of a richtextbox! - - TerminalBackend.trm.Add(this); // Makes the commands run! - } public Terminal() { InitializeComponent(); termmain.ContextMenuStrip = new ContextMenuStrip(); // Disables the right click of a richtextbox! - } - void Print(string text) + TerminalBackend.trm.Add(this); + } + + void Print() + { + termmain.AppendText($"\n {defaulttextResult}"); + TrackingPosition = termmain.Text.Length; + } + + void Print(string text) { - termmain.AppendText($"\n {text} \n {DefaulttextResult}"); + termmain.AppendText($"\n {text} \n {defaulttextResult}"); TrackingPosition = termmain.Text.Length; - } - if (e.Control && e.KeyCode == Keys.V) - { - //if (Clipboard.ContainsText()) - // termmain.Paste(DataFormats.GetFormat(DataFormats.Text)); - e.Handled = true; - } else if (e.KeyCode == Keys.Enter) { - RunningCommand = true; - TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition), TerminalID); // The most horrific line in the entire application! - RunningCommand = false; - termmain.AppendText($"\n {defaulttextResult}"); - TrackingPosition = termmain.Text.Length; - e.Handled = true; - } } + //if (e.Control && e.KeyCode == Keys.V) + // { + // //if (Clipboard.ContainsText()) + // // termmain.Paste(DataFormats.GetFormat(DataFormats.Text)); + // e.Handled = true; + // } else if (e.KeyCode == Keys.Enter) { + // RunningCommand = true; + // TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition), TerminalID); // The most horrific line in the entire application! + // RunningCommand = false; + // termmain.AppendText($"\n {defaulttextResult}"); + // TrackingPosition = termmain.Text.Length; + // e.Handled = true; + // } + //} + private void termmain_TextChanged(object sender, EventArgs e) { if (!RunningCommand) @@ -113,8 +109,7 @@ namespace ShiftOS.Main.ShiftOS.Apps TrackingPosition = termmain.Text.Length; DoClear = false; } - } -} + void termmain_KeyDown(object sender, KeyEventArgs e) { // The below code disables the ability to paste anything other then text... @@ -127,41 +122,10 @@ namespace ShiftOS.Main.ShiftOS.Apps } else if (e.KeyCode == Keys.Enter) { - Print( - TerminalBackend.RunCommand( - termmain.Text.Substring( - TrackingPosition, - termmain.Text.Length - TrackingPosition))); // The most horrific line in the entire application! + TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition), TerminalID); // The most horrific line in the entire application! + Print(); e.Handled = true; } } - - void termmain_TextChanged(object sender, EventArgs e) - { - if (termmain.SelectionStart < TrackingPosition) - { - if (DoClear) return; - - termmain.Text = OldText; - termmain.Select(termmain.Text.Length, 0); - } - else - { - OldText = termmain.Text; - } - } - - void termmain_SelectionChanged(object sender, EventArgs e) - { - if (termmain.SelectionStart >= TrackingPosition) return; - - termmain.Text = OldText; - termmain.Select(termmain.Text.Length, 0); - } - - void Terminal_Load(object sender, EventArgs e) - { - Print("\n"); - } } } diff --git a/ShiftOS.Main/ShiftOS/Desktop.cs b/ShiftOS.Main/ShiftOS/Desktop.cs index 10eea41..4bf4805 100644 --- a/ShiftOS.Main/ShiftOS/Desktop.cs +++ b/ShiftOS.Main/ShiftOS/Desktop.cs @@ -60,13 +60,6 @@ namespace ShiftOS.Main.ShiftOS ShiftWM.Init(trm, "Terminal", null, false, true); } - } -} - void terminalToolStripMenuItem_Click(object sender, EventArgs e) - { - var trm = new Terminal(); - ShiftWM.Init(trm, "Terminal", null); - } void textPadToolStripMenuItem_Click(object sender, EventArgs e) { -- cgit v1.2.3