From f4479669c4972797752e57a8d0b35420f87a67f0 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Wed, 16 Nov 2022 17:09:10 +0100 Subject: [PATCH] Rename some form member names due to warrnings --- .../Grf/AddParameter.Designer.cs | 95 +++++++++---------- .../Additional-Popups/Grf/AddParameter.resx | 6 ++ .../MipMapPrompt.Designer.cs | 18 ++-- .../generateModel.Designer.cs | 16 ++-- 4 files changed, 70 insertions(+), 65 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs index 0e4fac52..f17df864 100644 --- a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs @@ -28,34 +28,36 @@ /// private void InitializeComponent() { + MetroFramework.Controls.MetroLabel metroLabel1; + MetroFramework.Controls.MetroLabel metroLabel2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddParameter)); - this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); this.NameTextBox = new MetroFramework.Controls.MetroTextBox(); this.ValueTextBox = new MetroFramework.Controls.MetroTextBox(); - this.CancelButton = new MetroFramework.Controls.MetroButton(); - this.ConfirmButton = new MetroFramework.Controls.MetroButton(); + this.CancelBtn = new MetroFramework.Controls.MetroButton(); + this.ConfirmBtn = new MetroFramework.Controls.MetroButton(); + metroLabel1 = new MetroFramework.Controls.MetroLabel(); + metroLabel2 = new MetroFramework.Controls.MetroLabel(); this.SuspendLayout(); // // metroLabel1 // - this.metroLabel1.AutoSize = true; - this.metroLabel1.Location = new System.Drawing.Point(18, 27); - this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Size = new System.Drawing.Size(48, 19); - this.metroLabel1.TabIndex = 0; - this.metroLabel1.Text = "Name:"; - this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel1.AutoSize = true; + metroLabel1.Location = new System.Drawing.Point(18, 27); + metroLabel1.Name = "metroLabel1"; + metroLabel1.Size = new System.Drawing.Size(48, 19); + metroLabel1.TabIndex = 0; + metroLabel1.Text = "Name:"; + metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; // // metroLabel2 // - this.metroLabel2.AutoSize = true; - this.metroLabel2.Location = new System.Drawing.Point(17, 56); - this.metroLabel2.Name = "metroLabel2"; - this.metroLabel2.Size = new System.Drawing.Size(42, 19); - this.metroLabel2.TabIndex = 1; - this.metroLabel2.Text = "Value:"; - this.metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark; + metroLabel2.AutoSize = true; + metroLabel2.Location = new System.Drawing.Point(17, 56); + metroLabel2.Name = "metroLabel2"; + metroLabel2.Size = new System.Drawing.Size(42, 19); + metroLabel2.TabIndex = 1; + metroLabel2.Text = "Value:"; + metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark; // // NameTextBox // @@ -121,42 +123,42 @@ this.ValueTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.ValueTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // - // CancelButton + // CancelBtn // - this.CancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.CancelButton.Location = new System.Drawing.Point(23, 85); - this.CancelButton.Name = "CancelButton"; - this.CancelButton.Size = new System.Drawing.Size(95, 23); - this.CancelButton.Style = MetroFramework.MetroColorStyle.White; - this.CancelButton.TabIndex = 4; - this.CancelButton.Text = "Cancel"; - this.CancelButton.Theme = MetroFramework.MetroThemeStyle.Dark; - this.CancelButton.UseSelectable = true; + this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.CancelBtn.Location = new System.Drawing.Point(23, 85); + this.CancelBtn.Name = "CancelBtn"; + this.CancelBtn.Size = new System.Drawing.Size(95, 23); + this.CancelBtn.Style = MetroFramework.MetroColorStyle.White; + this.CancelBtn.TabIndex = 4; + this.CancelBtn.Text = "Cancel"; + this.CancelBtn.Theme = MetroFramework.MetroThemeStyle.Dark; + this.CancelBtn.UseSelectable = true; // - // ConfirmButton + // ConfirmBtn // - this.ConfirmButton.Location = new System.Drawing.Point(141, 85); - this.ConfirmButton.Name = "ConfirmButton"; - this.ConfirmButton.Size = new System.Drawing.Size(96, 23); - this.ConfirmButton.Style = MetroFramework.MetroColorStyle.White; - this.ConfirmButton.TabIndex = 5; - this.ConfirmButton.Text = "Confirm"; - this.ConfirmButton.Theme = MetroFramework.MetroThemeStyle.Dark; - this.ConfirmButton.UseSelectable = true; - this.ConfirmButton.Click += new System.EventHandler(this.ConfirmButton_Click); + this.ConfirmBtn.Location = new System.Drawing.Point(141, 85); + this.ConfirmBtn.Name = "ConfirmBtn"; + this.ConfirmBtn.Size = new System.Drawing.Size(96, 23); + this.ConfirmBtn.Style = MetroFramework.MetroColorStyle.White; + this.ConfirmBtn.TabIndex = 5; + this.ConfirmBtn.Text = "Confirm"; + this.ConfirmBtn.Theme = MetroFramework.MetroThemeStyle.Dark; + this.ConfirmBtn.UseSelectable = true; + this.ConfirmBtn.Click += new System.EventHandler(this.ConfirmButton_Click); // // AddParameter // - this.AcceptButton = this.ConfirmButton; + this.AcceptButton = this.ConfirmBtn; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(257, 126); - this.Controls.Add(this.ConfirmButton); - this.Controls.Add(this.CancelButton); + this.Controls.Add(this.ConfirmBtn); + this.Controls.Add(this.CancelBtn); this.Controls.Add(this.ValueTextBox); this.Controls.Add(this.NameTextBox); - this.Controls.Add(this.metroLabel2); - this.Controls.Add(this.metroLabel1); + this.Controls.Add(metroLabel2); + this.Controls.Add(metroLabel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; @@ -170,12 +172,9 @@ } #endregion - - private MetroFramework.Controls.MetroLabel metroLabel1; - private MetroFramework.Controls.MetroLabel metroLabel2; private MetroFramework.Controls.MetroTextBox ValueTextBox; - private MetroFramework.Controls.MetroButton CancelButton; - private MetroFramework.Controls.MetroButton ConfirmButton; + private MetroFramework.Controls.MetroButton CancelBtn; + private MetroFramework.Controls.MetroButton ConfirmBtn; private MetroFramework.Controls.MetroTextBox NameTextBox; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.resx b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.resx index 72d29f17..8f491558 100644 --- a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.resx +++ b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + False + diff --git a/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.Designer.cs index d67b1e1f..a428b920 100644 --- a/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.Designer.cs @@ -30,7 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MipMapPrompt)); this.TextLabel = new System.Windows.Forms.Label(); - this.CancelButton = new System.Windows.Forms.Button(); + this.CancelBtn = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -44,11 +44,11 @@ // // CancelButton // - resources.ApplyResources(this.CancelButton, "CancelButton"); - this.CancelButton.ForeColor = System.Drawing.Color.White; - this.CancelButton.Name = "CancelButton"; - this.CancelButton.UseVisualStyleBackColor = true; - this.CancelButton.Click += new System.EventHandler(this.CancelButton_Click); + resources.ApplyResources(this.CancelBtn, "CancelButton"); + this.CancelBtn.ForeColor = System.Drawing.Color.White; + this.CancelBtn.Name = "CancelButton"; + this.CancelBtn.UseVisualStyleBackColor = true; + this.CancelBtn.Click += new System.EventHandler(this.CancelButton_Click); // // button1 // @@ -80,12 +80,12 @@ // // MipMapPrompt // - this.AcceptButton = this.CancelButton; + this.AcceptButton = this.CancelBtn; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.numericUpDown1); this.Controls.Add(this.button1); - this.Controls.Add(this.CancelButton); + this.Controls.Add(this.CancelBtn); this.Controls.Add(this.TextLabel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.MaximizeBox = false; @@ -102,7 +102,7 @@ } #endregion - public System.Windows.Forms.Button CancelButton; + public System.Windows.Forms.Button CancelBtn; public System.Windows.Forms.Label TextLabel; public System.Windows.Forms.Button button1; private System.Windows.Forms.NumericUpDown numericUpDown1; diff --git a/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs index 28aea801..06ab612b 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs @@ -81,8 +81,8 @@ this.X = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Y = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Z = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.Width = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.Height = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this._Width = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this._Height = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Length = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.U = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.V = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -505,11 +505,11 @@ // // Width // - resources.ApplyResources(this.Width, "Width"); + resources.ApplyResources(this._Width, "Width"); // // Height // - resources.ApplyResources(this.Height, "Height"); + resources.ApplyResources(this._Height, "Height"); // // Length // @@ -531,8 +531,8 @@ this.X, this.Y, this.Z, - this.Width, - this.Height, + this._Width, + this._Height, this.Length, this.U, this.V}); @@ -666,8 +666,8 @@ private System.Windows.Forms.ColumnHeader X; private System.Windows.Forms.ColumnHeader Y; private System.Windows.Forms.ColumnHeader Z; - private System.Windows.Forms.ColumnHeader Width; - private System.Windows.Forms.ColumnHeader Height; + private System.Windows.Forms.ColumnHeader _Width; + private System.Windows.Forms.ColumnHeader _Height; private System.Windows.Forms.ColumnHeader Length; private System.Windows.Forms.ColumnHeader U; private System.Windows.Forms.ColumnHeader V;