From a9702f02232598f9a66bfeddf3c7fc80c201cc1e Mon Sep 17 00:00:00 2001 From: FireMonkey <38590471+ItsFireMonkey@users.noreply.github.com> Date: Fri, 31 May 2019 20:42:04 -0400 Subject: [PATCH 1/4] About Page Made Simple Went through the code and removed a few label tags, merging them onto one another allowing for less code. Also added the owner of the FModel project, Asval to the credits. --- FModel/Forms/About.Designer.cs | 74 +++++++++------------------------- 1 file changed, 19 insertions(+), 55 deletions(-) diff --git a/FModel/Forms/About.Designer.cs b/FModel/Forms/About.Designer.cs index 8a3b7c02..fce7e89c 100644 --- a/FModel/Forms/About.Designer.cs +++ b/FModel/Forms/About.Designer.cs @@ -36,9 +36,6 @@ this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -51,7 +48,7 @@ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; - // + // // linkLabel1 // this.linkLabel1.AutoSize = true; @@ -78,9 +75,9 @@ // this.label1.Location = new System.Drawing.Point(108, 47); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(360, 17); + this.label1.Size = new System.Drawing.Size(360, 40); this.label1.TabIndex = 3; - this.label1.Text = "FModel is a Fortnite .PAK files explorer built in C#"; + this.label1.Text = "FModel is a Fortnite .PAK file explorer built in C#\r\nIf you find this project useful, feel free to give it a star on GitHub\r\n⊂(◉‿◉)つ"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label2 @@ -95,60 +92,27 @@ // // label3 // - this.label3.Location = new System.Drawing.Point(108, 54); + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(12, 123); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(360, 45); - this.label3.TabIndex = 5; - this.label3.Text = "If you find this project useful, feel free to give it a star on GitHub\r\n⊂(◉‿◉)つ"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label3.Size = new System.Drawing.Size(42, 13); + this.label3.TabIndex = 6; + this.label3.Text = "Credits:"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label4 // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(12, 123); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(42, 13); - this.label4.TabIndex = 6; - this.label4.Text = "Credits:"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label5 - // - this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(127, 124); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(46, 12); - this.label5.TabIndex = 7; - this.label5.Text = "• AyeTSG"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label6 - // - this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(178, 124); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(61, 12); - this.label6.TabIndex = 8; - this.label6.Text = "• FireMonkey"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label8 - // - this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(53, 124); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(71, 12); - this.label8.TabIndex = 11; - this.label8.Text = "• Waddlesworth"; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(53, 124); + this.label4.Name = "label8"; + this.label4.Size = new System.Drawing.Size(71, 12); + this.label4.TabIndex = 11; + this.label4.Text = "• Asval • Waddlesworth • AyeTSG • FireMonkey"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // About // @@ -191,4 +155,4 @@ private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label8; } -} \ No newline at end of file +} From c182486b9d02eeaa3261d45c2216f196806bf755 Mon Sep 17 00:00:00 2001 From: FireMonkey <38590471+ItsFireMonkey@users.noreply.github.com> Date: Fri, 31 May 2019 20:44:14 -0400 Subject: [PATCH 2/4] Label fix --- FModel/Forms/About.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FModel/Forms/About.Designer.cs b/FModel/Forms/About.Designer.cs index fce7e89c..79a7d3e3 100644 --- a/FModel/Forms/About.Designer.cs +++ b/FModel/Forms/About.Designer.cs @@ -108,7 +108,7 @@ this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(53, 124); - this.label4.Name = "label8"; + this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(71, 12); this.label4.TabIndex = 11; this.label4.Text = "• Asval • Waddlesworth • AyeTSG • FireMonkey"; From a6df2bfde9600c23d61e5ab9444e628669faa28d Mon Sep 17 00:00:00 2001 From: FireMonkey <38590471+ItsFireMonkey@users.noreply.github.com> Date: Fri, 31 May 2019 20:48:05 -0400 Subject: [PATCH 3/4] =?UTF-8?q?=E2=8A=82(=E2=97=89=E2=80=BF=E2=97=89)?= =?UTF-8?q?=E3=81=A4=20Becomes=20=E2=8A=82(=E2=97=95=E2=80=BF=E2=97=95)?= =?UTF-8?q?=E3=81=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just less creepy man --- FModel/Forms/About.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FModel/Forms/About.Designer.cs b/FModel/Forms/About.Designer.cs index 79a7d3e3..69c60a28 100644 --- a/FModel/Forms/About.Designer.cs +++ b/FModel/Forms/About.Designer.cs @@ -77,7 +77,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(360, 40); this.label1.TabIndex = 3; - this.label1.Text = "FModel is a Fortnite .PAK file explorer built in C#\r\nIf you find this project useful, feel free to give it a star on GitHub\r\n⊂(◉‿◉)つ"; + this.label1.Text = "FModel is a Fortnite .PAK file explorer built in C#\r\nIf you find this project useful, feel free to give it a star on GitHub\r\n⊂(◕‿◕)つ"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label2 From c4fa43b6285d33b43b3013e4f91f6a30964dff9a Mon Sep 17 00:00:00 2001 From: FireMonkey <38590471+ItsFireMonkey@users.noreply.github.com> Date: Fri, 31 May 2019 20:58:34 -0400 Subject: [PATCH 4/4] About Page Fix #4 --- FModel/Forms/About.Designer.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/FModel/Forms/About.Designer.cs b/FModel/Forms/About.Designer.cs index 69c60a28..ccbd4b68 100644 --- a/FModel/Forms/About.Designer.cs +++ b/FModel/Forms/About.Designer.cs @@ -119,9 +119,6 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(467, 145); - this.Controls.Add(this.label8); - this.Controls.Add(this.label6); - this.Controls.Add(this.label5); this.Controls.Add(this.label4); this.Controls.Add(this.linkLabel2); this.Controls.Add(this.linkLabel1); @@ -151,8 +148,5 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label8; } }