aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Main
diff options
context:
space:
mode:
authorFloppyDiskDrive <[email protected]>2017-11-05 14:13:06 -0600
committerFloppyDiskDrive <[email protected]>2017-11-05 14:13:06 -0600
commit019da5b9ebf67b758a31dd05c4b17de66fa682f2 (patch)
tree9d2341a1e9ab8fe1216800265d70a18f5e7ac762 /ShiftOS.Main
parent70ccdd214ed90d7d3ec3b5c1f9d0e4414fbe4987 (diff)
downloadshiftos-rewind-019da5b9ebf67b758a31dd05c4b17de66fa682f2.tar.gz
shiftos-rewind-019da5b9ebf67b758a31dd05c4b17de66fa682f2.tar.bz2
shiftos-rewind-019da5b9ebf67b758a31dd05c4b17de66fa682f2.zip
Began to add textpad, extra functionality to the infobox template
Diffstat (limited to 'ShiftOS.Main')
-rw-r--r--ShiftOS.Main/ShiftOS.Main.csproj9
-rw-r--r--ShiftOS.Main/ShiftOS/Apps/TextPad.Designer.cs215
-rw-r--r--ShiftOS.Main/ShiftOS/Apps/TextPad.cs54
-rw-r--r--ShiftOS.Main/ShiftOS/Apps/TextPad.resx129
-rw-r--r--ShiftOS.Main/ShiftOS/Desktop.Designer.cs28
-rw-r--r--ShiftOS.Main/ShiftOS/Desktop.cs7
6 files changed, 433 insertions, 9 deletions
diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj
index f511503..93ece0f 100644
--- a/ShiftOS.Main/ShiftOS.Main.csproj
+++ b/ShiftOS.Main/ShiftOS.Main.csproj
@@ -85,6 +85,12 @@
<Compile Include="ShiftOS\Apps\TestForm.Designer.cs">
<DependentUpon>TestForm.cs</DependentUpon>
</Compile>
+ <Compile Include="ShiftOS\Apps\TextPad.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="ShiftOS\Apps\TextPad.Designer.cs">
+ <DependentUpon>TextPad.cs</DependentUpon>
+ </Compile>
<Compile Include="ShiftOS\Desktop.cs">
<SubType>Form</SubType>
</Compile>
@@ -119,6 +125,9 @@
<EmbeddedResource Include="ShiftOS\Apps\TestForm.resx">
<DependentUpon>TestForm.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ShiftOS\Apps\TextPad.resx">
+ <DependentUpon>TextPad.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="ShiftOS\Desktop.resx">
<DependentUpon>Desktop.cs</DependentUpon>
</EmbeddedResource>
diff --git a/ShiftOS.Main/ShiftOS/Apps/TextPad.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/TextPad.Designer.cs
new file mode 100644
index 0000000..7d83c68
--- /dev/null
+++ b/ShiftOS.Main/ShiftOS/Apps/TextPad.Designer.cs
@@ -0,0 +1,215 @@
+namespace ShiftOS.Main.ShiftOS.Apps
+{
+ partial class TextPad
+ {
+ /// <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.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+ this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.wordWrapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.insertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.timeAndDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.textBox = new System.Windows.Forms.RichTextBox();
+ this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
+ this.menuStrip1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.fileToolStripMenuItem,
+ this.editToolStripMenuItem,
+ this.insertToolStripMenuItem,
+ this.helpToolStripMenuItem});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(315, 24);
+ this.menuStrip1.TabIndex = 0;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // fileToolStripMenuItem
+ //
+ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.newToolStripMenuItem,
+ this.openToolStripMenuItem,
+ this.saveToolStripMenuItem,
+ this.saveAsToolStripMenuItem,
+ this.toolStripMenuItem1,
+ this.exitToolStripMenuItem});
+ this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.fileToolStripMenuItem.Text = "File";
+ //
+ // newToolStripMenuItem
+ //
+ this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+ this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.newToolStripMenuItem.Text = "New...";
+ this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
+ //
+ // openToolStripMenuItem
+ //
+ this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.openToolStripMenuItem.Text = "Open...";
+ this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
+ //
+ // saveToolStripMenuItem
+ //
+ this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+ this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.saveToolStripMenuItem.Text = "Save...";
+ //
+ // saveAsToolStripMenuItem
+ //
+ this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
+ this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.saveAsToolStripMenuItem.Text = "Save As...";
+ //
+ // toolStripMenuItem1
+ //
+ this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
+ //
+ // exitToolStripMenuItem
+ //
+ this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.exitToolStripMenuItem.Text = "Exit";
+ //
+ // editToolStripMenuItem
+ //
+ this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.fontToolStripMenuItem,
+ this.wordWrapToolStripMenuItem});
+ this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+ this.editToolStripMenuItem.Text = "Edit";
+ //
+ // fontToolStripMenuItem
+ //
+ this.fontToolStripMenuItem.Name = "fontToolStripMenuItem";
+ this.fontToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.fontToolStripMenuItem.Text = "Font";
+ //
+ // wordWrapToolStripMenuItem
+ //
+ this.wordWrapToolStripMenuItem.Checked = true;
+ this.wordWrapToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.wordWrapToolStripMenuItem.Name = "wordWrapToolStripMenuItem";
+ this.wordWrapToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.wordWrapToolStripMenuItem.Text = "Word Wrap";
+ //
+ // insertToolStripMenuItem
+ //
+ this.insertToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.timeAndDateToolStripMenuItem});
+ this.insertToolStripMenuItem.Name = "insertToolStripMenuItem";
+ this.insertToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+ this.insertToolStripMenuItem.Text = "Insert";
+ //
+ // timeAndDateToolStripMenuItem
+ //
+ this.timeAndDateToolStripMenuItem.Name = "timeAndDateToolStripMenuItem";
+ this.timeAndDateToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+ this.timeAndDateToolStripMenuItem.Text = "Time and Date...";
+ //
+ // helpToolStripMenuItem
+ //
+ this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.aboutToolStripMenuItem});
+ this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+ this.helpToolStripMenuItem.Text = "Help";
+ //
+ // aboutToolStripMenuItem
+ //
+ this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.aboutToolStripMenuItem.Text = "About...";
+ //
+ // textBox
+ //
+ this.textBox.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.textBox.Location = new System.Drawing.Point(0, 24);
+ this.textBox.Name = "textBox";
+ this.textBox.Size = new System.Drawing.Size(315, 265);
+ this.textBox.TabIndex = 1;
+ this.textBox.Text = "";
+ //
+ // openFileDialog1
+ //
+ this.openFileDialog1.FileName = "openFileDialog1";
+ //
+ // TextPad
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.textBox);
+ this.Controls.Add(this.menuStrip1);
+ this.Name = "TextPad";
+ this.Size = new System.Drawing.Size(315, 289);
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.MenuStrip menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+ private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem fontToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem wordWrapToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem insertToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem timeAndDateToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
+ private System.Windows.Forms.RichTextBox textBox;
+ private System.Windows.Forms.OpenFileDialog openFileDialog1;
+ private System.Windows.Forms.SaveFileDialog saveFileDialog1;
+ }
+}
diff --git a/ShiftOS.Main/ShiftOS/Apps/TextPad.cs b/ShiftOS.Main/ShiftOS/Apps/TextPad.cs
new file mode 100644
index 0000000..6c091df
--- /dev/null
+++ b/ShiftOS.Main/ShiftOS/Apps/TextPad.cs
@@ -0,0 +1,54 @@
+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 System.IO;
+using ShiftOS.Engine;
+
+namespace ShiftOS.Main.ShiftOS.Apps
+{
+ public partial class TextPad : UserControl
+ {
+ string editedText;
+ public TextPad()
+ {
+ InitializeComponent();
+ editedText = textBox.Text;
+ }
+ private bool isEdited(string editedString)
+ {
+ editedString = editedText;
+ if(editedString != textBox.Text)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private void openToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (openFileDialog1.ShowDialog() == DialogResult.OK)
+ {
+ var sr = new StreamReader(openFileDialog1.FileName);
+ textBox.Text = sr.ReadToEnd();
+ sr.Close();
+ }
+ }
+
+ private void newToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (isEdited(textBox.Text))
+ {
+ MessageBox.Show("yay it works");
+ }
+ }
+ }
+}
diff --git a/ShiftOS.Main/ShiftOS/Apps/TextPad.resx b/ShiftOS.Main/ShiftOS/Apps/TextPad.resx
new file mode 100644
index 0000000..53f75e1
--- /dev/null
+++ b/ShiftOS.Main/ShiftOS/Apps/TextPad.resx
@@ -0,0 +1,129 @@
+<?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>
+ <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>153, 17</value>
+ </metadata>
+ <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>268, 17</value>
+ </metadata>
+ <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root> \ No newline at end of file
diff --git a/ShiftOS.Main/ShiftOS/Desktop.Designer.cs b/ShiftOS.Main/ShiftOS/Desktop.Designer.cs
index ae2dc17..9a7a4fb 100644
--- a/ShiftOS.Main/ShiftOS/Desktop.Designer.cs
+++ b/ShiftOS.Main/ShiftOS/Desktop.Designer.cs
@@ -32,9 +32,10 @@
this.listView1 = new System.Windows.Forms.ListView();
this.taskbar = new System.Windows.Forms.ToolStrip();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.terminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.taskbarClock = new System.Windows.Forms.ToolStripLabel();
this.timer1 = new System.Windows.Forms.Timer(this.components);
- this.terminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.textPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.taskbar.SuspendLayout();
this.SuspendLayout();
//
@@ -43,7 +44,7 @@
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.Margin = new System.Windows.Forms.Padding(2);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(1277, 684);
this.listView1.TabIndex = 0;
@@ -66,7 +67,8 @@
// toolStripDropDownButton1
//
this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.terminalToolStripMenuItem});
+ this.terminalToolStripMenuItem,
+ this.textPadToolStripMenuItem});
this.toolStripDropDownButton1.Image = global::ShiftOS.Main.Properties.Resources.iconWebBrowser;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
@@ -74,6 +76,13 @@
this.toolStripDropDownButton1.Tag = ((uint)(0u));
this.toolStripDropDownButton1.Text = "Programs";
//
+ // terminalToolStripMenuItem
+ //
+ this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
+ this.terminalToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.terminalToolStripMenuItem.Text = "Terminal";
+ this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click);
+ //
// taskbarClock
//
this.taskbarClock.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -88,12 +97,12 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
- // terminalToolStripMenuItem
+ // textPadToolStripMenuItem
//
- 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);
+ this.textPadToolStripMenuItem.Name = "textPadToolStripMenuItem";
+ this.textPadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.textPadToolStripMenuItem.Text = "TextPad";
+ this.textPadToolStripMenuItem.Click += new System.EventHandler(this.textPadToolStripMenuItem_Click);
//
// Desktop
//
@@ -102,7 +111,7 @@
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.Margin = new System.Windows.Forms.Padding(2);
this.Name = "Desktop";
this.Text = "Desktop";
this.taskbar.ResumeLayout(false);
@@ -120,5 +129,6 @@
private System.Windows.Forms.ToolStripLabel taskbarClock;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripMenuItem terminalToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem textPadToolStripMenuItem;
}
} \ No newline at end of file
diff --git a/ShiftOS.Main/ShiftOS/Desktop.cs b/ShiftOS.Main/ShiftOS/Desktop.cs
index 06f1fc8..66392a7 100644
--- a/ShiftOS.Main/ShiftOS/Desktop.cs
+++ b/ShiftOS.Main/ShiftOS/Desktop.cs
@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.Engine.WindowManager;
+using ShiftOS.Engine;
namespace ShiftOS.Main.ShiftOS
{
@@ -64,5 +65,11 @@ namespace ShiftOS.Main.ShiftOS
ShiftWM.Init(trm, "Terminal", null, false, true);
}
+
+ private void textPadToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var tp = new Apps.TextPad();
+ ShiftWM.Init(tp, "TextPad", Properties.Resources.iconTextPad.ToIcon());
+ }
}
}