From 0a552e395477d2bb4c90e12624d11b28545a4933 Mon Sep 17 00:00:00 2001 From: AShifter Date: Sun, 24 Sep 2017 13:56:11 -0600 Subject: Update WM It's pretty much done. Pair with DE, and serve hot. --- ShiftOS.Main/ShiftDemo.Designer.cs | 59 ------------ ShiftOS.Main/ShiftDemo.cs | 20 ---- ShiftOS.Main/ShiftDemo.resx | 120 ------------------------ ShiftOS.Main/ShiftOS.Main.csproj | 12 +-- ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs | 59 ++++++++++++ ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs | 20 ++++ ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx | 120 ++++++++++++++++++++++++ ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs | 83 ++++++++++++++++ ShiftOS.Main/ShiftOS/Apps/TestForm.cs | 23 +++++ ShiftOS.Main/ShiftOS/Apps/TestForm.resx | 120 ++++++++++++++++++++++++ ShiftOS.Main/TestForm.Designer.cs | 83 ---------------- ShiftOS.Main/TestForm.cs | 23 ----- ShiftOS.Main/TestForm.resx | 120 ------------------------ 13 files changed, 431 insertions(+), 431 deletions(-) delete mode 100644 ShiftOS.Main/ShiftDemo.Designer.cs delete mode 100644 ShiftOS.Main/ShiftDemo.cs delete mode 100644 ShiftOS.Main/ShiftDemo.resx create mode 100644 ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs create mode 100644 ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs create mode 100644 ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx create mode 100644 ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs create mode 100644 ShiftOS.Main/ShiftOS/Apps/TestForm.cs create mode 100644 ShiftOS.Main/ShiftOS/Apps/TestForm.resx delete mode 100644 ShiftOS.Main/TestForm.Designer.cs delete mode 100644 ShiftOS.Main/TestForm.cs delete mode 100644 ShiftOS.Main/TestForm.resx (limited to 'ShiftOS.Main') diff --git a/ShiftOS.Main/ShiftDemo.Designer.cs b/ShiftOS.Main/ShiftDemo.Designer.cs deleted file mode 100644 index 5c3a0de..0000000 --- a/ShiftOS.Main/ShiftDemo.Designer.cs +++ /dev/null @@ -1,59 +0,0 @@ -namespace ShiftOS.Main -{ - partial class ShiftDemo - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.label1 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 16); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(35, 13); - this.label1.TabIndex = 0; - this.label1.Text = "label1"; - // - // ShiftDemo - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label1); - this.Name = "ShiftDemo"; - this.Size = new System.Drawing.Size(300, 300); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - public System.Windows.Forms.Label label1; - } -} diff --git a/ShiftOS.Main/ShiftDemo.cs b/ShiftOS.Main/ShiftDemo.cs deleted file mode 100644 index 1f400c8..0000000 --- a/ShiftOS.Main/ShiftDemo.cs +++ /dev/null @@ -1,20 +0,0 @@ -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; - -namespace ShiftOS.Main -{ - public partial class ShiftDemo : UserControl - { - public ShiftDemo() - { - InitializeComponent(); - } - } -} diff --git a/ShiftOS.Main/ShiftDemo.resx b/ShiftOS.Main/ShiftDemo.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ShiftOS.Main/ShiftDemo.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index 1343d99..77bf889 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -52,16 +52,16 @@ - + UserControl - + ShiftDemo.cs - + Form - + TestForm.cs @@ -77,10 +77,10 @@ Resources.resx True - + ShiftDemo.cs - + TestForm.cs diff --git a/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs new file mode 100644 index 0000000..5c3a0de --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs @@ -0,0 +1,59 @@ +namespace ShiftOS.Main +{ + partial class ShiftDemo + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(18, 16); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(35, 13); + this.label1.TabIndex = 0; + this.label1.Text = "label1"; + // + // ShiftDemo + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Name = "ShiftDemo"; + this.Size = new System.Drawing.Size(300, 300); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + public System.Windows.Forms.Label label1; + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs new file mode 100644 index 0000000..1f400c8 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs @@ -0,0 +1,20 @@ +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; + +namespace ShiftOS.Main +{ + public partial class ShiftDemo : UserControl + { + public ShiftDemo() + { + InitializeComponent(); + } + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs new file mode 100644 index 0000000..654466d --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs @@ -0,0 +1,83 @@ +namespace ShiftOS.Main +{ + partial class TestForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 13); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(260, 20); + this.textBox1.TabIndex = 0; + this.textBox1.Text = "Title"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(12, 39); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(260, 20); + this.textBox2.TabIndex = 1; + this.textBox2.Text = "Contents"; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(12, 65); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(260, 23); + this.button1.TabIndex = 2; + this.button1.Text = "Create Window"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.Button1_Click); + // + // TestForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(284, 100); + this.Controls.Add(this.button1); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Name = "TestForm"; + this.Text = "TestForm"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Button button1; + } +} \ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs new file mode 100644 index 0000000..85be4a3 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs @@ -0,0 +1,23 @@ +using System; +using System.Windows.Forms; +using ShiftOS.Engine.WindowManager; + +namespace ShiftOS.Main +{ + public partial class TestForm : Form + { + public ShiftWM shiftWM = new ShiftWM(); + + public TestForm() + { + InitializeComponent(); + } + + private void Button1_Click(object sender, EventArgs e) + { + ShiftDemo demo = new ShiftDemo(); + demo.label1.Text = textBox2.Text; + shiftWM.Init(demo, textBox1.Text, null); + } + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.resx b/ShiftOS.Main/ShiftOS/Apps/TestForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS.Main/TestForm.Designer.cs b/ShiftOS.Main/TestForm.Designer.cs deleted file mode 100644 index 654466d..0000000 --- a/ShiftOS.Main/TestForm.Designer.cs +++ /dev/null @@ -1,83 +0,0 @@ -namespace ShiftOS.Main -{ - partial class TestForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(12, 13); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(260, 20); - this.textBox1.TabIndex = 0; - this.textBox1.Text = "Title"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(12, 39); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(260, 20); - this.textBox2.TabIndex = 1; - this.textBox2.Text = "Contents"; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(12, 65); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(260, 23); - this.button1.TabIndex = 2; - this.button1.Text = "Create Window"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.Button1_Click); - // - // TestForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 100); - this.Controls.Add(this.button1); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); - this.Name = "TestForm"; - this.Text = "TestForm"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Button button1; - } -} \ No newline at end of file diff --git a/ShiftOS.Main/TestForm.cs b/ShiftOS.Main/TestForm.cs deleted file mode 100644 index e1f926f..0000000 --- a/ShiftOS.Main/TestForm.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Windows.Forms; -using ShiftOS.Engine.WindowManager; - -namespace ShiftOS.Main -{ - public partial class TestForm : Form - { - public ShiftWM shiftWM = new ShiftWM(); - public ShiftDemo demo = new ShiftDemo(); - - public TestForm() - { - InitializeComponent(); - } - - private void Button1_Click(object sender, EventArgs e) - { - demo.label1.Text = textBox2.Text; - shiftWM.Init(demo, textBox1.Text); - } - } -} diff --git a/ShiftOS.Main/TestForm.resx b/ShiftOS.Main/TestForm.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ShiftOS.Main/TestForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file -- cgit v1.2.3