added some stuff to the gitignore

This commit is contained in:
John T 2017-09-27 20:46:40 -04:00
commit 52dc6e02dd
7 changed files with 36 additions and 23 deletions

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View file

@ -3,7 +3,6 @@ using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using ImageMagick;
namespace ShiftOS.Engine namespace ShiftOS.Engine
{ {

View file

@ -33,7 +33,7 @@
this.btnOpt2 = new System.Windows.Forms.Button(); this.btnOpt2 = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.changeSize = new System.Windows.Forms.Timer(this.components); this.changeSize = new System.Windows.Forms.Timer(this.components);
this.label1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -84,14 +84,13 @@
// //
// label1 // label1
// //
this.label1.BackColor = System.Drawing.SystemColors.Window; this.label1.AutoSize = true;
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.label1.Font = new System.Drawing.Font("Lucida Console", 9.25F);
this.label1.Font = new System.Drawing.Font("Lucida Console", 9F); this.label1.Location = new System.Drawing.Point(105, 55);
this.label1.Location = new System.Drawing.Point(111, 61);
this.label1.Multiline = true;
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(219, 57); this.label1.Size = new System.Drawing.Size(55, 13);
this.label1.TabIndex = 3; this.label1.TabIndex = 3;
this.label1.Text = "label1";
// //
// InfoboxTemplate // InfoboxTemplate
// //
@ -116,6 +115,6 @@
public System.Windows.Forms.Button btnOpt2; public System.Windows.Forms.Button btnOpt2;
public System.Windows.Forms.PictureBox pictureBox1; public System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Timer changeSize; private System.Windows.Forms.Timer changeSize;
public System.Windows.Forms.TextBox label1; public System.Windows.Forms.Label label1;
} }
} }

View file

@ -17,6 +17,15 @@ namespace ShiftOS.Engine.WindowManager
return Windows.First(p => (uint) control.Tag == p.Id); return Windows.First(p => (uint) control.Tag == p.Id);
} }
/// <summary>
/// Shows a new Window based on a UserControl.
/// </summary>
/// <param name="content">The UserControl to use</param>
/// <param name="title">The program's title</param>
/// <param name="icon">The icon to show</param>
/// <param name="showAsInfobox">Checks if this is an infobox</param>
/// <param name="resize">Enables or disables resizing</param>
/// <returns></returns>
public static ShiftWindow Init(UserControl content, string title, Icon icon, bool showAsInfobox = false, bool resize = true) public static ShiftWindow Init(UserControl content, string title, Icon icon, bool showAsInfobox = false, bool resize = true)
{ {
// Setup Window // Setup Window
@ -68,13 +77,19 @@ namespace ShiftOS.Engine.WindowManager
return app; return app;
} }
/// <summary>
/// Shows a new infobox.
/// </summary>
/// <param name="title">The title of the infobox.</param>
/// <param name="body">The infobox's content.</param>
/// <param name="type">The ButtonType used for the infobox.</param>
/// <returns></returns>
public static InfoboxTemplate StartInfoboxSession(string title, string body, ButtonType type) public static InfoboxTemplate StartInfoboxSession(string title, string body, ButtonType type)
{ {
InfoboxTemplate info = new InfoboxTemplate(type) InfoboxTemplate info = new InfoboxTemplate(type)
{ {
label1 = { Text = body } label1 = { Text = body }
}; };
Init(info, title, Properties.Resources.iconInfoBox_fw.ToIcon(), true, false); Init(info, title, Properties.Resources.iconInfoBox_fw.ToIcon(), true, false);
return info; return info;
} }

View file

@ -167,19 +167,19 @@ namespace ShiftOS.Main
textgeninput = lblhackwords; textgeninput = lblhackwords;
textgen.Interval = 10; textgen.Interval = 10;
rtext = ""; rtext = "";
TextType("Congratulations, you have been involuntarily selected to be an Alpha Tester for ShiftOS." + Environment.NewLine + Environment.NewLine); TextType("Congratulations, " + Environment.UserName + "you have been involuntarily selected to be an Alpha Tester for ShiftOS!" + Environment.NewLine + Environment.NewLine);
break; break;
case 4: case 4:
TextType("At this current point in time I do not wish to reveal my identity or future intentions." + Environment.NewLine + Environment.NewLine); TextType("At this time, I do not wish to reveal any of my intentions and idenity." + Environment.NewLine + Environment.NewLine);
break; break;
case 5: case 5:
TextType("I just need to use you and your computer as an external test bed to evolve my experimental operating system." + Environment.NewLine + Environment.NewLine); TextType("I just need to use you and your computer as an external test bed to evolve my experimental operating system." + Environment.NewLine + Environment.NewLine);
break; break;
case 6: case 6:
TextType("Right now ShiftOS is practically non-existent but Ill work on coding it remotely as you use it." + Environment.NewLine + Environment.NewLine); TextType("I need to expand the name of ShiftOS, so I'll work on it, and you'll have the chance to use ShiftOS!" + Environment.NewLine + Environment.NewLine);
break; break;
case 7: case 7:
TextType("Your hard drive will now be formatted in preparation for the installation of ShiftOS" + Environment.NewLine + Environment.NewLine); TextType("Your hard drive will now be formatted in preparation for the installation of ShiftOS." + Environment.NewLine + Environment.NewLine);
break; break;
case 8: case 8:
TextType("Starting Format."); TextType("Starting Format.");
@ -201,23 +201,23 @@ namespace ShiftOS.Main
rtext = ""; rtext = "";
break; break;
case 20: case 20:
TextType("Scanning Drive C:/"); TextType("Scanning Drive C:\\...");
break; break;
case 21: case 21:
TextType(Environment.NewLine + Environment.NewLine + "Drive Label: " + cdrive.VolumeLabel); TextType(Environment.NewLine + Environment.NewLine + "Drive Label: " + cdrive.VolumeLabel);
break; break;
case 22: case 22:
TextType(Environment.NewLine + "Total Drive Size: " + String.Format((cdrive.TotalSize / 1024 / 1024 / 1024).ToString(), "0.00") + " GigaBytes "); TextType(Environment.NewLine + "Total Drive Size: " + String.Format((cdrive.TotalSize / 1024 / 1024 / 1024).ToString(), "0.00") + "GB. ");
break; break;
case 23: case 23:
TextType(Environment.NewLine + "Old File System: " + cdrive.DriveFormat + " "); TextType(Environment.NewLine + "Old File System: " + cdrive.DriveFormat + ". ");
break; break;
case 24: case 24:
TextType(Environment.NewLine + "New File System: ShiftFS "); TextType(Environment.NewLine + "New File System: ShiftFS. ");
break; break;
case 25: case 25:
TextType(Environment.NewLine + Environment.NewLine + "Formatting C:/ - "); TextType(Environment.NewLine + Environment.NewLine + "Formatting C:\\... - ");
conversationtimer.Interval = 100; conversationtimer.Interval = 100;
break; break;
case 26: // TODO: to 126 case 26: // TODO: to 126