Merge pull request #130 from ComputeLinux/master

Make a better loading screen

2 files changed, 58 insertions, 7 deletions

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 <F8> 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)
+        {
+
+        }
     }
 }