diff --git a/ShiftOS.WinForms/Applications/About.Designer.cs b/ShiftOS.WinForms/Applications/About.Designer.cs
new file mode 100644
index 0000000..e44b29e
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/About.Designer.cs
@@ -0,0 +1,102 @@
+namespace ShiftOS.WinForms.Applications
+{
+ partial class About
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.lbshiftit = new System.Windows.Forms.Label();
+ this.lbaboutdesc = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.justthes;
+ this.pictureBox1.Location = new System.Drawing.Point(14, 18);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(105, 105);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(137, 40);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(43, 13);
+ this.label1.TabIndex = 1;
+ this.label1.Tag = "header1";
+ this.label1.Text = "ShiftOS";
+ //
+ // lbshiftit
+ //
+ this.lbshiftit.AutoSize = true;
+ this.lbshiftit.Location = new System.Drawing.Point(140, 73);
+ this.lbshiftit.Name = "lbshiftit";
+ this.lbshiftit.Size = new System.Drawing.Size(84, 13);
+ this.lbshiftit.TabIndex = 2;
+ this.lbshiftit.Tag = "header2";
+ this.lbshiftit.Text = "Shift it your way.";
+ //
+ // lbaboutdesc
+ //
+ this.lbaboutdesc.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lbaboutdesc.Location = new System.Drawing.Point(14, 126);
+ this.lbaboutdesc.Name = "lbaboutdesc";
+ this.lbaboutdesc.Size = new System.Drawing.Size(498, 328);
+ this.lbaboutdesc.TabIndex = 3;
+ this.lbaboutdesc.Text = "label2";
+ //
+ // About
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.lbaboutdesc);
+ this.Controls.Add(this.lbshiftit);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.pictureBox1);
+ this.Name = "About";
+ this.Size = new System.Drawing.Size(532, 474);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label lbshiftit;
+ private System.Windows.Forms.Label lbaboutdesc;
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/About.cs b/ShiftOS.WinForms/Applications/About.cs
new file mode 100644
index 0000000..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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
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
+ {
+ "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
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -883,6 +859,16 @@ namespace ShiftOS.WinForms.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap justthes {
+ get {
+ object obj = ResourceManager.GetObject("justthes", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized string similar to [
/// "english"
@@ -907,23 +893,24 @@ namespace ShiftOS.WinForms.Properties {
///
/// 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]";.
///
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,209 +118,137 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ..\Resources\ArtPadcirclerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadcirclerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPaderacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadfloodfill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ArtPadsquarerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\ArtPadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\ArtPadmagnify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadopen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadOval.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadpaintbrush.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadpencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadpixelplacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadredo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadsquarerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadsquarerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadtexttool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\ArtPadundo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon0.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon10.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon11.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon12.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon13.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon14.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon15.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon16.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon17.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon18.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon19.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon2.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\fileiconsaa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\fileicon3.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\fileicon4.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\SystemIcons\iconVideoPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\fileicon5.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon6.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon7.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon8.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileicon9.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\fileiconsaa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\FloppyDriveIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\hello.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
-
-
- ..\Resources\languages.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
-
- ..\Resources\Shiftorium.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
-
- ..\Resources\Songs.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
-
- ..\Resources\strings_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+ ..\SystemIcons\iconTerminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\strings_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
- ..\Resources\sys_shiftoriumstory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+ ..\Resources\fileicon7.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\ShiftOS.rtf;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\fileicon19.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\SystemIcons\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\IconTerminal.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\SystemIcons\iconTextPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconArtpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\fileicon14.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Shiftorium.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
..\SystemIcons\iconAudioPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconBitnoteDigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\fileicon4.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconBitnoteWallet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\fileicon0.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconCalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\SystemIcons\iconShiftnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon10.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconSnakey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\SystemIcons\iconClock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconColourPicker.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconDodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconDownloader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconFileOpener.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconFileSaver.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\SystemIcons\iconFileSkimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconfloodgate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\fileicon15.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\icongraphicpicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ArtPadundo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconSkinShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\SystemIcons\iconIconManager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ArtPadtexttool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconKnowledgeInput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\sys_shiftoriumstory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
+ ..\SystemIcons\iconSkinLoader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconCalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconDodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\FloppyDriveIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadOval.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon5.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconoctocat.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadpencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconArtpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconPong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\RegularDesktopGlyph.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconfloodgate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadpixelplacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\SystemIcons\iconmaze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -328,58 +256,133 @@
..\SystemIcons\iconNameChanger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconoctocat.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconPong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconShiftnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\SystemIcons\iconShiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\languages.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
- ..\SystemIcons\iconSkinLoader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ArtPadcirclerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconSkinShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ArtPaderacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\SystemIcons\iconSnakey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconTerminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconTextPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconunitytoggle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconVideoPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\SystemIcons\iconvirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\fileicon13.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\SystemIcons\iconWebBrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\RegularDesktopGlyph.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\SystemIcons\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconFileOpener.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon18.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon17.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconKnowledgeInput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconDownloader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Songs.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
+ ..\Resources\fileicon6.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon8.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\hello.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+
+
+ ..\Resources\ArtPadpaintbrush.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon2.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadcirclerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ShiftOS.rtf;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\ArtPadmagnify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconBitnoteWallet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadsquarerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\icongraphicpicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon12.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconvirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon11.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\strings_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
+ ..\Resources\ArtPadredo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadopen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconunitytoggle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon9.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\fileicon16.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconBitnoteDigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconColourPicker.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadfloodfill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\SystemIcons\iconFileSaver.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\ArtPadRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\IconTerminal.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\justthes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Resources/justthes.png b/ShiftOS.WinForms/Resources/justthes.png
new file mode 100644
index 0000000..a85ba27
Binary files /dev/null and b/ShiftOS.WinForms/Resources/justthes.png differ
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 @@
+
+ UserControl
+
+
+ About.cs
+
UserControl
@@ -262,6 +268,9 @@
+
+ About.cs
+
Artpad.cs
@@ -518,6 +527,7 @@
+
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;
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 3952995..9bc876f 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -358,8 +358,8 @@ namespace ShiftOS.Engine
[Command("shutdown")]
public static bool Shutdown()
{
- SaveSystem.ShuttingDown = true;
TerminalBackend.InvokeCommand("sos.save");
+ SaveSystem.ShuttingDown = true;
AppearanceManager.Exit();
return true;
}