diff options
Diffstat (limited to 'ShiftOS.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/Applications/About.Designer.cs | 102 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/About.cs | 94 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/About.resx | 120 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ColorPicker.Designer.cs | 46 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ColorPicker.cs | 10 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ShiftLetters.cs | 58 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.Designer.cs | 61 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.resx | 343 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Resources/justthes.png | bin | 0 -> 10030 bytes | |||
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 10 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs | 24 | ||||
| -rw-r--r-- | ShiftOS.WinForms/WinformsDesktop.cs | 6 |
12 files changed, 639 insertions, 235 deletions
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 + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + 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..cd95296 --- /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) 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 +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 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file 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.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 4514157..aa3bf18 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -66,9 +66,59 @@ namespace ShiftOS.WinForms.Applications lbllives.Visible = true; lblword.Visible = true; btnrestart.Visible = false; - 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"); + + var wordlist = new List<string> + { + "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) + { + if (!wordlist.Contains(w.ToLower()) + { + wordlist.Add(w.ToLower()); + } + } + foreach(var w in contributorsWordlist) + { + 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()) + { + 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<word.Length; i++) @@ -100,6 +150,8 @@ namespace ShiftOS.WinForms.Applications } + string lastword = ""; + private void tbguess_TextChanged(object sender, EventArgs e) { if (this.tbguess.Text.Length == 1) diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index 8472f1d..767d75d 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1,28 +1,4 @@ -/* - * MIT License - * - * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -884,6 +860,16 @@ namespace ShiftOS.WinForms.Properties { } /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap justthes { + get { + object obj = ResourceManager.GetObject("justthes", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> /// Looks up a localized string similar to [ /// "english" /// "deutsch - in beta" @@ -907,23 +893,24 @@ namespace ShiftOS.WinForms.Properties { /// <summary> /// Looks up a localized string similar to [ + ///// CALCULATOR UPGRADES /// { - /// Name: "MUD Fundamentals", - /// Cost: 50, - /// Description: "Some basic commands for the terminal that'll help you out in the multi-user domain.", - /// Dependencies: null + /// Name: "Calculator", + /// Cost: 1000, + /// Dependencies: "wm_free_placement;desktop", + /// Description: "Crazy math problems getting you down? Well, this calculator will take care of that!" /// }, /// { - /// Name: "AL Notifications", - /// Cost: 125, - /// Dependencies: "app_launcher", - /// Description: "Want to open the Notifications application from within the App Launcher? This upgrade is for you." + /// Name: "AL Calculator", + /// Cost: 350, + /// Dependencies: "calculator;app_launcher", + /// Description: "Add an App Launcher Entry for the Calculator!" /// }, /// { - /// Name: "Guess the Word", - /// Cost: 150, - /// Dependencies: null, - /// Description: "Sick and tired of playing Pong? Buy this upgrade [rest of string was truncated]";. + /// Name: "Calc Equals Button", + /// Cost: 600, + /// Dependencies: "calculator", + /// Description: "Right now, you can only type numbers, [rest of string was truncated]";. /// </summary> internal static string Shiftorium { get { diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index 3e4819f..000157a 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -118,268 +118,271 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="ArtPadcirclerubber" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadcirclerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="ArtPadcirclerubberselected" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadcirclerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="ArtPaderacer" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPaderacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="ArtPadfloodfill" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadfloodfill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadsquarerubberselected" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadsquarerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="ArtPadlinetool" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ArtPadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadmagnify" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadmagnify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="ArtPadnew" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileiconsaa" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileiconsaa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadopen" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadopen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon3" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon3.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadOval" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadOval.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconVideoPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconVideoPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadpaintbrush" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadpaintbrush.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconTerminal1" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconTerminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadpencil" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadpencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="strings_en" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\strings_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> - <data name="ArtPadpixelplacer" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadpixelplacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon7" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon7.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadRectangle" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon19" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon19.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadredo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadredo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconorcwrite" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadsave" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconTextPad" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconTextPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadsquarerubber" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadsquarerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon14" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon14.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadsquarerubberselected" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadsquarerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Shiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Shiftorium.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> - <data name="ArtPadtexttool" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadtexttool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconAudioPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconAudioPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ArtPadundo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ArtPadundo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon4" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon4.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fileicon0" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fileicon0.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon1" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconShiftnet" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconShiftnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="DefaultMouse" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fileicon10" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fileicon10.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon11" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon11.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="fileicon12" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon12.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconSnakey" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconSnakey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon13" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon13.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconClock" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconClock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon14" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon14.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconFileSkimmer" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconFileSkimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fileicon15" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fileicon15.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon16.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="fileicon17" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon17.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="fileicon18" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon18.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="fileicon19" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon19.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadundo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadundo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon2.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconSkinShifter" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconSkinShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon3" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon3.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconshutdown" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon4" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon4.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconIconManager" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconIconManager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon5" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon5.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadtexttool" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadtexttool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon6" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon6.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="sys_shiftoriumstory" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sys_shiftoriumstory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> - <data name="fileicon7" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon7.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconSkinLoader" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconSkinLoader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon8" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon8.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconCalculator" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconCalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileicon9" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileicon9.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconDodge" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconDodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fileiconsaa" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fileiconsaa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconSysinfo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="FloppyDriveIcon" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\FloppyDriveIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="hello" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\hello.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value> + <data name="ArtPadOval" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadOval.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="languages" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\languages.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <data name="fileicon5" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon5.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Shiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Shiftorium.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <data name="iconoctocat" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconoctocat.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Songs" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Songs.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <data name="ArtPadpencil" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadpencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="strings_de" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\strings_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <data name="iconArtpad" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconArtpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="strings_en" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\strings_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <data name="iconPong" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconPong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sys_shiftoriumstory" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sys_shiftoriumstory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <data name="RegularDesktopGlyph" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\RegularDesktopGlyph.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ShiftOS" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ShiftOS.rtf;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="fileicon1" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="DefaultMouse" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconfloodgate" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconfloodgate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="IconTerminal" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\IconTerminal.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadpixelplacer" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadpixelplacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconArtpad" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconArtpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconmaze" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconmaze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconAudioPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconAudioPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconNameChanger" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconNameChanger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconBitnoteDigger" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconBitnoteDigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconShiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconShiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconBitnoteWallet" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconBitnoteWallet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="languages" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\languages.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> - <data name="iconCalculator" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconCalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadcirclerubber" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadcirclerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconClock" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconClock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPaderacer" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPaderacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconColourPicker_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconColourPicker.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon13" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon13.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconDodge" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconDodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconWebBrowser" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconWebBrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconDownloader" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconDownloader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconInfoBox_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="iconFileOpener_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\SystemIcons\iconFileOpener.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconFileSaver_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconFileSaver.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconShifter" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconFileSkimmer" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconFileSkimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon18" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon18.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconfloodgate" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconfloodgate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon17" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon17.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="icongraphicpicker" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\icongraphicpicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconKnowledgeInput" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconKnowledgeInput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconIconManager" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconIconManager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconDownloader" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconDownloader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconInfoBox_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Songs" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Songs.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> - <data name="iconKnowledgeInput" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconKnowledgeInput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon6" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon6.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconmaze" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconmaze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon8" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon8.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconNameChanger" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconNameChanger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="hello" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\hello.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value> </data> - <data name="iconoctocat" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconoctocat.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadpaintbrush" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadpaintbrush.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconorcwrite" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon2.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconPong" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconPong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadcirclerubberselected" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadcirclerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconShifter" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadsave" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconShiftnet" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconShiftnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadnew" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconShiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconShiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ShiftOS" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ShiftOS.rtf;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="iconshutdown" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadmagnify" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadmagnify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconSkinLoader" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconSkinLoader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconBitnoteWallet" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconBitnoteWallet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconSkinShifter" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconSkinShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ArtPadsquarerubber" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadsquarerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconSnakey" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconSnakey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="icongraphicpicker" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\icongraphicpicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconSysinfo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon12" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon12.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconTerminal1" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconTerminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconvirusscanner" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconvirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconTextPad" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconTextPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon11" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon11.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="strings_de" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\strings_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + </data> + <data name="ArtPadredo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadredo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ArtPadopen" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadopen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="iconunitytoggle" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\SystemIcons\iconunitytoggle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconVideoPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconVideoPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon9" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon9.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconvirusscanner" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconvirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fileicon16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fileicon16.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="iconWebBrowser" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\SystemIcons\iconWebBrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconBitnoteDigger" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconBitnoteDigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="RegularDesktopGlyph" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\RegularDesktopGlyph.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="iconColourPicker_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconColourPicker.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ArtPadfloodfill" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadfloodfill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="iconFileSaver_fw" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\SystemIcons\iconFileSaver.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ArtPadRectangle" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ArtPadRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="IconTerminal" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\IconTerminal.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="justthes" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\justthes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root>
\ No newline at end of file diff --git a/ShiftOS.WinForms/Resources/justthes.png b/ShiftOS.WinForms/Resources/justthes.png Binary files differnew file mode 100644 index 0000000..a85ba27 --- /dev/null +++ b/ShiftOS.WinForms/Resources/justthes.png diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 6fc2341..e458704 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -58,6 +58,12 @@ </Reference> </ItemGroup> <ItemGroup> + <Compile Include="Applications\About.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="Applications\About.Designer.cs"> + <DependentUpon>About.cs</DependentUpon> + </Compile> <Compile Include="Applications\Artpad.cs"> <SubType>UserControl</SubType> </Compile> @@ -262,6 +268,9 @@ <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="WinformsWindowManager.cs" /> + <EmbeddedResource Include="Applications\About.resx"> + <DependentUpon>About.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Applications\Artpad.resx"> <DependentUpon>Artpad.cs</DependentUpon> </EmbeddedResource> @@ -518,6 +527,7 @@ </ItemGroup> <ItemGroup> <None Include="Resources\RegularDesktopGlyph.bmp" /> + <None Include="Resources\justthes.png" /> <Content Include="SystemIcons\iconArtpad.png" /> <Content Include="SystemIcons\iconAudioPlayer.png" /> <Content Include="SystemIcons\iconBitnoteDigger.png" /> diff --git a/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs b/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs index f34fd95..28623ef 100644 --- a/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs +++ b/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs @@ -441,11 +441,31 @@ namespace ShiftOS.WinForms.Tools } public override Color MenuStripGradientBegin { - get { return LoadedSkin.Menu_MenuStripGradientBegin; } + get + { + if (LoadedSkin.AppLauncherImage != null) + { + return Color.Transparent; + } + else + { + return LoadedSkin.Menu_MenuStripGradientBegin; + } + } } public override Color MenuStripGradientEnd { - get { return LoadedSkin.Menu_MenuStripGradientEnd; } + get + { + if (LoadedSkin.AppLauncherImage != null) + { + return Color.Transparent; + } + else + { + return LoadedSkin.Menu_MenuStripGradientEnd; + } + } } public override Color MenuItemSelected { diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index ac5198a..45730c4 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -275,7 +275,11 @@ namespace ShiftOS.WinForms })); this.BackgroundImageLayout = GetImageLayout("desktopbackground"); desktoppanel.BackgroundImage = ((Bitmap)GetImage("desktoppanel")); - if (desktoppanel.BackgroundImage != null) ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1)); + 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)); lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor; |
