diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs index 84e1e4e..a1f3067 100644 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs +++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs @@ -65,6 +65,7 @@ namespace DualScreenDemo SetPinYinSingersAndButtonsVisibility(false); // 隱藏拼音搜尋相關控件 SetHandWritingForSingersAndButtonsVisibility(false); // 隱藏手寫搜尋相關控件 SetWordCountSingersAndButtonsVisibility(false); // 隱藏字數搜尋相關控件 + SetZhuYinSingersAndButtonsVisibility(true); // 顯示注音搜尋相關控件 //SetPictureBoxArtistSearchAndButtonsVisibility(false); // 隱藏其他搜尋模式的圖片框 @@ -517,7 +518,8 @@ namespace DualScreenDemo { // 隱藏 ZhuYin 歌手圖片框 pictureBoxZhuYinSingers.Visible = false; - + // 關閉注音搜尋的按鈕顏色 + zhuyinSearchButton.BackgroundImage = zhuyinSearchNormalBackground; // 隱藏與 ZhuYin 歌手相關的所有按鈕 SetZhuYinSingersAndButtonsVisibility(false); } diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs index 08c77bb..fda8214 100644 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs +++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs @@ -45,6 +45,8 @@ namespace DualScreenDemo SetZhuYinSingersAndButtonsVisibility(false); SetPinYinSingersAndButtonsVisibility(false); SetHandWritingForSingersAndButtonsVisibility(false); + SetWordCountSingersAndButtonsVisibility(false); // 隱藏字數搜尋相關控件 + SetEnglishSingersAndButtonsVisibility(true); //SetPictureBoxArtistSearchAndButtonsVisibility(false); ResetinputBox(); @@ -269,6 +271,7 @@ namespace DualScreenDemo { pictureBoxEnglishSingers.Visible = false; + englishSearchButton.BackgroundImage = englishSearchNormalBackground; SetEnglishSingersAndButtonsVisibility(false); } diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.HandwritingSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.HandwritingSearch.cs index 9472f2e..961d186 100644 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.HandwritingSearch.cs +++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.HandwritingSearch.cs @@ -45,6 +45,7 @@ namespace DualScreenDemo SetZhuYinSingersAndButtonsVisibility(false); SetEnglishSingersAndButtonsVisibility(false); SetPinYinSingersAndButtonsVisibility(false); + SetWordCountSingersAndButtonsVisibility(false); // 隱藏字數搜尋相關控件 //SetPictureBoxArtistSearchAndButtonsVisibility(false); SetHandWritingForSingersAndButtonsVisibility(true); @@ -299,7 +300,7 @@ namespace DualScreenDemo this.SuspendLayout(); SetHandWritingForSingersAndButtonsVisibility(false); - + handWritingSearchButton.BackgroundImage = handWritingSearchNormalBackground; this.ResumeLayout(); } diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.PinyinSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.PinyinSearch.cs index 3915489..c997ec5 100644 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.PinyinSearch.cs +++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.PinyinSearch.cs @@ -38,8 +38,11 @@ namespace DualScreenDemo - SetZhuYinSingersAndButtonsVisibility(false); - SetEnglishSingersAndButtonsVisibility(false); + SetZhuYinSingersAndButtonsVisibility(false); // 隱藏注音搜尋相關控件 + SetEnglishSingersAndButtonsVisibility(false); // 隱藏英文搜尋相關控件 + SetWordCountSingersAndButtonsVisibility(false); // 隱藏字數搜尋相關控件 + SetHandWritingForSingersAndButtonsVisibility(false); // 隱藏手寫搜尋相關控件 + SetPinYinSingersAndButtonsVisibility(true); //SetPictureBoxArtistSearchAndButtonsVisibility(false); pictureBoxPinYinSingers.Visible = true; @@ -168,6 +171,7 @@ namespace DualScreenDemo private void CloseButtonPinYinSingers_Click(object sender, EventArgs e) { pictureBoxPinYinSingers.Visible = false; + pinyinSearchButton.BackgroundImage = pinyinSearchNormalBackground; SetPinYinSingersAndButtonsVisibility(false); } diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.WordCountSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.WordCountSearch.cs index ecc7377..5fdce9a 100644 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.WordCountSearch.cs +++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.WordCountSearch.cs @@ -64,23 +64,24 @@ namespace DualScreenDemo /// 事件參數。 private void WordCountSearchSingersButton_Click(object sender, EventArgs e) { - // 設定按鈕背景,將「注音搜尋」設為啟動狀態,其餘按鈕恢復為正常狀態 - zhuyinSearchButton.BackgroundImage = zhuyinSearchActiveBackground; + // 設定按鈕背景,將「字數搜尋」設為啟動狀態,其餘按鈕恢復為正常狀態 + wordCountSearchButton.BackgroundImage = wordCountSearchActiveBackground; englishSearchButton.BackgroundImage = englishSearchNormalBackground; pinyinSearchButton.BackgroundImage = pinyinSearchNormalBackground; - wordCountSearchButton.BackgroundImage = wordCountSearchNormalBackground; + zhuyinSearchButton.BackgroundImage = zhuyinSearchNormalBackground; handWritingSearchButton.BackgroundImage = handWritingSearchNormalBackground; // 載入設定檔,取得圖片路徑資訊 var configData = LoadConfigDataforWordCountSingers(); - // 取得「注音歌手圖片」的完整路徑 + // 取得「字數歌手圖片」的完整路徑 string imagePath = Path.Combine(Application.StartupPath, configData["ImagePaths"]["WordCountSingers"]); - // 在 PictureBox 中顯示對應的「注音歌手」圖片 + // 在 PictureBox 中顯示對應的「字數歌手」圖片 ShowImageOnPictureBoxWordCountSingers(Path.Combine(Application.StartupPath, imagePath)); // 設定不同搜尋模式的 UI 控件可見性 + SetZhuYinSingersAndButtonsVisibility(false); // 隱藏注音搜尋相關控件 SetEnglishSingersAndButtonsVisibility(false); // 隱藏英文字母搜尋相關控件 SetPinYinSingersAndButtonsVisibility(false); // 隱藏拼音搜尋相關控件 SetHandWritingForSingersAndButtonsVisibility(false); // 隱藏手寫搜尋相關控件 @@ -88,7 +89,7 @@ namespace DualScreenDemo //SetPictureBoxArtistSearchAndButtonsVisibility(false); // 隱藏其他搜尋模式的圖片框 SetWordCountSingersAndButtonsVisibility(true); // 顯示字數搜尋相關控件 ResetinputBox(); - // 顯示「注音歌手搜尋」的圖片框 + // 顯示「字數歌手搜尋」的圖片框 pictureBoxWordCountSingers.Visible = true; } @@ -535,6 +536,7 @@ namespace DualScreenDemo { // 隱藏 WordCount 歌手圖片框 pictureBoxWordCountSingers.Visible = false; + wordCountSearchButton.BackgroundImage = wordCountSearchNormalBackground; // 隱藏與 WordCount 歌手相關的所有按鈕 SetWordCountSingersAndButtonsVisibility(false);