diff --git a/MusicPlayer2/MusicPlayer2.rc b/MusicPlayer2/MusicPlayer2.rc index 08098d4d..b3a34a0c 100644 Binary files a/MusicPlayer2/MusicPlayer2.rc and b/MusicPlayer2/MusicPlayer2.rc differ diff --git a/MusicPlayer2/MusicPlayerDlg.cpp b/MusicPlayer2/MusicPlayerDlg.cpp index 6ce85fba..7c7bc099 100644 --- a/MusicPlayer2/MusicPlayerDlg.cpp +++ b/MusicPlayer2/MusicPlayerDlg.cpp @@ -321,7 +321,7 @@ void CMusicPlayerDlg::LoadConfig() theApp.m_app_setting_data.theme_color_follow_system = ini.GetBool(_T("config"), _T("theme_color_follow_system"), 1); m_display_format = static_cast(ini.GetInt(_T("config"), _T("playlist_display_format"), 2)); theApp.m_play_setting_data.show_lyric_in_cortana = ini.GetBool(_T("config"), _T("show_lyric_in_cortana"), 0); - theApp.m_play_setting_data.save_lyric_in_offset = ini.GetBool(_T("config"), _T("save_lyric_in_offset"), 1); + theApp.m_play_setting_data.save_lyric_in_offset = ini.GetBool(_T("config"), _T("save_lyric_in_offset"), 0); theApp.m_app_setting_data.lyric_font_name = ini.GetString(L"config", L"font", L"微软雅黑"); theApp.m_app_setting_data.lyric_font_size = ini.GetInt(L"config", L"font_size", 10); theApp.m_app_setting_data.lyric_line_space = ini.GetInt(L"config", L"lyric_line_space", 2); diff --git a/MusicPlayer2/PlaySettingsDlg.cpp b/MusicPlayer2/PlaySettingsDlg.cpp index dc442800..2da9fc96 100644 --- a/MusicPlayer2/PlaySettingsDlg.cpp +++ b/MusicPlayer2/PlaySettingsDlg.cpp @@ -43,8 +43,8 @@ BEGIN_MESSAGE_MAP(CPlaySettingsDlg, CDialogEx) ON_BN_CLICKED(IDC_SHOW_TASKBAR_PROGRESS, &CPlaySettingsDlg::OnBnClickedShowTaskbarProgress) ON_BN_CLICKED(IDC_LYRIC_FUZZY_MATCH, &CPlaySettingsDlg::OnBnClickedLyricFuzzyMatch) ON_BN_CLICKED(IDC_SHOW_LYRIC_IN_CORTANA, &CPlaySettingsDlg::OnBnClickedShowLyricInCortana) - ON_BN_CLICKED(IDC_SAVE_IN_OFFSET_TAG, &CPlaySettingsDlg::OnBnClickedSaveInOffsetTag) - ON_BN_CLICKED(IDC_SAVE_IN_TIME_TAG, &CPlaySettingsDlg::OnBnClickedSaveInTimeTag) + //ON_BN_CLICKED(IDC_SAVE_IN_OFFSET_TAG, &CPlaySettingsDlg::OnBnClickedSaveInOffsetTag) + //ON_BN_CLICKED(IDC_SAVE_IN_TIME_TAG, &CPlaySettingsDlg::OnBnClickedSaveInTimeTag) ON_BN_CLICKED(IDC_LYRIC_DOUBLE_LINE_CHECK, &CPlaySettingsDlg::OnBnClickedLyricDoubleLineCheck) ON_CBN_SELCHANGE(IDC_CORTANA_COLOR_COMBO, &CPlaySettingsDlg::OnCbnSelchangeCortanaColorCombo) ON_BN_CLICKED(IDC_SHOW_ALBUM_COVER_IN_CORTANA, &CPlaySettingsDlg::OnBnClickedShowAlbumCoverInCortana) @@ -84,10 +84,10 @@ BOOL CPlaySettingsDlg::OnInitDialog() m_show_taskbar_progress_check.SetCheck(FALSE); m_show_taskbar_progress_check.EnableWindow(FALSE); #endif - if(m_data.save_lyric_in_offset) - ((CButton*)GetDlgItem(IDC_SAVE_IN_OFFSET_TAG))->SetCheck(TRUE); - else - ((CButton*)GetDlgItem(IDC_SAVE_IN_TIME_TAG))->SetCheck(TRUE); + //if(m_data.save_lyric_in_offset) + // ((CButton*)GetDlgItem(IDC_SAVE_IN_OFFSET_TAG))->SetCheck(TRUE); + //else + // ((CButton*)GetDlgItem(IDC_SAVE_IN_TIME_TAG))->SetCheck(TRUE); SetCortanaControlEnable(m_data.show_lyric_in_cortana); @@ -96,8 +96,8 @@ BOOL CPlaySettingsDlg::OnInitDialog() m_tool_tip.Create(this); m_tool_tip.SetMaxTipWidth(300); m_tool_tip.AddTool(&m_lyric_fuzzy_match_check, _T("如果去掉此复选框的勾选,则只会匹配和歌曲文件名完全一样的歌词文件;\r\n如果选中此复选框,当找不到文件名完全一样的歌词文件时,会匹配文件名中包含艺术家和歌曲标题的歌词文件。\r\n(可能需要重新启动程序才能生效。)")); - m_tool_tip.AddTool(GetDlgItem(IDC_SAVE_IN_OFFSET_TAG), _T("将歌词偏移保存到offset标签中,选择此项会使得修改的时间偏移很容易恢复,但是并非所有的播放器都支持offset标签。")); - m_tool_tip.AddTool(GetDlgItem(IDC_SAVE_IN_TIME_TAG), _T("将歌词偏移保存到每个时间标签中,选择此项会使得修改的时间偏移不那么容易恢复,但是对其他播放器的兼容性很好。")); + //m_tool_tip.AddTool(GetDlgItem(IDC_SAVE_IN_OFFSET_TAG), _T("将歌词偏移保存到offset标签中,选择此项会使得修改的时间偏移很容易恢复,但是并非所有的播放器都支持offset标签。")); + //m_tool_tip.AddTool(GetDlgItem(IDC_SAVE_IN_TIME_TAG), _T("将歌词偏移保存到每个时间标签中,选择此项会使得修改的时间偏移不那么容易恢复,但是对其他播放器的兼容性很好。")); m_tool_tip.AddTool(GetDlgItem(IDC_LYRIC_PATH_EDIT), _T("说明:如果歌曲所在目录下找不到匹配的歌词文件,就会在此文件夹下寻找歌词文件。")); m_tool_tip.AddTool(GetDlgItem(IDC_SHOW_LYRIC_IN_CORTANA), _T("勾选项后,可以在 Cortana 搜索框中显示歌词、歌曲名称和专辑封面。开启此功能后可能需要重新启动软件才能生效。")); @@ -203,18 +203,18 @@ void CPlaySettingsDlg::OnBnClickedShowLyricInCortana() } -void CPlaySettingsDlg::OnBnClickedSaveInOffsetTag() -{ - // TODO: 在此添加控件通知处理程序代码 - m_data.save_lyric_in_offset = true; -} +//void CPlaySettingsDlg::OnBnClickedSaveInOffsetTag() +//{ +// // TODO: 在此添加控件通知处理程序代码 +// m_data.save_lyric_in_offset = true; +//} -void CPlaySettingsDlg::OnBnClickedSaveInTimeTag() -{ - // TODO: 在此添加控件通知处理程序代码 - m_data.save_lyric_in_offset = false; -} +//void CPlaySettingsDlg::OnBnClickedSaveInTimeTag() +//{ +// // TODO: 在此添加控件通知处理程序代码 +// m_data.save_lyric_in_offset = false; +//} void CPlaySettingsDlg::OnBnClickedLyricDoubleLineCheck() diff --git a/MusicPlayer2/PlaySettingsDlg.h b/MusicPlayer2/PlaySettingsDlg.h index 64b7423a..de5c0262 100644 --- a/MusicPlayer2/PlaySettingsDlg.h +++ b/MusicPlayer2/PlaySettingsDlg.h @@ -48,8 +48,8 @@ public: virtual BOOL PreTranslateMessage(MSG* pMsg); CButton m_show_lyric_in_cortana_check; afx_msg void OnBnClickedShowLyricInCortana(); - afx_msg void OnBnClickedSaveInOffsetTag(); - afx_msg void OnBnClickedSaveInTimeTag(); + //afx_msg void OnBnClickedSaveInOffsetTag(); + //afx_msg void OnBnClickedSaveInTimeTag(); afx_msg void OnBnClickedLyricDoubleLineCheck(); afx_msg void OnCbnSelchangeCortanaColorCombo(); afx_msg void OnBnClickedShowAlbumCoverInCortana();