From 0c4d9feafa7b42f5b8a0d59cd3bbe33ddb68eaa4 Mon Sep 17 00:00:00 2001 From: Zhong Yang Date: Mon, 23 Jul 2018 22:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=89=E9=A1=B9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E2=80=9C=E6=AD=8C=E8=AF=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E2=80=9D=E7=9A=84=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=94=B9=E4=B8=BA=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=AF=8F=E4=B8=AA=E6=97=B6=E9=97=B4=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MusicPlayer2/MusicPlayer2.rc | Bin 101170 -> 100630 bytes MusicPlayer2/MusicPlayerDlg.cpp | 2 +- MusicPlayer2/PlaySettingsDlg.cpp | 36 +++++++++++++++---------------- MusicPlayer2/PlaySettingsDlg.h | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/MusicPlayer2/MusicPlayer2.rc b/MusicPlayer2/MusicPlayer2.rc index 08098d4d830a358354c1f10ab26a42383dcf7750..b3a34a0ce2aec5499be1c524ca338750e7143b23 100644 GIT binary patch delta 250 zcmdlqjcwW_whc|zlbK`;CU3Hy#b`d+*XAj!IfD*^<>Wvc(aCX!N|U@M7E6#VlUF!zVzitb>++P{ zfWZ PXxNiEYy~whc|zlP4`Un7qk)7Ngl@Uz?|_W(+zEmXiZ*L??fkq%=9tR)gONC}ISJ z=0Mtv!Dw=!i~i&*w$m7mCTH7S1(J^T_Uw24BcgYv@=sodKOL{22%zTpn8+Z z`m;^7*kXLL&vyF<{H_G4(+JOJNCU!RhE#?U2KJ1)YF$4K1~mqM22F;^22;f(JsJEM z;(=T@APi=3We5TCLKqww+$V1|R-QcJj1;dS&}dTzV<2e=v?B4Wxf;3^=d-o^zNLPd ziZDI|YP=}K_z(t924A4z*o-yUg2QGY|dah`L08$pe0xhEEG)`%)y~J$#E06 zA%g+fTp$g!&3tl;(=uj|NxIItK-ysPZ0AA{y_wg=oe`+m0&11fWI+?t$r6rylNY%z QW3+7cbldLf#(35V0Hu?GK>z>% 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();