diff options
Diffstat (limited to 'ShiftOS.Main/ShiftOS/Apps/ShifterStuff')
4 files changed, 179 insertions, 98 deletions
diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs index 5d50bc0..5e617cb 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs @@ -128,6 +128,7 @@ this.Font = new System.Drawing.Font("Lucida Console", 9.25F); this.Name = "SelectColor"; this.Size = new System.Drawing.Size(317, 158); + this.Load += new System.EventHandler(this.SelectColor_Load); ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).EndInit(); diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs index 5e335b0..3da3b98 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Globalization; using System.Windows.Forms; using ShiftOS.Engine.WindowManager; +using ShiftOS.Engine.UI; namespace ShiftOS.Main.ShiftOS.Apps.ShifterStuff { @@ -50,5 +51,13 @@ namespace ShiftOS.Main.ShiftOS.Apps.ShifterStuff { SetColor(); } - } + + private void SelectColor_Load(object sender, EventArgs e) + { + var s = new ShiftButton(); + s.Location = new System.Drawing.Point(211, 48); + s.Text = "test"; + Controls.Add(s); + } + } }
\ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs index 8bbbac2..d94aebe 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs @@ -30,6 +30,8 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.button6 = new System.Windows.Forms.Button(); + this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button(); @@ -38,7 +40,8 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.button1 = new System.Windows.Forms.Button(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.btnLoad = new System.Windows.Forms.Button(); + this.shiftButton1 = new Engine.UI.ShiftButton(); + this.button7 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -59,6 +62,9 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.button7); + this.tabPage1.Controls.Add(this.shiftButton1); + this.tabPage1.Controls.Add(this.button6); this.tabPage1.Controls.Add(this.btnLoad); this.tabPage1.Controls.Add(this.btnSave); this.tabPage1.Controls.Add(this.button5); @@ -74,6 +80,30 @@ this.tabPage1.Text = "Titlebar"; this.tabPage1.UseVisualStyleBackColor = true; // + // button6 + // + this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button6.Font = new System.Drawing.Font("Lucida Console", 8.25F); + this.button6.Location = new System.Drawing.Point(6, 152); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(314, 23); + this.button6.TabIndex = 8; + this.button6.Text = "Set Midnight Skin"; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.button6_Click); + // + // btnLoad + // + this.btnLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnLoad.Font = new System.Drawing.Font("Lucida Console", 8.25F); + this.btnLoad.Location = new System.Drawing.Point(165, 267); + this.btnLoad.Name = "btnLoad"; + this.btnLoad.Size = new System.Drawing.Size(155, 23); + this.btnLoad.TabIndex = 7; + this.btnLoad.Text = "Load Skin"; + this.btnLoad.UseVisualStyleBackColor = true; + this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click); + // // btnSave // this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -96,7 +126,6 @@ this.button5.TabIndex = 5; this.button5.Text = "Apply"; this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); // // button4 // @@ -166,17 +195,33 @@ this.tabPage2.Text = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // - // btnLoad + // shiftButton1 // - this.btnLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnLoad.Font = new System.Drawing.Font("Lucida Console", 8.25F); - this.btnLoad.Location = new System.Drawing.Point(165, 267); - this.btnLoad.Name = "btnLoad"; - this.btnLoad.Size = new System.Drawing.Size(155, 23); - this.btnLoad.TabIndex = 7; - this.btnLoad.Text = "Load Skin"; - this.btnLoad.UseVisualStyleBackColor = true; - this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click); + this.shiftButton1.BackColor = System.Drawing.Color.White; + this.shiftButton1.FlatAppearance.BorderColor = System.Drawing.Color.Gray; + this.shiftButton1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.shiftButton1.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.shiftButton1.ForeColor = System.Drawing.Color.Black; + this.shiftButton1.Location = new System.Drawing.Point(205, 25); + this.shiftButton1.Margin = new System.Windows.Forms.Padding(0); + this.shiftButton1.MinimumSize = new System.Drawing.Size(75, 23); + this.shiftButton1.Name = "shiftButton1"; + this.shiftButton1.Padding = new System.Windows.Forms.Padding(3); + this.shiftButton1.Size = new System.Drawing.Size(100, 23); + this.shiftButton1.TabIndex = 9; + this.shiftButton1.Text = "ShiftButton"; + this.shiftButton1.UseVisualStyleBackColor = false; + // + // button7 + // + this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button7.Font = new System.Drawing.Font("Lucida Console", 8.25F); + this.button7.Location = new System.Drawing.Point(205, 51); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(100, 23); + this.button7.TabIndex = 10; + this.button7.Text = "NormalBtn"; + this.button7.UseVisualStyleBackColor = true; // // Shifter // @@ -205,5 +250,8 @@ private System.Windows.Forms.Button button5; private System.Windows.Forms.Button btnSave; private System.Windows.Forms.Button btnLoad; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Button button7; + private Engine.UI.ShiftButton shiftButton1; } } diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs index bf116e9..2c3cd8e 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs @@ -12,7 +12,6 @@ namespace ShiftOS.Main.ShiftOS.Apps.ShifterStuff public partial class Shifter : UserControl { public int ColorType; //This is a check to see what option was chosen. - public Shifter() { InitializeComponent(); @@ -24,95 +23,106 @@ namespace ShiftOS.Main.ShiftOS.Apps.ShifterStuff ShiftWM.Init(new SelectColor(), "Select a color", Resources.iconColourPicker_fw); } - void SetDefaultSkin(object sender, EventArgs e) + /// <summary> + /// Modifies the values in ShiftShiftSkinData.Colors. + /// </summary> + /// <param name="borderColor">The border color of the window.</param> + /// <param name="btnClose">The close button color of the window.</param> + /// <param name="btnCloseHover">The close button color of the window while hovering.</param> + /// <param name="btnMax">The maximize button color of the window.</param> + /// <param name="btnMaxHover">The maximize button color of the window while hovering.</param> + /// <param name="btnMin">The minimize button color of the window.</param> + /// <param name="btnMinHover">The minimize button color of the window while hovering.</param> + void ModifyData(Color borderColor, Color btnClose, Color btnCloseHover, Color btnMax, Color btnMaxHover, Color btnMin, Color btnMinHover) + { + SetBorderColor(borderColor); + ShiftSkinData.Colors.BtnCloseColor = btnClose; + ShiftSkinData.Colors.BtnCloseHoverColor = btnCloseHover; + ShiftSkinData.Colors.BtnMaxColor = btnMax; + ShiftSkinData.Colors.BtnMaxHoverColor = btnMaxHover; + ShiftSkinData.Colors.BtnMinColor = btnMin; + ShiftSkinData.Colors.BtnMinHoverColor = btnMinHover; + } + + // SetBorderColor + public void SetBorderColor(Color borderColor) + { + ShiftSkinData.Colors.LeftTopCornerColor = borderColor; + ShiftSkinData.Colors.TitleBarColor = borderColor; + ShiftSkinData.Colors.RightTopCornerColor = borderColor; + ShiftSkinData.Colors.LeftSideColor = borderColor; + ShiftSkinData.Colors.RightSideColor = borderColor; + ShiftSkinData.Colors.LeftBottomCornerColor = borderColor; + ShiftSkinData.Colors.BottomSideColor = borderColor; + ShiftSkinData.Colors.RightBottomCornerColor = borderColor; + } + + void SetDefaultSkin(object sender, EventArgs e) { - int offset = 30; - SetBorderColor(Color.FromArgb(64, 64, 64)); - ShiftSkinData.BtnCloseColor = Color.Black; - ShiftSkinData.BtnCloseHoverColor = Color.FromArgb(40, 40, 40); - ShiftSkinData.BtnMaxColor = Color.Black; - ShiftSkinData.BtnMaxHoverColor = Color.FromArgb(40, 40, 40); - ShiftSkinData.BtnMinColor = Color.Black; - ShiftSkinData.BtnMinHoverColor = Color.FromArgb(40, 40, 40); - button5_Click(sender, e); + ModifyData(Color.FromArgb(64, 64, 64), Color.Black, Color.FromArgb(40, 40, 40), Color.Black, Color.FromArgb(40, 40, 40), Color.Black, Color.FromArgb(40, 40, 40)); + ApplySkin(); } void SetColorSkin(object sender, EventArgs e) { - SetBorderColor(Color.Blue); - ShiftSkinData.BtnCloseColor = Color.Red; - ShiftSkinData.BtnMaxColor = Color.Yellow; - ShiftSkinData.BtnMinColor = Color.Green; - ShiftSkinData.BtnCloseHoverColor = Color.FromArgb(255, 102, 102); - ShiftSkinData.BtnMaxHoverColor = Color.FromArgb(255, 255, 153); - ShiftSkinData.BtnMinColor = Color.FromArgb(102, 255, 102); - button5_Click(sender, e); + ModifyData(Color.Blue, Color.Red, Color.FromArgb(255, 102, 102), Color.Yellow, Color.FromArgb(255, 255, 153), Color.Green, Color.FromArgb(102, 255, 102)); + ApplySkin(); } void SetRandomSkin(object sender, EventArgs e) { var rnd = new Random(); - SetBorderColor(Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255))); - ShiftSkinData.BtnCloseColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)); - ShiftSkinData.BtnMaxColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)); - ShiftSkinData.BtnMinColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)); - ShiftSkinData.BtnCloseHoverColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)); - ShiftSkinData.BtnMaxHoverColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)); - ShiftSkinData.BtnMinHoverColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)); - button5_Click(sender, e); + ModifyData( + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)), // Border Color + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)), // Close Button Color + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)), // Close Hover Color + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)), // Maximize Button Color + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)), // Maximize Hover Color + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)), // Minimize Button Color + Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255))); // Minimize Hover Color + ApplySkin(); } - // SetBorderColor - public void SetBorderColor(Color borderColor) - { - ShiftSkinData.LeftTopCornerColor = borderColor; - ShiftSkinData.TitleBarColor = borderColor; - ShiftSkinData.RightTopCornerColor = borderColor; - ShiftSkinData.LeftSideColor = borderColor; - ShiftSkinData.RightSideColor = borderColor; - ShiftSkinData.LeftBottomCornerColor = borderColor; - ShiftSkinData.BottomSideColor = borderColor; - ShiftSkinData.RightBottomCornerColor = borderColor; - } - - void button5_Click(object sender, EventArgs e) + void ApplySkin() { foreach (var window in ShiftWM.Windows) { - window.Invoke(new Action(() => window.titleBar.BackColor = ShiftSkinData.TitleBarColor)); - window.Invoke(new Action(() => window.leftTopCorner.BackColor = ShiftSkinData.LeftTopCornerColor)); - window.Invoke(new Action(() => window.rightTopCorner.BackColor = ShiftSkinData.RightTopCornerColor)); - window.Invoke(new Action(() => window.leftSide.BackColor = ShiftSkinData.LeftSideColor)); - window.Invoke(new Action(() => window.rightSide.BackColor = ShiftSkinData.RightSideColor)); - window.Invoke(new Action(() => window.leftBottomCorner.BackColor = ShiftSkinData.LeftBottomCornerColor)); - window.Invoke(new Action(() => window.bottomSide.BackColor = ShiftSkinData.BottomSideColor)); - window.Invoke(new Action(() => window.rightBottomCorner.BackColor = ShiftSkinData.RightBottomCornerColor)); - window.Invoke(new Action(() => window.btnClose.BackColor = ShiftSkinData.BtnCloseColor)); - window.Invoke(new Action(() => window.btnMax.BackColor = ShiftSkinData.BtnMaxColor)); - window.Invoke(new Action(() => window.btnMin.BackColor = ShiftSkinData.BtnMinColor)); + window.Invoke(new Action(() => window.titleBar.BackColor = ShiftSkinData.Colors.TitleBarColor)); + window.Invoke(new Action(() => window.leftTopCorner.BackColor = ShiftSkinData.Colors.LeftTopCornerColor)); + window.Invoke(new Action(() => window.rightTopCorner.BackColor = ShiftSkinData.Colors.RightTopCornerColor)); + window.Invoke(new Action(() => window.leftSide.BackColor = ShiftSkinData.Colors.LeftSideColor)); + window.Invoke(new Action(() => window.rightSide.BackColor = ShiftSkinData.Colors.RightSideColor)); + window.Invoke(new Action(() => window.leftBottomCorner.BackColor = ShiftSkinData.Colors.LeftBottomCornerColor)); + window.Invoke(new Action(() => window.bottomSide.BackColor = ShiftSkinData.Colors.BottomSideColor)); + window.Invoke(new Action(() => window.rightBottomCorner.BackColor = ShiftSkinData.Colors.RightBottomCornerColor)); + window.Invoke(new Action(() => window.btnClose.BackColor = ShiftSkinData.Colors.BtnCloseColor)); + window.Invoke(new Action(() => window.btnMax.BackColor = ShiftSkinData.Colors.BtnMaxColor)); + window.Invoke(new Action(() => window.btnMin.BackColor = ShiftSkinData.Colors.BtnMinColor)); } } void btnSave_Click(object sender, EventArgs e) { - var shiftColors = new Color[14]; - shiftColors[0] = ShiftSkinData.LeftTopCornerColor; - shiftColors[1] = ShiftSkinData.TitleBarColor; - shiftColors[2] = ShiftSkinData.RightTopCornerColor; - shiftColors[3] = ShiftSkinData.LeftSideColor; - shiftColors[4] = ShiftSkinData.RightSideColor; - shiftColors[5] = ShiftSkinData.LeftBottomCornerColor; - shiftColors[6] = ShiftSkinData.BottomSideColor; - shiftColors[7] = ShiftSkinData.RightBottomCornerColor; - shiftColors[8] = ShiftSkinData.BtnCloseColor; - shiftColors[9] = ShiftSkinData.BtnMaxColor; - shiftColors[10] = ShiftSkinData.BtnMinColor; - shiftColors[11] = ShiftSkinData.BtnCloseHoverColor; - shiftColors[12] = ShiftSkinData.BtnMaxHoverColor; - shiftColors[13] = ShiftSkinData.BtnMinHoverColor; + Color[] shiftSkinColors = new Color[14]; + int i = 0; + + shiftSkinColors[0] = ShiftSkinData.Colors.LeftTopCornerColor; + shiftSkinColors[1] = ShiftSkinData.Colors.TitleBarColor; + shiftSkinColors[2] = ShiftSkinData.Colors.RightTopCornerColor; + shiftSkinColors[3] = ShiftSkinData.Colors.LeftSideColor; + shiftSkinColors[4] = ShiftSkinData.Colors.RightSideColor; + shiftSkinColors[5] = ShiftSkinData.Colors.LeftBottomCornerColor; + shiftSkinColors[6] = ShiftSkinData.Colors.BottomSideColor; + shiftSkinColors[7] = ShiftSkinData.Colors.RightBottomCornerColor; + shiftSkinColors[8] = ShiftSkinData.Colors.BtnCloseColor; + shiftSkinColors[9] = ShiftSkinData.Colors.BtnCloseHoverColor; + shiftSkinColors[10] = ShiftSkinData.Colors.BtnMaxColor; + shiftSkinColors[11] = ShiftSkinData.Colors.BtnMaxHoverColor; + shiftSkinColors[12] = ShiftSkinData.Colors.BtnMinColor; + shiftSkinColors[13] = ShiftSkinData.Colors.BtnMinHoverColor; using (var fobj = File.OpenWrite(@"C:\Users\Public\Documents\Skin.whoa")) - Whoa.Whoa.SerialiseObject(fobj, shiftColors); + Whoa.Whoa.SerialiseObject(fobj, shiftSkinColors); ShiftWM.StartInfoboxSession( "Saved Skin", @@ -122,30 +132,43 @@ namespace ShiftOS.Main.ShiftOS.Apps.ShifterStuff private void btnLoad_Click(object sender, EventArgs e) { - var shiftColors = new Color[14]; + Color[] shiftSkinColors = new Color[14]; using (var fobj = File.OpenRead(@"C:\Users\Public\Documents\Skin.whoa")) - shiftColors = Whoa.Whoa.DeserialiseObject<Color[]>(fobj); + shiftSkinColors = Whoa.Whoa.DeserialiseObject<Color[]>(fobj); - ShiftSkinData.LeftTopCornerColor = shiftColors[0]; - ShiftSkinData.TitleBarColor = shiftColors[1]; - ShiftSkinData.RightTopCornerColor = shiftColors[2]; - ShiftSkinData.LeftSideColor = shiftColors[3]; - ShiftSkinData.RightSideColor = shiftColors[4]; - ShiftSkinData.LeftBottomCornerColor = shiftColors[5]; - ShiftSkinData.BottomSideColor = shiftColors[6]; - ShiftSkinData.RightBottomCornerColor = shiftColors[7]; - ShiftSkinData.BtnCloseColor = shiftColors[8]; - ShiftSkinData.BtnMaxColor = shiftColors[9]; - ShiftSkinData.BtnMinColor = shiftColors[10]; - ShiftSkinData.BtnCloseHoverColor = shiftColors[11]; - ShiftSkinData.BtnMaxHoverColor = shiftColors[12]; - ShiftSkinData.BtnMinHoverColor = shiftColors[13]; + ShiftSkinData.Colors.LeftTopCornerColor = shiftSkinColors[0]; + ShiftSkinData.Colors.TitleBarColor = shiftSkinColors[1]; + ShiftSkinData.Colors.RightTopCornerColor = shiftSkinColors[2]; + ShiftSkinData.Colors.LeftSideColor = shiftSkinColors[3]; + ShiftSkinData.Colors.RightSideColor = shiftSkinColors[4]; + ShiftSkinData.Colors.LeftBottomCornerColor = shiftSkinColors[5]; + ShiftSkinData.Colors.BottomSideColor = shiftSkinColors[6]; + ShiftSkinData.Colors.RightBottomCornerColor = shiftSkinColors[7]; + ShiftSkinData.Colors.BtnCloseColor = shiftSkinColors[8]; + ShiftSkinData.Colors.BtnCloseHoverColor = shiftSkinColors[9]; + ShiftSkinData.Colors.BtnMaxColor = shiftSkinColors[10]; + ShiftSkinData.Colors.BtnMaxHoverColor = shiftSkinColors[11]; + ShiftSkinData.Colors.BtnMinColor = shiftSkinColors[12]; + ShiftSkinData.Colors.BtnMinHoverColor = shiftSkinColors[13]; - button5_Click(sender, e); + ApplySkin(); ShiftWM.StartInfoboxSession( "Loaded Skin", "Loaded Skin from C:\\Users\\Public\\Documents\\Skin.whoa", InfoboxTemplate.ButtonType.Ok); } + + private void button6_Click(object sender, EventArgs e) + { + ModifyData( + Color.FromArgb(15, 29, 45), + Color.FromArgb(15, 29, 78), + Color.FromArgb(15, 29, 100), + Color.FromArgb(15, 29, 130), + Color.FromArgb(15, 29, 108), + Color.FromArgb(15, 29, 130), + Color.FromArgb(15, 29, 160)); + ApplySkin(); + } } }
\ No newline at end of file |