Updated fork

Conflicts:
	.vs/ShiftOS/v15/sqlite3/storage.ide

1 files changed, 51 insertions, 30 deletions

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;
     }
 }