diff --git a/AssetStudioGUI/AboutForm.Designer.cs b/AssetStudioGUI/AboutForm.Designer.cs index 4020a92..dae52d0 100644 --- a/AssetStudioGUI/AboutForm.Designer.cs +++ b/AssetStudioGUI/AboutForm.Designer.cs @@ -71,16 +71,14 @@ // // tabControl1 // - this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(8, 103); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tabControl1.Location = new System.Drawing.Point(0, 106); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(370, 315); - this.tabControl1.TabIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(421, 343); + this.tabControl1.TabIndex = 3; // // tabPage1 // @@ -91,10 +89,10 @@ this.tabPage1.Controls.Add(this.label10); this.tabPage1.Controls.Add(this.tableLayoutPanel2); this.tabPage1.Controls.Add(this.tableLayoutPanel1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Location = new System.Drawing.Point(4, 24); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(362, 289); + this.tabPage1.Size = new System.Drawing.Size(413, 315); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Info"; // @@ -102,11 +100,12 @@ // this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.panel1.AutoSize = true; this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.label2); this.panel1.Location = new System.Drawing.Point(9, 16); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(347, 46); + this.panel1.Size = new System.Drawing.Size(398, 49); this.panel1.TabIndex = 21; // // label2 @@ -115,7 +114,7 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(347, 46); + this.label2.Size = new System.Drawing.Size(398, 49); this.label2.TabIndex = 0; this.label2.Text = "AssetStudio is a tool for exploring, extracting, and exporting assets and asset b" + "undles."; @@ -123,19 +122,18 @@ // // textBox2 // - this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.textBox2.BackColor = System.Drawing.SystemColors.Window; this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox2.Cursor = System.Windows.Forms.Cursors.Default; this.textBox2.Enabled = false; this.textBox2.ForeColor = System.Drawing.SystemColors.GrayText; - this.textBox2.Location = new System.Drawing.Point(9, 232); + this.textBox2.Location = new System.Drawing.Point(3, 261); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(347, 51); - this.textBox2.TabIndex = 20; + this.textBox2.Size = new System.Drawing.Size(407, 51); + this.textBox2.TabIndex = 5; this.textBox2.TabStop = false; this.textBox2.Text = "* Neither the repository, nor the tool, nor the author of the tool, nor the autho" + "r of the modification is affiliated with, sponsored, or authorized by Unity Tech" + @@ -144,10 +142,10 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(6, 150); + this.label11.Location = new System.Drawing.Point(6, 170); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(43, 13); - this.label11.TabIndex = 17; + this.label11.Size = new System.Drawing.Size(49, 15); + this.label11.TabIndex = 3; this.label11.Text = "Authors"; // // label10 @@ -155,31 +153,33 @@ this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(8, 65); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(42, 13); - this.label10.TabIndex = 16; + this.label10.Size = new System.Drawing.Size(45, 15); + this.label10.TabIndex = 1; this.label10.Text = "Version"; // // tableLayoutPanel2 // + this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tableLayoutPanel2.BackColor = System.Drawing.SystemColors.Menu; this.tableLayoutPanel2.ColumnCount = 3; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 41.37931F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 58.62069F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 114F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 27.59494F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 44.81013F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 27.8481F)); this.tableLayoutPanel2.Controls.Add(this.label16, 0, 0); this.tableLayoutPanel2.Controls.Add(this.label17, 1, 0); this.tableLayoutPanel2.Controls.Add(this.gitPerfareLinkLabel, 2, 0); this.tableLayoutPanel2.Controls.Add(this.label18, 0, 1); this.tableLayoutPanel2.Controls.Add(this.label19, 1, 1); this.tableLayoutPanel2.Controls.Add(this.gitAelurumLinkLabel, 2, 1); - this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 165); + this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 185); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Padding = new System.Windows.Forms.Padding(2); this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(350, 40); - this.tableLayoutPanel2.TabIndex = 15; + this.tableLayoutPanel2.Size = new System.Drawing.Size(399, 40); + this.tableLayoutPanel2.TabIndex = 4; // // label16 // @@ -187,18 +187,18 @@ this.label16.BackColor = System.Drawing.Color.Transparent; this.label16.Location = new System.Drawing.Point(5, 2); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(78, 13); - this.label16.TabIndex = 9; + this.label16.Size = new System.Drawing.Size(90, 15); + this.label16.TabIndex = 0; this.label16.Text = "Original author:"; // // label17 // this.label17.AutoSize = true; this.label17.BackColor = System.Drawing.Color.Transparent; - this.label17.Location = new System.Drawing.Point(101, 2); + this.label17.Location = new System.Drawing.Point(113, 2); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(110, 13); - this.label17.TabIndex = 10; + this.label17.Size = new System.Drawing.Size(117, 15); + this.label17.TabIndex = 1; this.label17.Text = "Perfare (c) 2016-2022"; // // gitPerfareLinkLabel @@ -206,10 +206,10 @@ this.gitPerfareLinkLabel.AutoSize = true; this.gitPerfareLinkLabel.BackColor = System.Drawing.Color.Transparent; this.gitPerfareLinkLabel.LinkColor = System.Drawing.SystemColors.MenuHighlight; - this.gitPerfareLinkLabel.Location = new System.Drawing.Point(237, 2); + this.gitPerfareLinkLabel.Location = new System.Drawing.Point(289, 2); this.gitPerfareLinkLabel.Name = "gitPerfareLinkLabel"; - this.gitPerfareLinkLabel.Size = new System.Drawing.Size(67, 13); - this.gitPerfareLinkLabel.TabIndex = 11; + this.gitPerfareLinkLabel.Size = new System.Drawing.Size(74, 15); + this.gitPerfareLinkLabel.TabIndex = 2; this.gitPerfareLinkLabel.TabStop = true; this.gitPerfareLinkLabel.Text = "GitHub page"; this.gitPerfareLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gitPerfareLinkLabel_LinkClicked); @@ -220,18 +220,18 @@ this.label18.BackColor = System.Drawing.Color.Transparent; this.label18.Location = new System.Drawing.Point(5, 20); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(76, 13); - this.label18.TabIndex = 12; + this.label18.Size = new System.Drawing.Size(89, 15); + this.label18.TabIndex = 3; this.label18.Text = "Author of mod:"; // // label19 // this.label19.AutoSize = true; this.label19.BackColor = System.Drawing.Color.Transparent; - this.label19.Location = new System.Drawing.Point(101, 20); + this.label19.Location = new System.Drawing.Point(113, 20); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(113, 13); - this.label19.TabIndex = 13; + this.label19.Size = new System.Drawing.Size(124, 15); + this.label19.TabIndex = 4; this.label19.Text = "aelurum (c) 2021-2025"; // // gitAelurumLinkLabel @@ -239,21 +239,23 @@ this.gitAelurumLinkLabel.AutoSize = true; this.gitAelurumLinkLabel.BackColor = System.Drawing.Color.Transparent; this.gitAelurumLinkLabel.LinkColor = System.Drawing.SystemColors.MenuHighlight; - this.gitAelurumLinkLabel.Location = new System.Drawing.Point(237, 20); + this.gitAelurumLinkLabel.Location = new System.Drawing.Point(289, 20); this.gitAelurumLinkLabel.Name = "gitAelurumLinkLabel"; - this.gitAelurumLinkLabel.Size = new System.Drawing.Size(67, 13); - this.gitAelurumLinkLabel.TabIndex = 14; + this.gitAelurumLinkLabel.Size = new System.Drawing.Size(74, 15); + this.gitAelurumLinkLabel.TabIndex = 5; this.gitAelurumLinkLabel.TabStop = true; this.gitAelurumLinkLabel.Text = "GitHub page"; this.gitAelurumLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gitAelurumLinkLabel_LinkClicked); // // tableLayoutPanel1 // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tableLayoutPanel1.BackColor = System.Drawing.SystemColors.Menu; this.tableLayoutPanel1.ColumnCount = 3; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 41.37931F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 58.62069F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 114F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 38.46154F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 61.53846F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.Controls.Add(this.label5, 0, 0); this.tableLayoutPanel1.Controls.Add(this.productNamelabel, 1, 0); this.tableLayoutPanel1.Controls.Add(this.label7, 0, 1); @@ -268,11 +270,8 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(350, 60); - this.tableLayoutPanel1.TabIndex = 5; + this.tableLayoutPanel1.Size = new System.Drawing.Size(399, 60); + this.tableLayoutPanel1.TabIndex = 2; // // label5 // @@ -280,7 +279,7 @@ this.label5.BackColor = System.Drawing.Color.Transparent; this.label5.Location = new System.Drawing.Point(5, 2); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(76, 13); + this.label5.Size = new System.Drawing.Size(85, 15); this.label5.TabIndex = 0; this.label5.Text = "Product name:"; // @@ -288,9 +287,9 @@ // this.productNamelabel.AutoSize = true; this.productNamelabel.BackColor = System.Drawing.Color.Transparent; - this.productNamelabel.Location = new System.Drawing.Point(101, 2); + this.productNamelabel.Location = new System.Drawing.Point(114, 2); this.productNamelabel.Name = "productNamelabel"; - this.productNamelabel.Size = new System.Drawing.Size(103, 13); + this.productNamelabel.Size = new System.Drawing.Size(113, 15); this.productNamelabel.TabIndex = 1; this.productNamelabel.Text = "AssetStudioModGUI"; // @@ -300,7 +299,7 @@ this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.Location = new System.Drawing.Point(5, 20); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(68, 13); + this.label7.Size = new System.Drawing.Size(76, 15); this.label7.TabIndex = 2; this.label7.Text = "Mod version:"; // @@ -309,7 +308,7 @@ this.modVersionLabel.AutoSize = true; this.modVersionLabel.BackColor = System.Drawing.Color.Transparent; this.modVersionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.modVersionLabel.Location = new System.Drawing.Point(101, 20); + this.modVersionLabel.Location = new System.Drawing.Point(114, 20); this.modVersionLabel.Name = "modVersionLabel"; this.modVersionLabel.Size = new System.Drawing.Size(46, 13); this.modVersionLabel.TabIndex = 3; @@ -323,43 +322,44 @@ this.label4.Location = new System.Drawing.Point(5, 38); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(55, 13); - this.label4.TabIndex = 4; + this.label4.TabIndex = 5; this.label4.Text = "Based on:"; // // label8 // this.label8.AutoSize = true; this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Location = new System.Drawing.Point(101, 38); + this.label8.Location = new System.Drawing.Point(114, 38); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(108, 13); - this.label8.TabIndex = 5; + this.label8.Size = new System.Drawing.Size(114, 15); + this.label8.TabIndex = 6; this.label8.Text = "AssetStudio v0.16.47"; // // checkUpdatesLinkLabel // this.checkUpdatesLinkLabel.AutoSize = true; this.checkUpdatesLinkLabel.BackColor = System.Drawing.Color.Transparent; + this.checkUpdatesLinkLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.checkUpdatesLinkLabel.LinkColor = System.Drawing.SystemColors.MenuHighlight; - this.checkUpdatesLinkLabel.Location = new System.Drawing.Point(237, 20); + this.checkUpdatesLinkLabel.Location = new System.Drawing.Point(289, 20); this.checkUpdatesLinkLabel.Name = "checkUpdatesLinkLabel"; - this.checkUpdatesLinkLabel.Size = new System.Drawing.Size(96, 13); - this.checkUpdatesLinkLabel.TabIndex = 6; + this.checkUpdatesLinkLabel.Size = new System.Drawing.Size(105, 18); + this.checkUpdatesLinkLabel.TabIndex = 4; this.checkUpdatesLinkLabel.TabStop = true; this.checkUpdatesLinkLabel.Text = "Check for Updates"; + this.checkUpdatesLinkLabel.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.checkUpdatesLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.checkUpdatesLinkLabel_LinkClicked); // // tabPage2 // this.tabPage2.BackColor = System.Drawing.SystemColors.Window; this.tabPage2.Controls.Add(this.licenseRichTextBox); - this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Location = new System.Drawing.Point(4, 24); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(362, 289); + this.tabPage2.Size = new System.Drawing.Size(413, 315); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "License"; - this.tabPage2.UseVisualStyleBackColor = true; // // licenseRichTextBox // @@ -370,7 +370,7 @@ this.licenseRichTextBox.Location = new System.Drawing.Point(3, 3); this.licenseRichTextBox.Name = "licenseRichTextBox"; this.licenseRichTextBox.ReadOnly = true; - this.licenseRichTextBox.Size = new System.Drawing.Size(356, 283); + this.licenseRichTextBox.Size = new System.Drawing.Size(407, 309); this.licenseRichTextBox.TabIndex = 0; this.licenseRichTextBox.Text = "MIT License"; this.licenseRichTextBox.ZoomFactor = 1.1F; @@ -382,7 +382,7 @@ this.pictureBox1.Image = global::AssetStudioGUI.Properties.Resources.as_logo; this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(384, 50); + this.pictureBox1.Size = new System.Drawing.Size(421, 50); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -394,7 +394,7 @@ this.productTitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.productTitleLabel.Location = new System.Drawing.Point(0, 52); this.productTitleLabel.Name = "productTitleLabel"; - this.productTitleLabel.Size = new System.Drawing.Size(384, 30); + this.productTitleLabel.Size = new System.Drawing.Size(421, 30); this.productTitleLabel.TabIndex = 1; this.productTitleLabel.Text = "AssetStudioModGUI"; this.productTitleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -404,10 +404,10 @@ this.CloseButton.BackColor = System.Drawing.SystemColors.ButtonFace; this.CloseButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.CloseButton.Dock = System.Windows.Forms.DockStyle.Bottom; - this.CloseButton.Location = new System.Drawing.Point(0, 422); + this.CloseButton.Location = new System.Drawing.Point(0, 449); this.CloseButton.Name = "CloseButton"; - this.CloseButton.Size = new System.Drawing.Size(384, 39); - this.CloseButton.TabIndex = 1; + this.CloseButton.Size = new System.Drawing.Size(421, 39); + this.CloseButton.TabIndex = 4; this.CloseButton.Text = "Close"; this.CloseButton.UseVisualStyleBackColor = false; // @@ -418,10 +418,10 @@ this.productVersionLabel.Location = new System.Drawing.Point(0, 82); this.productVersionLabel.Name = "productVersionLabel"; this.productVersionLabel.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); - this.productVersionLabel.Size = new System.Drawing.Size(384, 13); + this.productVersionLabel.Size = new System.Drawing.Size(421, 13); this.productVersionLabel.TabIndex = 2; this.productVersionLabel.Text = "v0.18.0.0 [x64]"; - this.productVersionLabel.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.productVersionLabel.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // panel2 // @@ -431,7 +431,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(384, 95); + this.panel2.Size = new System.Drawing.Size(421, 95); this.panel2.TabIndex = 3; // // panel3 @@ -439,22 +439,26 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Top; this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(384, 5); + this.panel3.Size = new System.Drawing.Size(421, 5); this.panel3.TabIndex = 3; // // AboutForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoScroll = true; + this.AutoSize = true; this.CancelButton = this.CloseButton; - this.ClientSize = new System.Drawing.Size(384, 461); + this.ClientSize = new System.Drawing.Size(421, 488); this.Controls.Add(this.panel2); this.Controls.Add(this.panel3); - this.Controls.Add(this.CloseButton); this.Controls.Add(this.tabControl1); + this.Controls.Add(this.CloseButton); + this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(450, 550); this.MinimizeBox = false; this.Name = "AboutForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -484,8 +488,6 @@ private System.Windows.Forms.Label productVersionLabel; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label17; private System.Windows.Forms.LinkLabel gitPerfareLinkLabel; @@ -506,5 +508,7 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; } } \ No newline at end of file diff --git a/AssetStudioGUI/AssetStudioGUI.csproj b/AssetStudioGUI/AssetStudioGUI.csproj index 258da4b..a68dae0 100644 --- a/AssetStudioGUI/AssetStudioGUI.csproj +++ b/AssetStudioGUI/AssetStudioGUI.csproj @@ -17,6 +17,10 @@ app.manifest + + + + diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs index 1a70155..2f607a9 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs @@ -894,7 +894,6 @@ this.tabControl1.Padding = new System.Drawing.Point(17, 3); this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(480, 633); - this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 0; this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected); // @@ -902,9 +901,9 @@ // this.tabPage1.Controls.Add(this.sceneTreeView); this.tabPage1.Controls.Add(this.panel2); - this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Location = new System.Drawing.Point(4, 24); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(472, 607); + this.tabPage1.Size = new System.Drawing.Size(472, 605); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Scene Hierarchy"; this.tabPage1.UseVisualStyleBackColor = true; @@ -918,7 +917,7 @@ this.sceneTreeView.HideSelection = false; this.sceneTreeView.Location = new System.Drawing.Point(0, 22); this.sceneTreeView.Name = "sceneTreeView"; - this.sceneTreeView.Size = new System.Drawing.Size(472, 585); + this.sceneTreeView.Size = new System.Drawing.Size(472, 583); this.sceneTreeView.TabIndex = 0; this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck); this.sceneTreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.sceneTreeView_NodeMouseClick); @@ -938,9 +937,9 @@ // this.sceneExactSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.sceneExactSearchCheckBox.Cursor = System.Windows.Forms.Cursors.Hand; - this.sceneExactSearchCheckBox.Location = new System.Drawing.Point(377, 3); + this.sceneExactSearchCheckBox.Location = new System.Drawing.Point(369, 3); this.sceneExactSearchCheckBox.Name = "sceneExactSearchCheckBox"; - this.sceneExactSearchCheckBox.Size = new System.Drawing.Size(92, 16); + this.sceneExactSearchCheckBox.Size = new System.Drawing.Size(100, 16); this.sceneExactSearchCheckBox.TabIndex = 2; this.sceneExactSearchCheckBox.Text = "Exact search"; this.sceneExactSearchCheckBox.UseVisualStyleBackColor = true; @@ -953,7 +952,7 @@ this.treeSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.treeSearch.Location = new System.Drawing.Point(0, 0); this.treeSearch.Name = "treeSearch"; - this.treeSearch.Size = new System.Drawing.Size(472, 20); + this.treeSearch.Size = new System.Drawing.Size(472, 23); this.treeSearch.TabIndex = 1; this.treeSearch.Text = " Search "; this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged); @@ -965,9 +964,9 @@ // this.tabPage2.Controls.Add(this.assetListView); this.tabPage2.Controls.Add(this.panel1); - this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Location = new System.Drawing.Point(4, 24); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(472, 607); + this.tabPage2.Size = new System.Drawing.Size(472, 605); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Asset List"; this.tabPage2.UseVisualStyleBackColor = true; @@ -987,7 +986,7 @@ this.assetListView.HideSelection = false; this.assetListView.Location = new System.Drawing.Point(0, 23); this.assetListView.Name = "assetListView"; - this.assetListView.Size = new System.Drawing.Size(472, 584); + this.assetListView.Size = new System.Drawing.Size(472, 582); this.assetListView.TabIndex = 0; this.assetListView.UseCompatibleStateImageBehavior = false; this.assetListView.View = System.Windows.Forms.View.Details; @@ -1062,7 +1061,7 @@ this.listSearchHistory.Dock = System.Windows.Forms.DockStyle.Fill; this.listSearchHistory.Location = new System.Drawing.Point(0, 0); this.listSearchHistory.Name = "listSearchHistory"; - this.listSearchHistory.Size = new System.Drawing.Size(351, 21); + this.listSearchHistory.Size = new System.Drawing.Size(351, 23); this.listSearchHistory.TabIndex = 2; this.listSearchHistory.TabStop = false; this.listSearchHistory.SelectedIndexChanged += new System.EventHandler(this.listSearchHistory_SelectedIndexChanged); @@ -1081,16 +1080,16 @@ "Regex (Container)"}); this.listSearchFilterMode.Location = new System.Drawing.Point(351, 0); this.listSearchFilterMode.Name = "listSearchFilterMode"; - this.listSearchFilterMode.Size = new System.Drawing.Size(121, 21); + this.listSearchFilterMode.Size = new System.Drawing.Size(121, 23); this.listSearchFilterMode.TabIndex = 2; this.listSearchFilterMode.SelectedIndexChanged += new System.EventHandler(this.listSearchFilterMode_SelectedIndexChanged); // // tabPage3 // this.tabPage3.Controls.Add(this.classesListView); - this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Location = new System.Drawing.Point(4, 24); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(472, 607); + this.tabPage3.Size = new System.Drawing.Size(472, 605); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Asset Classes"; this.tabPage3.UseVisualStyleBackColor = true; @@ -1106,7 +1105,7 @@ this.classesListView.Location = new System.Drawing.Point(0, 0); this.classesListView.MultiSelect = false; this.classesListView.Name = "classesListView"; - this.classesListView.Size = new System.Drawing.Size(472, 607); + this.classesListView.Size = new System.Drawing.Size(472, 605); this.classesListView.TabIndex = 0; this.classesListView.UseCompatibleStateImageBehavior = false; this.classesListView.View = System.Windows.Forms.View.Details; @@ -1161,9 +1160,9 @@ // tabPage4 // this.tabPage4.Controls.Add(this.previewPanel); - this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Location = new System.Drawing.Point(4, 24); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(768, 607); + this.tabPage4.Size = new System.Drawing.Size(768, 605); this.tabPage4.TabIndex = 0; this.tabPage4.Text = "Preview"; this.tabPage4.UseVisualStyleBackColor = true; @@ -1181,7 +1180,7 @@ this.previewPanel.Image = global::AssetStudioGUI.Properties.Resources.preview; this.previewPanel.Location = new System.Drawing.Point(0, 0); this.previewPanel.Name = "previewPanel"; - this.previewPanel.Size = new System.Drawing.Size(768, 607); + this.previewPanel.Size = new System.Drawing.Size(768, 605); this.previewPanel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.previewPanel.TabIndex = 1; this.previewPanel.TabStop = false; @@ -1195,7 +1194,7 @@ this.assetInfoLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.assetInfoLabel.Location = new System.Drawing.Point(4, 8); this.assetInfoLabel.Name = "assetInfoLabel"; - this.assetInfoLabel.Size = new System.Drawing.Size(0, 13); + this.assetInfoLabel.Size = new System.Drawing.Size(0, 15); this.assetInfoLabel.TabIndex = 0; // // FMODpanel @@ -1215,7 +1214,7 @@ this.FMODpanel.Dock = System.Windows.Forms.DockStyle.Fill; this.FMODpanel.Location = new System.Drawing.Point(0, 0); this.FMODpanel.Name = "FMODpanel"; - this.FMODpanel.Size = new System.Drawing.Size(768, 607); + this.FMODpanel.Size = new System.Drawing.Size(768, 605); this.FMODpanel.TabIndex = 2; this.FMODpanel.Visible = false; // @@ -1228,7 +1227,7 @@ this.FMODaudioChannelsLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.FMODaudioChannelsLabel.Location = new System.Drawing.Point(384, 255); this.FMODaudioChannelsLabel.Name = "FMODaudioChannelsLabel"; - this.FMODaudioChannelsLabel.Size = new System.Drawing.Size(38, 13); + this.FMODaudioChannelsLabel.Size = new System.Drawing.Size(40, 15); this.FMODaudioChannelsLabel.TabIndex = 10; this.FMODaudioChannelsLabel.Text = "Stereo"; // @@ -1241,7 +1240,7 @@ this.FMODcopyrightLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.FMODcopyrightLabel.Location = new System.Drawing.Point(214, 365); this.FMODcopyrightLabel.Name = "FMODcopyrightLabel"; - this.FMODcopyrightLabel.Size = new System.Drawing.Size(283, 13); + this.FMODcopyrightLabel.Size = new System.Drawing.Size(316, 15); this.FMODcopyrightLabel.TabIndex = 9; this.FMODcopyrightLabel.Text = "Audio Engine supplied by FMOD by Firelight Technologies."; // @@ -1254,7 +1253,7 @@ this.FMODinfoLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.FMODinfoLabel.Location = new System.Drawing.Point(285, 255); this.FMODinfoLabel.Name = "FMODinfoLabel"; - this.FMODinfoLabel.Size = new System.Drawing.Size(0, 13); + this.FMODinfoLabel.Size = new System.Drawing.Size(0, 15); this.FMODinfoLabel.TabIndex = 8; // // FMODtimerLabel @@ -1266,7 +1265,7 @@ this.FMODtimerLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.FMODtimerLabel.Location = new System.Drawing.Point(477, 255); this.FMODtimerLabel.Name = "FMODtimerLabel"; - this.FMODtimerLabel.Size = new System.Drawing.Size(102, 13); + this.FMODtimerLabel.Size = new System.Drawing.Size(102, 15); this.FMODtimerLabel.TabIndex = 7; this.FMODtimerLabel.Text = "00:00.00 / 00:00.00"; // @@ -1279,7 +1278,7 @@ this.FMODstatusLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.FMODstatusLabel.Location = new System.Drawing.Point(214, 255); this.FMODstatusLabel.Name = "FMODstatusLabel"; - this.FMODstatusLabel.Size = new System.Drawing.Size(47, 13); + this.FMODstatusLabel.Size = new System.Drawing.Size(51, 15); this.FMODstatusLabel.TabIndex = 6; this.FMODstatusLabel.Text = "Stopped"; // @@ -1373,7 +1372,7 @@ this.fontPreviewBox.Location = new System.Drawing.Point(0, 0); this.fontPreviewBox.Name = "fontPreviewBox"; this.fontPreviewBox.ReadOnly = true; - this.fontPreviewBox.Size = new System.Drawing.Size(768, 607); + this.fontPreviewBox.Size = new System.Drawing.Size(768, 605); this.fontPreviewBox.TabIndex = 0; this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text"); this.fontPreviewBox.Visible = false; @@ -1385,7 +1384,7 @@ this.glControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.glControl1.Location = new System.Drawing.Point(0, 0); this.glControl1.Name = "glControl1"; - this.glControl1.Size = new System.Drawing.Size(768, 607); + this.glControl1.Size = new System.Drawing.Size(768, 605); this.glControl1.TabIndex = 4; this.glControl1.Visible = false; this.glControl1.VSync = false; @@ -1406,7 +1405,7 @@ this.textPreviewBox.Name = "textPreviewBox"; this.textPreviewBox.ReadOnly = true; this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textPreviewBox.Size = new System.Drawing.Size(768, 607); + this.textPreviewBox.Size = new System.Drawing.Size(768, 605); this.textPreviewBox.TabIndex = 2; this.textPreviewBox.Visible = false; this.textPreviewBox.WordWrap = false; @@ -1420,7 +1419,7 @@ this.classTextBox.Name = "classTextBox"; this.classTextBox.ReadOnly = true; this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.classTextBox.Size = new System.Drawing.Size(768, 607); + this.classTextBox.Size = new System.Drawing.Size(768, 605); this.classTextBox.TabIndex = 3; this.classTextBox.Visible = false; this.classTextBox.WordWrap = false; @@ -1429,9 +1428,9 @@ // this.tabPage5.Controls.Add(this.dumpTreeView); this.tabPage5.Controls.Add(this.dumpTextBox); - this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Location = new System.Drawing.Point(4, 24); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Size = new System.Drawing.Size(768, 607); + this.tabPage5.Size = new System.Drawing.Size(768, 605); this.tabPage5.TabIndex = 1; this.tabPage5.Text = "Dump"; this.tabPage5.UseVisualStyleBackColor = true; @@ -1442,7 +1441,7 @@ this.dumpTreeView.Location = new System.Drawing.Point(0, 0); this.dumpTreeView.Name = "dumpTreeView"; this.dumpTreeView.PathSeparator = "/"; - this.dumpTreeView.Size = new System.Drawing.Size(768, 607); + this.dumpTreeView.Size = new System.Drawing.Size(768, 605); this.dumpTreeView.TabIndex = 1; this.dumpTreeView.Visible = false; this.dumpTreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.DumpTreeView_NodeMouseClick); @@ -1456,7 +1455,7 @@ this.dumpTextBox.Name = "dumpTextBox"; this.dumpTextBox.ReadOnly = true; this.dumpTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.dumpTextBox.Size = new System.Drawing.Size(768, 607); + this.dumpTextBox.Size = new System.Drawing.Size(768, 605); this.dumpTextBox.TabIndex = 0; this.dumpTextBox.WordWrap = false; // @@ -1693,9 +1692,13 @@ // AssetStudioGUIForm // this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoSize = true; this.ClientSize = new System.Drawing.Size(1264, 681); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.menuStrip1); + this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = global::AssetStudioGUI.Properties.Resources._as; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; @@ -1704,6 +1707,8 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "AssetStudioModGUI"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AssetStudioGUIForm_FormClosing); + this.Load += new System.EventHandler(this.ReScale); + this.FontChanged += new System.EventHandler(this.ReScale); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.AssetStudioGUIForm_DragDrop); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.AssetStudioGUIForm_DragEnter); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AssetStudioForm_KeyDown); diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 4da3682..f65076e 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -126,6 +126,7 @@ namespace AssetStudioGUI private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts); private string guiTitle; + private float guiFontHeight = 16.0f; public AssetStudioGUIForm() { @@ -2477,6 +2478,12 @@ namespace AssetStudioGUI alwaysDecompressToDiskToolStripMenuItem.Checked = assetsManager.Options.BundleOptions.DecompressToDisk; customBlockInfoCompressionComboBox.SelectedIndex = SetComboBoxIndex(assetsManager.Options.BundleOptions.CustomBlockInfoCompression); customBlockCompressionComboBox.SelectedIndex = SetComboBoxIndex(assetsManager.Options.BundleOptions.CustomBlockCompression); + + //highDpi workaround + var font = customUnityVersionToolStripMenuItem.Font; + specifyUnityVersionTextBox.Font = font; + customBlockInfoCompressionComboBox.Font = font; + customBlockCompressionComboBox.Font = font; } private static int SetComboBoxIndex(CompressionType compressionType) @@ -2637,6 +2644,22 @@ namespace AssetStudioGUI MessageBox.Show(msg, "Info", MessageBoxButtons.OK); } + //highDpi workaround + private void ReScale(object sender, EventArgs e) + { + float k = Font.Height / guiFontHeight; + if (k == 1.0f) + return; + + //asset list fix + foreach (ColumnHeader column in assetListView.Columns) + { + column.Width = (int)(column.Width * k); + } + + guiFontHeight = Font.Height; + } + private void DumpTreeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { if (e.Button == MouseButtons.Right) diff --git a/AssetStudioGUI/ExportOptions.Designer.cs b/AssetStudioGUI/ExportOptions.Designer.cs index fd2c254..e034445 100644 --- a/AssetStudioGUI/ExportOptions.Designer.cs +++ b/AssetStudioGUI/ExportOptions.Designer.cs @@ -30,8 +30,6 @@ { this.components = new System.ComponentModel.Container(); this.OKbutton = new System.Windows.Forms.Button(); - this.Cancel = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); this.rawByteArrayFromMono = new System.Windows.Forms.CheckBox(); this.overwriteExistingFiles = new System.Windows.Forms.CheckBox(); this.parallelExportMaxLabel = new System.Windows.Forms.Label(); @@ -52,16 +50,14 @@ this.topng = new System.Windows.Forms.RadioButton(); this.tobmp = new System.Windows.Forms.RadioButton(); this.converttexture = new System.Windows.Forms.CheckBox(); - this.l2dGroupBox = new System.Windows.Forms.GroupBox(); this.l2dAssetSearchByFilenameCheckBox = new System.Windows.Forms.CheckBox(); this.l2dModelGroupComboBox = new System.Windows.Forms.ComboBox(); this.l2dModelGroupLabel = new System.Windows.Forms.Label(); this.l2dMotionExportMethodPanel = new System.Windows.Forms.Panel(); - this.l2dMonoBehaviourRadioButton = new System.Windows.Forms.RadioButton(); this.l2dAnimationClipRadioButton = new System.Windows.Forms.RadioButton(); + this.l2dMonoBehaviourRadioButton = new System.Windows.Forms.RadioButton(); this.l2dMotionExportMethodLabel = new System.Windows.Forms.Label(); this.l2dForceBezierCheckBox = new System.Windows.Forms.CheckBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); this.fbxResetButton = new System.Windows.Forms.Button(); this.uvBindingsLabel = new System.Windows.Forms.Label(); this.uvIndicesCheckedListBox = new System.Windows.Forms.CheckedListBox(); @@ -84,82 +80,58 @@ this.exportAllNodes = new System.Windows.Forms.CheckBox(); this.eulerFilter = new System.Windows.Forms.CheckBox(); this.optionTooltip = new System.Windows.Forms.ToolTip(this.components); - this.groupBox1.SuspendLayout(); + this.optionsTabControl = new System.Windows.Forms.TabControl(); + this.generalTabPage = new System.Windows.Forms.TabPage(); + this.imagesTabPage = new System.Windows.Forms.TabPage(); + this.fbxTabPage = new System.Windows.Forms.TabPage(); + this.live2DTabPage = new System.Windows.Forms.TabPage(); + this.Cancel = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.parallelExportUpDown)).BeginInit(); this.panel1.SuspendLayout(); - this.l2dGroupBox.SuspendLayout(); this.l2dMotionExportMethodPanel.SuspendLayout(); - this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.scaleFactor)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.boneSize)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.filterPrecision)).BeginInit(); + this.optionsTabControl.SuspendLayout(); + this.generalTabPage.SuspendLayout(); + this.imagesTabPage.SuspendLayout(); + this.fbxTabPage.SuspendLayout(); + this.live2DTabPage.SuspendLayout(); this.SuspendLayout(); // // OKbutton // + this.OKbutton.AutoSize = true; this.OKbutton.BackColor = System.Drawing.SystemColors.ButtonFace; - this.OKbutton.Location = new System.Drawing.Point(460, 459); + this.OKbutton.Location = new System.Drawing.Point(228, 418); + this.OKbutton.Margin = new System.Windows.Forms.Padding(6); this.OKbutton.Name = "OKbutton"; - this.OKbutton.Size = new System.Drawing.Size(75, 23); - this.OKbutton.TabIndex = 4; + this.OKbutton.Size = new System.Drawing.Size(88, 27); + this.OKbutton.TabIndex = 2; this.OKbutton.Text = "OK"; this.OKbutton.UseVisualStyleBackColor = false; this.OKbutton.Click += new System.EventHandler(this.OKbutton_Click); // - // Cancel - // - this.Cancel.BackColor = System.Drawing.SystemColors.ButtonFace; - this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(541, 459); - this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(75, 23); - this.Cancel.TabIndex = 5; - this.Cancel.Text = "Cancel"; - this.Cancel.UseVisualStyleBackColor = false; - this.Cancel.Click += new System.EventHandler(this.Cancel_Click); - // - // groupBox1 - // - this.groupBox1.AutoSize = true; - this.groupBox1.BackColor = System.Drawing.SystemColors.Menu; - this.groupBox1.Controls.Add(this.rawByteArrayFromMono); - this.groupBox1.Controls.Add(this.overwriteExistingFiles); - this.groupBox1.Controls.Add(this.parallelExportMaxLabel); - this.groupBox1.Controls.Add(this.parallelExportCheckBox); - this.groupBox1.Controls.Add(this.parallelExportUpDown); - this.groupBox1.Controls.Add(this.filenameFormatLabel); - this.groupBox1.Controls.Add(this.filenameFormatComboBox); - this.groupBox1.Controls.Add(this.exportSpriteWithAlphaMask); - this.groupBox1.Controls.Add(this.openAfterExport); - this.groupBox1.Controls.Add(this.restoreExtensionName); - this.groupBox1.Controls.Add(this.assetGroupOptions); - this.groupBox1.Controls.Add(this.label6); - this.groupBox1.Controls.Add(this.convertAudio); - this.groupBox1.Controls.Add(this.panel1); - this.groupBox1.Controls.Add(this.converttexture); - this.groupBox1.Location = new System.Drawing.Point(12, 13); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(316, 303); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Export"; - // // rawByteArrayFromMono // + this.rawByteArrayFromMono.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.rawByteArrayFromMono.AutoSize = true; - this.rawByteArrayFromMono.Location = new System.Drawing.Point(6, 267); + this.rawByteArrayFromMono.Location = new System.Drawing.Point(7, 184); this.rawByteArrayFromMono.Name = "rawByteArrayFromMono"; - this.rawByteArrayFromMono.Size = new System.Drawing.Size(290, 17); - this.rawByteArrayFromMono.TabIndex = 15; - this.rawByteArrayFromMono.Text = "Raw: Extract raw byte array from MonoBehaviour assets"; + this.rawByteArrayFromMono.Size = new System.Drawing.Size(352, 19); + this.rawByteArrayFromMono.TabIndex = 11; + this.rawByteArrayFromMono.Text = "ExportRaw: Extract raw byte array from MonoBehaviour assets"; this.rawByteArrayFromMono.UseVisualStyleBackColor = true; // // overwriteExistingFiles // + this.overwriteExistingFiles.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.overwriteExistingFiles.AutoSize = true; - this.overwriteExistingFiles.Location = new System.Drawing.Point(6, 63); + this.overwriteExistingFiles.Location = new System.Drawing.Point(7, 83); this.overwriteExistingFiles.Name = "overwriteExistingFiles"; - this.overwriteExistingFiles.Size = new System.Drawing.Size(130, 17); + this.overwriteExistingFiles.Size = new System.Drawing.Size(145, 19); this.overwriteExistingFiles.TabIndex = 5; this.overwriteExistingFiles.Text = "Overwrite existing files"; this.overwriteExistingFiles.UseVisualStyleBackColor = true; @@ -168,22 +140,24 @@ // this.parallelExportMaxLabel.AutoSize = true; this.parallelExportMaxLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.parallelExportMaxLabel.Location = new System.Drawing.Point(260, 244); + this.parallelExportMaxLabel.Location = new System.Drawing.Point(312, 132); this.parallelExportMaxLabel.Name = "parallelExportMaxLabel"; - this.parallelExportMaxLabel.Size = new System.Drawing.Size(33, 13); - this.parallelExportMaxLabel.TabIndex = 14; + this.parallelExportMaxLabel.Size = new System.Drawing.Size(36, 15); + this.parallelExportMaxLabel.TabIndex = 9; this.parallelExportMaxLabel.Text = "Max: "; this.optionTooltip.SetToolTip(this.parallelExportMaxLabel, "*The maximum number matches the number of CPU cores"); // // parallelExportCheckBox // + this.parallelExportCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.parallelExportCheckBox.AutoSize = true; this.parallelExportCheckBox.Checked = true; this.parallelExportCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.parallelExportCheckBox.Location = new System.Drawing.Point(6, 242); + this.parallelExportCheckBox.Location = new System.Drawing.Point(7, 132); this.parallelExportCheckBox.Name = "parallelExportCheckBox"; - this.parallelExportCheckBox.Size = new System.Drawing.Size(203, 17); - this.parallelExportCheckBox.TabIndex = 12; + this.parallelExportCheckBox.Size = new System.Drawing.Size(228, 19); + this.parallelExportCheckBox.TabIndex = 7; this.parallelExportCheckBox.Text = "Export in parallel with number of tasks"; this.optionTooltip.SetToolTip(this.parallelExportCheckBox, "*Requires slightly more RAM than in single-task mode"); this.parallelExportCheckBox.UseVisualStyleBackColor = true; @@ -191,7 +165,8 @@ // // parallelExportUpDown // - this.parallelExportUpDown.Location = new System.Drawing.Point(211, 241); + this.parallelExportUpDown.AutoSize = true; + this.parallelExportUpDown.Location = new System.Drawing.Point(256, 129); this.parallelExportUpDown.Maximum = new decimal(new int[] { 8, 0, @@ -203,8 +178,8 @@ 0, 0}); this.parallelExportUpDown.Name = "parallelExportUpDown"; - this.parallelExportUpDown.Size = new System.Drawing.Size(42, 20); - this.parallelExportUpDown.TabIndex = 13; + this.parallelExportUpDown.Size = new System.Drawing.Size(49, 23); + this.parallelExportUpDown.TabIndex = 8; this.parallelExportUpDown.Value = new decimal(new int[] { 1, 0, @@ -214,10 +189,10 @@ // filenameFormatLabel // this.filenameFormatLabel.AutoSize = true; - this.filenameFormatLabel.Location = new System.Drawing.Point(177, 18); + this.filenameFormatLabel.Location = new System.Drawing.Point(210, 7); this.filenameFormatLabel.Name = "filenameFormatLabel"; - this.filenameFormatLabel.Size = new System.Drawing.Size(84, 13); - this.filenameFormatLabel.TabIndex = 3; + this.filenameFormatLabel.Size = new System.Drawing.Size(97, 15); + this.filenameFormatLabel.TabIndex = 2; this.filenameFormatLabel.Text = "File name format"; // // filenameFormatComboBox @@ -228,44 +203,50 @@ "asset name", "asset name@pathID", "pathID"}); - this.filenameFormatComboBox.Location = new System.Drawing.Point(177, 35); + this.filenameFormatComboBox.Location = new System.Drawing.Point(210, 25); this.filenameFormatComboBox.Name = "filenameFormatComboBox"; - this.filenameFormatComboBox.Size = new System.Drawing.Size(120, 21); - this.filenameFormatComboBox.TabIndex = 4; + this.filenameFormatComboBox.Size = new System.Drawing.Size(139, 23); + this.filenameFormatComboBox.TabIndex = 3; // // exportSpriteWithAlphaMask // + this.exportSpriteWithAlphaMask.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.exportSpriteWithAlphaMask.AutoSize = true; this.exportSpriteWithAlphaMask.Checked = true; this.exportSpriteWithAlphaMask.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportSpriteWithAlphaMask.Location = new System.Drawing.Point(6, 173); + this.exportSpriteWithAlphaMask.Location = new System.Drawing.Point(7, 70); this.exportSpriteWithAlphaMask.Name = "exportSpriteWithAlphaMask"; - this.exportSpriteWithAlphaMask.Size = new System.Drawing.Size(205, 17); - this.exportSpriteWithAlphaMask.TabIndex = 9; + this.exportSpriteWithAlphaMask.Size = new System.Drawing.Size(228, 19); + this.exportSpriteWithAlphaMask.TabIndex = 2; this.exportSpriteWithAlphaMask.Text = "Export sprites with alpha mask applied"; this.exportSpriteWithAlphaMask.UseVisualStyleBackColor = true; // // openAfterExport // + this.openAfterExport.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.openAfterExport.AutoSize = true; this.openAfterExport.Checked = true; this.openAfterExport.CheckState = System.Windows.Forms.CheckState.Checked; - this.openAfterExport.Location = new System.Drawing.Point(6, 219); + this.openAfterExport.Location = new System.Drawing.Point(7, 107); this.openAfterExport.Name = "openAfterExport"; - this.openAfterExport.Size = new System.Drawing.Size(137, 17); - this.openAfterExport.TabIndex = 11; + this.openAfterExport.Size = new System.Drawing.Size(153, 19); + this.openAfterExport.TabIndex = 6; this.openAfterExport.Text = "Open folder after export"; this.openAfterExport.UseVisualStyleBackColor = true; // // restoreExtensionName // + this.restoreExtensionName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.restoreExtensionName.AutoSize = true; this.restoreExtensionName.Checked = true; this.restoreExtensionName.CheckState = System.Windows.Forms.CheckState.Checked; - this.restoreExtensionName.Location = new System.Drawing.Point(6, 86); + this.restoreExtensionName.Location = new System.Drawing.Point(7, 59); this.restoreExtensionName.Name = "restoreExtensionName"; - this.restoreExtensionName.Size = new System.Drawing.Size(275, 17); - this.restoreExtensionName.TabIndex = 6; + this.restoreExtensionName.Size = new System.Drawing.Size(300, 19); + this.restoreExtensionName.TabIndex = 4; this.restoreExtensionName.Text = "Try to restore/Use original TextAsset extension name"; this.optionTooltip.SetToolTip(this.restoreExtensionName, "If not checked, AssetStudio will export all TextAssets with the \".txt\" extension"); this.restoreExtensionName.UseVisualStyleBackColor = true; @@ -281,50 +262,55 @@ "source file name", "scene hierarchy", "do not group"}); - this.assetGroupOptions.Location = new System.Drawing.Point(6, 35); + this.assetGroupOptions.Location = new System.Drawing.Point(7, 25); this.assetGroupOptions.Name = "assetGroupOptions"; - this.assetGroupOptions.Size = new System.Drawing.Size(165, 21); - this.assetGroupOptions.TabIndex = 2; + this.assetGroupOptions.Size = new System.Drawing.Size(192, 23); + this.assetGroupOptions.TabIndex = 1; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 18); + this.label6.Location = new System.Drawing.Point(7, 7); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(127, 13); - this.label6.TabIndex = 1; + this.label6.Size = new System.Drawing.Size(140, 15); + this.label6.TabIndex = 0; this.label6.Text = "Group exported assets by"; // // convertAudio // + this.convertAudio.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.convertAudio.AutoSize = true; this.convertAudio.Checked = true; this.convertAudio.CheckState = System.Windows.Forms.CheckState.Checked; - this.convertAudio.Location = new System.Drawing.Point(6, 196); + this.convertAudio.Location = new System.Drawing.Point(7, 159); this.convertAudio.Name = "convertAudio"; - this.convertAudio.Size = new System.Drawing.Size(213, 17); + this.convertAudio.Size = new System.Drawing.Size(237, 19); this.convertAudio.TabIndex = 10; this.convertAudio.Text = "Convert FMOD AudioClip to WAV(PCM)"; this.convertAudio.UseVisualStyleBackColor = true; // // panel1 // + this.panel1.AutoSize = true; this.panel1.Controls.Add(this.towebp); this.panel1.Controls.Add(this.totga); this.panel1.Controls.Add(this.tojpg); this.panel1.Controls.Add(this.topng); this.panel1.Controls.Add(this.tobmp); - this.panel1.Location = new System.Drawing.Point(18, 134); + this.panel1.Location = new System.Drawing.Point(34, 33); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(279, 33); - this.panel1.TabIndex = 8; + this.panel1.Size = new System.Drawing.Size(288, 23); + this.panel1.TabIndex = 1; // // towebp // this.towebp.AutoSize = true; - this.towebp.Location = new System.Drawing.Point(207, 7); + this.towebp.Dock = System.Windows.Forms.DockStyle.Left; + this.towebp.Location = new System.Drawing.Point(208, 0); this.towebp.Name = "towebp"; - this.towebp.Size = new System.Drawing.Size(54, 17); + this.towebp.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.towebp.Size = new System.Drawing.Size(61, 23); this.towebp.TabIndex = 4; this.towebp.Text = "Webp"; this.towebp.UseVisualStyleBackColor = true; @@ -332,9 +318,11 @@ // totga // this.totga.AutoSize = true; - this.totga.Location = new System.Drawing.Point(154, 7); + this.totga.Dock = System.Windows.Forms.DockStyle.Left; + this.totga.Location = new System.Drawing.Point(160, 0); this.totga.Name = "totga"; - this.totga.Size = new System.Drawing.Size(44, 17); + this.totga.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.totga.Size = new System.Drawing.Size(48, 23); this.totga.TabIndex = 3; this.totga.Text = "Tga"; this.totga.UseVisualStyleBackColor = true; @@ -342,9 +330,11 @@ // tojpg // this.tojpg.AutoSize = true; - this.tojpg.Location = new System.Drawing.Point(99, 7); + this.tojpg.Dock = System.Windows.Forms.DockStyle.Left; + this.tojpg.Location = new System.Drawing.Point(106, 0); this.tojpg.Name = "tojpg"; - this.tojpg.Size = new System.Drawing.Size(48, 17); + this.tojpg.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.tojpg.Size = new System.Drawing.Size(54, 23); this.tojpg.TabIndex = 2; this.tojpg.Text = "Jpeg"; this.tojpg.UseVisualStyleBackColor = true; @@ -353,9 +343,11 @@ // this.topng.AutoSize = true; this.topng.Checked = true; - this.topng.Location = new System.Drawing.Point(52, 7); + this.topng.Dock = System.Windows.Forms.DockStyle.Left; + this.topng.Location = new System.Drawing.Point(55, 0); this.topng.Name = "topng"; - this.topng.Size = new System.Drawing.Size(44, 17); + this.topng.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.topng.Size = new System.Drawing.Size(51, 23); this.topng.TabIndex = 1; this.topng.TabStop = true; this.topng.Text = "Png"; @@ -364,48 +356,38 @@ // tobmp // this.tobmp.AutoSize = true; - this.tobmp.Location = new System.Drawing.Point(3, 7); + this.tobmp.Dock = System.Windows.Forms.DockStyle.Left; + this.tobmp.Location = new System.Drawing.Point(0, 0); this.tobmp.Name = "tobmp"; - this.tobmp.Size = new System.Drawing.Size(46, 17); + this.tobmp.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.tobmp.Size = new System.Drawing.Size(55, 23); this.tobmp.TabIndex = 0; this.tobmp.Text = "Bmp"; this.tobmp.UseVisualStyleBackColor = true; // // converttexture // + this.converttexture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.converttexture.AutoSize = true; this.converttexture.Checked = true; this.converttexture.CheckState = System.Windows.Forms.CheckState.Checked; - this.converttexture.Location = new System.Drawing.Point(6, 110); + this.converttexture.Location = new System.Drawing.Point(7, 7); this.converttexture.Name = "converttexture"; - this.converttexture.Size = new System.Drawing.Size(116, 17); - this.converttexture.TabIndex = 7; + this.converttexture.Size = new System.Drawing.Size(123, 19); + this.converttexture.TabIndex = 0; this.converttexture.Text = "Convert Texture2D"; this.converttexture.UseVisualStyleBackColor = true; // - // l2dGroupBox - // - this.l2dGroupBox.BackColor = System.Drawing.SystemColors.Menu; - this.l2dGroupBox.Controls.Add(this.l2dAssetSearchByFilenameCheckBox); - this.l2dGroupBox.Controls.Add(this.l2dModelGroupComboBox); - this.l2dGroupBox.Controls.Add(this.l2dModelGroupLabel); - this.l2dGroupBox.Controls.Add(this.l2dMotionExportMethodPanel); - this.l2dGroupBox.Controls.Add(this.l2dMotionExportMethodLabel); - this.l2dGroupBox.Controls.Add(this.l2dForceBezierCheckBox); - this.l2dGroupBox.Location = new System.Drawing.Point(12, 304); - this.l2dGroupBox.Name = "l2dGroupBox"; - this.l2dGroupBox.Size = new System.Drawing.Size(316, 149); - this.l2dGroupBox.TabIndex = 2; - this.l2dGroupBox.TabStop = false; - this.l2dGroupBox.Text = "Cubism Live2D"; - // // l2dAssetSearchByFilenameCheckBox // + this.l2dAssetSearchByFilenameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.l2dAssetSearchByFilenameCheckBox.AutoSize = true; - this.l2dAssetSearchByFilenameCheckBox.Location = new System.Drawing.Point(6, 45); + this.l2dAssetSearchByFilenameCheckBox.Location = new System.Drawing.Point(7, 141); this.l2dAssetSearchByFilenameCheckBox.Name = "l2dAssetSearchByFilenameCheckBox"; - this.l2dAssetSearchByFilenameCheckBox.Size = new System.Drawing.Size(270, 17); - this.l2dAssetSearchByFilenameCheckBox.TabIndex = 3; + this.l2dAssetSearchByFilenameCheckBox.Size = new System.Drawing.Size(297, 19); + this.l2dAssetSearchByFilenameCheckBox.TabIndex = 5; this.l2dAssetSearchByFilenameCheckBox.Text = "Search for model-related Live2D assets by file name"; this.optionTooltip.SetToolTip(this.l2dAssetSearchByFilenameCheckBox, "Preferred option if all l2d assets of a single model are stored in a single file " + "or containers are obfuscated"); @@ -419,113 +401,88 @@ "container path", "source file name", "model name"}); - this.l2dModelGroupComboBox.Location = new System.Drawing.Point(142, 18); + this.l2dModelGroupComboBox.Location = new System.Drawing.Point(7, 25); this.l2dModelGroupComboBox.Name = "l2dModelGroupComboBox"; - this.l2dModelGroupComboBox.Size = new System.Drawing.Size(154, 21); - this.l2dModelGroupComboBox.TabIndex = 2; + this.l2dModelGroupComboBox.Size = new System.Drawing.Size(151, 23); + this.l2dModelGroupComboBox.TabIndex = 1; // // l2dModelGroupLabel // this.l2dModelGroupLabel.AutoSize = true; - this.l2dModelGroupLabel.Location = new System.Drawing.Point(6, 21); + this.l2dModelGroupLabel.Location = new System.Drawing.Point(7, 7); this.l2dModelGroupLabel.Name = "l2dModelGroupLabel"; - this.l2dModelGroupLabel.Size = new System.Drawing.Size(130, 13); - this.l2dModelGroupLabel.TabIndex = 1; + this.l2dModelGroupLabel.Size = new System.Drawing.Size(148, 15); + this.l2dModelGroupLabel.TabIndex = 0; this.l2dModelGroupLabel.Text = "Group exported models by"; // // l2dMotionExportMethodPanel // - this.l2dMotionExportMethodPanel.Controls.Add(this.l2dMonoBehaviourRadioButton); + this.l2dMotionExportMethodPanel.AutoSize = true; this.l2dMotionExportMethodPanel.Controls.Add(this.l2dAnimationClipRadioButton); - this.l2dMotionExportMethodPanel.Location = new System.Drawing.Point(18, 89); + this.l2dMotionExportMethodPanel.Controls.Add(this.l2dMonoBehaviourRadioButton); + this.l2dMotionExportMethodPanel.Location = new System.Drawing.Point(33, 78); this.l2dMotionExportMethodPanel.Name = "l2dMotionExportMethodPanel"; - this.l2dMotionExportMethodPanel.Size = new System.Drawing.Size(279, 27); - this.l2dMotionExportMethodPanel.TabIndex = 5; + this.l2dMotionExportMethodPanel.Size = new System.Drawing.Size(315, 31); + this.l2dMotionExportMethodPanel.TabIndex = 3; + // + // l2dAnimationClipRadioButton + // + this.l2dAnimationClipRadioButton.AccessibleName = "AnimationClipV2"; + this.l2dAnimationClipRadioButton.AutoSize = true; + this.l2dAnimationClipRadioButton.Dock = System.Windows.Forms.DockStyle.Left; + this.l2dAnimationClipRadioButton.Location = new System.Drawing.Point(193, 0); + this.l2dAnimationClipRadioButton.Name = "l2dAnimationClipRadioButton"; + this.l2dAnimationClipRadioButton.Size = new System.Drawing.Size(102, 31); + this.l2dAnimationClipRadioButton.TabIndex = 1; + this.l2dAnimationClipRadioButton.Text = "AnimationClip"; + this.l2dAnimationClipRadioButton.UseVisualStyleBackColor = true; // // l2dMonoBehaviourRadioButton // this.l2dMonoBehaviourRadioButton.AccessibleName = "MonoBehaviour"; this.l2dMonoBehaviourRadioButton.AutoSize = true; this.l2dMonoBehaviourRadioButton.Checked = true; - this.l2dMonoBehaviourRadioButton.Location = new System.Drawing.Point(3, 5); + this.l2dMonoBehaviourRadioButton.Dock = System.Windows.Forms.DockStyle.Left; + this.l2dMonoBehaviourRadioButton.Location = new System.Drawing.Point(0, 0); this.l2dMonoBehaviourRadioButton.Name = "l2dMonoBehaviourRadioButton"; - this.l2dMonoBehaviourRadioButton.Size = new System.Drawing.Size(167, 17); + this.l2dMonoBehaviourRadioButton.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.l2dMonoBehaviourRadioButton.Size = new System.Drawing.Size(193, 31); this.l2dMonoBehaviourRadioButton.TabIndex = 0; this.l2dMonoBehaviourRadioButton.TabStop = true; this.l2dMonoBehaviourRadioButton.Text = "MonoBehaviour (Fade motion)"; this.optionTooltip.SetToolTip(this.l2dMonoBehaviourRadioButton, "If no Fade motions are found, the AnimationClip method will be used"); this.l2dMonoBehaviourRadioButton.UseVisualStyleBackColor = true; // - // l2dAnimationClipRadioButton - // - this.l2dAnimationClipRadioButton.AccessibleName = "AnimationClipV2"; - this.l2dAnimationClipRadioButton.AutoSize = true; - this.l2dAnimationClipRadioButton.Location = new System.Drawing.Point(178, 5); - this.l2dAnimationClipRadioButton.Name = "l2dAnimationClipRadioButton"; - this.l2dAnimationClipRadioButton.Size = new System.Drawing.Size(88, 17); - this.l2dAnimationClipRadioButton.TabIndex = 1; - this.l2dAnimationClipRadioButton.Text = "AnimationClip"; - this.l2dAnimationClipRadioButton.UseVisualStyleBackColor = true; - // // l2dMotionExportMethodLabel // this.l2dMotionExportMethodLabel.AutoSize = true; - this.l2dMotionExportMethodLabel.Location = new System.Drawing.Point(6, 70); + this.l2dMotionExportMethodLabel.Location = new System.Drawing.Point(7, 60); this.l2dMotionExportMethodLabel.Name = "l2dMotionExportMethodLabel"; - this.l2dMotionExportMethodLabel.Size = new System.Drawing.Size(109, 13); - this.l2dMotionExportMethodLabel.TabIndex = 4; + this.l2dMotionExportMethodLabel.Size = new System.Drawing.Size(128, 15); + this.l2dMotionExportMethodLabel.TabIndex = 2; this.l2dMotionExportMethodLabel.Text = "Motion export method"; // // l2dForceBezierCheckBox // + this.l2dForceBezierCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.l2dForceBezierCheckBox.AutoSize = true; - this.l2dForceBezierCheckBox.Location = new System.Drawing.Point(6, 122); + this.l2dForceBezierCheckBox.Location = new System.Drawing.Point(7, 117); this.l2dForceBezierCheckBox.Name = "l2dForceBezierCheckBox"; - this.l2dForceBezierCheckBox.Size = new System.Drawing.Size(304, 17); - this.l2dForceBezierCheckBox.TabIndex = 6; + this.l2dForceBezierCheckBox.Size = new System.Drawing.Size(338, 19); + this.l2dForceBezierCheckBox.TabIndex = 4; this.l2dForceBezierCheckBox.Text = "Smooth motions (calc Linear segments as Bezier segments)"; this.optionTooltip.SetToolTip(this.l2dForceBezierCheckBox, "May help if the exported motions look jerky/not smooth enough"); this.l2dForceBezierCheckBox.UseVisualStyleBackColor = true; // - // groupBox2 - // - this.groupBox2.AutoSize = true; - this.groupBox2.BackColor = System.Drawing.SystemColors.Menu; - this.groupBox2.Controls.Add(this.fbxResetButton); - this.groupBox2.Controls.Add(this.uvBindingsLabel); - this.groupBox2.Controls.Add(this.uvIndicesCheckedListBox); - this.groupBox2.Controls.Add(this.uvTypesListBox); - this.groupBox2.Controls.Add(this.exportAllUvsAsDiffuseMaps); - this.groupBox2.Controls.Add(this.exportBlendShape); - this.groupBox2.Controls.Add(this.exportAnimations); - this.groupBox2.Controls.Add(this.scaleFactor); - this.groupBox2.Controls.Add(this.label5); - this.groupBox2.Controls.Add(this.fbxFormat); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.fbxVersion); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.boneSize); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.exportSkins); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.filterPrecision); - this.groupBox2.Controls.Add(this.castToBone); - this.groupBox2.Controls.Add(this.exportAllNodes); - this.groupBox2.Controls.Add(this.eulerFilter); - this.groupBox2.Location = new System.Drawing.Point(328, 13); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(289, 440); - this.groupBox2.TabIndex = 3; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Fbx"; - // // fbxResetButton // + this.fbxResetButton.AutoSize = true; this.fbxResetButton.BackColor = System.Drawing.SystemColors.ButtonFace; - this.fbxResetButton.Location = new System.Drawing.Point(208, 398); + this.fbxResetButton.Location = new System.Drawing.Point(280, 320); this.fbxResetButton.Name = "fbxResetButton"; - this.fbxResetButton.Size = new System.Drawing.Size(75, 23); - this.fbxResetButton.TabIndex = 21; + this.fbxResetButton.Size = new System.Drawing.Size(88, 27); + this.fbxResetButton.TabIndex = 20; this.fbxResetButton.Text = "Reset"; this.fbxResetButton.UseVisualStyleBackColor = false; this.fbxResetButton.Click += new System.EventHandler(this.resetButton_Click); @@ -533,10 +490,10 @@ // uvBindingsLabel // this.uvBindingsLabel.AutoSize = true; - this.uvBindingsLabel.Location = new System.Drawing.Point(6, 173); + this.uvBindingsLabel.Location = new System.Drawing.Point(7, 166); this.uvBindingsLabel.Name = "uvBindingsLabel"; - this.uvBindingsLabel.Size = new System.Drawing.Size(87, 13); - this.uvBindingsLabel.TabIndex = 17; + this.uvBindingsLabel.Size = new System.Drawing.Size(97, 15); + this.uvBindingsLabel.TabIndex = 16; this.uvBindingsLabel.Text = "UV type bindings"; // // uvIndicesCheckedListBox @@ -552,11 +509,11 @@ "UV5", "UV6", "UV7"}); - this.uvIndicesCheckedListBox.Location = new System.Drawing.Point(12, 192); + this.uvIndicesCheckedListBox.Location = new System.Drawing.Point(18, 188); this.uvIndicesCheckedListBox.Name = "uvIndicesCheckedListBox"; this.uvIndicesCheckedListBox.ScrollAlwaysVisible = true; - this.uvIndicesCheckedListBox.Size = new System.Drawing.Size(125, 80); - this.uvIndicesCheckedListBox.TabIndex = 18; + this.uvIndicesCheckedListBox.Size = new System.Drawing.Size(151, 93); + this.uvIndicesCheckedListBox.TabIndex = 17; this.optionTooltip.SetToolTip(this.uvIndicesCheckedListBox, "Checked UVs will be exported (if they exist)"); this.uvIndicesCheckedListBox.SelectedIndexChanged += new System.EventHandler(this.uvIndicesCheckedListBox_SelectedIndexChanged); // @@ -564,6 +521,7 @@ // this.uvTypesListBox.FormattingEnabled = true; this.uvTypesListBox.IntegralHeight = false; + this.uvTypesListBox.ItemHeight = 15; this.uvTypesListBox.Items.AddRange(new object[] { "Diffuse", "NormalMap", @@ -575,21 +533,23 @@ "Shininess", "Reflection", "Transparency"}); - this.uvTypesListBox.Location = new System.Drawing.Point(151, 192); + this.uvTypesListBox.Location = new System.Drawing.Point(205, 188); this.uvTypesListBox.Name = "uvTypesListBox"; this.uvTypesListBox.ScrollAlwaysVisible = true; - this.uvTypesListBox.Size = new System.Drawing.Size(125, 80); - this.uvTypesListBox.TabIndex = 19; + this.uvTypesListBox.Size = new System.Drawing.Size(151, 93); + this.uvTypesListBox.TabIndex = 18; this.uvTypesListBox.SelectedIndexChanged += new System.EventHandler(this.uvTypesListBox_SelectedIndexChanged); // // exportAllUvsAsDiffuseMaps // this.exportAllUvsAsDiffuseMaps.AccessibleDescription = ""; + this.exportAllUvsAsDiffuseMaps.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.exportAllUvsAsDiffuseMaps.AutoSize = true; - this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(6, 278); + this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(7, 287); this.exportAllUvsAsDiffuseMaps.Name = "exportAllUvsAsDiffuseMaps"; - this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(168, 17); - this.exportAllUvsAsDiffuseMaps.TabIndex = 20; + this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(183, 19); + this.exportAllUvsAsDiffuseMaps.TabIndex = 19; this.exportAllUvsAsDiffuseMaps.Text = "Export all UVs as diffuse maps"; this.optionTooltip.SetToolTip(this.exportAllUvsAsDiffuseMaps, "Check if some UV maps are missing after export (e.g. in Blender). But this can al" + "so cause some bugs with UVs."); @@ -598,25 +558,29 @@ // // exportBlendShape // + this.exportBlendShape.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.exportBlendShape.AutoSize = true; this.exportBlendShape.Checked = true; this.exportBlendShape.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportBlendShape.Location = new System.Drawing.Point(6, 114); + this.exportBlendShape.Location = new System.Drawing.Point(7, 104); this.exportBlendShape.Name = "exportBlendShape"; - this.exportBlendShape.Size = new System.Drawing.Size(114, 17); - this.exportBlendShape.TabIndex = 5; + this.exportBlendShape.Size = new System.Drawing.Size(124, 19); + this.exportBlendShape.TabIndex = 4; this.exportBlendShape.Text = "Export blendshape"; this.exportBlendShape.UseVisualStyleBackColor = true; // // exportAnimations // + this.exportAnimations.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.exportAnimations.AutoSize = true; this.exportAnimations.Checked = true; this.exportAnimations.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportAnimations.Location = new System.Drawing.Point(6, 91); + this.exportAnimations.Location = new System.Drawing.Point(7, 80); this.exportAnimations.Name = "exportAnimations"; - this.exportAnimations.Size = new System.Drawing.Size(109, 17); - this.exportAnimations.TabIndex = 4; + this.exportAnimations.Size = new System.Drawing.Size(122, 19); + this.exportAnimations.TabIndex = 3; this.exportAnimations.Text = "Export animations"; this.exportAnimations.UseVisualStyleBackColor = true; // @@ -628,10 +592,10 @@ 0, 0, 131072}); - this.scaleFactor.Location = new System.Drawing.Point(233, 73); + this.scaleFactor.Location = new System.Drawing.Point(309, 65); this.scaleFactor.Name = "scaleFactor"; - this.scaleFactor.Size = new System.Drawing.Size(50, 20); - this.scaleFactor.TabIndex = 12; + this.scaleFactor.Size = new System.Drawing.Size(58, 23); + this.scaleFactor.TabIndex = 11; this.scaleFactor.Value = new decimal(new int[] { 1, 0, @@ -641,10 +605,10 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(163, 75); + this.label5.Location = new System.Drawing.Point(224, 67); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(64, 13); - this.label5.TabIndex = 11; + this.label5.Size = new System.Drawing.Size(67, 15); + this.label5.TabIndex = 10; this.label5.Text = "ScaleFactor"; // // fbxFormat @@ -654,18 +618,18 @@ this.fbxFormat.Items.AddRange(new object[] { "Binary", "Ascii"}); - this.fbxFormat.Location = new System.Drawing.Point(222, 103); + this.fbxFormat.Location = new System.Drawing.Point(297, 95); this.fbxFormat.Name = "fbxFormat"; - this.fbxFormat.Size = new System.Drawing.Size(61, 21); - this.fbxFormat.TabIndex = 14; + this.fbxFormat.Size = new System.Drawing.Size(70, 23); + this.fbxFormat.TabIndex = 13; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(156, 106); + this.label4.Location = new System.Drawing.Point(220, 98); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(59, 13); - this.label4.TabIndex = 13; + this.label4.Size = new System.Drawing.Size(65, 15); + this.label4.TabIndex = 12; this.label4.Text = "FBXFormat"; // // fbxVersion @@ -679,26 +643,26 @@ "7.3", "7.4", "7.5"}); - this.fbxVersion.Location = new System.Drawing.Point(236, 135); + this.fbxVersion.Location = new System.Drawing.Point(313, 126); this.fbxVersion.Name = "fbxVersion"; - this.fbxVersion.Size = new System.Drawing.Size(47, 21); - this.fbxVersion.TabIndex = 16; + this.fbxVersion.Size = new System.Drawing.Size(54, 23); + this.fbxVersion.TabIndex = 15; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(168, 138); + this.label3.Location = new System.Drawing.Point(226, 130); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(62, 13); - this.label3.TabIndex = 15; + this.label3.Size = new System.Drawing.Size(65, 15); + this.label3.TabIndex = 14; this.label3.Text = "FBXVersion"; // // boneSize // - this.boneSize.Location = new System.Drawing.Point(233, 47); + this.boneSize.Location = new System.Drawing.Point(309, 35); this.boneSize.Name = "boneSize"; - this.boneSize.Size = new System.Drawing.Size(50, 20); - this.boneSize.TabIndex = 10; + this.boneSize.Size = new System.Drawing.Size(58, 23); + this.boneSize.TabIndex = 9; this.boneSize.Value = new decimal(new int[] { 10, 0, @@ -708,31 +672,33 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(175, 49); + this.label2.Location = new System.Drawing.Point(238, 37); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 13); - this.label2.TabIndex = 9; + this.label2.Size = new System.Drawing.Size(54, 15); + this.label2.TabIndex = 8; this.label2.Text = "BoneSize"; // // exportSkins // + this.exportSkins.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.exportSkins.AutoSize = true; this.exportSkins.Checked = true; this.exportSkins.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportSkins.Location = new System.Drawing.Point(6, 68); + this.exportSkins.Location = new System.Drawing.Point(7, 55); this.exportSkins.Name = "exportSkins"; - this.exportSkins.Size = new System.Drawing.Size(83, 17); - this.exportSkins.TabIndex = 3; + this.exportSkins.Size = new System.Drawing.Size(89, 19); + this.exportSkins.TabIndex = 2; this.exportSkins.Text = "Export skins"; this.exportSkins.UseVisualStyleBackColor = true; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(155, 23); + this.label1.Location = new System.Drawing.Point(218, 7); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(72, 13); - this.label1.TabIndex = 7; + this.label1.Size = new System.Drawing.Size(81, 15); + this.label1.TabIndex = 6; this.label1.Text = "FilterPrecision"; // // filterPrecision @@ -743,10 +709,10 @@ 0, 0, 131072}); - this.filterPrecision.Location = new System.Drawing.Point(233, 21); + this.filterPrecision.Location = new System.Drawing.Point(309, 5); this.filterPrecision.Name = "filterPrecision"; - this.filterPrecision.Size = new System.Drawing.Size(50, 20); - this.filterPrecision.TabIndex = 8; + this.filterPrecision.Size = new System.Drawing.Size(58, 23); + this.filterPrecision.TabIndex = 7; this.filterPrecision.Value = new decimal(new int[] { 25, 0, @@ -755,51 +721,163 @@ // // castToBone // + this.castToBone.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.castToBone.AutoSize = true; - this.castToBone.Location = new System.Drawing.Point(6, 137); + this.castToBone.Location = new System.Drawing.Point(7, 128); this.castToBone.Name = "castToBone"; - this.castToBone.Size = new System.Drawing.Size(131, 17); - this.castToBone.TabIndex = 6; + this.castToBone.Size = new System.Drawing.Size(143, 19); + this.castToBone.TabIndex = 5; this.castToBone.Text = "All nodes cast to bone"; this.castToBone.UseVisualStyleBackColor = true; // // exportAllNodes // + this.exportAllNodes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.exportAllNodes.AutoSize = true; this.exportAllNodes.Checked = true; this.exportAllNodes.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportAllNodes.Location = new System.Drawing.Point(6, 45); + this.exportAllNodes.Location = new System.Drawing.Point(7, 31); this.exportAllNodes.Name = "exportAllNodes"; - this.exportAllNodes.Size = new System.Drawing.Size(101, 17); - this.exportAllNodes.TabIndex = 2; + this.exportAllNodes.Size = new System.Drawing.Size(110, 19); + this.exportAllNodes.TabIndex = 1; this.exportAllNodes.Text = "Export all nodes"; this.exportAllNodes.UseVisualStyleBackColor = true; // // eulerFilter // + this.eulerFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.eulerFilter.AutoSize = true; this.eulerFilter.Checked = true; this.eulerFilter.CheckState = System.Windows.Forms.CheckState.Checked; - this.eulerFilter.Location = new System.Drawing.Point(6, 22); + this.eulerFilter.Location = new System.Drawing.Point(7, 7); this.eulerFilter.Name = "eulerFilter"; - this.eulerFilter.Size = new System.Drawing.Size(72, 17); - this.eulerFilter.TabIndex = 1; + this.eulerFilter.Size = new System.Drawing.Size(78, 19); + this.eulerFilter.TabIndex = 0; this.eulerFilter.Text = "EulerFilter"; this.eulerFilter.UseVisualStyleBackColor = true; // + // optionsTabControl + // + this.optionsTabControl.Controls.Add(this.generalTabPage); + this.optionsTabControl.Controls.Add(this.imagesTabPage); + this.optionsTabControl.Controls.Add(this.fbxTabPage); + this.optionsTabControl.Controls.Add(this.live2DTabPage); + this.optionsTabControl.Location = new System.Drawing.Point(12, 12); + this.optionsTabControl.Margin = new System.Windows.Forms.Padding(12); + this.optionsTabControl.Name = "optionsTabControl"; + this.optionsTabControl.SelectedIndex = 0; + this.optionsTabControl.Size = new System.Drawing.Size(398, 400); + this.optionsTabControl.TabIndex = 1; + // + // generalTabPage + // + this.generalTabPage.BackColor = System.Drawing.SystemColors.Menu; + this.generalTabPage.Controls.Add(this.rawByteArrayFromMono); + this.generalTabPage.Controls.Add(this.label6); + this.generalTabPage.Controls.Add(this.overwriteExistingFiles); + this.generalTabPage.Controls.Add(this.parallelExportMaxLabel); + this.generalTabPage.Controls.Add(this.parallelExportCheckBox); + this.generalTabPage.Controls.Add(this.convertAudio); + this.generalTabPage.Controls.Add(this.parallelExportUpDown); + this.generalTabPage.Controls.Add(this.assetGroupOptions); + this.generalTabPage.Controls.Add(this.filenameFormatLabel); + this.generalTabPage.Controls.Add(this.restoreExtensionName); + this.generalTabPage.Controls.Add(this.filenameFormatComboBox); + this.generalTabPage.Controls.Add(this.openAfterExport); + this.generalTabPage.Location = new System.Drawing.Point(4, 24); + this.generalTabPage.Name = "generalTabPage"; + this.generalTabPage.Size = new System.Drawing.Size(390, 372); + this.generalTabPage.TabIndex = 0; + this.generalTabPage.Text = "General"; + // + // imagesTabPage + // + this.imagesTabPage.BackColor = System.Drawing.SystemColors.Menu; + this.imagesTabPage.Controls.Add(this.panel1); + this.imagesTabPage.Controls.Add(this.converttexture); + this.imagesTabPage.Controls.Add(this.exportSpriteWithAlphaMask); + this.imagesTabPage.Location = new System.Drawing.Point(4, 24); + this.imagesTabPage.Name = "imagesTabPage"; + this.imagesTabPage.Size = new System.Drawing.Size(390, 372); + this.imagesTabPage.TabIndex = 3; + this.imagesTabPage.Text = "Images"; + // + // fbxTabPage + // + this.fbxTabPage.BackColor = System.Drawing.SystemColors.Menu; + this.fbxTabPage.Controls.Add(this.fbxResetButton); + this.fbxTabPage.Controls.Add(this.eulerFilter); + this.fbxTabPage.Controls.Add(this.uvBindingsLabel); + this.fbxTabPage.Controls.Add(this.exportAllNodes); + this.fbxTabPage.Controls.Add(this.uvIndicesCheckedListBox); + this.fbxTabPage.Controls.Add(this.castToBone); + this.fbxTabPage.Controls.Add(this.uvTypesListBox); + this.fbxTabPage.Controls.Add(this.filterPrecision); + this.fbxTabPage.Controls.Add(this.exportAllUvsAsDiffuseMaps); + this.fbxTabPage.Controls.Add(this.label1); + this.fbxTabPage.Controls.Add(this.exportBlendShape); + this.fbxTabPage.Controls.Add(this.exportSkins); + this.fbxTabPage.Controls.Add(this.exportAnimations); + this.fbxTabPage.Controls.Add(this.label2); + this.fbxTabPage.Controls.Add(this.scaleFactor); + this.fbxTabPage.Controls.Add(this.boneSize); + this.fbxTabPage.Controls.Add(this.label5); + this.fbxTabPage.Controls.Add(this.label3); + this.fbxTabPage.Controls.Add(this.fbxFormat); + this.fbxTabPage.Controls.Add(this.fbxVersion); + this.fbxTabPage.Controls.Add(this.label4); + this.fbxTabPage.Location = new System.Drawing.Point(4, 24); + this.fbxTabPage.Name = "fbxTabPage"; + this.fbxTabPage.Size = new System.Drawing.Size(390, 372); + this.fbxTabPage.TabIndex = 1; + this.fbxTabPage.Text = "FBX"; + // + // live2DTabPage + // + this.live2DTabPage.BackColor = System.Drawing.SystemColors.Menu; + this.live2DTabPage.Controls.Add(this.l2dAssetSearchByFilenameCheckBox); + this.live2DTabPage.Controls.Add(this.l2dModelGroupLabel); + this.live2DTabPage.Controls.Add(this.l2dModelGroupComboBox); + this.live2DTabPage.Controls.Add(this.l2dForceBezierCheckBox); + this.live2DTabPage.Controls.Add(this.l2dMotionExportMethodLabel); + this.live2DTabPage.Controls.Add(this.l2dMotionExportMethodPanel); + this.live2DTabPage.Location = new System.Drawing.Point(4, 24); + this.live2DTabPage.Name = "live2DTabPage"; + this.live2DTabPage.Size = new System.Drawing.Size(390, 372); + this.live2DTabPage.TabIndex = 2; + this.live2DTabPage.Text = "Cubism Live2D"; + // + // Cancel + // + this.Cancel.AutoSize = true; + this.Cancel.BackColor = System.Drawing.SystemColors.ButtonFace; + this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.Cancel.Location = new System.Drawing.Point(322, 418); + this.Cancel.Margin = new System.Windows.Forms.Padding(6); + this.Cancel.Name = "Cancel"; + this.Cancel.Size = new System.Drawing.Size(88, 27); + this.Cancel.TabIndex = 3; + this.Cancel.Text = "Cancel"; + this.Cancel.UseVisualStyleBackColor = false; + this.Cancel.Click += new System.EventHandler(this.Cancel_Click); + // // ExportOptions // this.AcceptButton = this.OKbutton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoSize = true; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.BackColor = System.Drawing.SystemColors.Menu; this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(628, 494); - this.Controls.Add(this.l2dGroupBox); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.Cancel); + this.ClientSize = new System.Drawing.Size(422, 451); + this.Controls.Add(this.optionsTabControl); this.Controls.Add(this.OKbutton); + this.Controls.Add(this.Cancel); + this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.MinimizeBox = false; @@ -807,20 +885,24 @@ this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Export options"; - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); + this.Load += new System.EventHandler(this.ExportOptions_Load); ((System.ComponentModel.ISupportInitialize)(this.parallelExportUpDown)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - this.l2dGroupBox.ResumeLayout(false); - this.l2dGroupBox.PerformLayout(); this.l2dMotionExportMethodPanel.ResumeLayout(false); this.l2dMotionExportMethodPanel.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.scaleFactor)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.boneSize)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.filterPrecision)).EndInit(); + this.optionsTabControl.ResumeLayout(false); + this.generalTabPage.ResumeLayout(false); + this.generalTabPage.PerformLayout(); + this.imagesTabPage.ResumeLayout(false); + this.imagesTabPage.PerformLayout(); + this.fbxTabPage.ResumeLayout(false); + this.fbxTabPage.PerformLayout(); + this.live2DTabPage.ResumeLayout(false); + this.live2DTabPage.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -828,8 +910,6 @@ #endregion private System.Windows.Forms.Button OKbutton; - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.CheckBox converttexture; private System.Windows.Forms.RadioButton tojpg; private System.Windows.Forms.RadioButton topng; @@ -837,7 +917,6 @@ private System.Windows.Forms.RadioButton totga; private System.Windows.Forms.CheckBox convertAudio; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.NumericUpDown boneSize; private System.Windows.Forms.Label label2; private System.Windows.Forms.CheckBox exportSkins; @@ -862,7 +941,6 @@ private System.Windows.Forms.ToolTip optionTooltip; private System.Windows.Forms.CheckBox exportSpriteWithAlphaMask; private System.Windows.Forms.RadioButton towebp; - private System.Windows.Forms.GroupBox l2dGroupBox; private System.Windows.Forms.CheckBox l2dForceBezierCheckBox; private System.Windows.Forms.Label l2dMotionExportMethodLabel; private System.Windows.Forms.RadioButton l2dAnimationClipRadioButton; @@ -882,5 +960,11 @@ private System.Windows.Forms.Button fbxResetButton; private System.Windows.Forms.CheckBox overwriteExistingFiles; private System.Windows.Forms.CheckBox rawByteArrayFromMono; + private System.Windows.Forms.TabControl optionsTabControl; + private System.Windows.Forms.TabPage generalTabPage; + private System.Windows.Forms.TabPage fbxTabPage; + private System.Windows.Forms.TabPage live2DTabPage; + private System.Windows.Forms.TabPage imagesTabPage; + private System.Windows.Forms.Button Cancel; } } \ No newline at end of file diff --git a/AssetStudioGUI/ExportOptions.cs b/AssetStudioGUI/ExportOptions.cs index ccc9286..303c26e 100644 --- a/AssetStudioGUI/ExportOptions.cs +++ b/AssetStudioGUI/ExportOptions.cs @@ -152,5 +152,16 @@ namespace AssetStudioGUI SetFromFbxSettings(new Fbx.Settings()); uvIndicesCheckedListBox_SelectedIndexChanged(sender, e); } + + //highDpi workaround (net472/.net-win7) + private void ExportOptions_Load(object sender, EventArgs e) + { + if (Font.Height == 16) + return; + + var k = Font.Height / 16.0f; + var listHeight = (int)(uvTypesListBox.ItemHeight * 6 * k); + uvTypesListBox.Height = uvIndicesCheckedListBox.Height = listHeight; + } } } diff --git a/AssetStudioGUI/Program.cs b/AssetStudioGUI/Program.cs index cc9f563..03babec 100644 --- a/AssetStudioGUI/Program.cs +++ b/AssetStudioGUI/Program.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System; using System.Windows.Forms; namespace AssetStudioGUI @@ -15,7 +12,7 @@ namespace AssetStudioGUI static void Main() { #if !NETFRAMEWORK - Application.SetHighDpiMode(HighDpiMode.SystemAware); + Application.SetHighDpiMode(HighDpiMode.PerMonitorV2); #endif Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); diff --git a/AssetStudioGUI/app.manifest b/AssetStudioGUI/app.manifest index d54b852..a0b7f6d 100644 --- a/AssetStudioGUI/app.manifest +++ b/AssetStudioGUI/app.manifest @@ -53,8 +53,8 @@ Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation --> - true - system + false + unaware true