From 32dfd8950d051869a4c0cd79f0835a647acaa208 Mon Sep 17 00:00:00 2001 From: Zhong Yang Date: Fri, 17 Jul 2020 23:20:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MusicPlayer2/CommonData.h | 2 ++ MusicPlayer2/MusicPlayer2.cpp | 4 ++++ MusicPlayer2/MusicPlayer2.rc | Bin 431766 -> 432080 bytes MusicPlayer2/MusicPlayer2.vcxproj | 2 ++ MusicPlayer2/MusicPlayer2.vcxproj.filters | 6 ++++++ MusicPlayer2/res/media_lib.ico | Bin 19278 -> 19278 bytes MusicPlayer2/res/media_lib_d.ico | Bin 19278 -> 19278 bytes MusicPlayer2/res/pause_dark.ico | Bin 22918 -> 36230 bytes MusicPlayer2/res/pause_white.ico | Bin 36230 -> 36230 bytes MusicPlayer2/res/playlist_dock_d.ico | Bin 0 -> 9622 bytes MusicPlayer2/res/playlist_float_d.ico | Bin 0 -> 9622 bytes MusicPlayer2/resource.h | Bin 112834 -> 113014 bytes 12 files changed, 14 insertions(+) create mode 100644 MusicPlayer2/res/playlist_dock_d.ico create mode 100644 MusicPlayer2/res/playlist_float_d.ico diff --git a/MusicPlayer2/CommonData.h b/MusicPlayer2/CommonData.h index 64de5e0a..787f1d8c 100644 --- a/MusicPlayer2/CommonData.h +++ b/MusicPlayer2/CommonData.h @@ -419,6 +419,8 @@ struct IconSet HICON help; HICON ff_new; HICON rew_new; + HICON playlist_dock; + HICON playlist_float; }; diff --git a/MusicPlayer2/MusicPlayer2.cpp b/MusicPlayer2/MusicPlayer2.cpp index 08e0d3dc..84099817 100644 --- a/MusicPlayer2/MusicPlayer2.cpp +++ b/MusicPlayer2/MusicPlayer2.cpp @@ -523,6 +523,8 @@ void CMusicPlayerApp::LoadIconResource() m_icon_set.help = CDrawCommon::LoadIconResource(IDI_HELP_D, DPI(16), DPI(16)); m_icon_set.ff_new = CDrawCommon::LoadIconResource(IDI_FF_NEW_D, DPI(16), DPI(16)); m_icon_set.rew_new = CDrawCommon::LoadIconResource(IDI_REW_NEW_D, DPI(16), DPI(16)); + m_icon_set.playlist_dock = CDrawCommon::LoadIconResource(IDI_PLAYLIST_DOCK_D, DPI(16), DPI(16)); + m_icon_set.playlist_float = CDrawCommon::LoadIconResource(IDI_PLAYLIST_FLOAT_D, DPI(16), DPI(16)); } void CMusicPlayerApp::InitMenuResourse() @@ -581,6 +583,8 @@ void CMusicPlayerApp::InitMenuResourse() CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_DOWNLOAD_LYRIC, FALSE, m_icon_set.download); CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_LYRIC_BATCH_DOWNLOAD, FALSE, m_icon_set.download1); //视图 + CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_SHOW_PLAYLIST, FALSE, m_icon_set.playlist_dock); + CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_FLOAT_PLAYLIST, FALSE, m_icon_set.playlist_float); CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_SHOW_MENU_BAR, FALSE, m_icon_set.menu.GetIcon(true)); CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_MINI_MODE, FALSE, m_icon_set.mini.GetIcon(true)); CMenuIcon::AddIconToMenuItem(m_menu_set.m_main_menu.GetSafeHmenu(), ID_FULL_SCREEN, FALSE, m_icon_set.full_screen1.GetIcon(true)); diff --git a/MusicPlayer2/MusicPlayer2.rc b/MusicPlayer2/MusicPlayer2.rc index e74d03af9df16c30c77205b3e909c9aa9d2f15a7..9e701ce076e04ff38aa4e81c7d2fa1a91cf85e9a 100644 GIT binary patch delta 126 zcmbQXR_elfsSR)JCI^@bOzx54;&fy1Ven^gWC)oYuje^=k12<64nrnGF+&MMJVP2o z4nsaeB16gKKr3~iY93C124@Cupp47pjmDmn_nESBBUGnMzNjVJ{Kl^RjU6KpGXXI( P5VHU=>-INxY^%ZngzPA# delta 48 ycmcbxUTWG}sSR)Jrtew6v|;)^f99}e9mjSZM@ArK0%B$$W&vW>?K+NZOTqy0wGny% diff --git a/MusicPlayer2/MusicPlayer2.vcxproj b/MusicPlayer2/MusicPlayer2.vcxproj index 951f4308..25274d62 100644 --- a/MusicPlayer2/MusicPlayer2.vcxproj +++ b/MusicPlayer2/MusicPlayer2.vcxproj @@ -485,6 +485,8 @@ + + diff --git a/MusicPlayer2/MusicPlayer2.vcxproj.filters b/MusicPlayer2/MusicPlayer2.vcxproj.filters index 91dddebe..6298db8b 100644 --- a/MusicPlayer2/MusicPlayer2.vcxproj.filters +++ b/MusicPlayer2/MusicPlayer2.vcxproj.filters @@ -1285,5 +1285,11 @@ 资源文件\Icons + + 资源文件\Icons + + + 资源文件\Icons + \ No newline at end of file diff --git a/MusicPlayer2/res/media_lib.ico b/MusicPlayer2/res/media_lib.ico index 7ae3f9868d4b8cb1bc4676a088731494ef171d3e..74b992a93873fa52dd08020f9aa2dbffb792af7b 100644 GIT binary patch delta 666 zcmX>%jq%(xMsEfNMg~>}0Ra%Lz>vYhz!1j3z#t+5;qPE$VAux~laPS$J2)8_%D5RA z6cix*6+nIefNBj4fc%Nx)e{>WWd8sE{||^!0MJMr1r0SogBF@__l!5g)V|0Xwbby$G{7=#ZtGcerUjldv2e!0y%Sf;rF E0M6XQM*si- delta 1048 zcmX>%jq%(xMsEfNMg~>}0RaXeP+-VlVPFUYvP486{2goz4Eum$5)u%82PXqV88=X+ z0))Q;sP7+8t$_iMKhe9o{{R2~MnD{jgpEK-K>(i|lKcyxx>ZQ{Igo7()r(aQY&gXH zdXUAdU;L59H`gjEiv9;yzj8hmmH{q_1 z02xGy{(7ipbRUoshm=HNJ;?Qx7(k(ZVEE$*0pjD3k|>y1WpDNWKLf+TW(I}^Mh1pC SmIw^ugT!&mZQj8$%?$uY9TS59 diff --git a/MusicPlayer2/res/media_lib_d.ico b/MusicPlayer2/res/media_lib_d.ico index 81d4535828913a5b30000785b7b6ef431dd00f68..61e27621c312e6e1c4c950fb85bcae7172196829 100644 GIT binary patch delta 777 zcmX>%jq%(xMsEfNMg~>}0Ra%Lz>vYhz!1j3z#t+5;qPE$VAux~laPS$J2)8_%D5RA z6cix*6+nIefNBj4fc%Nx)e{>W>htpQ{sHlSWDGPC43Nd3?0+yh7!4AKu|YI4ADN9V z2h~%Lq5)kI5e87G-w@(rkVVKC>N>FD$l^fuWJX=x$rHFzKp}^s2gJvt4=#tS2F3=_ v==yQVLB$6;BCMoSqZsh8)`VR~U5I)$nNndSxn?-IXT delta 1048 zcmX>%jq%(xMsEfNMg~>}0RaXeP+-VlVPFUYvP486{2goz4Eum$5)u%82PXqV88=X+ z0))Q;sP7+8t$_iMKhe9ozM!DM2#76X+4VLcpbx-|G2O zE;?OSmG31nSOab6uYT|K*EPwXag1s0O1su>-)=H*+Ka2LJ#VeuxwBq>yw=(msolG` zUcbHG+M64#Z8q!md-2`8+uFm2C)f8|`ygYxU9TTJZtdxl)*eWvNM(n$F4LuX92^|% zM%Yc@Geoz+I4UeC0% zn(D`Srk&MBpI*sp`o|UW*ce0e`rKcKZDed^)cXh0gnC@+4#@rHxDW3TQJt4F zu1juz&1=3UR(({b`sf_Zjq0NNsxF!v)oE^Yj^;*n(S21H&5i0bH#$diqq^w6s*C1E zb($NUqq$LCbYIm)bE7)Vjn2{Bs4lv%>Y}+(o#sa8Xl_&&-B)$d+^9}-qjNMjs*CQc zx@c}xr@7HNnj6(c_f=gqH>%Uz=p4Z1FqE}9$FX>N3m=0zxEcNv{>t*R> z@BMpsea>bg-t1nM9$`Sd7EiX0Fd*J6r=>?25U<6Pts@MGH_K`15eCF-@nq`=1LDnc zT6%;5@mf6DI>LZ>vz(S5VL-eVPqvOQAl@verAHVLuf>zCBMgW)%W3Hm2E=ReWa|h6 z;>~hedV~S-T0Gf0!hm?QoR%J8K)e=DwvI3$-Ylo3M;H*V#gnZg42U<&Y3UIL#B1?n z>j(ql&2n0LgaPqdJlQ(JfOxZNrntcCXS`2dV?rf$G5N4y->q)PJW+eQNo24paxK1J!}*Ky{!xa3&p)_igt7?^|bd6V1^X z%{yzqaQ^<;)&4QMA3G1_@%(IFcAm$NuCsaBdFc5(Kbx1G=kcTKY+iOAdOpw3=4I!3 z{OCHHmz{^6&-1f+*?As6y3Xch=b`8G{A^x!p2v@_vw7Kh==nT9o0pyE@uTZ(UUnXO zKF`nQW#@VP=sKI1orj*!^Rs!`c^*Hy&gNz3q384bY+iPr$B(YFdD(gB`8+?Hm!0SF zqw8#5b{={@&(G#%=Xw0-I-8fBhn~;#vw7Kh9zVLy=4I!h=kxq*UUr_xkFK+M*?H*s zJU^S4o#*kR>ug?j9(q2{&*o+4dHm=)o0px3p3n2MdD(d$Kf2E5W#^&i^ZaaHcAm$N zuCsaBdFc5(Kbx1G=kcTKY+iOAdOpw3=4I!3{OCHHmz{^6&-1f+*?As6y3Xch=b`8G z{A^x!p2v@_vw7Kh==sWD9jFde2dV?rf$BhYpgM55JFx$C0n|T^mgQCttodyEKz*{7 EU)Q$7AOHXW literal 22918 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 a8vlPr0N)B~VRmw6Kc2S48%A7Z;u}U literal 0 HcmV?d00001 diff --git a/MusicPlayer2/res/playlist_float_d.ico b/MusicPlayer2/res/playlist_float_d.ico new file mode 100644 index 0000000000000000000000000000000000000000..3d7116ae0ca81ee59afd4c2e234b01e0acc3c07e GIT binary patch literal 9622 zcmeHLy>1gh5Z)*e5u!+n6rmy|rQaZ~cn()UQKHEpTT6nmg!kxdxG* zGxTVpxbM#y?|H%b9RP)bzSkqw!DkHI*OBIg-$0S-yz{!gQLAy}2Yv)Z1tqQ1&}ucV z){@@@xK40`c}eRuFdqZOGO0f_j+VfaUs=nRL2_EH#!<1X)i|wI+;%_k?82SA04ODpS~m2r-;b6<-hVt zj<@s2W?+vS`_SzV??4p~ZGY&V6ByGTG)Yzr`5g8R;6DQ~ f%Ci^=lL=vdTw$@8OxmG5TPz4M66VJhM6>uG$6|9C literal 0 HcmV?d00001 diff --git a/MusicPlayer2/resource.h b/MusicPlayer2/resource.h index 4f08571bdf6ac4079c9bf328320bc75dfee8d3ae..663b2903d0d885073e1694abe51941656617c0e4 100644 GIT binary patch delta 118 zcmX@~k?q?jwhd}~CpYZfFuB2lXY#x-E_OEt9|nI0$I0?O@{<+zvrO;U&L}qd0TajM zoH;y`9rk%mzF@+`XgEEwo>3npKY7bvDX3l^R(}R(2Jgv=5S?Hd2LZOt6ZZZ1G5OR! MvF-D=GpaBG0NLIyw*UYD delta 58 zcmV-A0LB0I@&>~32Cyc*lh7Inm(o1}Fq0s^1d|B8&XX{{T9ZH!29ut@60=sn=J=Dm Qy%v|SxB(cqYPbOm0W}>OzyJUM