From b45df71168d5fa3f817c45194e4019d15b3a2aa0 Mon Sep 17 00:00:00 2001 From: AShifter Date: Sun, 1 Oct 2017 09:52:36 -0600 Subject: [PATCH] Shifting is working owow --- .vs/ShiftOS/v15/sqlite3/storage.ide | Bin 659456 -> 835584 bytes ShiftOS.Engine/ShiftOS.Engine.csproj | 1 + ShiftOS.Engine/WindowManager/ShiftArray.cs | 12 +++ ShiftOS.Engine/WindowManager/ShiftWM.cs | 2 +- .../Apps/ShifterStuff/SelectColor.Designer.cs | 81 +++++++++++------- .../ShiftOS/Apps/ShifterStuff/SelectColor.cs | 45 ++++------ .../Apps/ShifterStuff/Shifter.Designer.cs | 30 +++++++ .../ShiftOS/Apps/ShifterStuff/Shifter.cs | 10 +++ ShiftOS.Main/ShiftOS/Apps/TestForm.cs | 8 +- 9 files changed, 125 insertions(+), 64 deletions(-) create mode 100644 ShiftOS.Engine/WindowManager/ShiftArray.cs diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide index 3be545347161e0f3a0bdb4b06d984fe738e3e343..8466a5c5f121ec0935f907a065600c6485305ba9 100644 GIT binary patch delta 86058 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 InfoboxTemplate.cs + Form diff --git a/ShiftOS.Engine/WindowManager/ShiftArray.cs b/ShiftOS.Engine/WindowManager/ShiftArray.cs new file mode 100644 index 0000000..bfb3cde --- /dev/null +++ b/ShiftOS.Engine/WindowManager/ShiftArray.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Engine.WindowManager +{ + class ShiftArray + { + } +} diff --git a/ShiftOS.Engine/WindowManager/ShiftWM.cs b/ShiftOS.Engine/WindowManager/ShiftWM.cs index 0c69fb7..594848a 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWM.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWM.cs @@ -18,7 +18,7 @@ namespace ShiftOS.Engine.WindowManager } /// - /// Shows a new Window based on a UserControl. + /// Shows a new ShiftWindow based on a UserControl. /// /// The UserControl to use /// The program's title diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs index e305651..a7473a0 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs @@ -31,10 +31,13 @@ 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.redUpDown = new System.Windows.Forms.NumericUpDown(); + this.greenUpDown = new System.Windows.Forms.NumericUpDown(); + this.blueUpDown = new System.Windows.Forms.NumericUpDown(); + ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit(); this.SuspendLayout(); // // label1 @@ -64,27 +67,6 @@ 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; @@ -96,20 +78,59 @@ this.btnSetColor.UseVisualStyleBackColor = true; this.btnSetColor.Click += new System.EventHandler(this.btnSetColor_Click); // + // redUpDown + // + this.redUpDown.Location = new System.Drawing.Point(82, 32); + this.redUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.redUpDown.Name = "redUpDown"; + this.redUpDown.Size = new System.Drawing.Size(120, 20); + this.redUpDown.TabIndex = 7; + // + // greenUpDown + // + this.greenUpDown.Location = new System.Drawing.Point(82, 60); + this.greenUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.greenUpDown.Name = "greenUpDown"; + this.greenUpDown.Size = new System.Drawing.Size(120, 20); + this.greenUpDown.TabIndex = 8; + // + // blueUpDown + // + this.blueUpDown.Location = new System.Drawing.Point(82, 90); + this.blueUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.blueUpDown.Name = "blueUpDown"; + this.blueUpDown.Size = new System.Drawing.Size(120, 20); + this.blueUpDown.TabIndex = 9; + // // SelectColor // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.blueUpDown); + this.Controls.Add(this.greenUpDown); + this.Controls.Add(this.redUpDown); 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); + ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -120,9 +141,9 @@ 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; + private System.Windows.Forms.NumericUpDown redUpDown; + private System.Windows.Forms.NumericUpDown greenUpDown; + private System.Windows.Forms.NumericUpDown blueUpDown; } } diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs index 697e22e..f9f8f72 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs @@ -14,40 +14,31 @@ namespace ShiftOS.Main.ShiftOS.Apps public SelectColor() { InitializeComponent(); - + } private void btnSetColor_Click(object sender, EventArgs e) { + _colorType1 = Int32.Parse(redUpDown.Value.ToString()); + _colorType2 = Int32.Parse(greenUpDown.Value.ToString()); + _colorType3 = Int32.Parse(blueUpDown.Value.ToString()); try { - _colorType1 = Convert.ToInt32(textBox1.Text); - _colorType2 = Convert.ToInt32(textBox2.Text); - _colorType3 = Convert.ToInt32(textBox3.Text); - } - catch(FormatException ex) - { - ShiftWM.StartInfoboxSession("Error!", "Failed to parse integer. Error:\n" + ex, 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); - BackColor = _finalColor; - ShiftWM.StartInfoboxSession("Success!", "Changed color to:\n" + _colorType1.ToString() + ", " + _colorType2.ToString() + ", " + _colorType3.ToString() + ".", InfoboxTemplate.ButtonType.Ok); - } - catch (Exception) - { - ShiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.ButtonType.Ok); + _finalColor = Color.FromArgb(_colorType1, _colorType2, _colorType3); + //BackColor = _finalColor; + + foreach (var window in ShiftWM.Windows) +{ + window.Invoke(new Action(() => window.top.BackColor = _finalColor)); } + + ShiftWM.StartInfoboxSession("Success!", $"Changed color to:\r\n{_colorType1}, {_colorType2}, {_colorType3}.", InfoboxTemplate.ButtonType.Ok); } + catch (Exception) + { + ShiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.ButtonType.Ok); + } + //return _finalColor; } } -} + } diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs index a89dca4..51bce9c 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs @@ -33,6 +33,8 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.button1 = new System.Windows.Forms.Button(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -53,6 +55,8 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.button3); + this.tabPage1.Controls.Add(this.button2); this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; @@ -94,6 +98,30 @@ this.tabPage2.Text = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // + // button2 + // + this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button2.Font = new System.Drawing.Font("Lucida Console", 8.25F); + this.button2.Location = new System.Drawing.Point(171, 267); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(149, 23); + this.button2.TabIndex = 2; + this.button2.Text = "Set Colorful Skin"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button3.Font = new System.Drawing.Font("Lucida Console", 8.25F); + this.button3.Location = new System.Drawing.Point(6, 267); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(149, 23); + this.button3.TabIndex = 3; + this.button3.Text = "Set Default Skin"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // // Shifter // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -115,5 +143,7 @@ private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button button1; private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button2; } } diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs index 098920f..5d5ad7d 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs @@ -18,5 +18,15 @@ namespace ShiftOS.Main.ShiftOS.Apps colorType = 1; ShiftWM.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw.ToIcon()); } + + private void button3_Click(object sender, EventArgs e) + { + + } + + private void button2_Click(object sender, EventArgs e) + { + + } } } diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs index 1fd3b18..389f8d1 100644 --- a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs @@ -17,12 +17,8 @@ namespace ShiftOS.Main private void Button1_Click(object sender, EventArgs e) { - ShiftDemo demo = new ShiftDemo {label1 = {Text = textBox2.Text}}; - - var item = typeof(SystemIcons).GetProperties() - .First(p => p.Name == comboBox1.SelectedItem as string); - - ShiftWM.Init(demo, textBox1.Text, (item.GetMethod.Invoke(null, new object[0]) as Icon)); + ShiftDemo demo = new ShiftDemo(); + ShiftWM.Init(demo, textBox1.Text, null); ShiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.ButtonType.Ok); }