diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.Designer.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.Designer.cs index 6638b2b5..9e03ff1c 100644 --- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.Designer.cs +++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.Designer.cs @@ -34,8 +34,9 @@ this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.lblTitle = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.lblSeparator = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // pictureBox1 @@ -52,9 +53,9 @@ // this.lblStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.lblStatus.Location = new System.Drawing.Point(12, 150); + this.lblStatus.Location = new System.Drawing.Point(12, 13); this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(497, 16); + this.lblStatus.Size = new System.Drawing.Size(493, 16); this.lblStatus.TabIndex = 2; this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -62,10 +63,10 @@ // this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.progressBar1.Location = new System.Drawing.Point(12, 175); + this.progressBar1.Location = new System.Drawing.Point(12, 38); this.progressBar1.MarqueeAnimationSpeed = 5; this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(497, 23); + this.progressBar1.Size = new System.Drawing.Size(493, 23); this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee; this.progressBar1.TabIndex = 3; // @@ -93,35 +94,37 @@ this.label1.TabIndex = 4; this.label1.Text = "version 4.0"; // - // lblSeparator + // panel1 // - this.lblSeparator.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblSeparator.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lblSeparator.Location = new System.Drawing.Point(12, 140); - this.lblSeparator.Name = "lblSeparator"; - this.lblSeparator.Size = new System.Drawing.Size(497, 2); - this.lblSeparator.TabIndex = 5; + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(37)))), ((int)(((byte)(38))))); + this.panel1.Controls.Add(this.lblStatus); + this.panel1.Controls.Add(this.progressBar1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(0, 134); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(517, 72); + this.panel1.TabIndex = 5; // // SplashScreenWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(521, 210); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); + this.ClientSize = new System.Drawing.Size(517, 206); this.ControlBox = false; - this.Controls.Add(this.lblSeparator); + this.Controls.Add(this.panel1); this.Controls.Add(this.label1); this.Controls.Add(this.lblTitle); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.lblStatus); this.Controls.Add(this.pictureBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.ForeColor = System.Drawing.Color.White; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SplashScreenWindow"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -133,6 +136,6 @@ private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.Label lblTitle; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label lblSeparator; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.cs index b0851cb0..5469fe99 100644 --- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.cs +++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/SplashScreenWindow.cs @@ -7,102 +7,104 @@ using System.Windows.Forms; namespace UniversalEditor.UserInterface.WindowsForms { - public partial class SplashScreenWindow : Form - { - public SplashScreenWindow() - { - InitializeComponent(); + public partial class SplashScreenWindow : Form + { + public SplashScreenWindow() + { + InitializeComponent(); - // base.Font = SystemFonts.MenuFont; - // label1.Font = new Font(base.Font.FontFamily, 18, FontStyle.Bold); - // label1.Text = Configuration.ApplicationName; + // base.Font = SystemFonts.MenuFont; + // label1.Font = new Font(base.Font.FontFamily, 18, FontStyle.Bold); + // label1.Text = Configuration.ApplicationName; - // label2.Font = base.Font; + // label2.Font = base.Font; - /* - string path = System.Reflection.Assembly.GetExecutingAssembly().Location; - Icon icn = IconMethods.ExtractAssociatedIcon(path, 0); - if (icn != null) - { - pictureBox1.Image = icn.ToBitmap(); - } - */ + /* + string path = System.Reflection.Assembly.GetExecutingAssembly().Location; + Icon icn = IconMethods.ExtractAssociatedIcon(path, 0); + if (icn != null) + { + pictureBox1.Image = icn.ToBitmap(); + } + */ - if (LocalConfiguration.SplashScreen.Image != null) - { - pictureBox1.Image = LocalConfiguration.SplashScreen.Image; - } - else - { - if (!String.IsNullOrEmpty(LocalConfiguration.SplashScreen.ImageFileName)) - { - if (System.IO.File.Exists(LocalConfiguration.SplashScreen.ImageFileName)) - { - pictureBox1.Image = Image.FromFile(LocalConfiguration.SplashScreen.ImageFileName); - } - } - } - // Size = pictureBox1.Image.Size; - } + lblTitle.Text = Engine.CurrentEngine.DefaultLanguage.GetStringTableEntry("ApplicationTitle", "Universal Editor"); - protected override void OnShown(EventArgs e) - { - base.OnShown(e); + if (LocalConfiguration.SplashScreen.Image != null) + { + pictureBox1.Image = LocalConfiguration.SplashScreen.Image; + } + else + { + if (!String.IsNullOrEmpty(LocalConfiguration.SplashScreen.ImageFileName)) + { + if (System.IO.File.Exists(LocalConfiguration.SplashScreen.ImageFileName)) + { + pictureBox1.Image = Image.FromFile(LocalConfiguration.SplashScreen.ImageFileName); + } + } + } + // Size = pictureBox1.Image.Size; + } - if (LocalConfiguration.SplashScreen.Sound != null) - { - System.Media.SoundPlayer sp = new System.Media.SoundPlayer(LocalConfiguration.SplashScreen.Sound); - sp.Play(); - } - else - { - if (System.IO.File.Exists(LocalConfiguration.SplashScreen.SoundFileName)) - { - System.Media.SoundPlayer sp = new System.Media.SoundPlayer(LocalConfiguration.SplashScreen.SoundFileName); - sp.Play(); - } - } - } + protected override void OnShown(EventArgs e) + { + base.OnShown(e); - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - e.Graphics.DrawRectangle(Pens.Black, new Rectangle(0, 0, base.Width - 1, base.Height - 1)); - } + if (LocalConfiguration.SplashScreen.Sound != null) + { + System.Media.SoundPlayer sp = new System.Media.SoundPlayer(LocalConfiguration.SplashScreen.Sound); + sp.Play(); + } + else + { + if (System.IO.File.Exists(LocalConfiguration.SplashScreen.SoundFileName)) + { + System.Media.SoundPlayer sp = new System.Media.SoundPlayer(LocalConfiguration.SplashScreen.SoundFileName); + sp.Play(); + } + } + } - internal void InvokeClose() - { - Invoke(new Action(_InvokeClose)); - } - private void _InvokeClose() - { - Close(); - } + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + e.Graphics.DrawRectangle(Pens.Black, new Rectangle(0, 0, base.Width - 1, base.Height - 1)); + } - internal void InvokeUpdateStatus(string p) - { - Invoke(new Action(_InvokeUpdateStatus), p); - } - private void _InvokeUpdateStatus(string p) - { - lblStatus.Text = p; - } - } - public class SplashScreenSettings - { - private bool mvarEnabled = true; - public bool Enabled { get { return mvarEnabled; } set { mvarEnabled = value; } } + internal void InvokeClose() + { + Invoke(new Action(_InvokeClose)); + } + private void _InvokeClose() + { + Close(); + } - private string mvarImageFileName = String.Empty; - public string ImageFileName { get { return mvarImageFileName; } set { mvarImageFileName = value; } } + internal void InvokeUpdateStatus(string p) + { + Invoke(new Action(_InvokeUpdateStatus), p); + } + private void _InvokeUpdateStatus(string p) + { + lblStatus.Text = p; + } + } + public class SplashScreenSettings + { + private bool mvarEnabled = true; + public bool Enabled { get { return mvarEnabled; } set { mvarEnabled = value; } } - private string mvarSoundFileName = String.Empty; - public string SoundFileName { get { return mvarSoundFileName; } set { mvarSoundFileName = value; } } + private string mvarImageFileName = String.Empty; + public string ImageFileName { get { return mvarImageFileName; } set { mvarImageFileName = value; } } - private Image mvarImage = null; - public Image Image { get { return mvarImage; } set { mvarImage = value; } } + private string mvarSoundFileName = String.Empty; + public string SoundFileName { get { return mvarSoundFileName; } set { mvarSoundFileName = value; } } - private System.IO.MemoryStream mvarSound = null; - public System.IO.MemoryStream Sound { get { return mvarSound; } set { mvarSound = value; } } - } + private Image mvarImage = null; + public Image Image { get { return mvarImage; } set { mvarImage = value; } } + + private System.IO.MemoryStream mvarSound = null; + public System.IO.MemoryStream Sound { get { return mvarSound; } set { mvarSound = value; } } + } }