From 3a68ba50b95a4adfb4b1ff3682102eddff52b933 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Thu, 3 Aug 2023 13:56:05 +0200 Subject: [PATCH] MainForm.cs - Moved extended version text to Credits form --- .../Additional-Popups/CreditsForm.Designer.cs | 182 ++++++++++-------- .../Forms/Additional-Popups/CreditsForm.cs | 20 +- .../Forms/Additional-Popups/CreditsForm.resx | 21 ++ PCK-Studio/MainForm.cs | 7 - 4 files changed, 128 insertions(+), 102 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs b/PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs index e7eb9d93..8802f918 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs @@ -28,111 +28,131 @@ /// private void InitializeComponent() { + System.Windows.Forms.PictureBox pictureBox1; + MetroFramework.Controls.MetroLabel metroLabel1; + MetroFramework.Controls.MetroLabel metroLabel2; + MetroFramework.Controls.MetroLabel metroLabel3; + MetroFramework.Controls.MetroLabel metroLabel4; + MetroFramework.Controls.MetroLabel metroLabel5; + MetroFramework.Controls.MetroLabel metroLabel6; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreditsForm)); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel5 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel6 = new MetroFramework.Controls.MetroLabel(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.buildLabel = new MetroFramework.Controls.MetroLabel(); + pictureBox1 = new System.Windows.Forms.PictureBox(); + metroLabel1 = new MetroFramework.Controls.MetroLabel(); + metroLabel2 = new MetroFramework.Controls.MetroLabel(); + metroLabel3 = new MetroFramework.Controls.MetroLabel(); + metroLabel4 = new MetroFramework.Controls.MetroLabel(); + metroLabel5 = new MetroFramework.Controls.MetroLabel(); + metroLabel6 = new MetroFramework.Controls.MetroLabel(); + ((System.ComponentModel.ISupportInitialize)(pictureBox1)).BeginInit(); this.SuspendLayout(); // // pictureBox1 // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Enabled = false; - this.pictureBox1.Image = global::PckStudio.Properties.Resources.Splash; - this.pictureBox1.Location = new System.Drawing.Point(4, 5); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(0, 0, 11, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(550, 293); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); - this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_Click); + pictureBox1.BackColor = System.Drawing.Color.Transparent; + pictureBox1.Enabled = false; + pictureBox1.Image = global::PckStudio.Properties.Resources.Splash; + pictureBox1.Location = new System.Drawing.Point(4, 5); + pictureBox1.Margin = new System.Windows.Forms.Padding(0, 0, 11, 0); + pictureBox1.Name = "pictureBox1"; + pictureBox1.Size = new System.Drawing.Size(550, 293); + pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + pictureBox1.TabIndex = 0; + pictureBox1.TabStop = false; // // metroLabel1 // - this.metroLabel1.AutoSize = true; - this.metroLabel1.Enabled = false; - this.metroLabel1.Location = new System.Drawing.Point(4, 301); - this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Size = new System.Drawing.Size(250, 19); - this.metroLabel1.TabIndex = 1; - this.metroLabel1.Text = "Restored and maintained by PhoenixARC"; - this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel1.AutoSize = true; + metroLabel1.Enabled = false; + metroLabel1.Location = new System.Drawing.Point(4, 301); + metroLabel1.Name = "metroLabel1"; + metroLabel1.Size = new System.Drawing.Size(250, 19); + metroLabel1.TabIndex = 1; + metroLabel1.Text = "Restored and maintained by PhoenixARC"; + metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; // // metroLabel2 // - this.metroLabel2.AutoSize = true; - this.metroLabel2.Enabled = false; - this.metroLabel2.Location = new System.Drawing.Point(314, 301); - this.metroLabel2.Name = "metroLabel2"; - this.metroLabel2.Size = new System.Drawing.Size(269, 19); - this.metroLabel2.TabIndex = 2; - this.metroLabel2.Text = "Utilizing the Nobledez Website by Newagent"; - this.metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel2.AutoSize = true; + metroLabel2.Enabled = false; + metroLabel2.Location = new System.Drawing.Point(314, 301); + metroLabel2.Name = "metroLabel2"; + metroLabel2.Size = new System.Drawing.Size(269, 19); + metroLabel2.TabIndex = 2; + metroLabel2.Text = "Utilizing the Nobledez Website by Newagent"; + metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark; // // metroLabel3 // - this.metroLabel3.AutoSize = true; - this.metroLabel3.Enabled = false; - this.metroLabel3.Location = new System.Drawing.Point(314, 339); - this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Size = new System.Drawing.Size(212, 19); - this.metroLabel3.TabIndex = 3; - this.metroLabel3.Text = "3D skin renderer by Łukasz Rejman"; - this.metroLabel3.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel3.AutoSize = true; + metroLabel3.Enabled = false; + metroLabel3.Location = new System.Drawing.Point(314, 339); + metroLabel3.Name = "metroLabel3"; + metroLabel3.Size = new System.Drawing.Size(212, 19); + metroLabel3.TabIndex = 3; + metroLabel3.Text = "3D skin renderer by Łukasz Rejman"; + metroLabel3.Theme = MetroFramework.MetroThemeStyle.Dark; // // metroLabel4 // - this.metroLabel4.AutoSize = true; - this.metroLabel4.Enabled = false; - this.metroLabel4.Location = new System.Drawing.Point(314, 320); - this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Size = new System.Drawing.Size(199, 19); - this.metroLabel4.TabIndex = 4; - this.metroLabel4.Text = "3D renderer found by Newagent"; - this.metroLabel4.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel4.AutoSize = true; + metroLabel4.Enabled = false; + metroLabel4.Location = new System.Drawing.Point(314, 320); + metroLabel4.Name = "metroLabel4"; + metroLabel4.Size = new System.Drawing.Size(199, 19); + metroLabel4.TabIndex = 4; + metroLabel4.Text = "3D renderer found by Newagent"; + metroLabel4.Theme = MetroFramework.MetroThemeStyle.Dark; // // metroLabel5 // - this.metroLabel5.AutoSize = true; - this.metroLabel5.Enabled = false; - this.metroLabel5.Location = new System.Drawing.Point(4, 320); - this.metroLabel5.Name = "metroLabel5"; - this.metroLabel5.Size = new System.Drawing.Size(300, 19); - this.metroLabel5.TabIndex = 5; - this.metroLabel5.Text = "Additional development by MattNL and Miku-666"; - this.metroLabel5.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel5.AutoSize = true; + metroLabel5.Enabled = false; + metroLabel5.Location = new System.Drawing.Point(4, 320); + metroLabel5.Name = "metroLabel5"; + metroLabel5.Size = new System.Drawing.Size(300, 19); + metroLabel5.TabIndex = 5; + metroLabel5.Text = "Additional development by MattNL and Miku-666"; + metroLabel5.Theme = MetroFramework.MetroThemeStyle.Dark; // // metroLabel6 // - this.metroLabel6.AutoSize = true; - this.metroLabel6.Enabled = false; - this.metroLabel6.Location = new System.Drawing.Point(4, 339); - this.metroLabel6.Name = "metroLabel6"; - this.metroLabel6.Size = new System.Drawing.Size(203, 19); - this.metroLabel6.TabIndex = 6; - this.metroLabel6.Text = "Code base overhaul by Miku-666"; - this.metroLabel6.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel6.AutoSize = true; + metroLabel6.Enabled = false; + metroLabel6.Location = new System.Drawing.Point(4, 339); + metroLabel6.Name = "metroLabel6"; + metroLabel6.Size = new System.Drawing.Size(203, 19); + metroLabel6.TabIndex = 6; + metroLabel6.Text = "Code base overhaul by Miku-666"; + metroLabel6.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // buildLabel + // + this.buildLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(34)))), ((int)(((byte)(56))))); + this.buildLabel.Enabled = false; + this.buildLabel.ForeColor = System.Drawing.SystemColors.Control; + this.buildLabel.Location = new System.Drawing.Point(314, 30); + this.buildLabel.Name = "buildLabel"; + this.buildLabel.Size = new System.Drawing.Size(212, 171); + this.buildLabel.TabIndex = 7; + this.buildLabel.Text = "Build Information"; + this.buildLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.buildLabel.Theme = MetroFramework.MetroThemeStyle.Dark; // // CreditsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(585, 364); - this.Controls.Add(this.metroLabel6); - this.Controls.Add(this.metroLabel1); - this.Controls.Add(this.metroLabel5); - this.Controls.Add(this.metroLabel4); - this.Controls.Add(this.metroLabel3); - this.Controls.Add(this.metroLabel2); - this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.buildLabel); + this.Controls.Add(metroLabel6); + this.Controls.Add(metroLabel1); + this.Controls.Add(metroLabel5); + this.Controls.Add(metroLabel4); + this.Controls.Add(metroLabel3); + this.Controls.Add(metroLabel2); + this.Controls.Add(pictureBox1); this.DisplayHeader = false; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -144,7 +164,7 @@ this.Style = MetroFramework.MetroColorStyle.Black; this.Text = "programInfo"; this.Theme = MetroFramework.MetroThemeStyle.Dark; - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -153,12 +173,6 @@ #endregion private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; - private System.Windows.Forms.PictureBox pictureBox1; - private MetroFramework.Controls.MetroLabel metroLabel1; - private MetroFramework.Controls.MetroLabel metroLabel2; - private MetroFramework.Controls.MetroLabel metroLabel3; - private MetroFramework.Controls.MetroLabel metroLabel4; - private MetroFramework.Controls.MetroLabel metroLabel5; - private MetroFramework.Controls.MetroLabel metroLabel6; - } + private MetroFramework.Controls.MetroLabel buildLabel; + } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/CreditsForm.cs b/PCK-Studio/Forms/Additional-Popups/CreditsForm.cs index fb62cf3e..3f0b2ae5 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreditsForm.cs +++ b/PCK-Studio/Forms/Additional-Popups/CreditsForm.cs @@ -1,24 +1,22 @@ using System; using System.Windows.Forms; using MetroFramework.Forms; +using PckStudio.Internal; namespace PckStudio { public partial class CreditsForm : MetroForm { - int count = 0; public CreditsForm() { InitializeComponent(); +#if BETA + buildLabel.Text = $"[Beta] {ApplicationBuildInfo.BetaBuildVersion}@{CommitInfo.BranchName}"; +#elif DEBUG + buildLabel.Text = $"[Debug] {CommitInfo.BranchName}@{CommitInfo.CommitHash}"; +#else + buildLabel.Text = string.Empty; +#endif } - - private void pictureBox1_Click(object sender, EventArgs e) - { - if (++count == 5) - { - MessageBox.Show("🌸Miku🌸 was here!"); - count = 0; - } - } - } + } } diff --git a/PCK-Studio/Forms/Additional-Popups/CreditsForm.resx b/PCK-Studio/Forms/Additional-Popups/CreditsForm.resx index 02993faf..b7a2f32a 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreditsForm.resx +++ b/PCK-Studio/Forms/Additional-Popups/CreditsForm.resx @@ -117,6 +117,27 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + False + + + False + + + False + + + False + + + False + + + False + 17, 17 diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index d8720d99..067e9478 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -74,13 +74,6 @@ namespace PckStudio labelVersion.Text = $"{Application.ProductName}: {Application.ProductVersion}"; ChangelogRichTextBox.Text = Resources.CHANGELOG; -#if BETA - labelVersion.Text += $"{ApplicationBuildInfo.BetaBuildVersion}@{CommitInfo.BranchName}"; -#endif -#if DEBUG - labelVersion.Text += $" (Debug build: {CommitInfo.BranchName}@{CommitInfo.CommitHash})"; -#endif - pckFileTypeHandler = new Dictionary>(15) { [PckFile.FileData.FileType.SkinFile] = HandleSkinFile,