From b81dde230e542fd54d5dfc5b514578d9e38a0979 Mon Sep 17 00:00:00 2001 From: KIT! Date: Thu, 21 Mar 2024 17:32:32 +0100 Subject: [PATCH] Fixed genre sort, updated app layout Song list now gets sorted dynamically. Sorting still leaves to be desired and will require more attention. Made the app window bigger. --- Commons/Controls/MusicOrderViewer.cs | 41 +- Commons/Utils/Config.cs | 11 +- MainForm.Designer.cs | 562 ++++++++++++++------------- MainForm.RequestFiles.cs | 6 +- MainForm.SoundCreate.cs | 1 + MainForm.cs | 57 ++- 6 files changed, 342 insertions(+), 336 deletions(-) diff --git a/Commons/Controls/MusicOrderViewer.cs b/Commons/Controls/MusicOrderViewer.cs index e3dc201..6500220 100644 --- a/Commons/Controls/MusicOrderViewer.cs +++ b/Commons/Controls/MusicOrderViewer.cs @@ -11,6 +11,7 @@ using System.Linq; using System; using TaikoSoundEditor.Collections; using System.Text.RegularExpressions; +using System.Runtime.Remoting.Metadata.W3cXsd2001; namespace TaikoSoundEditor.Commons.Controls { @@ -32,32 +33,21 @@ namespace TaikoSoundEditor.Commons.Controls public void AddSong(IMusicOrder mo) { var songCard = new SongCard(WordList, mo); - - if (Config.MusicOrderSort == Config.MusicOrderSortValueNone) - { - SongCards.Add(songCard); - } - else if (Config.MusicOrderSort == Config.MusicOrderSortValueId) - { - SongCards.Add(songCard); - SongCards.Sort((c1, c2) => c1.MusicOrder.UniqueId.CompareTo(c2.MusicOrder.UniqueId)); - } - else if (Config.MusicOrderSort == Config.MusicOrderSortValueGenre) - { - var firstInGenre = SongCards.Find(c => c.MusicOrder.Genre == mo.Genre); - if (firstInGenre == null) - { - SongCards.Add(songCard); - } - else - { - var index = SongCards.IndexOf(firstInGenre); - SongCards.Insert(index, songCard); - } - } + SongCards.Add(songCard); CurrentPage = CurrentPage; } + public void SortSongs() + { + if (Config.MusicOrderSort == Config.MusicOrderSortValueId) SongCards.Sort((c1, c2) => c1.MusicOrder.UniqueId.CompareTo(c2.MusicOrder.UniqueId)); + else if (Config.MusicOrderSort == Config.MusicOrderSortValueTitle) SongCards.Sort((c1, c2) => c1.Title.CompareTo(c2.Title)); + else if (Config.MusicOrderSort == Config.MusicOrderSortValueGenre) SongCards.Sort((c1, c2) => { + var ret = c1.Genre.CompareTo(c2.Genre); + if (ret == 0) ret = c1.Title.CompareTo(c2.Title); + return ret; + }); + } + public void RemoveAllSongs(int uniqueId) { SongCards.RemoveAll(c => c.MusicOrder.UniqueId == uniqueId); @@ -130,7 +120,7 @@ namespace TaikoSoundEditor.Commons.Controls private static int ItemsPadding = 3; public void RefreshMusicOrdersPanel(Graphics g) - { + { var cards = SongCards.Skip(CurrentPage * ItemsPerPage).Take(ItemsPerPage).ToArray(); int itemW = MusicOrdersPanel.Width / ItemsPerRow - 2 * ItemsPadding; @@ -195,6 +185,8 @@ namespace TaikoSoundEditor.Commons.Controls } } + public void MusicOrdersPanel_Update() => MusicOrdersPanel.Invalidate(); + private void MusicOrdersPanel_Resize(object sender, EventArgs e) => ExceptionGuard.Run(() => { MusicOrdersPanel.Invalidate(); @@ -578,6 +570,7 @@ namespace TaikoSoundEditor.Commons.Controls var newMO = DatatableTypes.Clone(CardToClone.MusicOrder); newMO.Genre = genre; AddSong(newMO); + SortSongs(); } } } diff --git a/Commons/Utils/Config.cs b/Commons/Utils/Config.cs index f543e55..2c6619d 100644 --- a/Commons/Utils/Config.cs +++ b/Commons/Utils/Config.cs @@ -5,7 +5,7 @@ private static IniFile CreateIniFile() { var ini = new IniFile(); - if(!ini.KeyExists("MusicOrderSort")) ini.Write(MusicOrderSortProperty, MusicOrderSortValueNone); + if(!ini.KeyExists("MusicOrderSort")) ini.Write(MusicOrderSortProperty, MusicOrderSortValueGenre); return ini; } @@ -14,8 +14,10 @@ public static readonly IniFile IniFile = CreateIniFile(); public static void SetMusicOrderSortById() => IniFile.Write(MusicOrderSortProperty, MusicOrderSortValueId); - public static void SetMusicOrderNoSort() => IniFile.Write(MusicOrderSortProperty, MusicOrderSortValueNone); public static void SetMusicOrderSortByGenre() => IniFile.Write(MusicOrderSortProperty, MusicOrderSortValueGenre); + public static void SetMusicOrderSortByTitle() => IniFile.Write(MusicOrderSortProperty, MusicOrderSortValueTitle); + + public static void SetMusicOrderNoSort() => IniFile.Write(MusicOrderSortProperty, MusicOrderSortValueNoSort); public static string DatatableDefPath { @@ -52,8 +54,9 @@ public static string MusicOrderSortProperty = "MusicOrderSort"; public static string DatatableDefPathProperty = "DatatableDef"; - public static string MusicOrderSortValueNone = "None"; public static string MusicOrderSortValueId = "Id"; - public static string MusicOrderSortValueGenre = "Genre"; + public static string MusicOrderSortValueGenre = "Genre"; + public static string MusicOrderSortValueTitle = "Title"; + public static string MusicOrderSortValueNoSort = "None"; } } diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index bd206dd..aa683ce 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -36,6 +36,7 @@ namespace TaikoSoundEditor this.panel1 = new System.Windows.Forms.Panel(); this.groupBox13 = new System.Windows.Forms.GroupBox(); this.label22 = new System.Windows.Forms.Label(); + this.DatatableDef = new TaikoSoundEditor.Commons.Controls.PathSelector(); this.groupBox12 = new System.Windows.Forms.GroupBox(); this.UseEncryptionBox = new System.Windows.Forms.CheckBox(); this.FumenKeyBox = new System.Windows.Forms.TextBox(); @@ -44,13 +45,26 @@ namespace TaikoSoundEditor this.label20 = new System.Windows.Forms.Label(); this.OkButton = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.DirSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); this.label1 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); + this.WordListPathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); + this.MusicInfoPathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); + this.MusicOrderPathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); + this.MusicAttributePathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); this.label8 = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.preferencesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.musicOrderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sortByTitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SortByGenreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SortByIdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.noSortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SoundViewTab = new System.Windows.Forms.TabControl(); this.SoundViewerSimple = new System.Windows.Forms.TabPage(); this.LocateInMusicOrderButton = new System.Windows.Forms.Button(); @@ -93,13 +107,7 @@ namespace TaikoSoundEditor this.WordsGB = new System.Windows.Forms.GroupBox(); this.WordsGrid = new System.Windows.Forms.PropertyGrid(); this.MusicOrderTab = new System.Windows.Forms.TabPage(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.preferencesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.musicOrderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SortByGenreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SortByIdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NoSortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MusicOrderViewer = new TaikoSoundEditor.Commons.Controls.MusicOrderViewer(); this.RemoveSongButton = new System.Windows.Forms.Button(); this.DatatableSpaces = new System.Windows.Forms.CheckBox(); this.ExportOpenOnFinished = new System.Windows.Forms.CheckBox(); @@ -115,7 +123,6 @@ namespace TaikoSoundEditor this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.LoadedMusicBox = new System.Windows.Forms.ListBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.panel4 = new System.Windows.Forms.Panel(); this.groupBox10 = new System.Windows.Forms.GroupBox(); this.label3 = new System.Windows.Forms.Label(); this.SilenceBox = new System.Windows.Forms.NumericUpDown(); @@ -130,16 +137,10 @@ namespace TaikoSoundEditor this.label2 = new System.Windows.Forms.Label(); this.SongNameBox = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.DatatableDef = new TaikoSoundEditor.Commons.Controls.PathSelector(); - this.DirSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); - this.WordListPathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); - this.MusicInfoPathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); - this.MusicOrderPathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); - this.MusicAttributePathSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); - this.MusicOrderViewer = new TaikoSoundEditor.Commons.Controls.MusicOrderViewer(); this.TJASelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); this.AudioFileSelector = new TaikoSoundEditor.Commons.Controls.PathSelector(); + this.label10 = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); this.TabControl.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -148,6 +149,7 @@ namespace TaikoSoundEditor this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabPage2.SuspendLayout(); + this.menuStrip1.SuspendLayout(); this.SoundViewTab.SuspendLayout(); this.SoundViewerSimple.SuspendLayout(); this.groupBox11.SuspendLayout(); @@ -168,12 +170,10 @@ namespace TaikoSoundEditor this.WordSubGB.SuspendLayout(); this.WordsGB.SuspendLayout(); this.MusicOrderTab.SuspendLayout(); - this.menuStrip1.SuspendLayout(); this.groupBox8.SuspendLayout(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabPage3.SuspendLayout(); - this.panel4.SuspendLayout(); this.groupBox10.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SilenceBox)).BeginInit(); this.groupBox9.SuspendLayout(); @@ -190,7 +190,7 @@ namespace TaikoSoundEditor this.TabControl.Location = new System.Drawing.Point(0, 0); this.TabControl.Name = "TabControl"; this.TabControl.SelectedIndex = 0; - this.TabControl.Size = new System.Drawing.Size(586, 400); + this.TabControl.Size = new System.Drawing.Size(984, 561); this.TabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.TabControl.TabIndex = 0; // @@ -201,7 +201,7 @@ namespace TaikoSoundEditor this.tabPage1.Location = new System.Drawing.Point(4, 5); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(578, 391); + this.tabPage1.Size = new System.Drawing.Size(976, 552); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "tabPage1"; // @@ -213,18 +213,18 @@ namespace TaikoSoundEditor this.panel1.Controls.Add(this.OkButton); this.panel1.Controls.Add(this.groupBox2); this.panel1.Controls.Add(this.groupBox1); - this.panel1.Location = new System.Drawing.Point(125, 7); + this.panel1.Location = new System.Drawing.Point(85, 9); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(321, 376); + this.panel1.Size = new System.Drawing.Size(786, 537); this.panel1.TabIndex = 1; // // groupBox13 // this.groupBox13.Controls.Add(this.label22); this.groupBox13.Controls.Add(this.DatatableDef); - this.groupBox13.Location = new System.Drawing.Point(3, 273); + this.groupBox13.Location = new System.Drawing.Point(3, 277); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Size = new System.Drawing.Size(315, 75); + this.groupBox13.Size = new System.Drawing.Size(780, 75); this.groupBox13.TabIndex = 13; this.groupBox13.TabStop = false; this.groupBox13.Text = "Config"; @@ -238,6 +238,19 @@ namespace TaikoSoundEditor this.label22.TabIndex = 14; this.label22.Text = "Datatable def"; // + // DatatableDef + // + this.DatatableDef.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.DatatableDef.Filter = "JSON files(*.json)|*.json|All files(*.*)|*.*"; + this.DatatableDef.Location = new System.Drawing.Point(83, 19); + this.DatatableDef.Name = "DatatableDef"; + this.DatatableDef.Path = ""; + this.DatatableDef.SelectsFolder = false; + this.DatatableDef.Size = new System.Drawing.Size(691, 20); + this.DatatableDef.TabIndex = 13; + this.DatatableDef.PathChanged += new TaikoSoundEditor.Commons.Controls.PathSelector.OnPathChanged(this.DatatableDef_PathChanged); + // // groupBox12 // this.groupBox12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -249,7 +262,7 @@ namespace TaikoSoundEditor this.groupBox12.Controls.Add(this.label20); this.groupBox12.Location = new System.Drawing.Point(3, 177); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Size = new System.Drawing.Size(315, 94); + this.groupBox12.Size = new System.Drawing.Size(780, 94); this.groupBox12.TabIndex = 12; this.groupBox12.TabStop = false; this.groupBox12.Text = "AES keys"; @@ -271,7 +284,7 @@ namespace TaikoSoundEditor | System.Windows.Forms.AnchorStyles.Right))); this.FumenKeyBox.Location = new System.Drawing.Point(58, 45); this.FumenKeyBox.Name = "FumenKeyBox"; - this.FumenKeyBox.Size = new System.Drawing.Size(253, 20); + this.FumenKeyBox.Size = new System.Drawing.Size(716, 20); this.FumenKeyBox.TabIndex = 13; this.FumenKeyBox.TextChanged += new System.EventHandler(this.FumenKeyBox_TextChanged); // @@ -290,7 +303,7 @@ namespace TaikoSoundEditor | System.Windows.Forms.AnchorStyles.Right))); this.DatatableKeyBox.Location = new System.Drawing.Point(58, 20); this.DatatableKeyBox.Name = "DatatableKeyBox"; - this.DatatableKeyBox.Size = new System.Drawing.Size(253, 20); + this.DatatableKeyBox.Size = new System.Drawing.Size(716, 20); this.DatatableKeyBox.TabIndex = 11; this.DatatableKeyBox.TextChanged += new System.EventHandler(this.DatatableKeyBox_TextChanged); // @@ -306,9 +319,9 @@ namespace TaikoSoundEditor // OkButton // this.OkButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OkButton.Location = new System.Drawing.Point(225, 354); + this.OkButton.Location = new System.Drawing.Point(690, 508); this.OkButton.Name = "OkButton"; - this.OkButton.Size = new System.Drawing.Size(93, 20); + this.OkButton.Size = new System.Drawing.Size(93, 26); this.OkButton.TabIndex = 10; this.OkButton.Text = "Looks good"; this.OkButton.UseVisualStyleBackColor = true; @@ -322,11 +335,23 @@ namespace TaikoSoundEditor this.groupBox2.Controls.Add(this.label1); this.groupBox2.Location = new System.Drawing.Point(3, 122); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(315, 49); + this.groupBox2.Size = new System.Drawing.Size(780, 49); this.groupBox2.TabIndex = 9; this.groupBox2.TabStop = false; this.groupBox2.Text = "Or specify the game diretory (/datatable)"; // + // DirSelector + // + this.DirSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.DirSelector.Filter = "All files(*.*)|*.*"; + this.DirSelector.Location = new System.Drawing.Point(58, 19); + this.DirSelector.Name = "DirSelector"; + this.DirSelector.Path = ""; + this.DirSelector.SelectsFolder = true; + this.DirSelector.Size = new System.Drawing.Size(716, 20); + this.DirSelector.TabIndex = 11; + // // label1 // this.label1.AutoSize = true; @@ -350,7 +375,7 @@ namespace TaikoSoundEditor this.groupBox1.Controls.Add(this.label8); this.groupBox1.Location = new System.Drawing.Point(3, 3); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(315, 114); + this.groupBox1.Size = new System.Drawing.Size(780, 114); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "Select individual files"; @@ -382,6 +407,54 @@ namespace TaikoSoundEditor this.label7.TabIndex = 13; this.label7.Text = "music_order.bin"; // + // WordListPathSelector + // + this.WordListPathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.WordListPathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; + this.WordListPathSelector.Location = new System.Drawing.Point(101, 88); + this.WordListPathSelector.Name = "WordListPathSelector"; + this.WordListPathSelector.Path = ""; + this.WordListPathSelector.SelectsFolder = false; + this.WordListPathSelector.Size = new System.Drawing.Size(673, 20); + this.WordListPathSelector.TabIndex = 12; + // + // MusicInfoPathSelector + // + this.MusicInfoPathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MusicInfoPathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; + this.MusicInfoPathSelector.Location = new System.Drawing.Point(101, 63); + this.MusicInfoPathSelector.Name = "MusicInfoPathSelector"; + this.MusicInfoPathSelector.Path = ""; + this.MusicInfoPathSelector.SelectsFolder = false; + this.MusicInfoPathSelector.Size = new System.Drawing.Size(673, 20); + this.MusicInfoPathSelector.TabIndex = 11; + // + // MusicOrderPathSelector + // + this.MusicOrderPathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MusicOrderPathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; + this.MusicOrderPathSelector.Location = new System.Drawing.Point(101, 38); + this.MusicOrderPathSelector.Name = "MusicOrderPathSelector"; + this.MusicOrderPathSelector.Path = ""; + this.MusicOrderPathSelector.SelectsFolder = false; + this.MusicOrderPathSelector.Size = new System.Drawing.Size(673, 20); + this.MusicOrderPathSelector.TabIndex = 10; + // + // MusicAttributePathSelector + // + this.MusicAttributePathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MusicAttributePathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; + this.MusicAttributePathSelector.Location = new System.Drawing.Point(101, 13); + this.MusicAttributePathSelector.Name = "MusicAttributePathSelector"; + this.MusicAttributePathSelector.Path = ""; + this.MusicAttributePathSelector.SelectsFolder = false; + this.MusicAttributePathSelector.Size = new System.Drawing.Size(673, 20); + this.MusicAttributePathSelector.TabIndex = 9; + // // label8 // this.label8.AutoSize = true; @@ -394,8 +467,8 @@ namespace TaikoSoundEditor // tabPage2 // this.tabPage2.BackColor = System.Drawing.Color.White; - this.tabPage2.Controls.Add(this.SoundViewTab); this.tabPage2.Controls.Add(this.menuStrip1); + this.tabPage2.Controls.Add(this.SoundViewTab); this.tabPage2.Controls.Add(this.RemoveSongButton); this.tabPage2.Controls.Add(this.DatatableSpaces); this.tabPage2.Controls.Add(this.ExportOpenOnFinished); @@ -409,10 +482,82 @@ namespace TaikoSoundEditor this.tabPage2.Location = new System.Drawing.Point(4, 5); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(578, 391); + this.tabPage2.Size = new System.Drawing.Size(976, 552); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "tabPage2"; // + // menuStrip1 + // + this.menuStrip1.BackColor = System.Drawing.Color.Transparent; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.preferencesToolStripMenuItem1, + this.checkForUpdatesToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(3, 3); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); + this.menuStrip1.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.menuStrip1.Size = new System.Drawing.Size(970, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // preferencesToolStripMenuItem1 + // + this.preferencesToolStripMenuItem1.BackColor = System.Drawing.Color.Transparent; + this.preferencesToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.musicOrderToolStripMenuItem}); + this.preferencesToolStripMenuItem1.Name = "preferencesToolStripMenuItem1"; + this.preferencesToolStripMenuItem1.Size = new System.Drawing.Size(80, 20); + this.preferencesToolStripMenuItem1.Text = "Preferences"; + // + // musicOrderToolStripMenuItem + // + this.musicOrderToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.sortByTitleToolStripMenuItem, + this.SortByGenreToolStripMenuItem, + this.SortByIdToolStripMenuItem, + this.noSortToolStripMenuItem}); + this.musicOrderToolStripMenuItem.Name = "musicOrderToolStripMenuItem"; + this.musicOrderToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.musicOrderToolStripMenuItem.Text = "Music order"; + // + // sortByTitleToolStripMenuItem + // + this.sortByTitleToolStripMenuItem.Name = "sortByTitleToolStripMenuItem"; + this.sortByTitleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.sortByTitleToolStripMenuItem.Text = "Sort by title"; + this.sortByTitleToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); + // + // SortByGenreToolStripMenuItem + // + this.SortByGenreToolStripMenuItem.CheckOnClick = true; + this.SortByGenreToolStripMenuItem.Name = "SortByGenreToolStripMenuItem"; + this.SortByGenreToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.SortByGenreToolStripMenuItem.Text = "Sort by genre"; + this.SortByGenreToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); + // + // SortByIdToolStripMenuItem + // + this.SortByIdToolStripMenuItem.CheckOnClick = true; + this.SortByIdToolStripMenuItem.Name = "SortByIdToolStripMenuItem"; + this.SortByIdToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.SortByIdToolStripMenuItem.Text = "Sort by Id"; + this.SortByIdToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); + // + // noSortToolStripMenuItem + // + this.noSortToolStripMenuItem.Name = "noSortToolStripMenuItem"; + this.noSortToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.noSortToolStripMenuItem.Text = "No Sort"; + this.noSortToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); + // + // checkForUpdatesToolStripMenuItem + // + this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; + this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(115, 20); + this.checkForUpdatesToolStripMenuItem.Text = "Check for updates"; + this.checkForUpdatesToolStripMenuItem.Visible = false; + this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); + // // SoundViewTab // this.SoundViewTab.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -421,10 +566,10 @@ namespace TaikoSoundEditor this.SoundViewTab.Controls.Add(this.SoundViewerSimple); this.SoundViewTab.Controls.Add(this.SoundViewerExpert); this.SoundViewTab.Controls.Add(this.MusicOrderTab); - this.SoundViewTab.Location = new System.Drawing.Point(119, 24); + this.SoundViewTab.Location = new System.Drawing.Point(119, 30); this.SoundViewTab.Name = "SoundViewTab"; this.SoundViewTab.SelectedIndex = 0; - this.SoundViewTab.Size = new System.Drawing.Size(453, 263); + this.SoundViewTab.Size = new System.Drawing.Size(849, 408); this.SoundViewTab.TabIndex = 13; this.SoundViewTab.SelectedIndexChanged += new System.EventHandler(this.SoundViewTab_SelectedIndexChanged); // @@ -445,16 +590,16 @@ namespace TaikoSoundEditor this.SoundViewerSimple.Location = new System.Drawing.Point(4, 22); this.SoundViewerSimple.Name = "SoundViewerSimple"; this.SoundViewerSimple.Padding = new System.Windows.Forms.Padding(3); - this.SoundViewerSimple.Size = new System.Drawing.Size(445, 237); + this.SoundViewerSimple.Size = new System.Drawing.Size(841, 382); this.SoundViewerSimple.TabIndex = 1; this.SoundViewerSimple.Text = "Simple View"; this.SoundViewerSimple.UseVisualStyleBackColor = true; // // LocateInMusicOrderButton // - this.LocateInMusicOrderButton.Location = new System.Drawing.Point(204, 105); + this.LocateInMusicOrderButton.Location = new System.Drawing.Point(628, 108); this.LocateInMusicOrderButton.Name = "LocateInMusicOrderButton"; - this.LocateInMusicOrderButton.Size = new System.Drawing.Size(117, 20); + this.LocateInMusicOrderButton.Size = new System.Drawing.Size(132, 20); this.LocateInMusicOrderButton.TabIndex = 11; this.LocateInMusicOrderButton.Text = "Locate in Music Order"; this.LocateInMusicOrderButton.UseVisualStyleBackColor = true; @@ -472,9 +617,9 @@ namespace TaikoSoundEditor this.groupBox11.Controls.Add(this.SimpleStarNormalBox); this.groupBox11.Controls.Add(this.label15); this.groupBox11.Controls.Add(this.SimpleStarEasyBox); - this.groupBox11.Location = new System.Drawing.Point(199, 5); + this.groupBox11.Location = new System.Drawing.Point(628, 5); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(208, 95); + this.groupBox11.Size = new System.Drawing.Size(208, 97); this.groupBox11.TabIndex = 10; this.groupBox11.TabStop = false; this.groupBox11.Text = "Stars"; @@ -578,7 +723,7 @@ namespace TaikoSoundEditor this.SimpleIdBox.Location = new System.Drawing.Point(66, 5); this.SimpleIdBox.Name = "SimpleIdBox"; this.SimpleIdBox.ReadOnly = true; - this.SimpleIdBox.Size = new System.Drawing.Size(128, 20); + this.SimpleIdBox.Size = new System.Drawing.Size(556, 20); this.SimpleIdBox.TabIndex = 8; // // label13 @@ -595,7 +740,7 @@ namespace TaikoSoundEditor this.SimpleGenreBox.FormattingEnabled = true; this.SimpleGenreBox.Location = new System.Drawing.Point(66, 106); this.SimpleGenreBox.Name = "SimpleGenreBox"; - this.SimpleGenreBox.Size = new System.Drawing.Size(128, 21); + this.SimpleGenreBox.Size = new System.Drawing.Size(556, 21); this.SimpleGenreBox.TabIndex = 6; this.SimpleGenreBox.SelectedIndexChanged += new System.EventHandler(this.SimpleBoxChanged); // @@ -621,7 +766,7 @@ namespace TaikoSoundEditor // this.SimpleDetailBox.Location = new System.Drawing.Point(66, 81); this.SimpleDetailBox.Name = "SimpleDetailBox"; - this.SimpleDetailBox.Size = new System.Drawing.Size(128, 20); + this.SimpleDetailBox.Size = new System.Drawing.Size(556, 20); this.SimpleDetailBox.TabIndex = 3; this.SimpleDetailBox.TextChanged += new System.EventHandler(this.SimpleBoxChanged); // @@ -629,7 +774,7 @@ namespace TaikoSoundEditor // this.SimpleSubtitleBox.Location = new System.Drawing.Point(66, 55); this.SimpleSubtitleBox.Name = "SimpleSubtitleBox"; - this.SimpleSubtitleBox.Size = new System.Drawing.Size(128, 20); + this.SimpleSubtitleBox.Size = new System.Drawing.Size(556, 20); this.SimpleSubtitleBox.TabIndex = 2; this.SimpleSubtitleBox.TextChanged += new System.EventHandler(this.SimpleBoxChanged); // @@ -637,7 +782,7 @@ namespace TaikoSoundEditor // this.SimpleTitleBox.Location = new System.Drawing.Point(66, 30); this.SimpleTitleBox.Name = "SimpleTitleBox"; - this.SimpleTitleBox.Size = new System.Drawing.Size(128, 20); + this.SimpleTitleBox.Size = new System.Drawing.Size(556, 20); this.SimpleTitleBox.TabIndex = 1; this.SimpleTitleBox.TextChanged += new System.EventHandler(this.SimpleBoxChanged); // @@ -656,7 +801,7 @@ namespace TaikoSoundEditor this.SoundViewerExpert.Location = new System.Drawing.Point(4, 22); this.SoundViewerExpert.Name = "SoundViewerExpert"; this.SoundViewerExpert.Padding = new System.Windows.Forms.Padding(3); - this.SoundViewerExpert.Size = new System.Drawing.Size(445, 237); + this.SoundViewerExpert.Size = new System.Drawing.Size(841, 382); this.SoundViewerExpert.TabIndex = 0; this.SoundViewerExpert.Text = "Expert View"; this.SoundViewerExpert.UseVisualStyleBackColor = true; @@ -667,7 +812,7 @@ namespace TaikoSoundEditor this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox4.Location = new System.Drawing.Point(3, 3); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(439, 231); + this.groupBox4.Size = new System.Drawing.Size(835, 376); this.groupBox4.TabIndex = 4; this.groupBox4.TabStop = false; this.groupBox4.Text = "Sound Data"; @@ -686,7 +831,7 @@ namespace TaikoSoundEditor this.EditorTable.Name = "EditorTable"; this.EditorTable.RowCount = 1; this.EditorTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.EditorTable.Size = new System.Drawing.Size(433, 212); + this.EditorTable.Size = new System.Drawing.Size(829, 357); this.EditorTable.TabIndex = 7; this.EditorTable.Resize += new System.EventHandler(this.EditorTable_Resize); // @@ -695,9 +840,9 @@ namespace TaikoSoundEditor this.panel3.Controls.Add(this.groupBox6); this.panel3.Controls.Add(this.groupBox7); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(145, 3); + this.panel3.Location = new System.Drawing.Point(276, 3); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(141, 206); + this.panel3.Size = new System.Drawing.Size(275, 351); this.panel3.TabIndex = 5; // // groupBox6 @@ -706,7 +851,7 @@ namespace TaikoSoundEditor this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox6.Location = new System.Drawing.Point(0, 0); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(141, 99); + this.groupBox6.Size = new System.Drawing.Size(275, 223); this.groupBox6.TabIndex = 5; this.groupBox6.TabStop = false; this.groupBox6.Text = "Music Attributes"; @@ -717,7 +862,7 @@ namespace TaikoSoundEditor this.MusicAttributesGrid.HelpVisible = false; this.MusicAttributesGrid.Location = new System.Drawing.Point(3, 16); this.MusicAttributesGrid.Name = "MusicAttributesGrid"; - this.MusicAttributesGrid.Size = new System.Drawing.Size(135, 80); + this.MusicAttributesGrid.Size = new System.Drawing.Size(269, 204); this.MusicAttributesGrid.TabIndex = 3; this.MusicAttributesGrid.ToolbarVisible = false; // @@ -725,9 +870,9 @@ namespace TaikoSoundEditor // this.groupBox7.Controls.Add(this.MusicOrderGrid); this.groupBox7.Dock = System.Windows.Forms.DockStyle.Bottom; - this.groupBox7.Location = new System.Drawing.Point(0, 99); + this.groupBox7.Location = new System.Drawing.Point(0, 223); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(141, 107); + this.groupBox7.Size = new System.Drawing.Size(275, 128); this.groupBox7.TabIndex = 6; this.groupBox7.TabStop = false; this.groupBox7.Text = "Music Order"; @@ -738,7 +883,7 @@ namespace TaikoSoundEditor this.MusicOrderGrid.HelpVisible = false; this.MusicOrderGrid.Location = new System.Drawing.Point(3, 16); this.MusicOrderGrid.Name = "MusicOrderGrid"; - this.MusicOrderGrid.Size = new System.Drawing.Size(135, 88); + this.MusicOrderGrid.Size = new System.Drawing.Size(269, 109); this.MusicOrderGrid.TabIndex = 3; this.MusicOrderGrid.ToolbarVisible = false; // @@ -748,7 +893,7 @@ namespace TaikoSoundEditor this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox5.Location = new System.Drawing.Point(3, 3); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(136, 206); + this.groupBox5.Size = new System.Drawing.Size(267, 351); this.groupBox5.TabIndex = 4; this.groupBox5.TabStop = false; this.groupBox5.Text = "Music Info"; @@ -759,7 +904,7 @@ namespace TaikoSoundEditor this.MusicInfoGrid.HelpVisible = false; this.MusicInfoGrid.Location = new System.Drawing.Point(3, 16); this.MusicInfoGrid.Name = "MusicInfoGrid"; - this.MusicInfoGrid.Size = new System.Drawing.Size(130, 187); + this.MusicInfoGrid.Size = new System.Drawing.Size(261, 332); this.MusicInfoGrid.TabIndex = 3; this.MusicInfoGrid.ToolbarVisible = false; // @@ -769,18 +914,19 @@ namespace TaikoSoundEditor this.panel2.Controls.Add(this.WordSubGB); this.panel2.Controls.Add(this.WordsGB); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(292, 3); + this.panel2.Location = new System.Drawing.Point(557, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(138, 206); + this.panel2.Size = new System.Drawing.Size(269, 351); this.panel2.TabIndex = 6; // // WordDetailGB // + this.WordDetailGB.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.WordDetailGB.Controls.Add(this.WordDetailGrid); this.WordDetailGB.Dock = System.Windows.Forms.DockStyle.Top; - this.WordDetailGB.Location = new System.Drawing.Point(0, 159); + this.WordDetailGB.Location = new System.Drawing.Point(0, 239); this.WordDetailGB.Name = "WordDetailGB"; - this.WordDetailGB.Size = new System.Drawing.Size(138, 83); + this.WordDetailGB.Size = new System.Drawing.Size(269, 112); this.WordDetailGB.TabIndex = 8; this.WordDetailGB.TabStop = false; this.WordDetailGB.Text = "Word Detail"; @@ -791,17 +937,18 @@ namespace TaikoSoundEditor this.WordDetailGrid.HelpVisible = false; this.WordDetailGrid.Location = new System.Drawing.Point(3, 16); this.WordDetailGrid.Name = "WordDetailGrid"; - this.WordDetailGrid.Size = new System.Drawing.Size(132, 64); + this.WordDetailGrid.Size = new System.Drawing.Size(263, 93); this.WordDetailGrid.TabIndex = 3; this.WordDetailGrid.ToolbarVisible = false; // // WordSubGB // + this.WordSubGB.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.WordSubGB.Controls.Add(this.WordSubGrid); this.WordSubGB.Dock = System.Windows.Forms.DockStyle.Top; - this.WordSubGB.Location = new System.Drawing.Point(0, 76); + this.WordSubGB.Location = new System.Drawing.Point(0, 122); this.WordSubGB.Name = "WordSubGB"; - this.WordSubGB.Size = new System.Drawing.Size(138, 83); + this.WordSubGB.Size = new System.Drawing.Size(269, 117); this.WordSubGB.TabIndex = 7; this.WordSubGB.TabStop = false; this.WordSubGB.Text = "Word Sub"; @@ -812,7 +959,7 @@ namespace TaikoSoundEditor this.WordSubGrid.HelpVisible = false; this.WordSubGrid.Location = new System.Drawing.Point(3, 16); this.WordSubGrid.Name = "WordSubGrid"; - this.WordSubGrid.Size = new System.Drawing.Size(132, 64); + this.WordSubGrid.Size = new System.Drawing.Size(263, 98); this.WordSubGrid.TabIndex = 3; this.WordSubGrid.ToolbarVisible = false; // @@ -822,7 +969,7 @@ namespace TaikoSoundEditor this.WordsGB.Dock = System.Windows.Forms.DockStyle.Top; this.WordsGB.Location = new System.Drawing.Point(0, 0); this.WordsGB.Name = "WordsGB"; - this.WordsGB.Size = new System.Drawing.Size(138, 76); + this.WordsGB.Size = new System.Drawing.Size(269, 122); this.WordsGB.TabIndex = 6; this.WordsGB.TabStop = false; this.WordsGB.Text = "Words"; @@ -834,7 +981,7 @@ namespace TaikoSoundEditor this.WordsGrid.Location = new System.Drawing.Point(3, 16); this.WordsGrid.Name = "WordsGrid"; this.WordsGrid.PropertySort = System.Windows.Forms.PropertySort.Alphabetical; - this.WordsGrid.Size = new System.Drawing.Size(132, 57); + this.WordsGrid.Size = new System.Drawing.Size(263, 103); this.WordsGrid.TabIndex = 3; this.WordsGrid.ToolbarVisible = false; // @@ -844,78 +991,32 @@ namespace TaikoSoundEditor this.MusicOrderTab.Location = new System.Drawing.Point(4, 22); this.MusicOrderTab.Name = "MusicOrderTab"; this.MusicOrderTab.Padding = new System.Windows.Forms.Padding(3); - this.MusicOrderTab.Size = new System.Drawing.Size(445, 237); + this.MusicOrderTab.Size = new System.Drawing.Size(841, 382); this.MusicOrderTab.TabIndex = 2; this.MusicOrderTab.Text = "Music Order"; this.MusicOrderTab.UseVisualStyleBackColor = true; // - // menuStrip1 + // MusicOrderViewer // - this.menuStrip1.BackColor = System.Drawing.Color.Transparent; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.preferencesToolStripMenuItem1, - this.checkForUpdatesToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(3, 3); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(572, 24); - this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; - // - // preferencesToolStripMenuItem1 - // - this.preferencesToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.musicOrderToolStripMenuItem}); - this.preferencesToolStripMenuItem1.Name = "preferencesToolStripMenuItem1"; - this.preferencesToolStripMenuItem1.Size = new System.Drawing.Size(80, 20); - this.preferencesToolStripMenuItem1.Text = "Preferences"; - // - // musicOrderToolStripMenuItem - // - this.musicOrderToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SortByGenreToolStripMenuItem, - this.SortByIdToolStripMenuItem, - this.NoSortToolStripMenuItem}); - this.musicOrderToolStripMenuItem.Name = "musicOrderToolStripMenuItem"; - this.musicOrderToolStripMenuItem.Size = new System.Drawing.Size(137, 22); - this.musicOrderToolStripMenuItem.Text = "Music order"; - // - // SortByGenreToolStripMenuItem - // - this.SortByGenreToolStripMenuItem.CheckOnClick = true; - this.SortByGenreToolStripMenuItem.Name = "SortByGenreToolStripMenuItem"; - this.SortByGenreToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.SortByGenreToolStripMenuItem.Text = "Sort by genre"; - this.SortByGenreToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); - // - // SortByIdToolStripMenuItem - // - this.SortByIdToolStripMenuItem.CheckOnClick = true; - this.SortByIdToolStripMenuItem.Name = "SortByIdToolStripMenuItem"; - this.SortByIdToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.SortByIdToolStripMenuItem.Text = "Sort by Id"; - this.SortByIdToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); - // - // NoSortToolStripMenuItem - // - this.NoSortToolStripMenuItem.CheckOnClick = true; - this.NoSortToolStripMenuItem.Name = "NoSortToolStripMenuItem"; - this.NoSortToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.NoSortToolStripMenuItem.Text = "No sort"; - this.NoSortToolStripMenuItem.Click += new System.EventHandler(this.MusicOrderSortToolStripMenuItem_Click); - // - // checkForUpdatesToolStripMenuItem - // - this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; - this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(115, 20); - this.checkForUpdatesToolStripMenuItem.Text = "Check for updates"; - this.checkForUpdatesToolStripMenuItem.Visible = false; - this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); + this.MusicOrderViewer.CurrentPage = 0; + this.MusicOrderViewer.CutActive = false; + this.MusicOrderViewer.Dock = System.Windows.Forms.DockStyle.Fill; + this.MusicOrderViewer.ItemsPerCol = 5; + this.MusicOrderViewer.ItemsPerRow = 4; + this.MusicOrderViewer.Location = new System.Drawing.Point(3, 3); + this.MusicOrderViewer.Name = "MusicOrderViewer"; + this.MusicOrderViewer.PasteActive = false; + this.MusicOrderViewer.PasteMode = false; + this.MusicOrderViewer.RemoveActive = false; + this.MusicOrderViewer.Size = new System.Drawing.Size(835, 376); + this.MusicOrderViewer.TabIndex = 0; + this.MusicOrderViewer.SongRemoved += new TaikoSoundEditor.Commons.Controls.MusicOrderViewer.OnSongRemoved(this.MusicOrderViewer_SongRemoved); + this.MusicOrderViewer.SongDoubleClick += new TaikoSoundEditor.Commons.Controls.MusicOrderViewer.OnSongDoubleClick(this.MusicOrderViewer_SongDoubleClick); // // RemoveSongButton // this.RemoveSongButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.RemoveSongButton.Location = new System.Drawing.Point(189, 297); + this.RemoveSongButton.Location = new System.Drawing.Point(193, 447); this.RemoveSongButton.Name = "RemoveSongButton"; this.RemoveSongButton.Size = new System.Drawing.Size(64, 20); this.RemoveSongButton.TabIndex = 12; @@ -927,7 +1028,7 @@ namespace TaikoSoundEditor // this.DatatableSpaces.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.DatatableSpaces.AutoSize = true; - this.DatatableSpaces.Location = new System.Drawing.Point(119, 322); + this.DatatableSpaces.Location = new System.Drawing.Point(123, 472); this.DatatableSpaces.Name = "DatatableSpaces"; this.DatatableSpaces.Size = new System.Drawing.Size(276, 17); this.DatatableSpaces.TabIndex = 11; @@ -940,7 +1041,7 @@ namespace TaikoSoundEditor this.ExportOpenOnFinished.AutoSize = true; this.ExportOpenOnFinished.Checked = true; this.ExportOpenOnFinished.CheckState = System.Windows.Forms.CheckState.Checked; - this.ExportOpenOnFinished.Location = new System.Drawing.Point(119, 342); + this.ExportOpenOnFinished.Location = new System.Drawing.Point(123, 492); this.ExportOpenOnFinished.Name = "ExportOpenOnFinished"; this.ExportOpenOnFinished.Size = new System.Drawing.Size(181, 17); this.ExportOpenOnFinished.TabIndex = 10; @@ -950,7 +1051,7 @@ namespace TaikoSoundEditor // ExportAllButton // this.ExportAllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ExportAllButton.Location = new System.Drawing.Point(453, 367); + this.ExportAllButton.Location = new System.Drawing.Point(842, 519); this.ExportAllButton.Name = "ExportAllButton"; this.ExportAllButton.Size = new System.Drawing.Size(122, 20); this.ExportAllButton.TabIndex = 9; @@ -961,7 +1062,7 @@ namespace TaikoSoundEditor // ExportSoundBanksButton // this.ExportSoundBanksButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ExportSoundBanksButton.Location = new System.Drawing.Point(453, 342); + this.ExportSoundBanksButton.Location = new System.Drawing.Point(842, 494); this.ExportSoundBanksButton.Name = "ExportSoundBanksButton"; this.ExportSoundBanksButton.Size = new System.Drawing.Size(122, 20); this.ExportSoundBanksButton.TabIndex = 8; @@ -972,7 +1073,7 @@ namespace TaikoSoundEditor // ExportSoundFoldersButton // this.ExportSoundFoldersButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ExportSoundFoldersButton.Location = new System.Drawing.Point(453, 317); + this.ExportSoundFoldersButton.Location = new System.Drawing.Point(842, 469); this.ExportSoundFoldersButton.Name = "ExportSoundFoldersButton"; this.ExportSoundFoldersButton.Size = new System.Drawing.Size(122, 20); this.ExportSoundFoldersButton.TabIndex = 7; @@ -983,7 +1084,7 @@ namespace TaikoSoundEditor // ExportDatatableButton // this.ExportDatatableButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ExportDatatableButton.Location = new System.Drawing.Point(453, 292); + this.ExportDatatableButton.Location = new System.Drawing.Point(842, 444); this.ExportDatatableButton.Name = "ExportDatatableButton"; this.ExportDatatableButton.Size = new System.Drawing.Size(122, 20); this.ExportDatatableButton.TabIndex = 6; @@ -994,7 +1095,7 @@ namespace TaikoSoundEditor // CreateButton // this.CreateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CreateButton.Location = new System.Drawing.Point(119, 297); + this.CreateButton.Location = new System.Drawing.Point(123, 447); this.CreateButton.Name = "CreateButton"; this.CreateButton.Size = new System.Drawing.Size(64, 20); this.CreateButton.TabIndex = 5; @@ -1005,9 +1106,9 @@ namespace TaikoSoundEditor // groupBox8 // this.groupBox8.Controls.Add(this.NewSoundsBox); - this.groupBox8.Location = new System.Drawing.Point(7, 207); + this.groupBox8.Location = new System.Drawing.Point(10, 310); this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(107, 179); + this.groupBox8.Size = new System.Drawing.Size(107, 231); this.groupBox8.TabIndex = 3; this.groupBox8.TabStop = false; this.groupBox8.Text = "New Sounds List"; @@ -1018,7 +1119,7 @@ namespace TaikoSoundEditor this.NewSoundsBox.FormattingEnabled = true; this.NewSoundsBox.Location = new System.Drawing.Point(3, 16); this.NewSoundsBox.Name = "NewSoundsBox"; - this.NewSoundsBox.Size = new System.Drawing.Size(101, 160); + this.NewSoundsBox.Size = new System.Drawing.Size(101, 212); this.NewSoundsBox.TabIndex = 1; this.NewSoundsBox.SelectedIndexChanged += new System.EventHandler(this.NewSoundsBox_SelectedIndexChanged); // @@ -1027,9 +1128,9 @@ namespace TaikoSoundEditor this.groupBox3.Controls.Add(this.SearchBox); this.groupBox3.Controls.Add(this.pictureBox1); this.groupBox3.Controls.Add(this.LoadedMusicBox); - this.groupBox3.Location = new System.Drawing.Point(7, 26); + this.groupBox3.Location = new System.Drawing.Point(7, 30); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(107, 176); + this.groupBox3.Size = new System.Drawing.Size(107, 274); this.groupBox3.TabIndex = 2; this.groupBox3.TabStop = false; this.groupBox3.Text = "Sounds List"; @@ -1063,7 +1164,7 @@ namespace TaikoSoundEditor this.LoadedMusicBox.FormattingEnabled = true; this.LoadedMusicBox.Location = new System.Drawing.Point(3, 42); this.LoadedMusicBox.Name = "LoadedMusicBox"; - this.LoadedMusicBox.Size = new System.Drawing.Size(103, 121); + this.LoadedMusicBox.Size = new System.Drawing.Size(103, 225); this.LoadedMusicBox.TabIndex = 1; this.LoadedMusicBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.LoadedMusicBox_DrawItem); this.LoadedMusicBox.SelectedIndexChanged += new System.EventHandler(this.LoadedMusicBox_SelectedIndexChanged); @@ -1071,23 +1172,15 @@ namespace TaikoSoundEditor // tabPage3 // this.tabPage3.BackColor = System.Drawing.Color.White; + this.tabPage3.Controls.Add(this.groupBox10); this.tabPage3.Controls.Add(this.panel4); this.tabPage3.Location = new System.Drawing.Point(4, 5); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(578, 391); + this.tabPage3.Size = new System.Drawing.Size(976, 552); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "tabPage3"; // - // panel4 - // - this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.panel4.Controls.Add(this.groupBox10); - this.panel4.Location = new System.Drawing.Point(129, 66); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(321, 276); - this.panel4.TabIndex = 2; - // // groupBox10 // this.groupBox10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -1105,9 +1198,9 @@ namespace TaikoSoundEditor this.groupBox10.Controls.Add(this.TJASelector); this.groupBox10.Controls.Add(this.AudioFileSelector); this.groupBox10.Controls.Add(this.label10); - this.groupBox10.Location = new System.Drawing.Point(3, 3); + this.groupBox10.Location = new System.Drawing.Point(102, 7); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(315, 270); + this.groupBox10.Size = new System.Drawing.Size(766, 537); this.groupBox10.TabIndex = 8; this.groupBox10.TabStop = false; this.groupBox10.Text = "Create new sound"; @@ -1115,7 +1208,7 @@ namespace TaikoSoundEditor // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(155, 133); + this.label3.Location = new System.Drawing.Point(158, 147); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(47, 13); this.label3.TabIndex = 21; @@ -1123,7 +1216,7 @@ namespace TaikoSoundEditor // // SilenceBox // - this.SilenceBox.Location = new System.Drawing.Point(114, 132); + this.SilenceBox.Location = new System.Drawing.Point(117, 146); this.SilenceBox.Maximum = new decimal(new int[] { 10, 0, @@ -1189,7 +1282,7 @@ namespace TaikoSoundEditor this.AddSilenceBox.AutoSize = true; this.AddSilenceBox.Checked = true; this.AddSilenceBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.AddSilenceBox.Location = new System.Drawing.Point(6, 133); + this.AddSilenceBox.Location = new System.Drawing.Point(9, 147); this.AddSilenceBox.Name = "AddSilenceBox"; this.AddSilenceBox.Size = new System.Drawing.Size(112, 17); this.AddSilenceBox.TabIndex = 19; @@ -1201,16 +1294,17 @@ namespace TaikoSoundEditor // this.FeedbackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FeedbackBox.Location = new System.Drawing.Point(6, 198); + this.FeedbackBox.Enabled = false; + this.FeedbackBox.Location = new System.Drawing.Point(21, 181); this.FeedbackBox.Multiline = true; this.FeedbackBox.Name = "FeedbackBox"; - this.FeedbackBox.Size = new System.Drawing.Size(306, 68); + this.FeedbackBox.Size = new System.Drawing.Size(724, 219); this.FeedbackBox.TabIndex = 18; // // CreateBackButton // this.CreateBackButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.CreateBackButton.Location = new System.Drawing.Point(177, 172); + this.CreateBackButton.Location = new System.Drawing.Point(628, 511); this.CreateBackButton.Name = "CreateBackButton"; this.CreateBackButton.Size = new System.Drawing.Size(64, 20); this.CreateBackButton.TabIndex = 17; @@ -1221,7 +1315,7 @@ namespace TaikoSoundEditor // CreateOkButton // this.CreateOkButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.CreateOkButton.Location = new System.Drawing.Point(246, 172); + this.CreateOkButton.Location = new System.Drawing.Point(697, 511); this.CreateOkButton.Name = "CreateOkButton"; this.CreateOkButton.Size = new System.Drawing.Size(64, 20); this.CreateOkButton.TabIndex = 16; @@ -1232,7 +1326,7 @@ namespace TaikoSoundEditor // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 110); + this.label2.Location = new System.Drawing.Point(6, 116); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(61, 13); this.label2.TabIndex = 15; @@ -1242,130 +1336,31 @@ namespace TaikoSoundEditor // this.SongNameBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.SongNameBox.Location = new System.Drawing.Point(69, 107); + this.SongNameBox.Location = new System.Drawing.Point(72, 113); this.SongNameBox.Name = "SongNameBox"; - this.SongNameBox.Size = new System.Drawing.Size(243, 20); + this.SongNameBox.Size = new System.Drawing.Size(688, 20); this.SongNameBox.TabIndex = 14; this.SongNameBox.Text = "(6 characters id...)"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(6, 86); + this.label9.Location = new System.Drawing.Point(6, 65); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(42, 13); this.label9.TabIndex = 13; this.label9.Text = "TJA file"; // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(5, 61); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(50, 13); - this.label10.TabIndex = 8; - this.label10.Text = "Audio file"; - // - // DatatableDef - // - this.DatatableDef.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.DatatableDef.Filter = "JSON files(*.json)|*.json|All files(*.*)|*.*"; - this.DatatableDef.Location = new System.Drawing.Point(83, 19); - this.DatatableDef.Name = "DatatableDef"; - this.DatatableDef.Path = ""; - this.DatatableDef.SelectsFolder = false; - this.DatatableDef.Size = new System.Drawing.Size(226, 20); - this.DatatableDef.TabIndex = 13; - this.DatatableDef.PathChanged += new TaikoSoundEditor.Commons.Controls.PathSelector.OnPathChanged(this.DatatableDef_PathChanged); - // - // DirSelector - // - this.DirSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.DirSelector.Filter = "All files(*.*)|*.*"; - this.DirSelector.Location = new System.Drawing.Point(58, 19); - this.DirSelector.Name = "DirSelector"; - this.DirSelector.Path = ""; - this.DirSelector.SelectsFolder = true; - this.DirSelector.Size = new System.Drawing.Size(251, 20); - this.DirSelector.TabIndex = 11; - // - // WordListPathSelector - // - this.WordListPathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.WordListPathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; - this.WordListPathSelector.Location = new System.Drawing.Point(101, 88); - this.WordListPathSelector.Name = "WordListPathSelector"; - this.WordListPathSelector.Path = ""; - this.WordListPathSelector.SelectsFolder = false; - this.WordListPathSelector.Size = new System.Drawing.Size(208, 20); - this.WordListPathSelector.TabIndex = 12; - // - // MusicInfoPathSelector - // - this.MusicInfoPathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.MusicInfoPathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; - this.MusicInfoPathSelector.Location = new System.Drawing.Point(101, 63); - this.MusicInfoPathSelector.Name = "MusicInfoPathSelector"; - this.MusicInfoPathSelector.Path = ""; - this.MusicInfoPathSelector.SelectsFolder = false; - this.MusicInfoPathSelector.Size = new System.Drawing.Size(208, 20); - this.MusicInfoPathSelector.TabIndex = 11; - // - // MusicOrderPathSelector - // - this.MusicOrderPathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.MusicOrderPathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; - this.MusicOrderPathSelector.Location = new System.Drawing.Point(101, 38); - this.MusicOrderPathSelector.Name = "MusicOrderPathSelector"; - this.MusicOrderPathSelector.Path = ""; - this.MusicOrderPathSelector.SelectsFolder = false; - this.MusicOrderPathSelector.Size = new System.Drawing.Size(208, 20); - this.MusicOrderPathSelector.TabIndex = 10; - // - // MusicAttributePathSelector - // - this.MusicAttributePathSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.MusicAttributePathSelector.Filter = "Binary files(*.bin)|*.bin|All files(*.*)|*.*"; - this.MusicAttributePathSelector.Location = new System.Drawing.Point(101, 13); - this.MusicAttributePathSelector.Name = "MusicAttributePathSelector"; - this.MusicAttributePathSelector.Path = ""; - this.MusicAttributePathSelector.SelectsFolder = false; - this.MusicAttributePathSelector.Size = new System.Drawing.Size(208, 20); - this.MusicAttributePathSelector.TabIndex = 9; - // - // MusicOrderViewer - // - this.MusicOrderViewer.CurrentPage = 0; - this.MusicOrderViewer.CutActive = false; - this.MusicOrderViewer.Dock = System.Windows.Forms.DockStyle.Fill; - this.MusicOrderViewer.ItemsPerCol = 5; - this.MusicOrderViewer.ItemsPerRow = 4; - this.MusicOrderViewer.Location = new System.Drawing.Point(3, 3); - this.MusicOrderViewer.Name = "MusicOrderViewer"; - this.MusicOrderViewer.PasteActive = false; - this.MusicOrderViewer.PasteMode = false; - this.MusicOrderViewer.RemoveActive = false; - this.MusicOrderViewer.Size = new System.Drawing.Size(439, 231); - this.MusicOrderViewer.TabIndex = 0; - this.MusicOrderViewer.SongRemoved += new TaikoSoundEditor.Commons.Controls.MusicOrderViewer.OnSongRemoved(this.MusicOrderViewer_SongRemoved); - this.MusicOrderViewer.SongDoubleClick += new TaikoSoundEditor.Commons.Controls.MusicOrderViewer.OnSongDoubleClick(this.MusicOrderViewer_SongDoubleClick); - // // TJASelector // this.TJASelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.TJASelector.Filter = ".tja files(*.tja)|*.tja|All files(*.*)|*.*"; - this.TJASelector.Location = new System.Drawing.Point(69, 82); + this.TJASelector.Location = new System.Drawing.Point(72, 61); this.TJASelector.Name = "TJASelector"; this.TJASelector.Path = ""; this.TJASelector.SelectsFolder = false; - this.TJASelector.Size = new System.Drawing.Size(150, 20); + this.TJASelector.Size = new System.Drawing.Size(688, 20); this.TJASelector.TabIndex = 10; this.TJASelector.PathChanged += new TaikoSoundEditor.Commons.Controls.PathSelector.OnPathChanged(this.TJASelector_PathChanged); // @@ -1375,22 +1370,39 @@ namespace TaikoSoundEditor | System.Windows.Forms.AnchorStyles.Right))); this.AudioFileSelector.Filter = "OGG files(*.ogg)|*.ogg|mp3 files(*.mp3)|*.mp3|WAV files(*.wav)|*.wav|All files(*." + "*)|*.*"; - this.AudioFileSelector.Location = new System.Drawing.Point(69, 57); + this.AudioFileSelector.Location = new System.Drawing.Point(73, 89); this.AudioFileSelector.Name = "AudioFileSelector"; this.AudioFileSelector.Path = ""; this.AudioFileSelector.SelectsFolder = false; - this.AudioFileSelector.Size = new System.Drawing.Size(150, 20); + this.AudioFileSelector.Size = new System.Drawing.Size(688, 20); this.AudioFileSelector.TabIndex = 9; // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(6, 93); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(50, 13); + this.label10.TabIndex = 8; + this.label10.Text = "Audio file"; + // + // panel4 + // + this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.panel4.Location = new System.Drawing.Point(129, 66); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(621, 276); + this.panel4.TabIndex = 2; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(586, 400); + this.ClientSize = new System.Drawing.Size(984, 561); this.Controls.Add(this.TabControl); this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(602, 439); + this.MinimumSize = new System.Drawing.Size(1000, 600); this.Name = "MainForm"; this.Text = "Taiko Sound Editor"; this.TabControl.ResumeLayout(false); @@ -1406,6 +1418,8 @@ namespace TaikoSoundEditor this.groupBox1.PerformLayout(); this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.SoundViewTab.ResumeLayout(false); this.SoundViewerSimple.ResumeLayout(false); this.SoundViewerSimple.PerformLayout(); @@ -1428,14 +1442,11 @@ namespace TaikoSoundEditor this.WordSubGB.ResumeLayout(false); this.WordsGB.ResumeLayout(false); this.MusicOrderTab.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); this.groupBox8.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabPage3.ResumeLayout(false); - this.panel4.ResumeLayout(false); this.groupBox10.ResumeLayout(false); this.groupBox10.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.SilenceBox)).EndInit(); @@ -1545,7 +1556,6 @@ namespace TaikoSoundEditor private ToolStripMenuItem musicOrderToolStripMenuItem; private ToolStripMenuItem SortByGenreToolStripMenuItem; private ToolStripMenuItem SortByIdToolStripMenuItem; - private ToolStripMenuItem NoSortToolStripMenuItem; private ToolStripMenuItem checkForUpdatesToolStripMenuItem; private GroupBox groupBox12; private Label label20; @@ -1556,5 +1566,7 @@ namespace TaikoSoundEditor private GroupBox groupBox13; private Label label22; private PathSelector DatatableDef; + private ToolStripMenuItem sortByTitleToolStripMenuItem; + private ToolStripMenuItem noSortToolStripMenuItem; } } \ No newline at end of file diff --git a/MainForm.RequestFiles.cs b/MainForm.RequestFiles.cs index 9abeddd..e9d28b1 100644 --- a/MainForm.RequestFiles.cs +++ b/MainForm.RequestFiles.cs @@ -174,10 +174,8 @@ namespace TaikoSoundEditor });*/ MusicOrderViewer.WordList = WordList; - foreach (var musicOrder in MusicOrders.Items.Where(_ => MusicInfos.Items.Any(mi => mi.UniqueId == _.UniqueId))) - { - MusicOrderViewer.AddSong(musicOrder); - } + foreach (var musicOrder in MusicOrders.Items.Where(_ => MusicInfos.Items.Any(mi => mi.UniqueId == _.UniqueId))) MusicOrderViewer.AddSong(musicOrder); + MusicOrderViewer.SortSongs(); }); #endregion diff --git a/MainForm.SoundCreate.cs b/MainForm.SoundCreate.cs index 76bf738..d4f8b14 100644 --- a/MainForm.SoundCreate.cs +++ b/MainForm.SoundCreate.cs @@ -311,6 +311,7 @@ namespace TaikoSoundEditor MusicAttributes.Items.Add(ns.MusicAttribute); MusicOrderViewer.AddSong(mo); + MusicOrderViewer.SortSongs(); }); diff --git a/MainForm.cs b/MainForm.cs index 0030ee9..221f701 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -21,18 +21,6 @@ namespace TaikoSoundEditor WordListPathSelector.PathChanged += WordListPathSelector_PathChanged; DirSelector.PathChanged += DirSelector_PathChanged; - UseEncryptionBox.Checked = Config.UseEncryption; - UseEncryptionBox_CheckedChanged(null, null); // update state of the key two text boxes - - //If path is set for the datatable folder, update paths for all the files. - if (Config.DatatablesPath != "") DirSelector.Path = Config.DatatablesPath; - - - DatatableKeyBox.Text = Config.DatatableKey; - FumenKeyBox.Text = Config.FumenKey; - - DatatableDef.Path = Config.DatatableDefPath; - //Other stuff AddedMusicBinding.DataSource = AddedMusic; NewSoundsBox.DataSource = AddedMusicBinding; @@ -125,7 +113,7 @@ namespace TaikoSoundEditor Logger.Info($"Selection Changed MusicItem: {item}"); LoadMusicInfo(item); indexChanging = false; - SoundViewTab.SelectedTab = SoundViewerSimple; + if (SoundViewTab.SelectedTab == MusicOrderTab) SoundViewTab.SelectedTab = SoundViewerSimple; }); private void EditorTable_Resize(object sender, EventArgs e) => ExceptionGuard.Run(() => @@ -140,7 +128,7 @@ namespace TaikoSoundEditor LoadedMusicBox.SelectedItem = null; var item = NewSoundsBox.SelectedItem as NewSongData; LoadNewSongData(item); - SoundViewTab.SelectedTab = SoundViewerSimple; + if(SoundViewTab.SelectedTab == MusicOrderTab) SoundViewTab.SelectedTab = SoundViewerSimple; }); #endregion @@ -373,7 +361,7 @@ namespace TaikoSoundEditor private void MusicOrderSortToolStripMenuItem_Click(object sender, EventArgs e) { - SortByGenreToolStripMenuItem.Checked = SortByIdToolStripMenuItem.Checked = NoSortToolStripMenuItem.Checked = false; + SortByGenreToolStripMenuItem.Checked = SortByIdToolStripMenuItem.Checked = sortByTitleToolStripMenuItem.Checked = noSortToolStripMenuItem.Checked = false; if (sender == SortByGenreToolStripMenuItem) { @@ -385,28 +373,39 @@ namespace TaikoSoundEditor SortByIdToolStripMenuItem.Checked = true; Config.SetMusicOrderSortById(); } - else //if (sender == NoSortToolStripMenuItem) + else if (sender == sortByTitleToolStripMenuItem) { - NoSortToolStripMenuItem.Checked = true; + sortByTitleToolStripMenuItem.Checked = true; + Config.SetMusicOrderSortByTitle(); + } + else //(sender == noSortToolStripMenuItem) + { + noSortToolStripMenuItem.Checked = true; Config.SetMusicOrderNoSort(); } + + MusicOrderViewer.SortSongs(); + MusicOrderViewer.MusicOrdersPanel_Update(); } private void LoadPreferences() { + UseEncryptionBox.Checked = Config.UseEncryption; + UseEncryptionBox_CheckedChanged(null, null); // update state of the key two text boxes + + //If path is set for the datatable folder, update paths for all the files. + if (Config.DatatablesPath != "") DirSelector.Path = Config.DatatablesPath; + + + DatatableKeyBox.Text = Config.DatatableKey; + FumenKeyBox.Text = Config.FumenKey; + + DatatableDef.Path = Config.DatatableDefPath; + var musicOrderSort = Config.IniFile.Read(Config.MusicOrderSortProperty); - if (musicOrderSort == Config.MusicOrderSortValueGenre) - { - SortByGenreToolStripMenuItem.PerformClick(); - } - else if (musicOrderSort == Config.MusicOrderSortValueId) - { - SortByIdToolStripMenuItem.PerformClick(); - } - else - { - NoSortToolStripMenuItem.PerformClick(); - } + if (musicOrderSort == Config.MusicOrderSortValueGenre) SortByGenreToolStripMenuItem.PerformClick(); + else if (musicOrderSort == Config.MusicOrderSortValueId) SortByIdToolStripMenuItem.PerformClick(); + else if (musicOrderSort == Config.MusicOrderSortValueTitle) sortByTitleToolStripMenuItem.PerformClick(); } private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e) => ExceptionGuard.Run(() =>