From b2bd8eb462f222db64efbc729c6ce2cfb5b65d61 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 25 Feb 2017 20:28:58 -0500 Subject: Added custom wordlist feature to shiftletters --- .../Applications/ShiftLetters.Designer.cs | 33 +++++++++----- ShiftOS.WinForms/Applications/ShiftLetters.cs | 50 +++++++++++----------- ShiftOS.WinForms/Resources/Shiftorium.txt | 15 ++++++- ShiftOS.WinForms/ShiftOS.WinForms.csproj | 6 +++ 4 files changed, 66 insertions(+), 38 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index 4c56732..9e79181 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -56,19 +56,20 @@ namespace ShiftOS.WinForms.Applications this.tbguess = new System.Windows.Forms.TextBox(); this.lbllives = new System.Windows.Forms.Label(); this.btnrestart = new System.Windows.Forms.Button(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // // lblword // this.lblword.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblword.AutoSize = true; - this.lblword.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F); - this.lblword.Location = new System.Drawing.Point(116, 34); + this.lblword.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.75F); + this.lblword.Location = new System.Drawing.Point(5, 41); this.lblword.Name = "lblword"; this.lblword.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lblword.Size = new System.Drawing.Size(89, 22); + this.lblword.Size = new System.Drawing.Size(302, 22); this.lblword.TabIndex = 1; - this.lblword.Text = "Loading..."; + this.lblword.Text = "Choose a wordlist from the box below."; + this.lblword.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // tbguess // @@ -80,28 +81,37 @@ namespace ShiftOS.WinForms.Applications // // lbllives // - this.lbllives.AutoSize = true; - this.lbllives.Location = new System.Drawing.Point(127, 190); + this.lbllives.Anchor = System.Windows.Forms.AnchorStyles.None; + this.lbllives.Location = new System.Drawing.Point(9, 201); this.lbllives.Name = "lbllives"; - this.lbllives.Size = new System.Drawing.Size(69, 13); this.lbllives.TabIndex = 3; - this.lbllives.Text = "Still loading..."; + this.lbllives.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btnrestart // - this.btnrestart.Location = new System.Drawing.Point(130, 148); + this.btnrestart.Location = new System.Drawing.Point(121, 148); this.btnrestart.Name = "btnrestart"; this.btnrestart.Size = new System.Drawing.Size(75, 23); this.btnrestart.TabIndex = 4; - this.btnrestart.Text = "Restart"; + this.btnrestart.Text = "Play"; this.btnrestart.UseVisualStyleBackColor = true; this.btnrestart.Visible = false; this.btnrestart.Click += new System.EventHandler(this.btnrestart_Click); // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(99, 81); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.TabIndex = 5; + // // ShiftLetters // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.comboBox1); this.Controls.Add(this.btnrestart); this.Controls.Add(this.lbllives); this.Controls.Add(this.tbguess); @@ -118,5 +128,6 @@ namespace ShiftOS.WinForms.Applications private System.Windows.Forms.TextBox tbguess; private System.Windows.Forms.Label lbllives; private System.Windows.Forms.Button btnrestart; + private System.Windows.Forms.ComboBox comboBox1; } } diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 0dd1505..4e02e3c 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -46,6 +46,11 @@ namespace ShiftOS.WinForms.Applications string word = ""; static Random rng = new Random(); string guessedCharacters = ""; + List shiftWordlist = new List { "shiftos", "devx", "artpad", "shifter", "pong", + "shiftorium", "codepoints", "shiftletters", "shops", "mud", "notification", "namechanger", + "skinning", "skinloader", "calculator", "fileskimmer", "lua", "shiftnet", "terminal", "textpad"}; + List contributorsWordlist = new List { "12padams", "carverh", "computelinux", "lempamo", + "wowmom98", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"}; public ShiftLetters() { @@ -56,34 +61,14 @@ namespace ShiftOS.WinForms.Applications { guessedCharacters = ""; lives = 7; + comboBox1.Visible = false; tbguess.Visible = true; lbllives.Visible = true; lblword.Visible = true; btnrestart.Visible = false; - var wordlist = new List - { - "shiftos", - "devx", - "artpad", - "shifter", - "pong", - "shiftorium", - "codepoints", - "shiftletters", - "shops", - "mud", - "notification", - "namechanger", - "skinning", - "skinloader", - "calculator", - "fileskimmer", - "lua", - "shiftnet", - "terminal", - "textpad" - }; - word = wordlist[rng.Next(wordlist.Count)]; + if ((String)comboBox1.SelectedItem == "ShiftOS") word = shiftWordlist[rng.Next(shiftWordlist.Count)]; + else if ((String)comboBox1.SelectedItem == "Contributors") word = contributorsWordlist[rng.Next(contributorsWordlist.Count)]; + else throw new NullWordlistException(":P"); lbllives.Text = "You have 7 lives left!"; lblword.Text = ""; for (int i=0; i Artpad.cs + + UserControl + + + AudioPlayer.cs + UserControl -- cgit v1.2.3 From 8c679e4650b98890902fbbe0e7c348b02f9e6cf3 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 25 Feb 2017 20:30:13 -0500 Subject: forgot this --- ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index 9e79181..928ff82 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -84,7 +84,9 @@ namespace ShiftOS.WinForms.Applications this.lbllives.Anchor = System.Windows.Forms.AnchorStyles.None; this.lbllives.Location = new System.Drawing.Point(9, 201); this.lbllives.Name = "lbllives"; + this.lbllives.Size = new System.Drawing.Size(310, 13); this.lbllives.TabIndex = 3; + this.lbllives.Text = "To play, guess numbers and letters by typing in the box."; this.lbllives.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btnrestart -- cgit v1.2.3 From ab8c5c6f467b9ae61c27cdfb1a68c2812cb7d78f Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 25 Feb 2017 20:34:17 -0500 Subject: removed numbers --- ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs | 2 +- ShiftOS.WinForms/Applications/ShiftLetters.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index 928ff82..48e77bf 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -86,7 +86,7 @@ namespace ShiftOS.WinForms.Applications this.lbllives.Name = "lbllives"; this.lbllives.Size = new System.Drawing.Size(310, 13); this.lbllives.TabIndex = 3; - this.lbllives.Text = "To play, guess numbers and letters by typing in the box."; + this.lbllives.Text = "To play, guess letters by typing in the box."; this.lbllives.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btnrestart diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 4e02e3c..4514157 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -49,8 +49,8 @@ namespace ShiftOS.WinForms.Applications List shiftWordlist = new List { "shiftos", "devx", "artpad", "shifter", "pong", "shiftorium", "codepoints", "shiftletters", "shops", "mud", "notification", "namechanger", "skinning", "skinloader", "calculator", "fileskimmer", "lua", "shiftnet", "terminal", "textpad"}; - List contributorsWordlist = new List { "12padams", "carverh", "computelinux", "lempamo", - "wowmom98", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"}; + List contributorsWordlist = new List { "philipadams", "carverh", "computelinux", "lempamo", + "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"}; public ShiftLetters() { -- cgit v1.2.3 From 46d53ae12844a095913cd0fc784446d56d16048d Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 08:47:03 -0500 Subject: HEY STUPID --- ShiftOS.WinForms/Applications/ShiftLetters.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index aa3bf18..7a3000a 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -92,14 +92,14 @@ namespace ShiftOS.WinForms.Applications }; foreach(var w in shiftWordlist) { - if (!wordlist.Contains(w.ToLower()) + if (!wordlist.Contains(w.ToLower())) { wordlist.Add(w.ToLower()); } } foreach(var w in contributorsWordlist) { - if (!wordlist.Contains(w.ToLower()) + if (!wordlist.Contains(w.ToLower())) { wordlist.Add(w.ToLower()); } -- cgit v1.2.3 From 8d72f2c4d4ac742f942262159b5195bb44875846 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 10:11:58 -0500 Subject: shiftletters improvements --- .../Applications/ShiftLetters.Designer.cs | 2 + ShiftOS.WinForms/Applications/ShiftLetters.cs | 121 ++++++++++++++------- ShiftOS.WinForms/Resources/Shiftorium.txt | 6 + 3 files changed, 90 insertions(+), 39 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index 48e77bf..0692244 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -68,8 +68,10 @@ namespace ShiftOS.WinForms.Applications this.lblword.RightToLeft = System.Windows.Forms.RightToLeft.No; this.lblword.Size = new System.Drawing.Size(302, 22); this.lblword.TabIndex = 1; + this.lblword.Tag = "header3"; this.lblword.Text = "Choose a wordlist from the box below."; this.lblword.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblword.TextChanged += new System.EventHandler(this.lblword_TextChanged); // // tbguess // diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 7a3000a..e4adde2 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -52,6 +52,47 @@ namespace ShiftOS.WinForms.Applications List contributorsWordlist = new List { "philipadams", "carverh", "computelinux", "lempamo", "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"}; + List osWordlist = new List + { + "windows", + "longhorn", + "memphis", + "neptune", + "vista", + "visopsys", + "ubuntu", + "linux", + "arch", + "debian", + "redhat", + "fedora", + "opensuse", + "kubuntu", + "lubuntu", + "xubuntu", + "mythbuntu", + "ubuntumate", + "zorin", + "lindows", + "msdos", + "freedos", + "freebsd", + "netbsd", + "pcbsd", + "android", + "ios", + "macos", + "mint", + "mikeos", + "raspbian", + "cosmos", + "chicago", + "vienna", + "whistler", + "windowsxp", + "windowsforworkgroups" + }; + public ShiftLetters() { InitializeComponent(); @@ -67,50 +108,52 @@ namespace ShiftOS.WinForms.Applications lblword.Visible = true; btnrestart.Visible = false; - var wordlist = new List - { - "shiftos", - "devx", - "artpad", - "shifter", - "pong", - "shiftorium", - "codepoints", - "shiftletters", - "shops", - "mud", - "notification", - "namechanger", - "skinning", - "skinloader", - "calculator", - "fileskimmer", - "lua", - "shiftnet", - "terminal", - "textpad" - }; - foreach(var w in shiftWordlist) + bool isShiftOS = comboBox1.SelectedItem.ToString().ToLower() == "shiftos"; + bool isContributors = comboBox1.SelectedItem.ToString().ToLower() == "contributors"; + bool isOSes = comboBox1.SelectedItem.ToString().ToLower() == "operating systems"; + + + var wordlist = new List(); + if (isOSes) { - if (!wordlist.Contains(w.ToLower())) + foreach (var w in osWordlist) { - wordlist.Add(w.ToLower()); + if (!wordlist.Contains(w.ToLower())) + { + wordlist.Add(w.ToLower()); + } } } - foreach(var w in contributorsWordlist) + if (isShiftOS) { - if (!wordlist.Contains(w.ToLower())) + foreach (var w in shiftWordlist) { - wordlist.Add(w.ToLower()); + if (!wordlist.Contains(w.ToLower())) + { + wordlist.Add(w.ToLower()); + } } } - //This can diversify the amount of ShiftOS-related words in the game. - foreach(var upg in Shiftorium.GetDefaults()) + else if (isContributors) { - foreach(var w in upg.Name.Split(' ')) + foreach (var w in contributorsWordlist) { if (!wordlist.Contains(w.ToLower())) + { wordlist.Add(w.ToLower()); + } + } + } + if (isShiftOS) + { + //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)]; @@ -132,6 +175,7 @@ namespace ShiftOS.WinForms.Applications tbguess.Visible = false; comboBox1.Items.Add("ShiftOS"); if (ShiftoriumFrontend.UpgradeInstalled("sl_contributors_wordlist")) comboBox1.Items.Add("Contributors"); + if (Shiftorium.UpgradeInstalled("sl_operating_systems_wordlist")) comboBox1.Items.Add("Operating Systems"); btnrestart.Visible = true; } @@ -170,15 +214,9 @@ namespace ShiftOS.WinForms.Applications if (!lblword.Text.Contains("_")) { int oldlives = lives; - tbguess.Visible = false; - lives = 0; - lbllives.Visible = true; - btnrestart.Visible = true; - btnrestart.Text = "Restart"; - comboBox1.Visible = true; int cp = word.Length * oldlives; - lbllives.Text = "You earned: " + cp + " codepoints!"; SaveSystem.TransferCodepointsFrom("shiftletters", cp); + StartGame(); } } } @@ -211,5 +249,10 @@ namespace ShiftOS.WinForms.Applications } } + + private void lblword_TextChanged(object sender, EventArgs e) + { + lblword.Left = (this.Width - lblword.Width) / 2; + } } } diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 1945707..04cf6ac 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -6,6 +6,12 @@ Dependencies: "wm_free_placement;desktop", Description: "Crazy math problems getting you down? Well, this calculator will take care of that!" }, + { + Name: "SL Operating Systems Wordlist", + Cost: 500, + Dependencies: "shiftletters", + Description: "Know a lot about computer operating systems? This upgrade adds a wordlist to ShiftLetters, full of various Linux distros, Windows codenames and other OS names. All for the low price of 500 Codepoints! It's an incredible value but it's true! Upgrade today... except out of ShiftOS!" + }, { Name: "AL Calculator", Cost: 350, -- cgit v1.2.3 From 78a5a4281cde2105e59164890caa949ef7617510 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 10:24:27 -0500 Subject: more beta 1.2 stuff --- ShiftOS.WinForms/Applications/ColorPicker.cs | 1 - ShiftOS.WinForms/Applications/MUDControlCentre.cs | 3 +-- ShiftOS.WinForms/Applications/ShiftLetters.cs | 3 ++- ShiftOS.WinForms/Applications/Terminal.cs | 1 - ShiftOS.WinForms/Oobe.cs | 8 +------- ShiftOS.WinForms/Tools/ControlManager.cs | 5 +---- ShiftOS.WinForms/WinformsDesktop.cs | 5 ----- 7 files changed, 5 insertions(+), 21 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ColorPicker.cs b/ShiftOS.WinForms/Applications/ColorPicker.cs index a8c0b3f..bf35567 100644 --- a/ShiftOS.WinForms/Applications/ColorPicker.cs +++ b/ShiftOS.WinForms/Applications/ColorPicker.cs @@ -1049,7 +1049,6 @@ namespace ShiftOS.WinForms.Applications case 1: pnlpink1.BackColor = Color.HotPink; pnlpink1.Show(); - break; pnlpink1.BackColor = Color.DeepPink; pnlpink1.Show(); pnlpink2.BackColor = Color.HotPink; diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs index 6426562..02fe868 100644 --- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs +++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs @@ -243,8 +243,7 @@ namespace ShiftOS.WinForms.Applications } private Shop editingShop = null; - private string editingShopOldName = ""; - + public void ShowCreateShop() { this.Invoke(new Action(() => diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index e4adde2..6547d8d 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -177,6 +177,7 @@ namespace ShiftOS.WinForms.Applications if (ShiftoriumFrontend.UpgradeInstalled("sl_contributors_wordlist")) comboBox1.Items.Add("Contributors"); if (Shiftorium.UpgradeInstalled("sl_operating_systems_wordlist")) comboBox1.Items.Add("Operating Systems"); btnrestart.Visible = true; + lblword.Left = (this.Width - lblword.Width) / 2; } public void OnUpgrade() @@ -191,7 +192,7 @@ namespace ShiftOS.WinForms.Applications public void OnSkinLoad() { - + lblword.Left = (this.Width - lblword.Width) / 2; } string lastword = ""; diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs index ff3569b..7bab213 100644 --- a/ShiftOS.WinForms/Applications/Terminal.cs +++ b/ShiftOS.WinForms/Applications/Terminal.cs @@ -187,7 +187,6 @@ namespace ShiftOS.WinForms.Applications public static event TextSentEventHandler TextSent; - public event EventHandler OnComplete; public void ResetAllKeywords() { diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs index aa37792..7370396 100644 --- a/ShiftOS.WinForms/Oobe.cs +++ b/ShiftOS.WinForms/Oobe.cs @@ -54,15 +54,10 @@ namespace ShiftOS.WinForms string rtext; string gtexttotype; int charcount; - int currentletter; int slashcount; - int conversationcount = 0; Label textgeninput; - bool needtoclose = false; public bool upgraded = false; - int hackeffect; - int percentcount; - + private bool typing = false; public void TextType(string texttotype) @@ -74,7 +69,6 @@ namespace ShiftOS.WinForms charcount = texttotype.Length; gtexttotype = texttotype; - currentletter = 0; slashcount = 1; foreach (var c in gtexttotype) { diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs index 32f0217..5cc4813 100644 --- a/ShiftOS.WinForms/Tools/ControlManager.cs +++ b/ShiftOS.WinForms/Tools/ControlManager.cs @@ -194,10 +194,7 @@ namespace ShiftOS.WinForms.Tools } } - Image dithered = null; - - - ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor; + ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor; ctrl.Font = SkinEngine.LoadedSkin.MainFont; diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 45730c4..81079e4 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -48,11 +48,6 @@ namespace ShiftOS.WinForms /// public partial class WinformsDesktop : Form, IDesktop { - /// - /// Occurs when window added. - /// - private static event Action windowAdded; - /// /// Initializes a new instance of the class. /// -- cgit v1.2.3 From e2284a7bc577aa78f1d22c8134b651fcb00147a0 Mon Sep 17 00:00:00 2001 From: Aren Date: Sun, 26 Feb 2017 16:47:47 +0100 Subject: OCD "You have: 1 lives left!" --- ShiftOS.WinForms/Applications/ShiftLetters.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 6547d8d..32a1ed4 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -225,7 +225,12 @@ namespace ShiftOS.WinForms.Applications { guessedCharacters = guessedCharacters + charGuessed; lives--; - lbllives.Text = "You have: " + lives + " lives left!"; + if (lives == 1) + { + lbllives.Text = "You have 1 life left! Be careful..."; + } else { + lbllives.Text = "You have " + lives + " lives left!"; + } if (lives == 0) { tbguess.Visible = false; -- cgit v1.2.3 From de6a5ee4ac78f0680c5a5bff8a18caace983d09d Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 11:17:30 -0500 Subject: attempt transparency fix --- ShiftOS.WinForms/WinformsDesktop.Designer.cs | 1 + ShiftOS.WinForms/WinformsDesktop.cs | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/WinformsDesktop.Designer.cs b/ShiftOS.WinForms/WinformsDesktop.Designer.cs index 0585199..aef7296 100644 --- a/ShiftOS.WinForms/WinformsDesktop.Designer.cs +++ b/ShiftOS.WinForms/WinformsDesktop.Designer.cs @@ -76,6 +76,7 @@ namespace ShiftOS.WinForms this.desktoppanel.Name = "desktoppanel"; this.desktoppanel.Size = new System.Drawing.Size(1296, 24); this.desktoppanel.TabIndex = 0; + this.desktoppanel.Paint += new System.Windows.Forms.PaintEventHandler(this.desktoppanel_Paint); // // btnnotifications // diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 81079e4..73ad1bd 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -269,14 +269,28 @@ namespace ShiftOS.WinForms this.BackgroundImage = img; })); this.BackgroundImageLayout = GetImageLayout("desktopbackground"); - desktoppanel.BackgroundImage = ((Bitmap)GetImage("desktoppanel")); + + var pnlimg = GetImage("desktoppanel"); + if (pnlimg != null) + { + var bmp = new Bitmap(pnlimg); + bmp.MakeTransparent(Color.FromArgb(1, 0, 1)); + pnlimg = bmp; + } + + desktoppanel.BackgroundImage = pnlimg; if (desktoppanel.BackgroundImage != null) { - ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1)); desktoppanel.BackColor = Color.Transparent; } - menuStrip1.BackgroundImage = GetImage("applauncher"); - if (menuStrip1.BackgroundImage != null) ((Bitmap)menuStrip1.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1)); + var appimg = GetImage("applauncher"); + if (appimg != null) + { + var bmp = new Bitmap(appimg); + bmp.MakeTransparent(Color.FromArgb(1, 0, 1)); + appimg = bmp; + } + menuStrip1.BackgroundImage = appimg; lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor; lbtime.Font = LoadedSkin.DesktopPanelClockFont; if (desktoppanel.BackgroundImage == null) @@ -557,6 +571,11 @@ namespace ShiftOS.WinForms { AppearanceManager.SetupWindow(new Applications.Notifications()); } + + private void desktoppanel_Paint(object sender, PaintEventArgs e) + { + e.Graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality; + } } [ShiftOS.Engine.Scripting.Exposed("desktop")] -- cgit v1.2.3 From 83542a4b81ffeed01510886c7f89f2bda14eb5c5 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 11:43:26 -0500 Subject: Desktop panel RGB 1,0,1 transparency. Finally. After **YEARS** of research and development by both me and Philip Adams, and other ShiftOS devs, I was the one who finally implemented it. --- ShiftOS.WinForms/WinformsDesktop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 73ad1bd..899eb0d 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -269,6 +269,7 @@ namespace ShiftOS.WinForms this.BackgroundImage = img; })); this.BackgroundImageLayout = GetImageLayout("desktopbackground"); + desktoppanel.BackColor = LoadedSkin.DesktopPanelColor; var pnlimg = GetImage("desktoppanel"); if (pnlimg != null) @@ -306,7 +307,6 @@ namespace ShiftOS.WinForms sysmenuholder.Size = LoadedSkin.AppLauncherHolderSize; apps.Size = sysmenuholder.Size; menuStrip1.Renderer = new ShiftOSMenuRenderer(new AppLauncherColorTable()); - desktoppanel.BackColor = LoadedSkin.DesktopPanelColor; desktoppanel.BackgroundImageLayout = GetImageLayout("desktoppanel"); desktoppanel.Height = LoadedSkin.DesktopPanelHeight; if (LoadedSkin.DesktopPanelPosition == 1) -- cgit v1.2.3