diff --git a/PCK-Studio/Forms/Utilities/PckCenterBeta.Designer.cs b/PCK-Studio/Forms/Utilities/PckCenterBeta.Designer.cs index 90092557..a0aacd5f 100644 --- a/PCK-Studio/Forms/Utilities/PckCenterBeta.Designer.cs +++ b/PCK-Studio/Forms/Utilities/PckCenterBeta.Designer.cs @@ -350,7 +350,9 @@ this.Controls.Add(this.metroTabControl1); this.Font = new System.Drawing.Font("Segoe UI", 8.25F); this.ForeColor = System.Drawing.Color.White; + this.Location = new System.Drawing.Point(0, 0); this.Name = "PCKCenterBeta"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Pck Center"; this.metroTabControl1.ResumeLayout(false); this.metroTabPage1.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Utilities/Preferences.Designer.cs b/PCK-Studio/Forms/Utilities/Preferences.Designer.cs index 0449e8c7..f6d18231 100644 --- a/PCK-Studio/Forms/Utilities/Preferences.Designer.cs +++ b/PCK-Studio/Forms/Utilities/Preferences.Designer.cs @@ -128,7 +128,7 @@ this.pckWebServerTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.pckWebServerTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // - // Pref + // Preferences // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -140,7 +140,7 @@ this.Controls.Add(this.buttonClose); this.Controls.Add(this.buttonSave); this.ForeColor = System.Drawing.Color.White; - this.Name = "Pref"; + this.Name = "Preferences"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/PCK-Studio/Forms/Utilities/Preferences.resx b/PCK-Studio/Forms/Utilities/Preferences.resx index e1a04467..691c8f72 100644 --- a/PCK-Studio/Forms/Utilities/Preferences.resx +++ b/PCK-Studio/Forms/Utilities/Preferences.resx @@ -330,13 +330,19 @@ Segoe UI, 8.25pt + + 0, 0 + + + CenterParent + Preferences - Pref + Preferences - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + PckStudio.ToolboxItems.ThemeForm, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.Designer.cs b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.Designer.cs index 585bd870..9a3b37ea 100644 --- a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.Designer.cs +++ b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.Designer.cs @@ -63,6 +63,61 @@ ((System.ComponentModel.ISupportInitialize)(this.inflationUpDown)).BeginInit(); this.SuspendLayout(); // + // parentLabel + // + parentLabel.AutoSize = true; + parentLabel.FontSize = MetroFramework.MetroLabelSize.Tall; + parentLabel.Location = new System.Drawing.Point(357, 72); + parentLabel.Name = "parentLabel"; + parentLabel.Size = new System.Drawing.Size(64, 25); + parentLabel.TabIndex = 2; + parentLabel.Text = "Parent:"; + parentLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // positionLabel + // + positionLabel.AutoSize = true; + positionLabel.FontSize = MetroFramework.MetroLabelSize.Tall; + positionLabel.Location = new System.Drawing.Point(33, 72); + positionLabel.Name = "positionLabel"; + positionLabel.Size = new System.Drawing.Size(75, 25); + positionLabel.TabIndex = 4; + positionLabel.Text = "Position:"; + positionLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // sizeLabel + // + sizeLabel.AutoSize = true; + sizeLabel.FontSize = MetroFramework.MetroLabelSize.Tall; + sizeLabel.Location = new System.Drawing.Point(33, 97); + sizeLabel.Name = "sizeLabel"; + sizeLabel.Size = new System.Drawing.Size(46, 25); + sizeLabel.TabIndex = 22; + sizeLabel.Text = "Size:"; + sizeLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // uvLabel + // + uvLabel.AutoSize = true; + uvLabel.FontSize = MetroFramework.MetroLabelSize.Tall; + uvLabel.Location = new System.Drawing.Point(33, 123); + uvLabel.Name = "uvLabel"; + uvLabel.Size = new System.Drawing.Size(39, 25); + uvLabel.TabIndex = 26; + uvLabel.Text = "UV:"; + uvLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // inflationLabel + // + inflationLabel.AutoSize = true; + inflationLabel.FontSize = MetroFramework.MetroLabelSize.Tall; + inflationLabel.Location = new System.Drawing.Point(33, 149); + inflationLabel.Name = "inflationLabel"; + inflationLabel.Size = new System.Drawing.Size(55, 25); + inflationLabel.TabIndex = 31; + inflationLabel.Text = "Scale:"; + inflationLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + // // closeButton // this.closeButton.Location = new System.Drawing.Point(252, 187); @@ -81,17 +136,6 @@ this.toolTip.StyleManager = null; this.toolTip.Theme = MetroFramework.MetroThemeStyle.Dark; // - // parentLabel - // - parentLabel.AutoSize = true; - parentLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - parentLabel.Location = new System.Drawing.Point(357, 72); - parentLabel.Name = "parentLabel"; - parentLabel.Size = new System.Drawing.Size(64, 25); - parentLabel.TabIndex = 2; - parentLabel.Text = "Parent:"; - parentLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - // // parentComboBox // this.parentComboBox.FormattingEnabled = true; @@ -133,17 +177,6 @@ this.parentComboBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.parentComboBox.UseSelectable = true; // - // positionLabel - // - positionLabel.AutoSize = true; - positionLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - positionLabel.Location = new System.Drawing.Point(33, 72); - positionLabel.Name = "positionLabel"; - positionLabel.Size = new System.Drawing.Size(75, 25); - positionLabel.TabIndex = 4; - positionLabel.Text = "Position:"; - positionLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - // // PosXUpDown // this.PosXUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); @@ -279,17 +312,6 @@ this.SizeXUpDown.Size = new System.Drawing.Size(73, 22); this.SizeXUpDown.TabIndex = 23; // - // sizeLabel - // - sizeLabel.AutoSize = true; - sizeLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - sizeLabel.Location = new System.Drawing.Point(33, 97); - sizeLabel.Name = "sizeLabel"; - sizeLabel.Size = new System.Drawing.Size(46, 25); - sizeLabel.TabIndex = 22; - sizeLabel.Text = "Size:"; - sizeLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - // // uvYUpDown // this.uvYUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); @@ -340,17 +362,6 @@ this.uvXUpDown.Size = new System.Drawing.Size(73, 22); this.uvXUpDown.TabIndex = 27; // - // uvLabel - // - uvLabel.AutoSize = true; - uvLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - uvLabel.Location = new System.Drawing.Point(33, 123); - uvLabel.Name = "uvLabel"; - uvLabel.Size = new System.Drawing.Size(39, 25); - uvLabel.TabIndex = 26; - uvLabel.Text = "UV:"; - uvLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - // // armorCheckBox // this.armorCheckBox.AutoSize = true; @@ -399,17 +410,6 @@ this.inflationUpDown.Size = new System.Drawing.Size(73, 22); this.inflationUpDown.TabIndex = 32; // - // inflationLabel - // - inflationLabel.AutoSize = true; - inflationLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - inflationLabel.Location = new System.Drawing.Point(33, 149); - inflationLabel.Name = "inflationLabel"; - inflationLabel.Size = new System.Drawing.Size(55, 25); - inflationLabel.TabIndex = 31; - inflationLabel.Text = "Scale:"; - inflationLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - // // BoxEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -436,10 +436,12 @@ this.Controls.Add(this.closeButton); this.Font = new System.Drawing.Font("Segoe UI", 8.25F); this.ForeColor = System.Drawing.Color.White; + this.Location = new System.Drawing.Point(0, 0); this.MaximumSize = new System.Drawing.Size(630, 554); this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(630, 220); this.Name = "BoxEditor"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "BOX Editor"; ((System.ComponentModel.ISupportInitialize)(this.PosXUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PosYUpDown)).EndInit(); diff --git a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs index cc8a163b..c749dec3 100644 --- a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs +++ b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs @@ -51,7 +51,7 @@ namespace PckStudio.Forms.Utilities.Skins } - public BoxEditor(string inBOX, bool hasInflation) + public BoxEditor(string inBOX, bool hasInflation) { InitializeComponent(); diff --git a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.resx b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.resx index db5d551f..81de611b 100644 --- a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.resx +++ b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - False @@ -135,4 +132,7 @@ False + + 17, 17 + \ No newline at end of file diff --git a/PCK-Studio/Forms/Utilities/TextureConverterUtility.Designer.cs b/PCK-Studio/Forms/Utilities/TextureConverterUtility.Designer.cs index fafa4e53..3d84da70 100644 --- a/PCK-Studio/Forms/Utilities/TextureConverterUtility.Designer.cs +++ b/PCK-Studio/Forms/Utilities/TextureConverterUtility.Designer.cs @@ -121,7 +121,9 @@ namespace PckStudio.Forms.Utilities this.Controls.Add(this.listBox1); this.Font = new System.Drawing.Font("Segoe UI", 8.25F); this.ForeColor = System.Drawing.Color.White; + this.Location = new System.Drawing.Point(0, 0); this.Name = "TextureConverterUtility"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Texture Converter"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextureConverterUtility_FormClosing); this.Load += new System.EventHandler(this.TextureConverterUtility_Load); diff --git a/PCK-Studio/Forms/Utilities/installPS3.Designer.cs b/PCK-Studio/Forms/Utilities/installPS3.Designer.cs index 36f7bbe4..d7105866 100644 --- a/PCK-Studio/Forms/Utilities/installPS3.Designer.cs +++ b/PCK-Studio/Forms/Utilities/installPS3.Designer.cs @@ -312,7 +312,7 @@ this.replacePCKToolStripMenuItem.Text = "Replace with external PCK"; this.replacePCKToolStripMenuItem.Click += new System.EventHandler(this.replacePCKToolStripMenuItem_Click); // - // installPS3 + // InstallPS3 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -321,8 +321,10 @@ this.Controls.Add(this.metroTabControlMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F); this.ForeColor = System.Drawing.Color.White; + this.Location = new System.Drawing.Point(0, 0); this.MaximizeBox = false; - this.Name = "installPS3"; + this.Name = "InstallPS3"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Install to Playstation®3"; this.Load += new System.EventHandler(this.installPS3_Load); this.metroTabPageMain.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Utilities/installVita.Designer.cs b/PCK-Studio/Forms/Utilities/installVita.Designer.cs index 768a20ca..deb4bd89 100644 --- a/PCK-Studio/Forms/Utilities/installVita.Designer.cs +++ b/PCK-Studio/Forms/Utilities/installVita.Designer.cs @@ -314,7 +314,7 @@ namespace PckStudio.Forms this.replacePCKToolStripMenuItem.Text = "Replace with external PCK"; this.replacePCKToolStripMenuItem.Click += new System.EventHandler(this.replacePCKToolStripMenuItem_Click); // - // installVita + // InstallVita // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -323,8 +323,10 @@ namespace PckStudio.Forms this.Controls.Add(this.metroTabControlMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F); this.ForeColor = System.Drawing.Color.White; + this.Location = new System.Drawing.Point(0, 0); this.MaximizeBox = false; - this.Name = "installVita"; + this.Name = "InstallVita"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Install to Playstation®Vita"; this.Load += new System.EventHandler(this.installVita_Load); this.metroTabPageMain.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Utilities/installWiiU.Designer.cs b/PCK-Studio/Forms/Utilities/installWiiU.Designer.cs index 5f3973f3..153ebb5f 100644 --- a/PCK-Studio/Forms/Utilities/installWiiU.Designer.cs +++ b/PCK-Studio/Forms/Utilities/installWiiU.Designer.cs @@ -305,7 +305,7 @@ resources.ApplyResources(this.replacePCKToolStripMenuItem, "replacePCKToolStripMenuItem"); this.replacePCKToolStripMenuItem.Click += new System.EventHandler(this.replacePCKToolStripMenuItem_Click); // - // installWiiU + // InstallWiiU // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -313,7 +313,7 @@ this.Controls.Add(this.metroTabControlMain); this.ForeColor = System.Drawing.Color.White; this.MaximizeBox = false; - this.Name = "installWiiU"; + this.Name = "InstallWiiU"; this.metroTabPageMain.ResumeLayout(false); this.myTablePanel1.ResumeLayout(false); this.myTablePanel1.PerformLayout(); diff --git a/PCK-Studio/Forms/Utilities/installWiiU.resx b/PCK-Studio/Forms/Utilities/installWiiU.resx index e814a9af..31c1bb43 100644 --- a/PCK-Studio/Forms/Utilities/installWiiU.resx +++ b/PCK-Studio/Forms/Utilities/installWiiU.resx @@ -2436,6 +2436,12 @@ AABJRU5ErkJggg== + + 0, 0 + + + CenterParent + Install to Wii U @@ -2452,9 +2458,9 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - installWiiU + InstallWiiU - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + PckStudio.ToolboxItems.ThemeForm, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 6835c5f5..cade13dc 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -572,6 +572,7 @@ BoxEditor.cs + Designer ANIMEditor.cs