diff --git a/Controls/MusicOrderViewer.cs b/Controls/MusicOrderViewer.cs index fa53685..46d5175 100644 --- a/Controls/MusicOrderViewer.cs +++ b/Controls/MusicOrderViewer.cs @@ -187,6 +187,7 @@ namespace TaikoSoundEditor.Controls private void MusicOrdersPanel_MouseDown(object sender, MouseEventArgs e) { if (e.Button != MouseButtons.Left) return; + Select(); var cursor = e.Location; int itemW = MusicOrdersPanel.Width / ItemsPerRow; @@ -445,5 +446,27 @@ namespace TaikoSoundEditor.Controls CutActive = RemoveActive = true; MusicOrdersPanel.Invalidate(); } + + protected override bool ProcessCmdKey(ref Message msg, Keys keyData) + { + if (keyData == (Keys.Control | Keys.X) || keyData == (Keys.Control | Keys.C)) + { + //MessageBox.Show("Here?"); + if(CutActive) + { + CutButton_Click(null, null); + } + return true; + } + if (keyData == (Keys.Control | Keys.V)) + { + if(PasteActive) + { + PasteButton_Click(null, null); + } + return true; + } + return base.ProcessCmdKey(ref msg, keyData); + } } } diff --git a/MainForm.cs b/MainForm.cs index 677c74a..d16ddc4 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -254,7 +254,7 @@ namespace TaikoSoundEditor item.Word.JapaneseText = SimpleTitleBox.Text; item.WordSub.JapaneseText = SimpleSubtitleBox.Text; item.WordDetail.JapaneseText = SimpleDetailBox.Text; - item.MusicOrder.Genre = (Genre)(SimpleGenreBox.SelectedItem ?? Genre.Pop); + item.MusicOrder.Genre = item.MusicInfo.Genre = (Genre)(SimpleGenreBox.SelectedItem ?? Genre.Pop); item.MusicInfo.StarEasy=(int)SimpleStarEasyBox.Value; item.MusicInfo.StarNormal=(int)SimpleStarNormalBox.Value; item.MusicInfo.StarHard=(int)SimpleStarHardBox.Value; diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user index 41a40b2..bd8c0b4 100644 --- a/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-07-29T07:22:03.4096107Z;True|2023-07-29T10:05:26.6712083+03:00;True|2023-07-28T19:30:15.3174413+03:00;True|2023-07-22T19:07:39.3718711+03:00;True|2023-07-22T19:06:41.2393088+03:00;True|2023-07-22T12:07:26.2620601+03:00;True|2023-07-22T12:06:39.9230498+03:00;True|2023-07-22T11:29:18.0153916+03:00;True|2023-07-22T08:23:07.5000923+03:00;True|2023-07-21T20:03:15.6598520+03:00;True|2023-07-21T19:41:13.2800435+03:00;True|2023-07-19T13:08:33.4726289+03:00;True|2023-07-19T12:08:17.2430335+03:00;True|2023-07-18T09:38:50.7615921+03:00;True|2023-07-18T09:25:23.0403589+03:00;True|2023-07-17T17:57:08.1469738+03:00;True|2023-07-17T11:28:41.9554245+03:00;True|2023-07-17T11:15:26.2194507+03:00; + True|2023-07-29T08:05:03.3876668Z;True|2023-07-29T10:54:04.8963992+03:00;True|2023-07-29T10:22:03.4096107+03:00;True|2023-07-29T10:05:26.6712083+03:00;True|2023-07-28T19:30:15.3174413+03:00;True|2023-07-22T19:07:39.3718711+03:00;True|2023-07-22T19:06:41.2393088+03:00;True|2023-07-22T12:07:26.2620601+03:00;True|2023-07-22T12:06:39.9230498+03:00;True|2023-07-22T11:29:18.0153916+03:00;True|2023-07-22T08:23:07.5000923+03:00;True|2023-07-21T20:03:15.6598520+03:00;True|2023-07-21T19:41:13.2800435+03:00;True|2023-07-19T13:08:33.4726289+03:00;True|2023-07-19T12:08:17.2430335+03:00;True|2023-07-18T09:38:50.7615921+03:00;True|2023-07-18T09:25:23.0403589+03:00;True|2023-07-17T17:57:08.1469738+03:00;True|2023-07-17T11:28:41.9554245+03:00;True|2023-07-17T11:15:26.2194507+03:00; \ No newline at end of file