diff --git a/VGMToolbox/App.config b/VGMToolbox/App.config index b767842..aaddd59 100644 --- a/VGMToolbox/App.config +++ b/VGMToolbox/App.config @@ -9,7 +9,7 @@ - + diff --git a/VGMToolbox/Properties/AssemblyInfo.cs b/VGMToolbox/Properties/AssemblyInfo.cs index b5ed482..5b1cc75 100644 --- a/VGMToolbox/Properties/AssemblyInfo.cs +++ b/VGMToolbox/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1047.3.0")] -[assembly: AssemblyFileVersion("0.1047.3.0")] +[assembly: AssemblyVersion("0.1047.4.0")] +[assembly: AssemblyFileVersion("0.1047.4.0")] [assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/VGMToolbox/VGMToolbox.csproj b/VGMToolbox/VGMToolbox.csproj index 39e8988..40b832a 100644 --- a/VGMToolbox/VGMToolbox.csproj +++ b/VGMToolbox/VGMToolbox.csproj @@ -92,6 +92,9 @@ LocalIntranet + + Resources\ToolBox-2.ico + 3rd\ICSharpCode.SharpZipLib.dll diff --git a/VGMToolbox/forms/AboutForm.Designer.cs b/VGMToolbox/forms/AboutForm.Designer.cs index 4fef7ed..e74c4fe 100644 --- a/VGMToolbox/forms/AboutForm.Designer.cs +++ b/VGMToolbox/forms/AboutForm.Designer.cs @@ -35,25 +35,28 @@ private void InitializeComponent() this.linkLabelSupport = new System.Windows.Forms.LinkLabel(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.linkLabelGithub = new System.Windows.Forms.LinkLabel(); this.SuspendLayout(); // // linkLabelHomePage // this.linkLabelHomePage.AutoSize = true; - this.linkLabelHomePage.Location = new System.Drawing.Point(9, 159); + this.linkLabelHomePage.Location = new System.Drawing.Point(14, 220); + this.linkLabelHomePage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabelHomePage.Name = "linkLabelHomePage"; - this.linkLabelHomePage.Size = new System.Drawing.Size(63, 13); - this.linkLabelHomePage.TabIndex = 0; + this.linkLabelHomePage.Size = new System.Drawing.Size(89, 18); + this.linkLabelHomePage.TabIndex = 2; this.linkLabelHomePage.TabStop = true; this.linkLabelHomePage.Text = "Home Page"; this.linkLabelHomePage.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked); // // okButton // - this.okButton.Location = new System.Drawing.Point(105, 214); + this.okButton.Location = new System.Drawing.Point(153, 327); + this.okButton.Margin = new System.Windows.Forms.Padding(4); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 1; + this.okButton.Size = new System.Drawing.Size(112, 32); + this.okButton.TabIndex = 0; this.okButton.Text = "Close"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); @@ -62,21 +65,23 @@ private void InitializeComponent() // this.tbMain.AcceptsReturn = true; this.tbMain.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.tbMain.Location = new System.Drawing.Point(12, 12); + this.tbMain.Location = new System.Drawing.Point(18, 17); + this.tbMain.Margin = new System.Windows.Forms.Padding(4); this.tbMain.Multiline = true; this.tbMain.Name = "tbMain"; this.tbMain.ReadOnly = true; this.tbMain.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.tbMain.Size = new System.Drawing.Size(260, 113); - this.tbMain.TabIndex = 2; + this.tbMain.Size = new System.Drawing.Size(388, 155); + this.tbMain.TabIndex = 1; this.tbMain.Text = resources.GetString("tbMain.Text"); // // linkLabelSupport // this.linkLabelSupport.AutoSize = true; - this.linkLabelSupport.Location = new System.Drawing.Point(9, 177); + this.linkLabelSupport.Location = new System.Drawing.Point(14, 245); + this.linkLabelSupport.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabelSupport.Name = "linkLabelSupport"; - this.linkLabelSupport.Size = new System.Drawing.Size(96, 13); + this.linkLabelSupport.Size = new System.Drawing.Size(161, 18); this.linkLabelSupport.TabIndex = 3; this.linkLabelSupport.TabStop = true; this.linkLabelSupport.Text = "Support/Questions"; @@ -84,26 +89,40 @@ private void InitializeComponent() // // label1 // - this.label1.Location = new System.Drawing.Point(9, 128); + this.label1.Location = new System.Drawing.Point(14, 177); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(260, 31); + this.label1.Size = new System.Drawing.Size(390, 43); this.label1.TabIndex = 4; this.label1.Text = "VGMToolbox is freeware, Licensed under the MIT license."; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 196); + this.label2.Location = new System.Drawing.Point(14, 270); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(150, 13); + this.label2.Size = new System.Drawing.Size(251, 18); this.label2.TabIndex = 5; this.label2.Text = "Email: vgmtoolbox@gmail.com"; // + // linkLabelGithub + // + this.linkLabelGithub.AutoSize = true; + this.linkLabelGithub.Location = new System.Drawing.Point(14, 295); + this.linkLabelGithub.Name = "linkLabelGithub"; + this.linkLabelGithub.Size = new System.Drawing.Size(197, 18); + this.linkLabelGithub.TabIndex = 6; + this.linkLabelGithub.TabStop = true; + this.linkLabelGithub.Text = "Rev updates at Github"; + this.linkLabelGithub.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked); + // // AboutForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 240); + this.ClientSize = new System.Drawing.Size(426, 372); + this.Controls.Add(this.linkLabelGithub); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.linkLabelSupport); @@ -111,6 +130,7 @@ private void InitializeComponent() this.Controls.Add(this.okButton); this.Controls.Add(this.linkLabelHomePage); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "AboutForm"; this.Text = "About VGMToolbox"; this.ResumeLayout(false); @@ -126,5 +146,6 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel linkLabelSupport; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; + private System.Windows.Forms.LinkLabel linkLabelGithub; } } \ No newline at end of file diff --git a/VGMToolbox/forms/AboutForm.cs b/VGMToolbox/forms/AboutForm.cs index b227aa4..d5058bb 100644 --- a/VGMToolbox/forms/AboutForm.cs +++ b/VGMToolbox/forms/AboutForm.cs @@ -14,8 +14,9 @@ public AboutForm() { InitializeComponent(); - this.linkLabelHomePage.Links.Add(0, this.linkLabelHomePage.Text.Length, "http://sourceforge.net/projects/vgmtoolbox/"); - this.linkLabelSupport.Links.Add(0, this.linkLabelSupport.Text.Length, "http://hcs64.com/mboard/forum.php?showthread=22580"); + this.linkLabelHomePage.Links.Add(0, this.linkLabelHomePage.Text.Length, "https://sourceforge.net/projects/vgmtoolbox/"); + this.linkLabelSupport.Links.Add(0, this.linkLabelSupport.Text.Length, "https://hcs64.com/mboard/forum.php?showthread=22580"); + this.linkLabelGithub.Links.Add(0, this.linkLabelGithub.Text.Length, "https://github.com/Manicsteiner/VGMToolbox"); } private void okButton_Click(object sender, EventArgs e) diff --git a/VGMToolbox/forms/extraction/CriAcbAwbExtractorForm.cs b/VGMToolbox/forms/extraction/CriAcbAwbExtractorForm.cs index 330c75c..ae596b4 100644 --- a/VGMToolbox/forms/extraction/CriAcbAwbExtractorForm.cs +++ b/VGMToolbox/forms/extraction/CriAcbAwbExtractorForm.cs @@ -16,6 +16,7 @@ public CriAcbAwbExtractorForm(TreeNode pTreeNode) this.lblTitle.Text = "CRI ACB/AWB Archive Extractor"; this.tbOutput.Text = "Extract Files from CRI ACB/AWB Archives" + Environment.NewLine; this.tbOutput.Text += "*** For ACB/AWB pairs, only the ACB needs to be dropped." + Environment.NewLine; + this.tbOutput.Text += "*** If you encounter problems with the extract process, please try using VGMStream first." + Environment.NewLine; // hide the DoTask button since this is a drag and drop form this.btnDoTask.Hide();