From 44d8d5c50749b70e93dd5ccf8718645d8c3d2fad Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Sun, 24 Sep 2017 21:06:41 -0500 Subject: [PATCH] Added a clunky Shifter, made the wm look nicer --- .vs/ShiftOS/v15/sqlite3/storage.ide | Bin 3387392 -> 3395584 bytes .../WindowManager/ShiftWindow.Designer.cs | 12 +- ShiftOS.Engine/WindowManager/ShiftWindow.cs | 29 ++++ ShiftOS.Main/ShiftOS.Main.csproj | 15 +- .../Apps/ShifterStuff/SelectColor.Designer.cs | 128 ++++++++++++++++++ .../ShiftOS/Apps/ShifterStuff/SelectColor.cs | 60 ++++++++ .../SelectColor.resx} | 0 .../{ => ShifterStuff}/Shifter.Designer.cs | 24 ++-- .../Apps/{ => ShifterStuff}/Shifter.cs | 10 +- .../ShiftOS/Apps/ShifterStuff/Shifter.resx | 120 ++++++++++++++++ .../ShiftOS/Apps/TestForm.Designer.cs | 15 +- ShiftOS.Main/ShiftOS/Apps/TestForm.cs | 6 + 12 files changed, 394 insertions(+), 25 deletions(-) create mode 100644 ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs create mode 100644 ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs rename ShiftOS.Main/ShiftOS/Apps/{Shifter.resx => ShifterStuff/SelectColor.resx} (100%) rename ShiftOS.Main/ShiftOS/Apps/{ => ShifterStuff}/Shifter.Designer.cs (97%) rename ShiftOS.Main/ShiftOS/Apps/{ => ShifterStuff}/Shifter.cs (68%) create mode 100644 ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.resx diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide index 020954658b1f031db104f75b50baf547e38d4b46..1d1331faa619303609d7caea898742c68a4648c8 100644 GIT binary patch delta 20132 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 x3@4@SZ?*eM+`d_=FtDFD; diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs index 0b215a9..c26e724 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs @@ -155,21 +155,25 @@ // this.maximizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right; this.maximizebutton.BackColor = System.Drawing.Color.Black; - this.maximizebutton.Location = new System.Drawing.Point(228, 5); + this.maximizebutton.Location = new System.Drawing.Point(231, 4); this.maximizebutton.Name = "maximizebutton"; this.maximizebutton.Size = new System.Drawing.Size(21, 21); this.maximizebutton.TabIndex = 6; this.maximizebutton.TabStop = false; + this.maximizebutton.MouseEnter += new System.EventHandler(this.maximizebutton_MouseEnter); + this.maximizebutton.MouseLeave += new System.EventHandler(this.maximizebutton_MouseLeave); // // minimizebutton // this.minimizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right; this.minimizebutton.BackColor = System.Drawing.Color.Black; - this.minimizebutton.Location = new System.Drawing.Point(205, 5); + this.minimizebutton.Location = new System.Drawing.Point(208, 4); this.minimizebutton.Name = "minimizebutton"; this.minimizebutton.Size = new System.Drawing.Size(21, 21); this.minimizebutton.TabIndex = 5; this.minimizebutton.TabStop = false; + this.minimizebutton.MouseEnter += new System.EventHandler(this.minimizebutton_MouseEnter); + this.minimizebutton.MouseLeave += new System.EventHandler(this.minimizebutton_MouseLeave); // // Title // @@ -188,12 +192,14 @@ // this.closebutton.Anchor = System.Windows.Forms.AnchorStyles.Right; this.closebutton.BackColor = System.Drawing.Color.Black; - this.closebutton.Location = new System.Drawing.Point(251, 5); + this.closebutton.Location = new System.Drawing.Point(254, 4); this.closebutton.Name = "closebutton"; this.closebutton.Size = new System.Drawing.Size(21, 21); this.closebutton.TabIndex = 4; this.closebutton.TabStop = false; this.closebutton.Click += new System.EventHandler(this.closebutton_Click); + this.closebutton.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter); + this.closebutton.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave); // // right // diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.cs index 9caaa6c..a004aa6 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWindow.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWindow.cs @@ -40,5 +40,34 @@ namespace ShiftOS.Engine.WindowManager this.Close(); } + private void closebutton_MouseEnter(object sender, EventArgs e) + { + closebutton.BackColor = Color.Gray; + } + + private void closebutton_MouseLeave(object sender, EventArgs e) + { + closebutton.BackColor = Color.Black; + } + + private void maximizebutton_MouseEnter(object sender, EventArgs e) + { + maximizebutton.BackColor = Color.Gray; + } + + private void maximizebutton_MouseLeave(object sender, EventArgs e) + { + maximizebutton.BackColor = Color.Black; + } + + private void minimizebutton_MouseEnter(object sender, EventArgs e) + { + minimizebutton.BackColor = Color.Gray; + } + + private void minimizebutton_MouseLeave(object sender, EventArgs e) + { + minimizebutton.BackColor = Color.Black; + } } } diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index d6ea600..18e842f 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -52,16 +52,22 @@ + + UserControl + + + SelectColor.cs + UserControl ShiftDemo.cs - + UserControl - + Shifter.cs @@ -83,10 +89,13 @@ Resources.resx True + + SelectColor.cs + ShiftDemo.cs - + Shifter.cs diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs new file mode 100644 index 0000000..e305651 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs @@ -0,0 +1,128 @@ +namespace ShiftOS.Main.ShiftOS.Apps +{ + partial class SelectColor + { + /// + /// 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.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.btnSetColor = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 34); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(39, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Red:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(21, 62); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(55, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Green:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(21, 92); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(47, 13); + this.label3.TabIndex = 2; + this.label3.Text = "Blue:"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(75, 27); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(206, 20); + this.textBox1.TabIndex = 3; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(75, 58); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(206, 20); + this.textBox2.TabIndex = 4; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(75, 88); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(206, 20); + this.textBox3.TabIndex = 5; + // + // btnSetColor + // + this.btnSetColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSetColor.Location = new System.Drawing.Point(75, 121); + this.btnSetColor.Name = "btnSetColor"; + this.btnSetColor.Size = new System.Drawing.Size(93, 23); + this.btnSetColor.TabIndex = 6; + this.btnSetColor.Text = "Set Color"; + this.btnSetColor.UseVisualStyleBackColor = true; + this.btnSetColor.Click += new System.EventHandler(this.btnSetColor_Click); + // + // SelectColor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.btnSetColor); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Font = new System.Drawing.Font("Lucida Console", 9.25F); + this.Name = "SelectColor"; + this.Size = new System.Drawing.Size(317, 158); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Button btnSetColor; + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs new file mode 100644 index 0000000..175d1cb --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs @@ -0,0 +1,60 @@ +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.WindowManager; + +namespace ShiftOS.Main.ShiftOS.Apps +{ + public partial class SelectColor : UserControl + { + ShiftWM shiftWM = new ShiftWM(); + Color finalColor; + int colorType1; + int colorType2; + int colorType3; + public SelectColor() + { + InitializeComponent(); + + } + + private void btnSetColor_Click(object sender, EventArgs e) + { + try + { + colorType1 = Convert.ToInt32(textBox1.Text); + colorType2 = Convert.ToInt32(textBox2.Text); + colorType3 = Convert.ToInt32(textBox3.Text); + } + catch + { + shiftWM.StartInfoboxSession("Error!", "Cannot parse a string.", InfoboxTemplate.buttonType.OK); + } + + if (colorType1 > 255 || colorType2 > 255 || colorType3 > 255) + { + shiftWM.StartInfoboxSession("Error!", "A value cannot be greater than 255!", InfoboxTemplate.buttonType.OK); + } + else + { + try + { + ShiftWindow sw = new ShiftWindow(); + finalColor = Color.FromArgb(colorType1, colorType2, colorType3); + this.BackColor = finalColor; + shiftWM.StartInfoboxSession("Success!", "Changed color to:\n" + colorType1.ToString() + ", " + colorType2.ToString() + ", " + colorType3.ToString() + ".", InfoboxTemplate.buttonType.OK); + } + catch (Exception ex) + { + shiftWM.StartInfoboxSession("Error!", "An exception occured while setting the color! Exception: \n" + ex, InfoboxTemplate.buttonType.OK); + } + } + } + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/Shifter.resx b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.resx similarity index 100% rename from ShiftOS.Main/ShiftOS/Apps/Shifter.resx rename to ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.resx diff --git a/ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs similarity index 97% rename from ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs rename to ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs index 0e9b2b4..a89dca4 100644 --- a/ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs @@ -30,9 +30,9 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tabPage2 = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.button1 = new System.Windows.Forms.Button(); + this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -59,19 +59,9 @@ this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Size = new System.Drawing.Size(326, 296); this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "tabPage1"; + this.tabPage1.Text = "Titlebar"; this.tabPage1.UseVisualStyleBackColor = true; // - // tabPage2 - // - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(192, 74); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "tabPage2"; - this.tabPage2.UseVisualStyleBackColor = true; - // // groupBox1 // this.groupBox1.Controls.Add(this.button1); @@ -94,6 +84,16 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // tabPage2 + // + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(326, 296); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "tabPage2"; + this.tabPage2.UseVisualStyleBackColor = true; + // // Shifter // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/ShiftOS.Main/ShiftOS/Apps/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs similarity index 68% rename from ShiftOS.Main/ShiftOS/Apps/Shifter.cs rename to ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs index ce80f2b..74b2079 100644 --- a/ShiftOS.Main/ShiftOS/Apps/Shifter.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs @@ -13,6 +13,8 @@ namespace ShiftOS.Main.ShiftOS.Apps { public partial class Shifter : UserControl { + public int colorType; //This is a check to see what option was chosen. + ShiftWM wm = new ShiftWM(); public Shifter() { InitializeComponent(); @@ -20,12 +22,8 @@ namespace ShiftOS.Main.ShiftOS.Apps private void button1_Click(object sender, EventArgs e) { - ColorDialog cD = new ColorDialog(); - if (cD.ShowDialog() == DialogResult.OK) - { - ShiftWindow sw = new ShiftWindow(); - sw.top.BackColor = cD.Color; - } + colorType = 1; + wm.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw); } } } diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.resx b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.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 index 654466d..7049a7e 100644 --- a/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs @@ -31,6 +31,7 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // textBox1 @@ -53,17 +54,28 @@ // this.button1.Location = new System.Drawing.Point(12, 65); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(260, 23); + this.button1.Size = new System.Drawing.Size(128, 23); this.button1.TabIndex = 2; this.button1.Text = "Create Window"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.Button1_Click); // + // button2 + // + this.button2.Location = new System.Drawing.Point(146, 65); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(126, 23); + this.button2.TabIndex = 4; + this.button2.Text = "Test Shifter"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_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.button2); this.Controls.Add(this.button1); this.Controls.Add(this.textBox2); this.Controls.Add(this.textBox1); @@ -79,5 +91,6 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; } } \ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs index 91055af..c8cd086 100644 --- a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs @@ -1,6 +1,7 @@ using System; using System.Windows.Forms; using ShiftOS.Engine.WindowManager; +using ShiftOS.Main.ShiftOS.Apps; namespace ShiftOS.Main { @@ -20,5 +21,10 @@ namespace ShiftOS.Main shiftWM.Init(demo, textBox1.Text, null); shiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.buttonType.OK); } + + private void button2_Click(object sender, EventArgs e) + { + shiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter); + } } }