diff --git a/ShiftOS.WinForms/Applications/TriPresent.Designer.cs b/ShiftOS.WinForms/Applications/TriPresent.Designer.cs
new file mode 100644
index 0000000..1d7f51f
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/TriPresent.Designer.cs
@@ -0,0 +1,233 @@
+namespace ShiftOS.WinForms.Applications
+{
+ partial class TriPresent
+ {
+ ///
+ /// 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.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.addLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.AddItem = new System.Windows.Forms.Panel();
+ this.cancelAdd = new System.Windows.Forms.Button();
+ this.placeAdd = new System.Windows.Forms.Button();
+ this.yLabel = new System.Windows.Forms.Label();
+ this.xLabel = new System.Windows.Forms.Label();
+ this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
+ this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+ this.labelContents = new System.Windows.Forms.TextBox();
+ this.addItemLabel = new System.Windows.Forms.Label();
+ this.menuStrip1.SuspendLayout();
+ this.AddItem.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.fileToolStripMenuItem,
+ this.editToolStripMenuItem});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(758, 24);
+ this.menuStrip1.TabIndex = 0;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // fileToolStripMenuItem
+ //
+ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.openToolStripMenuItem,
+ this.saveToolStripMenuItem});
+ this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.fileToolStripMenuItem.Text = "&File";
+ //
+ // openToolStripMenuItem
+ //
+ this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.openToolStripMenuItem.Text = "&Open";
+ //
+ // saveToolStripMenuItem
+ //
+ this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+ this.saveToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.saveToolStripMenuItem.Text = "&Save";
+ //
+ // editToolStripMenuItem
+ //
+ this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.addToolStripMenuItem});
+ this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+ this.editToolStripMenuItem.Text = "&Edit";
+ //
+ // addToolStripMenuItem
+ //
+ this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.addLabelToolStripMenuItem});
+ this.addToolStripMenuItem.Name = "addToolStripMenuItem";
+ this.addToolStripMenuItem.Size = new System.Drawing.Size(96, 22);
+ this.addToolStripMenuItem.Text = "Add";
+ //
+ // addLabelToolStripMenuItem
+ //
+ this.addLabelToolStripMenuItem.Name = "addLabelToolStripMenuItem";
+ this.addLabelToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
+ this.addLabelToolStripMenuItem.Text = "Add Label";
+ this.addLabelToolStripMenuItem.Click += new System.EventHandler(this.addLabelToolStripMenuItem_Click);
+ //
+ // AddItem
+ //
+ this.AddItem.Controls.Add(this.cancelAdd);
+ this.AddItem.Controls.Add(this.placeAdd);
+ this.AddItem.Controls.Add(this.yLabel);
+ this.AddItem.Controls.Add(this.xLabel);
+ this.AddItem.Controls.Add(this.numericUpDown2);
+ this.AddItem.Controls.Add(this.numericUpDown1);
+ this.AddItem.Controls.Add(this.labelContents);
+ this.AddItem.Controls.Add(this.addItemLabel);
+ this.AddItem.Location = new System.Drawing.Point(260, 152);
+ this.AddItem.Name = "AddItem";
+ this.AddItem.Size = new System.Drawing.Size(244, 187);
+ this.AddItem.TabIndex = 1;
+ this.AddItem.Visible = false;
+ //
+ // cancelAdd
+ //
+ this.cancelAdd.Location = new System.Drawing.Point(121, 164);
+ this.cancelAdd.Name = "cancelAdd";
+ this.cancelAdd.Size = new System.Drawing.Size(123, 23);
+ this.cancelAdd.TabIndex = 7;
+ this.cancelAdd.Text = "Cancel";
+ this.cancelAdd.UseVisualStyleBackColor = true;
+ this.cancelAdd.Click += new System.EventHandler(this.button2_Click);
+ //
+ // placeAdd
+ //
+ this.placeAdd.Location = new System.Drawing.Point(0, 164);
+ this.placeAdd.Name = "placeAdd";
+ this.placeAdd.Size = new System.Drawing.Size(123, 23);
+ this.placeAdd.TabIndex = 6;
+ this.placeAdd.Text = "Place";
+ this.placeAdd.UseVisualStyleBackColor = true;
+ //
+ // yLabel
+ //
+ this.yLabel.AutoSize = true;
+ this.yLabel.Location = new System.Drawing.Point(227, 117);
+ this.yLabel.Name = "yLabel";
+ this.yLabel.Size = new System.Drawing.Size(14, 13);
+ this.yLabel.TabIndex = 5;
+ this.yLabel.Text = "Y";
+ //
+ // xLabel
+ //
+ this.xLabel.AutoSize = true;
+ this.xLabel.Location = new System.Drawing.Point(3, 117);
+ this.xLabel.Name = "xLabel";
+ this.xLabel.Size = new System.Drawing.Size(14, 13);
+ this.xLabel.TabIndex = 4;
+ this.xLabel.Text = "X";
+ //
+ // numericUpDown2
+ //
+ this.numericUpDown2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.numericUpDown2.Location = new System.Drawing.Point(157, 136);
+ this.numericUpDown2.Name = "numericUpDown2";
+ this.numericUpDown2.Size = new System.Drawing.Size(87, 20);
+ this.numericUpDown2.TabIndex = 3;
+ //
+ // numericUpDown1
+ //
+ this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.numericUpDown1.Location = new System.Drawing.Point(3, 136);
+ this.numericUpDown1.Name = "numericUpDown1";
+ this.numericUpDown1.Size = new System.Drawing.Size(87, 20);
+ this.numericUpDown1.TabIndex = 2;
+ //
+ // labelContents
+ //
+ this.labelContents.Location = new System.Drawing.Point(3, 26);
+ this.labelContents.Multiline = true;
+ this.labelContents.Name = "labelContents";
+ this.labelContents.Size = new System.Drawing.Size(238, 67);
+ this.labelContents.TabIndex = 1;
+ this.labelContents.Text = "Text";
+ //
+ // addItemLabel
+ //
+ this.addItemLabel.Location = new System.Drawing.Point(0, 0);
+ this.addItemLabel.Name = "addItemLabel";
+ this.addItemLabel.Size = new System.Drawing.Size(244, 23);
+ this.addItemLabel.TabIndex = 0;
+ this.addItemLabel.Text = "{ADD_ITEM_LABEL}";
+ this.addItemLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // TriPresent
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.AddItem);
+ this.Controls.Add(this.menuStrip1);
+ this.Name = "TriPresent";
+ this.Size = new System.Drawing.Size(758, 480);
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ this.AddItem.ResumeLayout(false);
+ this.AddItem.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.MenuStrip menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem addLabelToolStripMenuItem;
+ private System.Windows.Forms.Panel AddItem;
+ private System.Windows.Forms.Label addItemLabel;
+ private System.Windows.Forms.Button cancelAdd;
+ private System.Windows.Forms.Button placeAdd;
+ private System.Windows.Forms.Label yLabel;
+ private System.Windows.Forms.Label xLabel;
+ private System.Windows.Forms.NumericUpDown numericUpDown2;
+ private System.Windows.Forms.NumericUpDown numericUpDown1;
+ private System.Windows.Forms.TextBox labelContents;
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/TriPresent.cs b/ShiftOS.WinForms/Applications/TriPresent.cs
new file mode 100644
index 0000000..ab5db09
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/TriPresent.cs
@@ -0,0 +1,37 @@
+using ShiftOS.Objects.ShiftFS;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ShiftOS.Engine;
+
+namespace ShiftOS.WinForms.Applications
+{
+ [WinOpen("tripresent")]
+ [AppscapeEntry("TriPresent", "Part of the trilogy of office applications for enhancement of your system. TriPresent is easliy the best presentation creator out there for ShiftOS.", 1024, 750, "file_skimmer", "Office")]
+ [DefaultTitle("TriPresent")]
+ [Launcher("TriPresent", false, null, "Office")]
+ public partial class TriPresent : UserControl
+ {
+ public TriPresent()
+ {
+ InitializeComponent();
+ }
+
+ private void addLabelToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ addItemLabel.Text = "Add Label";
+ AddItem.Show();
+ }
+
+ private void button2_Click(object sender, EventArgs e)
+ {
+ AddItem.Hide();
+ }
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/TriPresent.resx b/ShiftOS.WinForms/Applications/TriPresent.resx
new file mode 100644
index 0000000..d5494e3
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/TriPresent.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
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 89da4e1..e372a8b 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -70,6 +70,12 @@
About.cs
+
+ UserControl
+
+
+ TriPresent.cs
+
UserControl
@@ -412,6 +418,9 @@
About.cs
+
+ TriPresent.cs
+
TriWrite.cs
diff --git a/ShiftOS_TheReturn/Localization.cs b/ShiftOS_TheReturn/Localization.cs
index 89d3582..2c701c9 100644
--- a/ShiftOS_TheReturn/Localization.cs
+++ b/ShiftOS_TheReturn/Localization.cs
@@ -167,8 +167,24 @@ namespace ShiftOS.Engine
// if the user has saved then store their username and systemname in these string variables please
if (SaveSystem.CurrentSave != null)
{
- usernameReplace = SaveSystem.CurrentUser.Username;
- domainReplace = SaveSystem.CurrentSave.SystemName;
+ try
+ {
+ usernameReplace = SaveSystem.CurrentUser.Username;
+ }
+ catch
+ {
+ usernameReplace = "user";
+ }
+
+ try
+ {
+ domainReplace = SaveSystem.CurrentSave.SystemName;
+ }
+ catch
+ {
+ domainReplace = "system";
+ }
+
}
string namespaceReplace = "";