Merge pull request #10 from Alex-TIMEHACK/master

Terminal. With a little example command.
This commit is contained in:
IBMPCDOS5 2017-10-14 13:44:48 -05:00 committed by GitHub
commit b0fb6ed50e
22 changed files with 78733 additions and 69 deletions

Binary file not shown.

View file

@ -52,6 +52,9 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Terminal\Commands\Hello.cs" />
<Compile Include="Terminal\TerminalBackend.cs" />
<Compile Include="Terminal\TerminalCommand.cs" />
<Compile Include="Tools.cs" />
<Compile Include="WindowManager\InfoboxTemplate.cs">
<SubType>UserControl</SubType>
@ -93,5 +96,6 @@
<ItemGroup>
<None Include="Resources\iconInfoBox.fw.png" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View file

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ShiftOS.Engine.Terminal.Commands
{
public class Hello : TerminalCommand
{
public override string GetName()
{
return "Hello";
}
public override string Run(params string[] parameters)
{
return "Oh, HELLO, " + String.Join(" ", parameters);
}
}
}

View file

@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
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<TerminalCommand> instances = from t in Assembly.GetExecutingAssembly().GetTypes()
where t.IsSubclassOf(typeof(TerminalCommand))
&& t.GetConstructor(Type.EmptyTypes) != null
select Activator.CreateInstance(t) as TerminalCommand;
/// <summary>
/// Runs a terminal command.
/// </summary>
/// <param name="command"></param>
/// <returns>Returns all the output from that command.</returns>
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 (TerminalCommand instance in instances)
{
if (instance.GetName() == name)
return instance.Run(theParams);
}
return "The command cannot be found.";
}
// An extra function ;)
private static Type[] GetTypesInNamespace(Assembly assembly, string nameSpace)
{
return assembly.GetTypes().Where(t => String.Equals(t.Namespace, nameSpace, StringComparison.Ordinal)).ToArray();
}
}
}

View file

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ShiftOS.Engine.Terminal
{
public abstract class TerminalCommand
{
public abstract string GetName();
public abstract string Run(params string[] parameters);
}
}

View file

@ -70,6 +70,12 @@
<Compile Include="ShiftOS\Apps\ShifterStuff\Shifter.Designer.cs">
<DependentUpon>Shifter.cs</DependentUpon>
</Compile>
<Compile Include="ShiftOS\Apps\Terminal.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ShiftOS\Apps\Terminal.Designer.cs">
<DependentUpon>Terminal.cs</DependentUpon>
</Compile>
<Compile Include="ShiftOS\Apps\TestForm.cs">
<SubType>Form</SubType>
</Compile>
@ -104,6 +110,9 @@
<EmbeddedResource Include="ShiftOS\Apps\ShifterStuff\Shifter.resx">
<DependentUpon>Shifter.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ShiftOS\Apps\Terminal.resx">
<DependentUpon>Terminal.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ShiftOS\Apps\TestForm.resx">
<DependentUpon>TestForm.cs</DependentUpon>
</EmbeddedResource>

View file

@ -0,0 +1,65 @@
namespace ShiftOS.Main.ShiftOS.Apps
{
partial class Terminal
{
/// <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 Component 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.termmain = new System.Windows.Forms.RichTextBox();
this.SuspendLayout();
//
// termmain
//
this.termmain.BackColor = System.Drawing.Color.Black;
this.termmain.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.termmain.Dock = System.Windows.Forms.DockStyle.Fill;
this.termmain.ForeColor = System.Drawing.Color.White;
this.termmain.Location = new System.Drawing.Point(0, 0);
this.termmain.Name = "termmain";
this.termmain.Size = new System.Drawing.Size(476, 394);
this.termmain.TabIndex = 0;
this.termmain.Text = "";
this.termmain.SelectionChanged += new System.EventHandler(this.termmain_SelectionChanged);
this.termmain.TextChanged += new System.EventHandler(this.termmain_TextChanged);
this.termmain.KeyDown += new System.Windows.Forms.KeyEventHandler(this.termmain_KeyDown);
//
// Terminal
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.termmain);
this.Name = "Terminal";
this.Size = new System.Drawing.Size(476, 394);
this.Load += new System.EventHandler(this.Terminal_Load);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.RichTextBox termmain;
}
}

View file

@ -0,0 +1,95 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.Engine;
using ShiftOS.Engine.Terminal;
namespace ShiftOS.Main.ShiftOS.Apps
{
public partial class Terminal : UserControl
{
public string defaulttextBefore = "user> ";
public string defaulttextResult = "user@shiftos> "; // NOT YET IMPLEMENTED!!!
public bool doClear = false;
// The below variables makes the terminal... a terminal!
public string OldText = "";
public int TrackingPosition = 0;
public Terminal()
{
InitializeComponent();
termmain.ContextMenuStrip = new ContextMenuStrip(); // Disables the right click of a richtextbox!
}
public void Print(string text)
{
termmain.AppendText($"\n {text} \n {defaulttextResult}");
TrackingPosition = termmain.Text.Length;
}
private void termmain_KeyDown(object sender, KeyEventArgs e)
{
// The below code disables the ability to paste anything other then text...
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) {
Print(TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition))); // The most horrific line in the entire application!
e.Handled = true;
}
}
private void termmain_TextChanged(object sender, EventArgs e)
{
if (termmain.SelectionStart < TrackingPosition)
{
if (doClear == false) // If it's not clearing the terminal
{
termmain.Text = OldText;
termmain.Select(termmain.Text.Length, 0);
}
}
else
{
OldText = termmain.Text;
}
}
private void termmain_SelectionChanged(object sender, EventArgs e)
{
if (termmain.SelectionStart < TrackingPosition)
{
termmain.Text = OldText;
termmain.Select(termmain.Text.Length, 0);
}
}
private void Terminal_Load(object sender, EventArgs e)
{
Print("\n");
}
public string RunCommand(string command)
{
string ToReturn = "";
if (command == "hi")
{
ToReturn = $"{ToReturn} \n Hi!";
MessageBox.Show("HI!");
}
return ToReturn;
}
}
}

View file

@ -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>

View file

@ -28,75 +28,87 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.listView1 = new System.Windows.Forms.ListView();
this.taskbar = new System.Windows.Forms.ToolStrip();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
this.taskbarClock = new System.Windows.Forms.ToolStripLabel();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.taskbar.SuspendLayout();
this.SuspendLayout();
//
// listView1
//
this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listView1.Location = new System.Drawing.Point(0, 0);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(1962, 1236);
this.listView1.TabIndex = 0;
this.listView1.UseCompatibleStateImageBehavior = false;
//
// taskbar
//
this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.taskbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.taskbar.ImageScalingSize = new System.Drawing.Size(24, 24);
this.taskbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.components = new System.ComponentModel.Container();
this.listView1 = new System.Windows.Forms.ListView();
this.taskbar = new System.Windows.Forms.ToolStrip();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
this.taskbarClock = new System.Windows.Forms.ToolStripLabel();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.terminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.taskbar.SuspendLayout();
this.SuspendLayout();
//
// listView1
//
this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listView1.Location = new System.Drawing.Point(0, 0);
this.listView1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(1277, 684);
this.listView1.TabIndex = 0;
this.listView1.UseCompatibleStateImageBehavior = false;
//
// taskbar
//
this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.taskbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.taskbar.ImageScalingSize = new System.Drawing.Size(24, 24);
this.taskbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripDropDownButton1,
this.taskbarClock});
this.taskbar.Location = new System.Drawing.Point(0, 1204);
this.taskbar.Name = "taskbar";
this.taskbar.Size = new System.Drawing.Size(1962, 32);
this.taskbar.TabIndex = 1;
this.taskbar.Text = "toolStrip1";
//
// toolStripDropDownButton1
//
this.toolStripDropDownButton1.Image = global::ShiftOS.Main.Properties.Resources.iconWebBrowser;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
this.toolStripDropDownButton1.Size = new System.Drawing.Size(131, 29);
this.toolStripDropDownButton1.Tag = ((uint)(0u));
this.toolStripDropDownButton1.Text = "Programs";
//
// taskbarClock
//
this.taskbarClock.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.taskbarClock.Image = global::ShiftOS.Main.Properties.Resources.iconClock;
this.taskbarClock.Name = "taskbarClock";
this.taskbarClock.Size = new System.Drawing.Size(70, 29);
this.taskbarClock.Tag = ((uint)(0u));
this.taskbarClock.Text = "0:00";
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// Desktop
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1962, 1236);
this.Controls.Add(this.taskbar);
this.Controls.Add(this.listView1);
this.Name = "Desktop";
this.Text = "Desktop";
this.taskbar.ResumeLayout(false);
this.taskbar.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
this.taskbar.Location = new System.Drawing.Point(0, 653);
this.taskbar.Name = "taskbar";
this.taskbar.Size = new System.Drawing.Size(1277, 31);
this.taskbar.TabIndex = 1;
this.taskbar.Text = "toolStrip1";
//
// toolStripDropDownButton1
//
this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.terminalToolStripMenuItem});
this.toolStripDropDownButton1.Image = global::ShiftOS.Main.Properties.Resources.iconWebBrowser;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
this.toolStripDropDownButton1.Size = new System.Drawing.Size(95, 28);
this.toolStripDropDownButton1.Tag = ((uint)(0u));
this.toolStripDropDownButton1.Text = "Programs";
//
// taskbarClock
//
this.taskbarClock.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.taskbarClock.Image = global::ShiftOS.Main.Properties.Resources.iconClock;
this.taskbarClock.Name = "taskbarClock";
this.taskbarClock.Size = new System.Drawing.Size(52, 28);
this.taskbarClock.Tag = ((uint)(0u));
this.taskbarClock.Text = "0:00";
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// terminalToolStripMenuItem
//
this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
this.terminalToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.terminalToolStripMenuItem.Text = "Terminal";
this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click);
//
// Desktop
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1277, 684);
this.Controls.Add(this.taskbar);
this.Controls.Add(this.listView1);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Desktop";
this.Text = "Desktop";
this.taskbar.ResumeLayout(false);
this.taskbar.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
@ -107,5 +119,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripLabel taskbarClock;
private System.Windows.Forms.Timer timer1;
}
private System.Windows.Forms.ToolStripMenuItem terminalToolStripMenuItem;
}
}

View file

@ -57,5 +57,12 @@ namespace ShiftOS.Main.ShiftOS
private void timer1_Tick(object sender, EventArgs e) =>
taskbarClock.Text = $"{DateTime.Now:t}";
}
private void terminalToolStripMenuItem_Click(object sender, EventArgs e)
{
Apps.Terminal trm = new Apps.Terminal();
ShiftWM.Init(trm, "Terminal", null, false, true);
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,11 @@
Please visit https://github.com/dlemstra/Magick.NET/Documentation for information on how to use Magick.NET.
The release notes can be found here: https://github.com/dlemstra/Magick.NET/releases.
Follow me on twitter (@MagickNET, https://twitter.com/MagickNET) to receive information about new
downloads and changes to Magick.NET and ImageMagick.
If you have an uncontrollable urge to give me something for the time and effort I am putting into this
project then please buy me something from my amazon wish list or send me an amazon gift card. You can
find my wishlist here: https://www.amazon.de/gp/registry/wishlist/2XFZAC3J04WAY. If you prefer to use
PayPal then click here: https://www.paypal.me/DirkLemstra.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff