From fed3801060be44b4a2ebad7c9d12605fb6954a13 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 25 Feb 2017 20:54:43 -0500 Subject: Add about box and fix desktop panel transparency bug --- ShiftOS.WinForms/Applications/About.Designer.cs | 102 ++++++++++++++++++++ ShiftOS.WinForms/Applications/About.cs | 94 +++++++++++++++++++ ShiftOS.WinForms/Applications/About.resx | 120 ++++++++++++++++++++++++ 3 files changed, 316 insertions(+) create mode 100644 ShiftOS.WinForms/Applications/About.Designer.cs create mode 100644 ShiftOS.WinForms/Applications/About.cs create mode 100644 ShiftOS.WinForms/Applications/About.resx (limited to 'ShiftOS.WinForms/Applications') diff --git a/ShiftOS.WinForms/Applications/About.Designer.cs b/ShiftOS.WinForms/Applications/About.Designer.cs new file mode 100644 index 0000000..e44b29e --- /dev/null +++ b/ShiftOS.WinForms/Applications/About.Designer.cs @@ -0,0 +1,102 @@ +namespace ShiftOS.WinForms.Applications +{ + partial class About + { + /// + /// 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.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + this.lbshiftit = new System.Windows.Forms.Label(); + this.lbaboutdesc = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.justthes; + this.pictureBox1.Location = new System.Drawing.Point(14, 18); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(105, 105); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(137, 40); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(43, 13); + this.label1.TabIndex = 1; + this.label1.Tag = "header1"; + this.label1.Text = "ShiftOS"; + // + // lbshiftit + // + this.lbshiftit.AutoSize = true; + this.lbshiftit.Location = new System.Drawing.Point(140, 73); + this.lbshiftit.Name = "lbshiftit"; + this.lbshiftit.Size = new System.Drawing.Size(84, 13); + this.lbshiftit.TabIndex = 2; + this.lbshiftit.Tag = "header2"; + this.lbshiftit.Text = "Shift it your way."; + // + // lbaboutdesc + // + this.lbaboutdesc.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lbaboutdesc.Location = new System.Drawing.Point(14, 126); + this.lbaboutdesc.Name = "lbaboutdesc"; + this.lbaboutdesc.Size = new System.Drawing.Size(498, 328); + this.lbaboutdesc.TabIndex = 3; + this.lbaboutdesc.Text = "label2"; + // + // About + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbaboutdesc); + this.Controls.Add(this.lbshiftit); + this.Controls.Add(this.label1); + this.Controls.Add(this.pictureBox1); + this.Name = "About"; + this.Size = new System.Drawing.Size(532, 474); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label lbshiftit; + private System.Windows.Forms.Label lbaboutdesc; + } +} diff --git a/ShiftOS.WinForms/Applications/About.cs b/ShiftOS.WinForms/Applications/About.cs new file mode 100644 index 0000000..54eddab --- /dev/null +++ b/ShiftOS.WinForms/Applications/About.cs @@ -0,0 +1,94 @@ +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; +using System.Reflection; + +namespace ShiftOS.WinForms.Applications +{ + [WinOpen("about")] + [Launcher("About", false, null, "Accessories")] + [DefaultTitle("About ShiftOS")] + public partial class About : UserControl, IShiftOSWindow + { + public About() + { + InitializeComponent(); + } + + public void SetupUI() + { + lbshiftit.Top = label1.Top + label1.Height; + + lbaboutdesc.Text = $@"ShiftOS +Copyright (c) 2017-{DateTime.Now.Year} Michael VanOverbeek and ShiftOS devs + +Engine version: Milestone 3, 1.0 Beta Series (Developer mode ON) +Frontend version: 1.0 Beta 1.2 +Multi-user domain version: 1.0 Rolling-Release + +Music courtesy of Selulance. Listen to the Fractal Forest album here: +https://www.youtube.com/watch?v=LB5jAYDL3VU&t=913s + +Special thanks to Philip Adams, the original creator of ShiftOS for helping us grow our community of amazing Shifters by featuring us on the YouTube Millionaire series and advertising us throughout various other series ran by him. + +Also, thanks to Rylan Arbour, Victor Tran and the other community moderators and administrators for helping us keep the community peaceful. + +Lastly, a huge special thanks to the community themselves - for testing, debugging, fixing, reporting bugs for, and enjoying our game even through its many failures, successes, revamps, etc. You guys are the reason we develop the game!"; + } + + public string GetEngineVersion() + { + foreach(var attr in typeof(IShiftOSWindow).Assembly.GetCustomAttributes(true)) + { + if(attr is AssemblyVersionAttribute) + { + var ver = attr as AssemblyVersionAttribute; + return ver.Version; + } + } + return "Unknown"; + } + + public string GetFrontendVersion() + { + foreach (var attr in this.GetType().Assembly.GetCustomAttributes(true)) + { + if (attr is AssemblyVersionAttribute) + { + var ver = attr as AssemblyVersionAttribute; + return ver.Version; + } + } + return "Unknown"; + } + + + + public void OnLoad() + { + SetupUI(); + } + + public void OnSkinLoad() + { + SetupUI(); + } + + public bool OnUnload() + { + return false; + } + + public void OnUpgrade() + { + + } + } +} diff --git a/ShiftOS.WinForms/Applications/About.resx b/ShiftOS.WinForms/Applications/About.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.WinForms/Applications/About.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 -- cgit v1.2.3 From 973512118b101cc61b346d6108fe90c03c8dccda Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 25 Feb 2017 21:03:45 -0500 Subject: I've been coding ShiftOS for years. Silly me. --- ShiftOS.WinForms/Applications/About.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShiftOS.WinForms/Applications') diff --git a/ShiftOS.WinForms/Applications/About.cs b/ShiftOS.WinForms/Applications/About.cs index 54eddab..cd95296 100644 --- a/ShiftOS.WinForms/Applications/About.cs +++ b/ShiftOS.WinForms/Applications/About.cs @@ -27,7 +27,7 @@ namespace ShiftOS.WinForms.Applications lbshiftit.Top = label1.Top + label1.Height; lbaboutdesc.Text = $@"ShiftOS -Copyright (c) 2017-{DateTime.Now.Year} Michael VanOverbeek and ShiftOS devs +Copyright (c) 2015-{DateTime.Now.Year} Michael VanOverbeek and ShiftOS devs Engine version: Milestone 3, 1.0 Beta Series (Developer mode ON) Frontend version: 1.0 Beta 1.2 -- cgit v1.2.3 From 4e00fc827d5f1b57c809858252c4c513100543fe Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 25 Feb 2017 21:58:57 -0500 Subject: massive shiftletters improvements --- ShiftOS.WinForms/Applications/ShiftLetters.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'ShiftOS.WinForms/Applications') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 0dd1505..2578669 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -83,7 +83,21 @@ namespace ShiftOS.WinForms.Applications "terminal", "textpad" }; + //This can diversify the amount of ShiftOS-related words in the game. + foreach(var upg in Shiftorium.GetDefaults()) + { + foreach(var w in upg.Name.Split(' ')) + { + if (!wordlist.Contains(w.ToLower())) + wordlist.Add(w.ToLower()); + } + } word = wordlist[rng.Next(wordlist.Count)]; + while(word == lastword) + { + word = wordlist[rng.Next(wordlist.Count)]; + } + lastword = word; //to make the game not choose the same word twice or more in a row lbllives.Text = "You have 7 lives left!"; lblword.Text = ""; for (int i=0; i Date: Sat, 25 Feb 2017 22:25:27 -0500 Subject: Color picker no longer british, more color picker ui fixes, and possible fix to issue #97 --- .../Applications/ColorPicker.Designer.cs | 46 +++++++++++----------- ShiftOS.WinForms/Applications/ColorPicker.cs | 10 +++++ ShiftOS_TheReturn/Commands.cs | 2 +- 3 files changed, 35 insertions(+), 23 deletions(-) (limited to 'ShiftOS.WinForms/Applications') diff --git a/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs b/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs index 0cd92d6..c89321f 100644 --- a/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs +++ b/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs @@ -354,7 +354,7 @@ namespace ShiftOS.WinForms.Applications this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill; this.pgcontents.Location = new System.Drawing.Point(0, 0); this.pgcontents.Name = "pgcontents"; - this.pgcontents.Size = new System.Drawing.Size(552, 657); + this.pgcontents.Size = new System.Drawing.Size(481, 608); this.pgcontents.TabIndex = 20; // // pnlpinkcolours @@ -382,7 +382,7 @@ namespace ShiftOS.WinForms.Applications this.pnlpinkcolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlpinkcolours.Location = new System.Drawing.Point(0, 521); this.pnlpinkcolours.Name = "pnlpinkcolours"; - this.pnlpinkcolours.Size = new System.Drawing.Size(552, 46); + this.pnlpinkcolours.Size = new System.Drawing.Size(481, 46); this.pnlpinkcolours.TabIndex = 11; this.pnlpinkcolours.Visible = false; // @@ -657,7 +657,7 @@ namespace ShiftOS.WinForms.Applications this.pnlredcolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlredcolours.Location = new System.Drawing.Point(0, 475); this.pnlredcolours.Name = "pnlredcolours"; - this.pnlredcolours.Size = new System.Drawing.Size(552, 46); + this.pnlredcolours.Size = new System.Drawing.Size(481, 46); this.pnlredcolours.TabIndex = 10; this.pnlredcolours.Visible = false; // @@ -929,7 +929,7 @@ namespace ShiftOS.WinForms.Applications this.pnlbrowncolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlbrowncolours.Location = new System.Drawing.Point(0, 429); this.pnlbrowncolours.Name = "pnlbrowncolours"; - this.pnlbrowncolours.Size = new System.Drawing.Size(552, 46); + this.pnlbrowncolours.Size = new System.Drawing.Size(481, 46); this.pnlbrowncolours.TabIndex = 8; this.pnlbrowncolours.Visible = false; // @@ -1201,7 +1201,7 @@ namespace ShiftOS.WinForms.Applications this.pnlorangecolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlorangecolours.Location = new System.Drawing.Point(0, 383); this.pnlorangecolours.Name = "pnlorangecolours"; - this.pnlorangecolours.Size = new System.Drawing.Size(552, 46); + this.pnlorangecolours.Size = new System.Drawing.Size(481, 46); this.pnlorangecolours.TabIndex = 7; this.pnlorangecolours.Visible = false; // @@ -1473,7 +1473,7 @@ namespace ShiftOS.WinForms.Applications this.pnlyellowcolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlyellowcolours.Location = new System.Drawing.Point(0, 337); this.pnlyellowcolours.Name = "pnlyellowcolours"; - this.pnlyellowcolours.Size = new System.Drawing.Size(552, 46); + this.pnlyellowcolours.Size = new System.Drawing.Size(481, 46); this.pnlyellowcolours.TabIndex = 6; this.pnlyellowcolours.Visible = false; // @@ -1745,7 +1745,7 @@ namespace ShiftOS.WinForms.Applications this.pnlgreencolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlgreencolours.Location = new System.Drawing.Point(0, 291); this.pnlgreencolours.Name = "pnlgreencolours"; - this.pnlgreencolours.Size = new System.Drawing.Size(552, 46); + this.pnlgreencolours.Size = new System.Drawing.Size(481, 46); this.pnlgreencolours.TabIndex = 5; this.pnlgreencolours.Visible = false; // @@ -2017,7 +2017,7 @@ namespace ShiftOS.WinForms.Applications this.pnlbluecolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlbluecolours.Location = new System.Drawing.Point(0, 245); this.pnlbluecolours.Name = "pnlbluecolours"; - this.pnlbluecolours.Size = new System.Drawing.Size(552, 46); + this.pnlbluecolours.Size = new System.Drawing.Size(481, 46); this.pnlbluecolours.TabIndex = 4; this.pnlbluecolours.Visible = false; // @@ -2289,7 +2289,7 @@ namespace ShiftOS.WinForms.Applications this.pnlpurplecolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlpurplecolours.Location = new System.Drawing.Point(0, 199); this.pnlpurplecolours.Name = "pnlpurplecolours"; - this.pnlpurplecolours.Size = new System.Drawing.Size(552, 46); + this.pnlpurplecolours.Size = new System.Drawing.Size(481, 46); this.pnlpurplecolours.TabIndex = 3; this.pnlpurplecolours.Visible = false; // @@ -2562,7 +2562,7 @@ namespace ShiftOS.WinForms.Applications this.pnlgraycolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlgraycolours.Location = new System.Drawing.Point(0, 153); this.pnlgraycolours.Name = "pnlgraycolours"; - this.pnlgraycolours.Size = new System.Drawing.Size(552, 46); + this.pnlgraycolours.Size = new System.Drawing.Size(481, 46); this.pnlgraycolours.TabIndex = 2; this.pnlgraycolours.Visible = false; // @@ -2779,7 +2779,7 @@ namespace ShiftOS.WinForms.Applications this.pnlanycolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlanycolours.Location = new System.Drawing.Point(0, 107); this.pnlanycolours.Name = "pnlanycolours"; - this.pnlanycolours.Size = new System.Drawing.Size(552, 46); + this.pnlanycolours.Size = new System.Drawing.Size(481, 46); this.pnlanycolours.TabIndex = 1; this.pnlanycolours.Visible = false; // @@ -2813,7 +2813,7 @@ namespace ShiftOS.WinForms.Applications this.txtanysgreen.BackColor = System.Drawing.Color.White; this.txtanysgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtanysgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtanysgreen.Location = new System.Drawing.Point(100, 22); + this.txtanysgreen.Location = new System.Drawing.Point(100, 23); this.txtanysgreen.Multiline = true; this.txtanysgreen.Name = "txtanysgreen"; this.txtanysgreen.Size = new System.Drawing.Size(28, 15); @@ -3046,7 +3046,7 @@ namespace ShiftOS.WinForms.Applications this.Panel1.Dock = System.Windows.Forms.DockStyle.Top; this.Panel1.Location = new System.Drawing.Point(0, 0); this.Panel1.Name = "Panel1"; - this.Panel1.Size = new System.Drawing.Size(552, 107); + this.Panel1.Size = new System.Drawing.Size(481, 107); this.Panel1.TabIndex = 0; // // lblnewcolourrgb @@ -3074,17 +3074,18 @@ namespace ShiftOS.WinForms.Applications this.Label26.Name = "Label26"; this.Label26.Size = new System.Drawing.Size(145, 18); this.Label26.TabIndex = 8; - this.Label26.Text = "New Colour"; + this.Label26.Text = "New Color"; // // Label17 // this.Label17.AutoSize = true; - this.Label17.Location = new System.Drawing.Point(7, 87); + this.Label17.Location = new System.Drawing.Point(29, 87); this.Label17.Name = "Label17"; - this.Label17.Size = new System.Drawing.Size(426, 13); + this.Label17.Size = new System.Drawing.Size(414, 13); this.Label17.TabIndex = 7; - this.Label17.Text = "Click the new colour above to confirm your colour choice or click the old colour " + - "to cancel"; + this.Label17.Text = "Click the new color above to confirm your colour choice or click the old color to" + + " cancel"; + this.Label17.Click += new System.EventHandler(this.Label17_Click); // // lbloldcolourrgb // @@ -3113,8 +3114,9 @@ namespace ShiftOS.WinForms.Applications this.Label14.Name = "Label14"; this.Label14.Size = new System.Drawing.Size(151, 18); this.Label14.TabIndex = 4; - this.Label14.Text = "Old Colour"; + this.Label14.Text = "Old Color"; this.Label14.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.Label14.Click += new System.EventHandler(this.Label14_Click); // // pnlnewcolour // @@ -3133,11 +3135,11 @@ namespace ShiftOS.WinForms.Applications // lblobjecttocolour // this.lblobjecttocolour.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblobjecttocolour.Location = new System.Drawing.Point(10, 5); + this.lblobjecttocolour.Location = new System.Drawing.Point(20, 6); this.lblobjecttocolour.Name = "lblobjecttocolour"; this.lblobjecttocolour.Size = new System.Drawing.Size(423, 23); this.lblobjecttocolour.TabIndex = 1; - this.lblobjecttocolour.Text = "Close Button Colour"; + this.lblobjecttocolour.Text = "Close Button Color"; this.lblobjecttocolour.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // ColorPicker @@ -3146,7 +3148,7 @@ namespace ShiftOS.WinForms.Applications this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pgcontents); this.Name = "ColorPicker"; - this.Size = new System.Drawing.Size(552, 657); + this.Size = new System.Drawing.Size(481, 608); this.Load += new System.EventHandler(this.Color_Picker_Load); this.pgcontents.ResumeLayout(false); this.pnlpinkcolours.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/ColorPicker.cs b/ShiftOS.WinForms/Applications/ColorPicker.cs index 04ff23e..a8c0b3f 100644 --- a/ShiftOS.WinForms/Applications/ColorPicker.cs +++ b/ShiftOS.WinForms/Applications/ColorPicker.cs @@ -2349,5 +2349,15 @@ namespace ShiftOS.WinForms.Applications public void OnUpgrade() { } + + private void Label14_Click(object sender, EventArgs e) + { + + } + + private void Label17_Click(object sender, EventArgs e) + { + + } } } diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs index 3952995..9bc876f 100644 --- a/ShiftOS_TheReturn/Commands.cs +++ b/ShiftOS_TheReturn/Commands.cs @@ -358,8 +358,8 @@ namespace ShiftOS.Engine [Command("shutdown")] public static bool Shutdown() { - SaveSystem.ShuttingDown = true; TerminalBackend.InvokeCommand("sos.save"); + SaveSystem.ShuttingDown = true; AppearanceManager.Exit(); return true; } -- cgit v1.2.3