diff --git a/ShiftOS.WinForms/Applications/Calculator.Designer.cs b/ShiftOS.WinForms/Applications/Calculator.Designer.cs
new file mode 100644
index 0000000..4347aa6
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/Calculator.Designer.cs
@@ -0,0 +1,58 @@
+namespace ShiftOS.WinForms.Applications
+{
+ partial class Calculator
+ {
+ ///
+ /// 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.numBox = new System.Windows.Forms.TextBox();
+ this.SuspendLayout();
+ //
+ // numBox
+ //
+ this.numBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.numBox.Location = new System.Drawing.Point(4, 3);
+ this.numBox.Name = "numBox";
+ this.numBox.Size = new System.Drawing.Size(143, 30);
+ this.numBox.TabIndex = 0;
+ //
+ // Calculator
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.numBox);
+ this.Name = "Calculator";
+ this.Load += new System.EventHandler(this.Template_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox numBox;
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/Calculator.cs b/ShiftOS.WinForms/Applications/Calculator.cs
new file mode 100644
index 0000000..cc34769
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/Calculator.cs
@@ -0,0 +1,52 @@
+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;
+
+namespace ShiftOS.WinForms.Applications
+{
+ [Launcher("Calculator", true, "al_calculator", "Accessories")]
+ [RequiresUpgrade("calculator")]
+ [WinOpen("calculator")]
+ [DefaultIcon("iconCalculator")]
+ public partial class Calculator : UserControl, IShiftOSWindow
+ {
+ public bool justopened = false;
+
+ public Calculator()
+ {
+ InitializeComponent();
+ }
+
+ private void Template_Load(object sender, EventArgs e)
+ {
+ justopened = true;
+ }
+
+ public void OnLoad()
+ {
+ throw new NotImplementedException();
+ }
+
+ public void OnSkinLoad()
+ {
+ throw new NotImplementedException();
+ }
+
+ public bool OnUnload()
+ {
+ throw new NotImplementedException();
+ }
+
+ public void OnUpgrade()
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/Calculator.resx b/ShiftOS.WinForms/Applications/Calculator.resx
new file mode 100644
index 0000000..61bc649
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/Calculator.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ True
+
+
\ No newline at end of file
diff --git a/ShiftOS_TheReturn/Resources/Shiftorium.txt b/ShiftOS_TheReturn/Resources/Shiftorium.txt
index 32c0514..ec0a36d 100644
--- a/ShiftOS_TheReturn/Resources/Shiftorium.txt
+++ b/ShiftOS_TheReturn/Resources/Shiftorium.txt
@@ -594,6 +594,20 @@
Cost: 2500,
Dependencies: "shiftorium_gui",
Description: "In the shiftorium GUI but dont know what you can spend because you can't see how many code points are on hand? Well shop easy, because with this upgrade that is now possible! You have to restart the shiftorium for it to work."
- }
+ },
+
+ // CALCULATOR UPGRADES
+ {
+ 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 Calculator",
+ Cost: 350,
+ Dependencies: "calculator;app_launcher",
+ Description: "Add an App Launcher Entry for the Calculator!"
+ }
]