From 3e1b5c83e36d0f3f3299ea491a6b3484ba4e6a48 Mon Sep 17 00:00:00 2001
From: Skyth <19259897+blueskythlikesclouds@users.noreply.github.com>
Date: Fri, 19 Mar 2021 22:24:07 +0300
Subject: [PATCH] Allow columns to be resized & reword most text in CSB Builder
---
Source/CsbBuilder/Builder/CsbBuilder.cs | 2 +-
.../BuilderNodes/BuilderAisacGraphNode.cs | 11 +-
.../BuilderNodes/BuilderAisacNode.cs | 7 +-
.../BuilderNodes/BuilderAisacPointNode.cs | 4 +-
.../BuilderNodes/BuilderBaseNode.cs | 2 +-
.../CsbBuilder/BuilderNodes/BuilderCueNode.cs | 11 +-
.../BuilderNodes/BuilderSoundElementNode.cs | 12 +-
.../BuilderNodes/BuilderSynthNode.cs | 14 +-
Source/CsbBuilder/Importer/CsbImporter.cs | 2 +-
Source/CsbBuilder/MainForm.Designer.cs | 228 +++++++++++-------
Source/CsbBuilder/MainForm.cs | 60 ++---
Source/CsbBuilder/MainForm.resx | 8 +-
Source/CsbBuilder/SetAudioForm.cs | 6 +-
Source/CsbBuilder/SetReferenceForm.cs | 2 +-
Source/CsbBuilder/Settings.cs | 30 +--
15 files changed, 219 insertions(+), 180 deletions(-)
diff --git a/Source/CsbBuilder/Builder/CsbBuilder.cs b/Source/CsbBuilder/Builder/CsbBuilder.cs
index 9863ac0..fdba430 100644
--- a/Source/CsbBuilder/Builder/CsbBuilder.cs
+++ b/Source/CsbBuilder/Builder/CsbBuilder.cs
@@ -39,7 +39,7 @@ public static void Build(CsbProject project, string outputFileName)
cueTables.Add(new SerializationCueTable
{
Name = cueNode.Name,
- Id = cueNode.Identifier,
+ Id = cueNode.Id,
UserData = cueNode.UserComment,
Flags = cueNode.Flags,
SynthPath = cueNode.SynthReference,
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderAisacGraphNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderAisacGraphNode.cs
index 4536a48..6b9590c 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderAisacGraphNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderAisacGraphNode.cs
@@ -10,27 +10,26 @@ namespace CsbBuilder.BuilderNodes
public class BuilderAisacGraphNode : BuilderBaseNode
{
[Category("General")]
- [Description("The type of this Graph. Currently, none of the types are known.")]
+ [Description("Type of this graph. Values are unknown.")]
public byte Type { get; set; }
[Category("Vector"), DisplayName("Maximum X")]
- [Description("The maximum range that the X values in this Graph can reach.")]
+ [Description("End X position of this graph.")]
public float MaximumX { get; set; }
[Category("Vector"), DisplayName("Minimum X")]
- [Description("The minimum range that the X values in this Graph can reach.")]
+ [Description("Begin X position of this graph.")]
public float MinimumX { get; set; }
[Category("Vector"), DisplayName("Maximum Y")]
- [Description("The maximum range that the Y values in this Graph can reach.")]
+ [Description("End Y position of this graph.")]
public float MaximumY { get; set; }
[Category("Vector"), DisplayName("Minimum Y")]
- [Description("The minimum range that the Y values in this Graph can reach.")]
+ [Description("End X position of this graph.")]
public float MinimumY { get; set; }
[Category("Vector"), DisplayName("Points")]
- [Description("The points of this Graph.")]
public List<BuilderAisacPointNode> Points { get; set; }
public BuilderAisacGraphNode()
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderAisacNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderAisacNode.cs
index 753dfb6..f74f5ae 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderAisacNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderAisacNode.cs
@@ -10,18 +10,17 @@ namespace CsbBuilder.BuilderNodes
public class BuilderAisacNode : BuilderBaseNode
{
[Category("General"), DisplayName("Aisac Name")]
- [Description("The name of this Aisac. (Shouldn't be seen as the node name.)")]
+ [Description("Representative name of this aisac.")]
public string AisacName { get; set; }
[Category("General")]
- [Description("The type of this Aisac. Currently, none of the types are known.")]
+ [Description("Type of this aisac. Values are unknown.")]
public byte Type { get; set; }
[Category("Graph")]
- [Description("The Graph's of this Aisac.")]
public List<BuilderAisacGraphNode> Graphs { get; set; }
- [Category("Graph"), DisplayName("Random Range (Unknown)")]
+ [Category("Graph"), DisplayName("Random Range")]
public byte RandomRange { get; set; }
public BuilderAisacNode()
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderAisacPointNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderAisacPointNode.cs
index 26d7144..d0dde3c 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderAisacPointNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderAisacPointNode.cs
@@ -10,11 +10,11 @@ namespace CsbBuilder.BuilderNodes
public class BuilderAisacPointNode : BuilderBaseNode
{
[Category("Vector"), DisplayName("X")]
- [Description("The X dimension of this Point, relative to the Graph it's in.")]
+ [Description("Normalized X coordinate of this point.")]
public ushort X { get; set; }
[Category("Vector"), DisplayName("Y")]
- [Description("The Y dimension of this Point, relative to the Graph it's in.")]
+ [Description("Normalized Y coordinate of this point.")]
public ushort Y { get; set; }
}
}
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderBaseNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderBaseNode.cs
index 35be81e..12a4e03 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderBaseNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderBaseNode.cs
@@ -11,7 +11,7 @@ namespace CsbBuilder.BuilderNodes
public abstract class BuilderBaseNode : ICloneable
{
[Category("General"), ReadOnly(true)]
- [Description("The name of this node.")]
+ [Description("Name of this node.")]
public string Name { get; set; }
public object Clone()
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderCueNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderCueNode.cs
index ad446bb..4e976cb 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderCueNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderCueNode.cs
@@ -9,21 +9,20 @@ namespace CsbBuilder.BuilderNodes
{
public class BuilderCueNode : BuilderBaseNode
{
- [Category("General"), DisplayName("Identifier")]
- [Description("The identifier of this Cue. Must be unique for this Cue Sheet.")]
- public uint Identifier { get; set; }
+ [Category("General"), DisplayName("ID")]
+ [Description("ID of this cue.")]
+ public uint Id { get; set; }
[ReadOnly(true)]
[Category("General"), DisplayName("Synth Reference Path")]
- [Description("The full path of the Synth (can be Track or Sound) that this Cue is referenced to. When this Cue is called to play in game, the referenced Synth will be played.")]
+ [Description("Full path of synth reference.")]
public string SynthReference { get; set; }
[Category("General"), DisplayName("User Comment")]
- [Description("User comment of this Cue.")]
public string UserComment { get; set; }
[Category("General")]
- [Description("Currently, none of the flags are known. However, value '1' seems to mute the Cue in-game.")]
+ [Description("Flags of this cue. Values are unknown.")]
public byte Flags { get; set; }
}
}
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderSoundElementNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderSoundElementNode.cs
index d803fae..32ab1fd 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderSoundElementNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderSoundElementNode.cs
@@ -11,31 +11,31 @@ public class BuilderSoundElementNode : BuilderBaseNode
{
[ReadOnly(true)]
[Category("General")]
- [Description("The name of the audio in Project/Audio directory, which is going to play before the loop audio starts to play. Can be left empty, so that there will be no audio to play.")]
+ [Description("File path of audio to play before loop. This can be left empty if loop is set.")]
public string Intro { get; set; }
[ReadOnly(true)]
[Category("General")]
- [Description("The name of the audio in Project/Audio directory, which is going to be looped. Can be left empty, so that there will be no audio to loop in-game.")]
+ [Description("File path of audio to play after intro. This can be left empty if intro is set.")]
public string Loop { get; set; }
[ReadOnly(true)]
[Category("General"), DisplayName("Channel Count")]
- [Description("The channel count of BOTH Intro and Loop audio files. If they do not match, this will most likely result issues in-game, because the game ignores the channel count information in the audio file itself, but uses this info.")]
+ [Description("Channel count of audio files. This information is used instead of the metadata in audio files.")]
public byte ChannelCount { get; set; }
[Category("General"), DisplayName("Streamed")]
- [Description("Determines whether the audio files specified here are going to be streamed from a .CPK file, which is outside the .CSB file. Otherwise, it will be played from the memory. That's the best to be 'true', if the specified audio files are large.")]
+ [Description("Determines whether audio files are going to be streamed from a .cpk file.")]
public bool Streaming { get; set; }
[ReadOnly(true)]
[Category("General"), DisplayName("Sample Rate")]
- [Description("The sample rate of BOTH Intro and Loop audio files. If they do not match, this will most likely result issues in-game, because the game ignores the sample rate information in the audio file itself, but uses this info.")]
+ [Description("Sample rate of audio files. This information is used instead of the metadata in audio files.")]
public uint SampleRate { get; set; }
[ReadOnly(true)]
[Category("General"), DisplayName("Sample Count")]
- [Description("The sample count of Intro and Loop files, added together.")]
+ [Description("Sample count of audio files added together.")]
public uint SampleCount { get; set; }
}
}
diff --git a/Source/CsbBuilder/BuilderNodes/BuilderSynthNode.cs b/Source/CsbBuilder/BuilderNodes/BuilderSynthNode.cs
index a061d26..79fbe01 100644
--- a/Source/CsbBuilder/BuilderNodes/BuilderSynthNode.cs
+++ b/Source/CsbBuilder/BuilderNodes/BuilderSynthNode.cs
@@ -37,7 +37,7 @@ public class BuilderSynthNode : BuilderBaseNode
public BuilderSynthType Type { get; set; }
[Category("General"), DisplayName("Playback Type")]
- [Description("The playback type of this Synth.")]
+ [Description("Playback type of this synth.")]
public BuilderSynthPlaybackType PlaybackType
{
get
@@ -63,7 +63,7 @@ public BuilderSynthPlaybackType PlaybackType
[ReadOnly(true)]
[Category("General"), DisplayName("Sound Element Reference Path")]
- [Description("The Sound that this Synth is referenced to. This will be empty if this Synth represents a Track.")]
+ [Description("Full reference path of sound element node. This is going to be empty if the node is a track.")]
public string SoundElementReference { get; set; }
[Browsable(false)]
@@ -71,19 +71,19 @@ public BuilderSynthPlaybackType PlaybackType
[ReadOnly(true)]
[Category("General"), DisplayName("Aisac Reference Path")]
- [Description("The Aisac that this Synth is referenced to.")]
+ [Description("Full reference path of aisac node.")]
public string AisacReference { get; set; }
[Category("General")]
- [Description("The volume of this Synth.")]
+ [Description("Volume of this synth. 1000 equals to 100%.")]
public short Volume { get; set; }
[Category("General")]
- [Description("The pitch of this Synth.")]
+ [Description("Pitch of this synth. Use positive/negative values to make it higher/lower pitched.")]
public short Pitch { get; set; }
[Category("General"), DisplayName("Delay Time")]
- [Description("The delay of this Synth. The time is in miliseconds.")]
+ [Description("How much time it takes to play this synth. The time is in milliseconds.")]
public uint DelayTime { get; set; }
[Category("Unknown"), DisplayName("S Control")]
@@ -316,7 +316,7 @@ public BuilderSynthPlaybackType PlaybackType
public ushort Filter2CutoffHigherGain { get; set; }
[Category("General"), DisplayName("Playback Probability")]
- [Description("The probability of this Synth being played. A random number (max 100) will be chosen and if this number is lower than this parameter (or equals), it will be played. This does not do anything if this Synth represents a Track.")]
+ [Description("Probability of this synth being played. Lower values make it less probable to play. Max is 100.")]
public byte PlaybackProbability
{
get
diff --git a/Source/CsbBuilder/Importer/CsbImporter.cs b/Source/CsbBuilder/Importer/CsbImporter.cs
index ca99d4a..c18d967 100644
--- a/Source/CsbBuilder/Importer/CsbImporter.cs
+++ b/Source/CsbBuilder/Importer/CsbImporter.cs
@@ -280,7 +280,7 @@ public static void Import(string path, CsbProject project)
{
BuilderCueNode cueNode = new BuilderCueNode();
cueNode.Name = cueTable.Name;
- cueNode.Identifier = cueTable.Id;
+ cueNode.Id = cueTable.Id;
cueNode.UserComment = cueTable.UserData;
cueNode.Flags = cueTable.Flags;
cueNode.SynthReference = cueTable.SynthPath;
diff --git a/Source/CsbBuilder/MainForm.Designer.cs b/Source/CsbBuilder/MainForm.Designer.cs
index 0bc5917..fbdf230 100644
--- a/Source/CsbBuilder/MainForm.Designer.cs
+++ b/Source/CsbBuilder/MainForm.Designer.cs
@@ -46,11 +46,12 @@ private void InitializeComponent()
this.buildCurrentProjectAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem49 = new System.Windows.Forms.ToolStripMenuItem();
+ this.convertADXsToWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.convertAndSplitLoopingToWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator();
this.aAXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.extractAAXToFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.packFolderToAAXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.convertADXsToWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.convertAndSplitLoopingToWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator();
this.settingsButton = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -182,7 +183,8 @@ private void InitializeComponent()
this.toolStripMenuItem41 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem42 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem43 = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator();
+ this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+ this.splitContainer4 = new System.Windows.Forms.SplitContainer();
this.mainMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
@@ -215,6 +217,14 @@ private void InitializeComponent()
this.statusStrip.SuspendLayout();
this.aisacNodeMenu.SuspendLayout();
this.aisacFolderMenu.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+ this.splitContainer3.Panel1.SuspendLayout();
+ this.splitContainer3.Panel2.SuspendLayout();
+ this.splitContainer3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
+ this.splitContainer4.Panel1.SuspendLayout();
+ this.splitContainer4.Panel2.SuspendLayout();
+ this.splitContainer4.SuspendLayout();
this.SuspendLayout();
//
// mainMenu
@@ -227,7 +237,7 @@ private void InitializeComponent()
this.mainMenu.Location = new System.Drawing.Point(0, 0);
this.mainMenu.Name = "mainMenu";
this.mainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.mainMenu.Size = new System.Drawing.Size(878, 24);
+ this.mainMenu.Size = new System.Drawing.Size(884, 24);
this.mainMenu.TabIndex = 0;
this.mainMenu.Text = "menuStrip1";
//
@@ -376,7 +386,7 @@ private void InitializeComponent()
this.toolStripSeparator26,
this.settingsButton});
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
- this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+ this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
this.toolsToolStripMenuItem.Text = "Tools";
//
// toolStripMenuItem49
@@ -388,9 +398,31 @@ private void InitializeComponent()
this.aAXToolStripMenuItem});
this.toolStripMenuItem49.Image = global::CsbBuilder.Properties.Resources.Sound;
this.toolStripMenuItem49.Name = "toolStripMenuItem49";
- this.toolStripMenuItem49.Size = new System.Drawing.Size(152, 22);
+ this.toolStripMenuItem49.Size = new System.Drawing.Size(136, 22);
this.toolStripMenuItem49.Text = "Audio Tools";
//
+ // convertADXsToWAVToolStripMenuItem
+ //
+ this.convertADXsToWAVToolStripMenuItem.Name = "convertADXsToWAVToolStripMenuItem";
+ this.convertADXsToWAVToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.convertADXsToWAVToolStripMenuItem.Text = "Convert to WAV File(s)";
+ this.convertADXsToWAVToolStripMenuItem.ToolTipText = "Convert audio files to WAV files";
+ this.convertADXsToWAVToolStripMenuItem.Click += new System.EventHandler(this.convertADXsToWAVToolStripMenuItem_Click);
+ //
+ // convertAndSplitLoopingToWAVToolStripMenuItem
+ //
+ this.convertAndSplitLoopingToWAVToolStripMenuItem.Name = "convertAndSplitLoopingToWAVToolStripMenuItem";
+ this.convertAndSplitLoopingToWAVToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.convertAndSplitLoopingToWAVToolStripMenuItem.Text = "Convert and split to WAV File(s)";
+ this.convertAndSplitLoopingToWAVToolStripMenuItem.ToolTipText = "Convert and split audio files to Intro and Loop parts using loop information in t" +
+ "he file";
+ this.convertAndSplitLoopingToWAVToolStripMenuItem.Click += new System.EventHandler(this.convertAndSplitLoopingToWAVToolStripMenuItem_Click);
+ //
+ // toolStripSeparator27
+ //
+ this.toolStripSeparator27.Name = "toolStripSeparator27";
+ this.toolStripSeparator27.Size = new System.Drawing.Size(237, 6);
+ //
// aAXToolStripMenuItem
//
this.aAXToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -403,44 +435,27 @@ private void InitializeComponent()
// extractAAXToFolderToolStripMenuItem
//
this.extractAAXToFolderToolStripMenuItem.Name = "extractAAXToFolderToolStripMenuItem";
- this.extractAAXToFolderToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
+ this.extractAAXToFolderToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.extractAAXToFolderToolStripMenuItem.Text = "Extract AAX(s) to folder";
this.extractAAXToFolderToolStripMenuItem.Click += new System.EventHandler(this.extractAAXToFolderToolStripMenuItem_Click);
//
// packFolderToAAXToolStripMenuItem
//
this.packFolderToAAXToolStripMenuItem.Name = "packFolderToAAXToolStripMenuItem";
- this.packFolderToAAXToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
+ this.packFolderToAAXToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.packFolderToAAXToolStripMenuItem.Text = "Pack file(s) to AAX";
this.packFolderToAAXToolStripMenuItem.Click += new System.EventHandler(this.packFolderToAAXToolStripMenuItem_Click);
//
- // convertADXsToWAVToolStripMenuItem
- //
- this.convertADXsToWAVToolStripMenuItem.Name = "convertADXsToWAVToolStripMenuItem";
- this.convertADXsToWAVToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.convertADXsToWAVToolStripMenuItem.Text = "Convert to WAV File(s)";
- this.convertADXsToWAVToolStripMenuItem.ToolTipText = "Convert audio files to WAV files";
- this.convertADXsToWAVToolStripMenuItem.Click += new System.EventHandler(this.convertADXsToWAVToolStripMenuItem_Click);
- //
- // convertAndSplitLoopingToWAVToolStripMenuItem
- //
- this.convertAndSplitLoopingToWAVToolStripMenuItem.Name = "convertAndSplitLoopingToWAVToolStripMenuItem";
- this.convertAndSplitLoopingToWAVToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.convertAndSplitLoopingToWAVToolStripMenuItem.Text = "Convert and split to WAV File(s)";
- this.convertAndSplitLoopingToWAVToolStripMenuItem.ToolTipText = "Convert and split audio files to Intro and Loop parts using loop information in t" +
- "he file";
- this.convertAndSplitLoopingToWAVToolStripMenuItem.Click += new System.EventHandler(this.convertAndSplitLoopingToWAVToolStripMenuItem_Click);
- //
// toolStripSeparator26
//
this.toolStripSeparator26.Name = "toolStripSeparator26";
- this.toolStripSeparator26.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator26.Size = new System.Drawing.Size(133, 6);
//
// settingsButton
//
this.settingsButton.Image = global::CsbBuilder.Properties.Resources.Settings;
this.settingsButton.Name = "settingsButton";
- this.settingsButton.Size = new System.Drawing.Size(152, 22);
+ this.settingsButton.Size = new System.Drawing.Size(136, 22);
this.settingsButton.Text = "Settings";
this.settingsButton.Click += new System.EventHandler(this.OpenSettings);
//
@@ -454,23 +469,20 @@ private void InitializeComponent()
// propertyGrid
//
this.propertyGrid.AllowDrop = true;
- this.propertyGrid.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.propertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
this.propertyGrid.Enabled = false;
this.propertyGrid.LineColor = System.Drawing.SystemColors.ControlDark;
- this.propertyGrid.Location = new System.Drawing.Point(252, 24);
+ this.propertyGrid.Location = new System.Drawing.Point(0, 0);
this.propertyGrid.Name = "propertyGrid";
- this.propertyGrid.Size = new System.Drawing.Size(374, 556);
+ this.propertyGrid.Size = new System.Drawing.Size(348, 565);
this.propertyGrid.TabIndex = 1;
this.propertyGrid.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.OnPropertyChange);
//
// splitContainer1
//
- this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Enabled = false;
- this.splitContainer1.Location = new System.Drawing.Point(0, 24);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
@@ -481,8 +493,8 @@ private void InitializeComponent()
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.tabControl3);
- this.splitContainer1.Size = new System.Drawing.Size(250, 556);
- this.splitContainer1.SplitterDistance = 247;
+ this.splitContainer1.Size = new System.Drawing.Size(264, 565);
+ this.splitContainer1.SplitterDistance = 253;
this.splitContainer1.TabIndex = 2;
//
// tabControl2
@@ -493,7 +505,7 @@ private void InitializeComponent()
this.tabControl2.Location = new System.Drawing.Point(0, 0);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(250, 247);
+ this.tabControl2.Size = new System.Drawing.Size(264, 253);
this.tabControl2.TabIndex = 0;
//
// tabPage3
@@ -502,7 +514,7 @@ private void InitializeComponent()
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(242, 221);
+ this.tabPage3.Size = new System.Drawing.Size(256, 227);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "Cue Nodes";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -521,7 +533,7 @@ private void InitializeComponent()
this.cueTree.Name = "cueTree";
this.cueTree.PathSeparator = "/";
this.cueTree.SelectedImageIndex = 0;
- this.cueTree.Size = new System.Drawing.Size(236, 215);
+ this.cueTree.Size = new System.Drawing.Size(250, 221);
this.cueTree.TabIndex = 0;
this.cueTree.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.OnRenameEnd);
this.cueTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.AfterNodeSelect);
@@ -575,7 +587,7 @@ private void InitializeComponent()
this.tabControl3.Location = new System.Drawing.Point(0, 0);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
- this.tabControl3.Size = new System.Drawing.Size(250, 305);
+ this.tabControl3.Size = new System.Drawing.Size(264, 308);
this.tabControl3.TabIndex = 0;
//
// tabPage4
@@ -584,7 +596,7 @@ private void InitializeComponent()
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage4.Size = new System.Drawing.Size(242, 279);
+ this.tabPage4.Size = new System.Drawing.Size(256, 282);
this.tabPage4.TabIndex = 0;
this.tabPage4.Text = "Synth Nodes";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -603,7 +615,7 @@ private void InitializeComponent()
this.synthTree.Name = "synthTree";
this.synthTree.PathSeparator = "/";
this.synthTree.SelectedImageIndex = 0;
- this.synthTree.Size = new System.Drawing.Size(236, 273);
+ this.synthTree.Size = new System.Drawing.Size(250, 276);
this.synthTree.TabIndex = 0;
this.synthTree.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.OnRenameEnd);
this.synthTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.AfterNodeSelect);
@@ -709,10 +721,9 @@ private void InitializeComponent()
//
// splitContainer2
//
- this.splitContainer2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer2.Enabled = false;
- this.splitContainer2.Location = new System.Drawing.Point(628, 24);
+ this.splitContainer2.Location = new System.Drawing.Point(0, 0);
this.splitContainer2.Name = "splitContainer2";
this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
@@ -723,8 +734,8 @@ private void InitializeComponent()
// splitContainer2.Panel2
//
this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
- this.splitContainer2.Size = new System.Drawing.Size(250, 556);
- this.splitContainer2.SplitterDistance = 247;
+ this.splitContainer2.Size = new System.Drawing.Size(264, 565);
+ this.splitContainer2.SplitterDistance = 250;
this.splitContainer2.TabIndex = 3;
//
// tabControl4
@@ -734,7 +745,7 @@ private void InitializeComponent()
this.tabControl4.Location = new System.Drawing.Point(0, 0);
this.tabControl4.Name = "tabControl4";
this.tabControl4.SelectedIndex = 0;
- this.tabControl4.Size = new System.Drawing.Size(250, 247);
+ this.tabControl4.Size = new System.Drawing.Size(264, 250);
this.tabControl4.TabIndex = 0;
//
// tabPage5
@@ -743,7 +754,7 @@ private void InitializeComponent()
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage5.Size = new System.Drawing.Size(242, 221);
+ this.tabPage5.Size = new System.Drawing.Size(256, 224);
this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "Sound Element Nodes";
this.tabPage5.UseVisualStyleBackColor = true;
@@ -762,7 +773,7 @@ private void InitializeComponent()
this.soundElementTree.Name = "soundElementTree";
this.soundElementTree.PathSeparator = "/";
this.soundElementTree.SelectedImageIndex = 0;
- this.soundElementTree.Size = new System.Drawing.Size(236, 215);
+ this.soundElementTree.Size = new System.Drawing.Size(250, 218);
this.soundElementTree.TabIndex = 0;
this.soundElementTree.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.OnRenameEnd);
this.soundElementTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.AfterNodeSelect);
@@ -778,7 +789,7 @@ private void InitializeComponent()
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(250, 305);
+ this.tabControl1.Size = new System.Drawing.Size(264, 311);
this.tabControl1.TabIndex = 0;
//
// tabPage1
@@ -787,7 +798,7 @@ private void InitializeComponent()
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(242, 279);
+ this.tabPage1.Size = new System.Drawing.Size(256, 285);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "AISAC Nodes";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -806,7 +817,7 @@ private void InitializeComponent()
this.aisacTree.Name = "aisacTree";
this.aisacTree.PathSeparator = "/";
this.aisacTree.SelectedImageIndex = 0;
- this.aisacTree.Size = new System.Drawing.Size(236, 273);
+ this.aisacTree.Size = new System.Drawing.Size(250, 279);
this.aisacTree.TabIndex = 0;
this.aisacTree.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.OnRenameEnd);
this.aisacTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.AfterNodeSelect);
@@ -825,13 +836,13 @@ private void InitializeComponent()
this.toolStripMenuItem47});
this.aisacTreeMenu.Name = "contextMenuStrip1";
this.aisacTreeMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.aisacTreeMenu.Size = new System.Drawing.Size(189, 104);
+ this.aisacTreeMenu.Size = new System.Drawing.Size(188, 104);
//
// toolStripMenuItem45
//
this.toolStripMenuItem45.Image = global::CsbBuilder.Properties.Resources.Create;
this.toolStripMenuItem45.Name = "toolStripMenuItem45";
- this.toolStripMenuItem45.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem45.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem45.Text = "Create";
this.toolStripMenuItem45.ToolTipText = "Create a new node.";
this.toolStripMenuItem45.Click += new System.EventHandler(this.CreateNode);
@@ -840,7 +851,7 @@ private void InitializeComponent()
//
this.toolStripMenuItem46.Image = global::CsbBuilder.Properties.Resources.Folder;
this.toolStripMenuItem46.Name = "toolStripMenuItem46";
- this.toolStripMenuItem46.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem46.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem46.Text = "Create Folder";
this.toolStripMenuItem46.ToolTipText = "Create a new folder.";
this.toolStripMenuItem46.Click += new System.EventHandler(this.CreateFolder);
@@ -848,26 +859,26 @@ private void InitializeComponent()
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
- this.toolStripSeparator24.Size = new System.Drawing.Size(185, 6);
+ this.toolStripSeparator24.Size = new System.Drawing.Size(184, 6);
//
// toolStripMenuItem48
//
this.toolStripMenuItem48.Image = global::CsbBuilder.Properties.Resources.Template;
this.toolStripMenuItem48.Name = "toolStripMenuItem48";
- this.toolStripMenuItem48.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem48.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem48.Text = "Load AISAC Template";
this.toolStripMenuItem48.Click += new System.EventHandler(this.LoadTemplate);
//
// toolStripSeparator25
//
this.toolStripSeparator25.Name = "toolStripSeparator25";
- this.toolStripSeparator25.Size = new System.Drawing.Size(185, 6);
+ this.toolStripSeparator25.Size = new System.Drawing.Size(184, 6);
//
// toolStripMenuItem47
//
this.toolStripMenuItem47.Image = global::CsbBuilder.Properties.Resources.Paste;
this.toolStripMenuItem47.Name = "toolStripMenuItem47";
- this.toolStripMenuItem47.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem47.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem47.Text = "Paste";
this.toolStripMenuItem47.ToolTipText = "Paste the copied node.";
this.toolStripMenuItem47.Click += new System.EventHandler(this.PasteNodeOnTree);
@@ -878,7 +889,7 @@ private void InitializeComponent()
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(242, 279);
+ this.tabPage2.Size = new System.Drawing.Size(376, 279);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Voice Limit Group Nodes";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -897,7 +908,7 @@ private void InitializeComponent()
this.voiceLimitGroupTree.Name = "voiceLimitGroupTree";
this.voiceLimitGroupTree.PathSeparator = "/";
this.voiceLimitGroupTree.SelectedImageIndex = 0;
- this.voiceLimitGroupTree.Size = new System.Drawing.Size(236, 273);
+ this.voiceLimitGroupTree.Size = new System.Drawing.Size(370, 273);
this.voiceLimitGroupTree.TabIndex = 0;
this.voiceLimitGroupTree.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.OnRenameEnd);
this.voiceLimitGroupTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.AfterNodeSelect);
@@ -1494,9 +1505,9 @@ private void InitializeComponent()
this.playButton,
this.stopButton,
this.statusLabel});
- this.statusStrip.Location = new System.Drawing.Point(0, 580);
+ this.statusStrip.Location = new System.Drawing.Point(0, 589);
this.statusStrip.Name = "statusStrip";
- this.statusStrip.Size = new System.Drawing.Size(878, 22);
+ this.statusStrip.Size = new System.Drawing.Size(884, 22);
this.statusStrip.TabIndex = 10;
this.statusStrip.Text = "statusStrip1";
//
@@ -1539,13 +1550,13 @@ private void InitializeComponent()
this.toolStripMenuItem38});
this.aisacNodeMenu.Name = "cueAndVoiceLimitGroupMenu";
this.aisacNodeMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.aisacNodeMenu.Size = new System.Drawing.Size(153, 148);
+ this.aisacNodeMenu.Size = new System.Drawing.Size(152, 148);
//
// toolStripMenuItem35
//
this.toolStripMenuItem35.Image = global::CsbBuilder.Properties.Resources.Create;
this.toolStripMenuItem35.Name = "toolStripMenuItem35";
- this.toolStripMenuItem35.Size = new System.Drawing.Size(152, 22);
+ this.toolStripMenuItem35.Size = new System.Drawing.Size(151, 22);
this.toolStripMenuItem35.Text = "Create";
this.toolStripMenuItem35.ToolTipText = "Create a new node after the selected node.";
this.toolStripMenuItem35.Click += new System.EventHandler(this.CreateAndInsertNode);
@@ -1553,13 +1564,13 @@ private void InitializeComponent()
// toolStripSeparator20
//
this.toolStripSeparator20.Name = "toolStripSeparator20";
- this.toolStripSeparator20.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator20.Size = new System.Drawing.Size(148, 6);
//
// loadTemplateToolStripMenuItem
//
this.loadTemplateToolStripMenuItem.Image = global::CsbBuilder.Properties.Resources.Template;
this.loadTemplateToolStripMenuItem.Name = "loadTemplateToolStripMenuItem";
- this.loadTemplateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.loadTemplateToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.loadTemplateToolStripMenuItem.Text = "Load Template";
this.loadTemplateToolStripMenuItem.Click += new System.EventHandler(this.LoadTemplate);
//
@@ -1567,20 +1578,20 @@ private void InitializeComponent()
//
this.saveTemplateToolStripMenuItem.Image = global::CsbBuilder.Properties.Resources.Template;
this.saveTemplateToolStripMenuItem.Name = "saveTemplateToolStripMenuItem";
- this.saveTemplateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.saveTemplateToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.saveTemplateToolStripMenuItem.Text = "Save Template";
this.saveTemplateToolStripMenuItem.Click += new System.EventHandler(this.SaveTemplate);
//
// toolStripSeparator21
//
this.toolStripSeparator21.Name = "toolStripSeparator21";
- this.toolStripSeparator21.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator21.Size = new System.Drawing.Size(148, 6);
//
// toolStripMenuItem36
//
this.toolStripMenuItem36.Image = global::CsbBuilder.Properties.Resources.Copy;
this.toolStripMenuItem36.Name = "toolStripMenuItem36";
- this.toolStripMenuItem36.Size = new System.Drawing.Size(152, 22);
+ this.toolStripMenuItem36.Size = new System.Drawing.Size(151, 22);
this.toolStripMenuItem36.Text = "Copy";
this.toolStripMenuItem36.ToolTipText = "Copy the selected node.";
this.toolStripMenuItem36.Click += new System.EventHandler(this.CopyNode);
@@ -1589,7 +1600,7 @@ private void InitializeComponent()
//
this.toolStripMenuItem37.Image = global::CsbBuilder.Properties.Resources.Paste;
this.toolStripMenuItem37.Name = "toolStripMenuItem37";
- this.toolStripMenuItem37.Size = new System.Drawing.Size(152, 22);
+ this.toolStripMenuItem37.Size = new System.Drawing.Size(151, 22);
this.toolStripMenuItem37.Text = "Paste";
this.toolStripMenuItem37.ToolTipText = "Paste the copied node after the selected node.";
this.toolStripMenuItem37.Click += new System.EventHandler(this.PasteAndInsertNode);
@@ -1598,7 +1609,7 @@ private void InitializeComponent()
//
this.toolStripMenuItem38.Image = global::CsbBuilder.Properties.Resources.Remove;
this.toolStripMenuItem38.Name = "toolStripMenuItem38";
- this.toolStripMenuItem38.Size = new System.Drawing.Size(152, 22);
+ this.toolStripMenuItem38.Size = new System.Drawing.Size(151, 22);
this.toolStripMenuItem38.Text = "Remove";
this.toolStripMenuItem38.ToolTipText = "Remove the selected node.";
this.toolStripMenuItem38.Click += new System.EventHandler(this.RemoveNode);
@@ -1616,13 +1627,13 @@ private void InitializeComponent()
this.toolStripMenuItem43});
this.aisacFolderMenu.Name = "synthSoundElementAndAisacMenu";
this.aisacFolderMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.aisacFolderMenu.Size = new System.Drawing.Size(189, 148);
+ this.aisacFolderMenu.Size = new System.Drawing.Size(188, 148);
//
// toolStripMenuItem39
//
this.toolStripMenuItem39.Image = global::CsbBuilder.Properties.Resources.Create;
this.toolStripMenuItem39.Name = "toolStripMenuItem39";
- this.toolStripMenuItem39.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem39.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem39.Text = "Create";
this.toolStripMenuItem39.ToolTipText = "Create a new child node.";
this.toolStripMenuItem39.Click += new System.EventHandler(this.CreateChildNode);
@@ -1631,7 +1642,7 @@ private void InitializeComponent()
//
this.toolStripMenuItem40.Image = global::CsbBuilder.Properties.Resources.Folder;
this.toolStripMenuItem40.Name = "toolStripMenuItem40";
- this.toolStripMenuItem40.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem40.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem40.Text = "Create Folder";
this.toolStripMenuItem40.ToolTipText = "Create a new child folder.";
this.toolStripMenuItem40.Click += new System.EventHandler(this.CreateChildFolder);
@@ -1639,26 +1650,26 @@ private void InitializeComponent()
// toolStripSeparator22
//
this.toolStripSeparator22.Name = "toolStripSeparator22";
- this.toolStripSeparator22.Size = new System.Drawing.Size(185, 6);
+ this.toolStripSeparator22.Size = new System.Drawing.Size(184, 6);
//
// toolStripMenuItem44
//
this.toolStripMenuItem44.Image = global::CsbBuilder.Properties.Resources.Template;
this.toolStripMenuItem44.Name = "toolStripMenuItem44";
- this.toolStripMenuItem44.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem44.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem44.Text = "Load AISAC Template";
this.toolStripMenuItem44.Click += new System.EventHandler(this.LoadTemplate);
//
// toolStripSeparator23
//
this.toolStripSeparator23.Name = "toolStripSeparator23";
- this.toolStripSeparator23.Size = new System.Drawing.Size(185, 6);
+ this.toolStripSeparator23.Size = new System.Drawing.Size(184, 6);
//
// toolStripMenuItem41
//
this.toolStripMenuItem41.Image = global::CsbBuilder.Properties.Resources.Copy;
this.toolStripMenuItem41.Name = "toolStripMenuItem41";
- this.toolStripMenuItem41.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem41.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem41.Text = "Copy";
this.toolStripMenuItem41.ToolTipText = "Copy the selected node.";
this.toolStripMenuItem41.Click += new System.EventHandler(this.CopyNode);
@@ -1667,7 +1678,7 @@ private void InitializeComponent()
//
this.toolStripMenuItem42.Image = global::CsbBuilder.Properties.Resources.Paste;
this.toolStripMenuItem42.Name = "toolStripMenuItem42";
- this.toolStripMenuItem42.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem42.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem42.Text = "Paste";
this.toolStripMenuItem42.ToolTipText = "Paste the copied node as child.";
this.toolStripMenuItem42.Click += new System.EventHandler(this.PasteNode);
@@ -1676,25 +1687,52 @@ private void InitializeComponent()
//
this.toolStripMenuItem43.Image = global::CsbBuilder.Properties.Resources.Remove;
this.toolStripMenuItem43.Name = "toolStripMenuItem43";
- this.toolStripMenuItem43.Size = new System.Drawing.Size(188, 22);
+ this.toolStripMenuItem43.Size = new System.Drawing.Size(187, 22);
this.toolStripMenuItem43.Text = "Remove";
this.toolStripMenuItem43.ToolTipText = "Remove the selected node.";
this.toolStripMenuItem43.Click += new System.EventHandler(this.RemoveNode);
//
- // toolStripSeparator27
+ // splitContainer3
//
- this.toolStripSeparator27.Name = "toolStripSeparator27";
- this.toolStripSeparator27.Size = new System.Drawing.Size(203, 6);
+ this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer3.Location = new System.Drawing.Point(0, 24);
+ this.splitContainer3.Name = "splitContainer3";
+ //
+ // splitContainer3.Panel1
+ //
+ this.splitContainer3.Panel1.Controls.Add(this.splitContainer1);
+ //
+ // splitContainer3.Panel2
+ //
+ this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
+ this.splitContainer3.Size = new System.Drawing.Size(884, 565);
+ this.splitContainer3.SplitterDistance = 264;
+ this.splitContainer3.TabIndex = 13;
+ //
+ // splitContainer4
+ //
+ this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer4.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer4.Name = "splitContainer4";
+ //
+ // splitContainer4.Panel1
+ //
+ this.splitContainer4.Panel1.Controls.Add(this.propertyGrid);
+ //
+ // splitContainer4.Panel2
+ //
+ this.splitContainer4.Panel2.Controls.Add(this.splitContainer2);
+ this.splitContainer4.Size = new System.Drawing.Size(616, 565);
+ this.splitContainer4.SplitterDistance = 348;
+ this.splitContainer4.TabIndex = 0;
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(878, 602);
+ this.ClientSize = new System.Drawing.Size(884, 611);
+ this.Controls.Add(this.splitContainer3);
this.Controls.Add(this.statusStrip);
- this.Controls.Add(this.splitContainer2);
- this.Controls.Add(this.splitContainer1);
- this.Controls.Add(this.propertyGrid);
this.Controls.Add(this.mainMenu);
this.MainMenuStrip = this.mainMenu;
this.Name = "MainForm";
@@ -1735,6 +1773,14 @@ private void InitializeComponent()
this.statusStrip.PerformLayout();
this.aisacNodeMenu.ResumeLayout(false);
this.aisacFolderMenu.ResumeLayout(false);
+ this.splitContainer3.Panel1.ResumeLayout(false);
+ this.splitContainer3.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+ this.splitContainer3.ResumeLayout(false);
+ this.splitContainer4.Panel1.ResumeLayout(false);
+ this.splitContainer4.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
+ this.splitContainer4.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1896,6 +1942,8 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem convertADXsToWAVToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem convertAndSplitLoopingToWAVToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator27;
+ private System.Windows.Forms.SplitContainer splitContainer3;
+ private System.Windows.Forms.SplitContainer splitContainer4;
}
}
diff --git a/Source/CsbBuilder/MainForm.cs b/Source/CsbBuilder/MainForm.cs
index a0e55ae..6f4c3c6 100644
--- a/Source/CsbBuilder/MainForm.cs
+++ b/Source/CsbBuilder/MainForm.cs
@@ -256,7 +256,7 @@ private void ImportCsbFile(object sender, EventArgs e)
using (OpenFileDialog openCsbFile = new OpenFileDialog
{
- Title = "Import CSB File",
+ Title = "Import CSB file",
DefaultExt = "csb",
Filter = "CSB Files|*.csb",
})
@@ -302,7 +302,7 @@ private TreeNode CreateCueNode(TreeNodeCollection collection, TreeNode parent, i
if (project.CueNodes.Count > 0)
{
- cueNode.Identifier = project.CueNodes.Max(cue => cue.Identifier) + 1;
+ cueNode.Id = project.CueNodes.Max(cue => cue.Id) + 1;
}
treeNode.Tag = cueNode;
@@ -882,7 +882,7 @@ private void LoadProject(object sender, EventArgs e)
using (OpenFileDialog openProject = new OpenFileDialog
{
- Title = "Open CSB Project File",
+ Title = "Open CSB project file",
Filter = "CSB Project files|*.csbproject",
DefaultExt = "csbproject",
})
@@ -893,7 +893,7 @@ private void LoadProject(object sender, EventArgs e)
if (!csbProject.AudioDirectory.Exists)
{
- MessageBox.Show("Audio directory does not seem to be present for this project. All the audio references will be removed.");
+ MessageBox.Show("Audio directory does not seem to be present for this project. All audio references are going to be removed.");
csbProject.SoundElementNodes.ForEach(soundElementNode => soundElementNode.Intro = string.Empty);
csbProject.SoundElementNodes.ForEach(soundElementNode => soundElementNode.Loop = string.Empty);
}
@@ -914,7 +914,7 @@ private void SaveProjectAs(object sender, EventArgs e)
{
using (SaveFileDialog saveProject = new SaveFileDialog
{
- Title = "Save CSB Project File As",
+ Title = "Save CSB project file as",
Filter = "CSB Project files|*.csbproject",
DefaultExt = "csbproject",
})
@@ -948,7 +948,7 @@ private void BuildProjectAs(object sender, EventArgs e)
{
using (SaveFileDialog buildCsb = new SaveFileDialog()
{
- Title = "Build Current Project As",
+ Title = "Build current project as",
DefaultExt = "csb",
Filter = "CSB Files|*.csb",
FileName = project.Name,
@@ -971,7 +971,7 @@ private void MergeProject(object sender, EventArgs e)
{
using (OpenFileDialog openProject = new OpenFileDialog
{
- Title = "Merge Project With",
+ Title = "Merge project with",
Filter = "CSB Project files|*.csbproject",
DefaultExt = "csbproject",
})
@@ -982,7 +982,7 @@ private void MergeProject(object sender, EventArgs e)
if (!csbProject.AudioDirectory.Exists)
{
- MessageBox.Show("Audio directory does not seem to be present for this project. All the audio references will be removed.");
+ MessageBox.Show("Audio directory does not seem to be present for this project. All audio references are going to be removed.");
csbProject.SoundElementNodes.ForEach(soundElementNode => soundElementNode.Intro = string.Empty);
csbProject.SoundElementNodes.ForEach(soundElementNode => soundElementNode.Loop = string.Empty);
}
@@ -1012,7 +1012,7 @@ private void ImportAndMergeProject(object sender, EventArgs e)
{
using (OpenFileDialog openCsbFile = new OpenFileDialog
{
- Title = "Import And Merge CSB File With",
+ Title = "Import and merge CSB file with",
DefaultExt = "csb",
Filter = "CSB Files|*.csb",
})
@@ -1108,7 +1108,7 @@ private void SetAisacReference(object sender, EventArgs e)
{
if (!CheckIfAny(aisacTree))
{
- MessageBox.Show("This project does not contain any Aisac nodes.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Failed to find any aisac node.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
@@ -1146,7 +1146,7 @@ private void SetVoiceLimitGroupReference(object sender, EventArgs e)
{
if (voiceLimitGroupTree.Nodes.Count == 0)
{
- MessageBox.Show("This project does not contain any Voice Limit Group nodes.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Failed to find any voice limit group node.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
@@ -1184,7 +1184,7 @@ private void SetSynthReference(object sender, EventArgs e)
{
if (!CheckIfAny(synthTree))
{
- MessageBox.Show("This project does not contain any Synth nodes.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Failed to find any synth node.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
@@ -1314,7 +1314,7 @@ private void SetSoundElementReference(object sender, EventArgs e)
{
if (!CheckIfAny(soundElementTree))
{
- MessageBox.Show("This project does not contain any Sound nodes.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Failed to find any sound node.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
@@ -1911,9 +1911,9 @@ private void PasteNode(int nodeIndex = -1)
// check if it's cue and fix duplicate identifier if needed
if (nodeToPaste.Tag is BuilderCueNode cueNode)
{
- while (project.CueNodes.Exists(cue => cue.Identifier == cueNode.Identifier))
+ while (project.CueNodes.Exists(cue => cue.Id == cueNode.Id))
{
- cueNode.Identifier++;
+ cueNode.Id++;
}
}
@@ -2100,7 +2100,7 @@ private void LoadTemplate(object sender, EventArgs e)
{
using (OpenFileDialog openAisacTemplate = new OpenFileDialog()
{
- Title = "Load AISAC Template",
+ Title = "Load AISAC template",
Filter = "XML Files|*.xml",
DefaultExt = "xml",
FileName = selectedNode != null ? selectedNode.Name : string.Empty,
@@ -2171,7 +2171,7 @@ private void LoadTemplate(object sender, EventArgs e)
catch
{
- MessageBox.Show("The template file is invalid.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Failed to load template file.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
@@ -2191,7 +2191,7 @@ private void SaveTemplate(object sender, EventArgs e)
{
using (SaveFileDialog saveAisacTemplate = new SaveFileDialog()
{
- Title = "Save AISAC Template",
+ Title = "Save AISAC template",
Filter = "XML Files|*.xml",
DefaultExt = "xml",
FileName = selectedNode.Name,
@@ -2226,7 +2226,7 @@ private void convertADXsToWAVToolStripMenuItem_Click(object sender, EventArgs e)
{
using (OpenFileDialog openFileDialog = new OpenFileDialog
{
- Title = "Convert Audio Files",
+ Title = "Convert audio files",
FileName = "Select audio files you want to convert and press Open",
Filter = Filters,
Multiselect = true,
@@ -2236,7 +2236,7 @@ private void convertADXsToWAVToolStripMenuItem_Click(object sender, EventArgs e)
{
using (SaveFileDialog saveFileDialog = new SaveFileDialog
{
- Title = "Output Directory",
+ Title = "Select output directory",
FileName = "Enter into a directory and press Save",
})
{
@@ -2323,7 +2323,7 @@ private void convertADXsToWAVToolStripMenuItem_Click(object sender, EventArgs e)
if (failedFiles.Count != 0)
{
- MessageBox.Show($"Following files could not be converted:\n{string.Join("\n", failedFiles)}", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Files that failed to convert:\n{string.Join("\n", failedFiles)}", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
@@ -2335,7 +2335,7 @@ private void extractAAXToFolderToolStripMenuItem_Click(object sender, EventArgs
{
using (OpenFileDialog openFileDialog = new OpenFileDialog
{
- Title = "Extract AAX Files",
+ Title = "Extract AAX files",
FileName = "Select AAX files you want to extract and press Open",
Filter = "AAX Files|*.aax",
DefaultExt = "aax",
@@ -2346,7 +2346,7 @@ private void extractAAXToFolderToolStripMenuItem_Click(object sender, EventArgs
{
using (SaveFileDialog saveFileDialog = new SaveFileDialog
{
- Title = "Output Directory",
+ Title = "Select output directory",
FileName = "Enter into a directory and press Save",
})
{
@@ -2386,7 +2386,7 @@ private void packFolderToAAXToolStripMenuItem_Click(object sender, EventArgs e)
{
using (OpenFileDialog openFileDialog = new OpenFileDialog
{
- Title = "Pack ADX Files",
+ Title = "Pack ADX files",
FileName = "Select ADX files you want to pack and press Open",
Filter = "All Files|*.adx;*.wav|ADX Files|*.adx|WAV Files|*.wav",
Multiselect = true,
@@ -2399,14 +2399,14 @@ private void packFolderToAAXToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openFileDialog.FileNames.Length > 2)
{
- MessageBox.Show("You can select maximum 2 ADX files.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("You can't select more than 2 ADX files.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else if (openFileDialog.FileNames.Length == 2 &&
!Path.GetExtension(openFileDialog.FileNames[0]).Equals(
Path.GetExtension(openFileDialog.FileNames[1]), StringComparison.OrdinalIgnoreCase))
{
- MessageBox.Show("You can select only the same type of files.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("You can select files only of the same type.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
@@ -2420,7 +2420,7 @@ private void packFolderToAAXToolStripMenuItem_Click(object sender, EventArgs e)
{
using (SaveFileDialog saveFileDialog = new SaveFileDialog
{
- Title = "Output File",
+ Title = "Select output file",
FileName = $"{Path.GetFileNameWithoutExtension(files[0])}.aax",
Filter = "AAX Files|*.aax",
DefaultExt = "aax",
@@ -2447,7 +2447,7 @@ private void convertAndSplitLoopingToWAVToolStripMenuItem_Click(object sender, E
{
using (OpenFileDialog openFileDialog = new OpenFileDialog
{
- Title = "Convert And Split Audio Files",
+ Title = "Convert and split audio files",
FileName = "Select audio files you want to convert and press Open",
Filter = Filters,
Multiselect = true,
@@ -2457,7 +2457,7 @@ private void convertAndSplitLoopingToWAVToolStripMenuItem_Click(object sender, E
{
using (SaveFileDialog saveFileDialog = new SaveFileDialog
{
- Title = "Output Directory",
+ Title = "Select output directory",
FileName = "Enter into a directory and press Save",
})
{
@@ -2526,7 +2526,7 @@ private void convertAndSplitLoopingToWAVToolStripMenuItem_Click(object sender, E
if (failedFiles.Count != 0)
{
- MessageBox.Show($"Following files could not be converted:\n{string.Join("\n", failedFiles)}", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Files that failed to convert:\n{string.Join("\n", failedFiles)}", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
diff --git a/Source/CsbBuilder/MainForm.resx b/Source/CsbBuilder/MainForm.resx
index 81a38fd..9947ad1 100644
--- a/Source/CsbBuilder/MainForm.resx
+++ b/Source/CsbBuilder/MainForm.resx
@@ -120,9 +120,6 @@
<metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>394, 17</value>
</metadata>
- <metadata name="splitContainer1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="nodeTreeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value>
</metadata>
@@ -135,9 +132,6 @@
<metadata name="folderTreeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>120, 17</value>
</metadata>
- <metadata name="splitContainer2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="aisacTreeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>161, 95</value>
</metadata>
@@ -172,6 +166,6 @@
<value>17, 95</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>74</value>
+ <value>194</value>
</metadata>
</root>
\ No newline at end of file
diff --git a/Source/CsbBuilder/SetAudioForm.cs b/Source/CsbBuilder/SetAudioForm.cs
index a83afb0..fdfb4ee 100644
--- a/Source/CsbBuilder/SetAudioForm.cs
+++ b/Source/CsbBuilder/SetAudioForm.cs
@@ -50,7 +50,7 @@ private void BrowseIntro(object sender, EventArgs e)
{
using (OpenFileDialog openAdx = new OpenFileDialog
{
- Title = "Select Your Audio File",
+ Title = "Select audio file",
Filter = "All Files|*.adx;*.wav|ADX Files|*.adx|WAV Files|*.wav",
})
{
@@ -65,7 +65,7 @@ private void BrowseLoop(object sender, EventArgs e)
{
using (OpenFileDialog openAdx = new OpenFileDialog
{
- Title = "Select Your Audio File",
+ Title = "Select audio file",
Filter = "All Files|*.adx;*.wav|ADX Files|*.adx|WAV Files|*.wav",
})
{
@@ -91,7 +91,7 @@ private void OnClose(object sender, FormClosingEventArgs e)
if (!string.IsNullOrEmpty(Intro) && !string.IsNullOrEmpty(Loop) && !introExtension.Equals(loopExtension, StringComparison.OrdinalIgnoreCase))
{
- MessageBox.Show("Please use the same types of audio files for Intro and Loop.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ MessageBox.Show("Audio files must be of the same type.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Warning);
e.Cancel = true;
}
}
diff --git a/Source/CsbBuilder/SetReferenceForm.cs b/Source/CsbBuilder/SetReferenceForm.cs
index f0f55ab..23ca1ad 100644
--- a/Source/CsbBuilder/SetReferenceForm.cs
+++ b/Source/CsbBuilder/SetReferenceForm.cs
@@ -81,7 +81,7 @@ private void SetReferenceForm_FormClosing(object sender, FormClosingEventArgs e)
{
if (SelectedNode != null && SelectedNode.ImageIndex == 3)
{
- MessageBox.Show("You can't set a folder as a reference!", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("You can't set folder nodes as references.", "CSB Builder", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.Cancel = true;
}
}
diff --git a/Source/CsbBuilder/Settings.cs b/Source/CsbBuilder/Settings.cs
index c60cd3b..e2db632 100644
--- a/Source/CsbBuilder/Settings.cs
+++ b/Source/CsbBuilder/Settings.cs
@@ -28,50 +28,50 @@ public enum NAudioWavePlayer
}
[DisplayName("Name node after its parent"), Category("General")]
- [Description("Names a node after its parent if it exists, or the node tree name.")]
+ [Description("Determines whether a node is going to be named after its parent when created.")]
public bool NameNodeAfterParent { get; set; }
[DisplayName("Buffer size"), Category("Stream")]
- [Description("Buffer size used to copy data from streams. Higher values may make streams faster or slower. (e.g. importing/building CSB files)")]
+ [Description("Buffer size to use for I/O operations.")]
public int BufferSize { get; set; }
[DisplayName("Default directory of new CSB projects"), Category("Project")]
- [Description("Default output directory of new CSB projects (relative to where .EXE is) in New Project window.")]
+ [Description("Default output directory of new CSB projects.")]
public string ProjectsDirectory { get; set; }
[DisplayName("Default name of new CSB projects"), Category("Project")]
- [Description("Default name of new CSB projects in New Project window.")]
+ [Description("Default name of new CSB projects.")]
public string ProjectsName { get; set; }
[DisplayName("Default project directory of imported CSB files"), Category("Project")]
- [Description("Default project output directory of imported CSB files.")]
+ [Description("Default project directory of imported CSB files.")]
public ProjectDirectory ImportedCsbProjectDirectory { get; set; }
[DisplayName("Rename Sound node to referenced Sound Element node"), Category("Application")]
public bool RenameToSoundElement { get; set; }
- [DisplayName("Enable threading"), Category("Stream")]
- [Description("Determines whether to use threads to extract data from CSB/CPK files during importing. It may make the importing faster or slower.")]
+ [DisplayName("Enable multi-threading"), Category("Stream")]
+ [Description("Determines whether I/O operations are going to be multi-threaded.")]
public bool EnableThreading { get; set; }
- [DisplayName("Maximum amount of cores"), Category("Stream")]
- [Description("Maximum amount of threads used to extract data from CSB/CPK files during importing.")]
+ [DisplayName("Max thread count"), Category("Stream")]
+ [Description("Max amount of threads to use for multi-threaded I/O operations.")]
public int MaxThreads { get; set; }
- [DisplayName("Wave Player"), Category("Sound")]
- [Description("Sound device for audio playback. If not supported, application is going to crash.")]
+ [DisplayName("Sound device"), Category("Sound")]
+ [Description("Sound device to use for audio playback. Application is going to crash if sound device is not supported.")]
public NAudioWavePlayer WavePlayer { get; set; }
- [DisplayName("Loop Count"), Category("Audio Converter")]
- [Description("Count of loop times for audio converter if input audio has loop information.")]
+ [DisplayName("Loop count"), Category("Audio converter")]
+ [Description("How many times the audio is going to be looped when converting to .wav.")]
public int LoopCount { get; set; }
[DisplayName("Fade Out Time"), Category("Audio Converter")]
- [Description("Fade out time in seconds after total 'Loop Count' loops for audio with loop information.")]
+ [Description("How much time it takes to fade out when converting to .wav.")]
public double FadeTime { get; set; }
[DisplayName("Fade Out Delay Time"), Category("Audio Converter")]
- [Description("Delay time in seconds before audio starts to fade out.")]
+ [Description("How much time it takes before starting to fade out when converting to .wav.")]
public double FadeDelay { get; set; }
public static Settings Load()