diff --git a/ShiftOS.WinForms/MainMenu/Loading.Designer.cs b/ShiftOS.WinForms/MainMenu/Loading.Designer.cs index 5cf42d6..c612d96 100644 --- a/ShiftOS.WinForms/MainMenu/Loading.Designer.cs +++ b/ShiftOS.WinForms/MainMenu/Loading.Designer.cs @@ -29,32 +29,74 @@ private void InitializeComponent() { this.label = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // label // - this.label.Dock = System.Windows.Forms.DockStyle.Fill; - this.label.Font = new System.Drawing.Font("Tahoma", 72F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.label.Font = new System.Drawing.Font("Tahoma", 24F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label.ForeColor = System.Drawing.Color.White; - this.label.Location = new System.Drawing.Point(0, 0); + this.label.Location = new System.Drawing.Point(832, 576); this.label.Name = "label"; - this.label.Size = new System.Drawing.Size(284, 262); + this.label.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.label.Size = new System.Drawing.Size(410, 85); this.label.TabIndex = 0; this.label.Text = "{GEN_LOADING}"; - this.label.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label.TextAlign = System.Drawing.ContentAlignment.BottomRight; + this.label.Click += new System.EventHandler(this.label_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(919, 646); + this.panel1.TabIndex = 1; + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.Black; + this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.austmicrotrends; + this.pictureBox1.InitialImage = global::ShiftOS.WinForms.Properties.Resources.austmicrotrends; + this.pictureBox1.Location = new System.Drawing.Point(3, 3); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(619, 193); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(3, 199); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(82, 24); + this.label1.TabIndex = 1; + this.label1.Text = "label1"; // // Loading // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(284, 262); + this.ClientSize = new System.Drawing.Size(1254, 670); + this.Controls.Add(this.panel1); this.Controls.Add(this.label); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "Loading"; this.Text = "Loading"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Shown += new System.EventHandler(this.Loading_FormShown); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); } @@ -62,5 +104,8 @@ #endregion private System.Windows.Forms.Label label; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/ShiftOS.WinForms/MainMenu/Loading.cs b/ShiftOS.WinForms/MainMenu/Loading.cs index c1c0ba0..c69fd3d 100644 --- a/ShiftOS.WinForms/MainMenu/Loading.cs +++ b/ShiftOS.WinForms/MainMenu/Loading.cs @@ -17,6 +17,7 @@ namespace ShiftOS.WinForms.MainMenu { InitializeComponent(); label.Text = Localization.Parse(label.Text); + label1.Text = "AMIBIOS(C)"+ DateTime.Now.Year +" Australian Microtrends, Plc.\nShiftsoft 480-L ACPI BIOS Revision 1002\nCPU : VTC 210-N " + Environment.ProcessorCount + " CPU 1.33GHz\n Speed : 1.337Ghz\n\nPress DEL to run Setup\nPress for BBS POPUP\nDDR3 Frequency 1337MHz, Dual Channel, Linear Mode\nChecking NVRAM\n\n1337MB OK"; } private void Loading_FormShown(object sender, EventArgs e) @@ -25,8 +26,13 @@ namespace ShiftOS.WinForms.MainMenu // before it starts doing stuff. var callback = new Timer(); callback.Tick += (o, a) => { Desktop.CurrentDesktop.Show(); Hide(); callback.Stop(); }; - callback.Interval = 1; + callback.Interval = 1000; //also so the bios screen shows callback.Start(); } + + private void label_Click(object sender, EventArgs e) + { + + } } } diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index 3289a0a..f56285a 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -349,6 +349,16 @@ namespace ShiftOS.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap austmicrotrends { + get { + object obj = ResourceManager.GetObject("austmicrotrends", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1104,7 +1114,7 @@ namespace ShiftOS.WinForms.Properties { /// Name: "NetXtreme Hyper Edition", /// CostPerMonth: 150, /// DownloadSpeed: 524288, //512 kb/s - /// Description: "It's time to supercharge your Shiftnet experience. [rest of string was truncated]";. + /// Description: "It's time to supercharge your Shift [rest of string was truncated]";. /// internal static string ShiftnetServices { get { @@ -1126,8 +1136,7 @@ namespace ShiftOS.WinForms.Properties { /// Name: "Icon Manager", /// Cost: 450, /// Description: "This tool allows you to add and edit application icons within ShiftOS for the small prive of 450 Codepoints!", - /// Dependencies: "skinning", - /// Category [rest of string was truncated]";. + /// Dependencies: "skinning [rest of string was truncated]";. /// internal static string Shiftorium { get { @@ -1137,7 +1146,7 @@ namespace ShiftOS.WinForms.Properties { /// /// Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} - ///{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\flo [rest of string was truncated]";. + ///{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fl [rest of string was truncated]";. /// internal static string ShiftOS { get { @@ -1286,8 +1295,7 @@ namespace ShiftOS.WinForms.Properties { ///Eine kurze Erklärung wie du das Terminal benutzt lautet wiefolgt. Du kannst das command 'sos.help' benutzen um eine Liste aller commands aufzurufen. Schreib es ///einfach in das Terminal und drücke <enter> um alle commands anzuzeigen. /// - ///Commands können mit argumenten versehen werden, indem du ein key-value Paar in einem {} Block hinter dem command angibst. Zum Beispiel: - /// [rest of string was truncated]";. + ///Commands können mit argumenten versehen werden, indem du ein key-value Paar in einem {} Block hinter dem command angibst. Zum Be [rest of string was truncated]";. /// internal static string strings_de { get { @@ -1296,18 +1304,23 @@ namespace ShiftOS.WinForms.Properties { } /// - /// Looks up a localized string similar to { - /// "{SUBMIT}":"Submit", + /// Looks up a localized string similar to /* + /// * ShiftOS English Language Pack + /// * + /// * This is the default language pack distributed within the game. + /// */ /// - ///"{TERMINAL_TUTORIAL_1}":"Welcome to the ShiftOS terminal. This is where you will spend the bulk of your time within ShiftOS. - /// - ///A brief rundown of how to use the terminal is as follows. You can use the 'sos.help' command to show a list of all commands. Simply type it in and strike <enter> to view all commands. - /// - ///Commands can be sent arguments by specifying a key-value pair inside a {} block at the end of the command. For example: - /// - ///some.command{print:\"hello\"} - ///math.add{op1:1,op2:2} - /// [rest of string was truncated]";. + ///{ + /// //General strings + /// //These strings can be used anywhere in the UI where language context isn't necessary. + /// "{GEN_PROGRAMS}": "Programs", + /// "{GEN_COMMANDS}": "Commands", + /// "{GEN_OBJECTIVES}": "Objectives", + /// "{GEN_CURRENTPROCESSES}": "Current processes", + /// "{GEN_WELCOME}": "Welcome to ShiftOS.", + /// "{GEN_SYSTEMNAME}": "System name", + /// "{GEN_PASSWORD}": "Password", + /// "{GEN_LPROMPT [rest of string was truncated]";. /// internal static string strings_en { get { @@ -1495,7 +1508,7 @@ namespace ShiftOS.WinForms.Properties { /// "Before you can begin with ShiftOS, you'll need to know a few things about it.", /// "One: Terminal command syntax.", /// "Inside ShiftOS, the bulk of your time is going to be spent within the Terminal.", - /// "The Terminal is an application that starts up when you turn on your computer. It allows you to execute system commands, open program [rest of string was truncated]";. + /// "The Terminal is an application that starts up when you turn on your computer. It allows you to execute system commands, ope [rest of string was truncated]";. /// internal static string sys_shiftoriumstory { get { diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index 128197b..5e5555b 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -34612,4 +34612,7 @@ ..\Resources\mindblow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\austmicrotrends.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/austmicrotrends.png b/ShiftOS.WinForms/Resources/austmicrotrends.png new file mode 100644 index 0000000..cad4464 Binary files /dev/null and b/ShiftOS.WinForms/Resources/austmicrotrends.png differ diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index fb6e51f..32594bb 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -889,6 +889,7 @@ +