diff --git a/DBObj/SongData.cs b/DBObj/SongData.cs index 0ffadde..5225671 100644 --- a/DBObj/SongData.cs +++ b/DBObj/SongData.cs @@ -103,22 +103,11 @@ namespace DBObj } public Color GetStateColor(){ Color c = Color.White; - if (state == PlayState.Played) - { - c = Color.Gray;//Color.FromArgb(200, 75, 125); // 播畢顏色:紫紅色 - } - else if (state == PlayState.NoFile) - { - c = Color.Gray; - } - else if (state == PlayState.Playing) - { - c = Color.LimeGreen; - } - else if (state == PlayState.InsertPlayback) - { - c = Color.Gold; - } + if (state == PlayState.Played) c = Color.Gray;//Color.FromArgb(200, 75, 125); // 播畢顏色:紫紅色 + else if (state == PlayState.Skipped)c = Color.Gray; + else if (state == PlayState.NoFile)c = Color.Gray; + else if (state == PlayState.Playing)c = Color.LimeGreen; + else if (state == PlayState.InsertPlayback)c = Color.Gold; return c; } public string GetStateTxt(bool IsSimplified){ diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs index b26f30a..02542ea 100644 --- a/DBObj/SongList.cs +++ b/DBObj/SongList.cs @@ -103,8 +103,8 @@ namespace DBObj public static void Cancel(SongData song) { not_played.Remove(song); - played.Remove(song); - chkCut(); + song.SetState(PlayState.Skipped); + played.Add(song); } public static void Insert(SongData song) diff --git a/Env.cs b/Env.cs index f280a94..707a4be 100644 --- a/Env.cs +++ b/Env.cs @@ -10,6 +10,7 @@ namespace Utils private static readonly List KtvPaths = new() { @"\\sshost\KTVSuperstar", + @"\\sshost1\KTVSuperstar", @"\\pc101\KTVSuperstar" }; diff --git a/PlayState.cs b/PlayState.cs index eb45d89..a3ee173 100644 --- a/PlayState.cs +++ b/PlayState.cs @@ -19,7 +19,7 @@ namespace DualScreenDemo [LocalizedDescription("無文件", "无文件")] NoFile, - [LocalizedDescription("已跳過", "已跳过")] + [LocalizedDescription("刪除", "删除")] Skipped } diff --git a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs index 77d5d9d..e0bdfbf 100644 --- a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs +++ b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs @@ -333,7 +333,7 @@ namespace DualScreenDemo EventHandler mouseEnter = (sender, e) => { // 變更歌手名稱為黃色 - artistLabel.ForeColor = Color.Yellow; + //artistLabel.ForeColor = Color.Yellow; // 增強分隔線的亮度,使其更明顯 separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255); @@ -522,8 +522,8 @@ namespace DualScreenDemo // 定義滑鼠進入 (MouseEnter) 事件的處理程序 EventHandler mouseEnter = (sender, e) => { - songLabel.ForeColor = Color.Yellow; - artistLabel.ForeColor = Color.Yellow; + //songLabel.ForeColor = Color.Yellow; + //artistLabel.ForeColor = Color.Yellow; separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255); }; diff --git a/Program.cs b/Program.cs index bea569b..f813674 100644 --- a/Program.cs +++ b/Program.cs @@ -13,7 +13,7 @@ namespace DualScreenDemo private static PrimaryForm primaryForm; // 儲存實例的參考 public static Room room = new Room(); - public static string verSion = "Server V2.8 202508081600"; + public static string verSion = "Server V2.8 202508081823"; [STAThread] static void Main()