From fc1283990013083e3fec12db2f0db8f263b45a95 Mon Sep 17 00:00:00 2001 From: Ruslan Molchanov Date: Sun, 29 Oct 2017 02:55:54 +0300 Subject: [PATCH] set an application icon --- CHANGELOG.md | 3 ++- .../ruslanys/vkmusic/ui/view/LoginFrame.java | 2 ++ .../ruslanys/vkmusic/ui/view/MainFrame.java | 2 ++ .../ruslanys/vkmusic/util/DesktopUtils.java | 22 ++++++++++++++++++ src/main/resources/images/icon.png | Bin 5530 -> 4948 bytes 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index becf8f5..03ac78b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ ## [Новое] ### Добавлено -- Установочные пакеты приложения для Windows, Unix, MacOS со встроенной JRE. +- Установочные пакеты приложения для Windows, Unix, MacOS со встроенной JRE. +- Установлена иконка (#14). ### Исправлено - Установлены минимальные размеры окон. diff --git a/src/main/java/me/ruslanys/vkmusic/ui/view/LoginFrame.java b/src/main/java/me/ruslanys/vkmusic/ui/view/LoginFrame.java index 811e804..5b0f74b 100644 --- a/src/main/java/me/ruslanys/vkmusic/ui/view/LoginFrame.java +++ b/src/main/java/me/ruslanys/vkmusic/ui/view/LoginFrame.java @@ -8,6 +8,7 @@ import javafx.scene.Scene; import javafx.scene.web.WebEngine; import javafx.scene.web.WebView; +import me.ruslanys.vkmusic.util.DesktopUtils; import org.springframework.stereotype.Component; import javax.swing.*; @@ -29,6 +30,7 @@ public class LoginFrame extends LoadingFrame implements ChangeListenerdwf*Ywa0&JP2SOw#l zB6J4m3Z+zAFt-H|0i{9!4ykITD!^O;pae=4GIJpy#{oL1MDm#UfVkW{dxaL{&73(? zIr;f?LrxoDme?6-SCgoL1R4mDeu|_QgCnibr36Jp*a4``q+IJs8S67&e(;DDy6mFa zIl$!PH^PdFDu0Fwt5KwQG#K5SwMgxOP>wL?l$4gPUG>UC<<8pU9nHc4;^R|;3tQ7j z1-XZnx(m!Lowlhy6mXV+Y(On;cZNSoOG~J9+NP%PYX^u+TF{L^QvmuMfGeH0#~T!I zl%f7*2)&k_GHt)p_B4baI)G4YV){^qB!ck^r>)V0T7LH1asZ*Y zq_n#P_$vc_oVLaa1hNGRGqdI}bUQ;3okN;ollUi==XY;eQ@#w4dkgcjo&2p$0=$O#+#1qD^f zLMdbvKYy3`a$>37`fYcB*u=D9%tji(*W0bzuTj`bjH#J(5_0WSYnua1PJScoTuIq1 z0{_V_oz0Ya#bsqr+O?o$ivz?a&cBh_wFtnCcIa#N2(}r_ld@+|-DR~Zwpzisqy>{0 z^aTQ)?>U5GE?op*tQGPvKV(^X1l_k{W$=V%Y>=WtjgWbl;%Vkl=E<|AyhXjqueDQ(f zI^}A0fY=#nSHqAs%(y|P+yGT5V5b4soy+G;$=4-Qn*-eS*n((Q_=Le-bjb`*A8Nm- z;D6y+bEh2CAx(<|#Lh^&8e*&qbiQ4v{gntFtYaiFJq;ZDM0$G|vL?{^cEZ;OEBBi5 zPrQDGX-Q@p-xHUGc$~TNr( z9UwMw{*4U!0?elFJpuHh1VyCKFKb@HZg1LobqkoB{6-kFYf+%{{SPLzfJ-eJHU00Q zUbXY);-cd6mk`+1^IHgfb7W}9^WL@bkg7-?`Ph520@#fx8Im=3+B#3J^=JeblYg8V zQ5D7&pgBM+>64S+2=nAxj~pPhM3MtBe9Z~&UQ|;47f-Hi@)i*HXlf54?6};ccbgju zs?y~OiphLw>b}OVYkCB5sd<6UZ+{ zY3T2bi~vFq<<*oTfd9dyo(H7CAAfp-4iJ}=c2{7d=MsSEwz#BM8%(`xzyX8=_^VYm z1+W>#$qkJH^*TURe*UGIqJ23+jQ-=2(tlpx-|BS$h9p{RQULprr25{iGc1gMJiV(J zYOnPM1+W`&8P{jM^oQ?izE@{{uiR=1`9;|Xa|F2R0WuK&Z(`43t1uYZQ2aHhBv z;up0$EWqu00Kii<-@54Asj9|>!)Rs&nW|~iG6G`;-H2ObqS5J!))zY28%oM5@ab3k z@OI87l$KRkV5O6&A5KIZ?VLMvrn~x`i$;LL)-)0jt(|{mR7udn9o z>i<_$Ug^f6qbG6dtmm0f9e>)k!i&@IM#~6~_COjWA}jlWc4&_zEr5rHUy54Z@uRdivB>1X#Cq59VjCgJCpXoi)hCP)gs}-G94VC$x+V!@1%z zuiHjn)fUfA8;gjr5K}gY0I6B)u;vS|f_xfCOkLzJrM)^sdDbso0uP zLl+#NsHkG7?h2ec_J5i$qx-ADz0sznXAx+{r4@MZ!!Pl~E7>S5ccw^ZkLV8Q5#2$X zJYSw;8i(72hldQl@T&Sh!fKReP00H9e@x2=4GF@85uS|#)qG!Y3d=tE%Cv4@h#h*f zR(ZP)9Mvih09g1!Ute$lQu<4^?LBl1JNB6$1xEDmfevk3d4JXB$|pN z6#Dk;Y))w{{%`%)TIB%%lw9a*2F@pUT2ysAW6f66GF&dkuSeeMRhu(Kr6@d8WLmd3 z#0}HCdj9$L@31>h{|Er4p0N+V+7USK03>Rlel1n({O$)W!`Q%^x+1z`Td&%jT?6Ih(v%2k{;m2vk1N9sBa} z^?vgOu79q+vJFP`_ic|sCxdV4j&7ax?47v{g?}tr3q#pAb0J0-CcxI(K8sdu)*@%p z$XgK^ZhpPpS0ckh@Y`SLdmdTx(H0y!dQzJ_Pf(C9Ty?0TeSCYc09$q)GA*ZNWEg%k z%Gw9Q#vbhM8$H0|J&LB-d*~Rl*P358_a3^I0e>=GY06s`eYjc6Q|^D=7K5H$^liM< zrlEO#udbai!pCjy+LTwi@yg^${=#BUUo6#(R+s@s8Fs$Fjr3!!2Dgtdyc2rcWAHNzR!XG9ML9eczOv$X~Y;hUpXLwY@!Ain|pi~Ih z@^d5VCF7$lxT9}(gom0R!l&Fl5QmSQ#($oJ1&9m}#q@iInqHf~@0SBmR^di?XfR@j z-mG;QdVWSOPM@=Kt-om$IFw=&Qw?V8PY!8_al`vy(nvj95hB2;b0ugM8D@I;w~`M( z--+~PpE+#?l!9{nTl!$#4iug#)*_3jYS{MY&Ocmm3U991=(HIZU_dz<{9aM%#(%px zo18SkHY(i){`T%CsHk)|eX$)d${Ea#XFsg_YA^PEf6Qq!Ea&~T+cd}dn}eas8Gy4- zBB;7|FMNN)rJIse z7Y+ab|GV-Flw5N8ct6thnk(?wwm98Nm&K<9I|Icln7gPZMb!z3jlf!{AF(f4X{PCmlTzh zW7mPB7}Te$?Ng`idynAh`OC5APyx;qm11{Z0lqz0fPpt(50?d7=r?u01}9FRL!J#Q zh9a_b*M=1zR^(Un1A>78cV{riGT;k z53wcjg&3a!)ybjC@M{MEfNgsY`FMK4a-2Br{4;Cr*1cHxzBRv_;2;+s|J_J*?hs{(dx zNcrPYpk}F9p&U!JX@4d!zYvf8&oXS+P=ClQIUBygdz#YSY7-F_g1eK4i7aU;KD-V?u zkgZjl4HTR_ix=Nmg=f=OVz1^ow7~PHytHMX;nT0oC%e?mpNzQkeJ78cZC~7sLA9U~2e2bo3o`Dm%C!A} z^1V)a0KY`Q%QNT3*V$jMe@8>1$rC37G%s9Sf1fsRgA$5MO5GedH}DccWaHA5gxdkC zGp}u6Pk)mH3Nx*?D}X%+^E35zKG5jd!9sC~X&Z^*f0Y>nc*FXobK(az=VCA&+*EJdSNX|1dGnXS)K}1kK5qmEds&DzAdui_6NM zR1j<8p8}XhAX_*h>S=G9wnZ#rPBieP^czXb>f`F9_~I z)%ks9(30f7e9n}75!Wz4=?!8JPzNQlFUUp1b#y+U$pHW$YwnbTl?WaTCD!Cf1pt7r zgWw*NF)Kk^E}Ygf7t7~N$)}LuA);_;S9^2-0X{ce6?f?Ri(rE558}u9$N~P#yy(agBb6DaFZSSnmYp7q743xFKheWVoTk% zta%B$i_6OfK-642^fh0U05aPZ5r1{N9i0!@Gy>ElF7egD#F7qhce{1_H)=OCPxU64 zLkG4Ot4+Tj!; z$U=~j*YgvYQwd}-?9H1JZaY^Yv2P6r=Sf{Nqj}iedcQH~jX2q}fmyWN-4;|n~ z;vS!W9o()5h}7=^wzhb#Zj{Og@j?<>SYKrhf5EREpqlvj)ZpW-WH=MPMYcin5rn_(bFnpXAP*>3{bJA2kaHsL815e-8~04;jqDqo8E8(~(FD*vX=DK$OD~ zQJ>Zy33OLKa4iVWzjL%rPH|XA;wVP(| z0Cf?HOMJaE!H6M77X|48(6yvgJ0Y|qLOTHA3LFZBs#2nia)v60LNbXE3Q2H6F&$^2 rg914~LU|m7Z!%`ZfA4P(ac22{itfn-S1CCA00000NkvXXu0mjfCuMTn delta 5507 zcmV-}6@2Q{CYmddNPiVPNklcYIW3*2jP6xl>XJq6k=kEC}eL?5+jti^@VE z1YFk_D`im--B$&{;P!c=@4Bnhpo<@sU4^W=fIUDGdJ#-iumDO2D^0+V%w)>F&w2lt zB&1EI+GtWKeOwO67Kj$HwX1H7~QQ^+cwz0SbKz}w9bp@d_f!j0q9D-;E z$TUddkbnaK1mK5|en5Dn#8DymD1(lG@ihbc6rz1np)am*?%ZEcP#~@ShQ>lx8=#k4 zCcS>4rfAm!@;YX|l1N+%Al(dIl4UgkTS4MOA+aH#U}NbsBfm96SG+jo0-&Gk<&?~7 z`%MsXuw)u62!GuzHAu=`EJO)2m$=ilHERpTcrCRjN=}IY817o=@OXTKh;h4Q3=;yG zR@>Av@&vPZR}d{sNpmb)RB*fBYKy{=&;c-b(!3r*5#vZ=Gz8jPZBH~XaF~Es7-H^{ zsrT%%+MZA(U;r=;ol^8mmNXfJ9ILG{h*AL47Ec|q3V$HB+L(qUOaQoCF0sko?N&+j z7Xe&mwLRv*p8_aYJay!|i4q725CBZMlmDG71pgmEKeO7J_`sVa<4;ScjViU;5=#SM z=#*D}Dy1@$2m`FN!$L|W$w^C}8U3YI23QgR118T;cMv_vBp(qFiWN2_3{t8r#4Jkl zxE2?T_kYA&ecS^e@3EqR%y@wWy2e{~Lc?+|NZh}8>d2MxR2#Pd$aB4r22a{F01w7X z=cxz-v#Zn8$Ky4j6qf)P^7#BdEb$)!>J<-trvY18@?A@&kJ@UsB4M_Iy!?41Nu~0n z^P{3SgDQqho`0v=icG5k`nguyGCkkS0O(<}bbp))NbrpG{V7uxExKJZL%t~iFf4y= zrUu6X0u44p{+WgZiUX4GT0VW0+i2N_2SComqE2=@FFkW6b>f4Ra zAb;=id7Y&y)(e5oM#xLjIxMkYQ*eV3HG%FLAZKDxC#i{*N$1B8BJPSB_x54=MLl)P z((~}J{JEJDj&;cnU;JQ}P<J~+fCB28XBc*5KnvB-|P4>08M`F%*GatNfvqA*Ex)cx{9I=?|tMR5)( zDZH;F8u?KLK%VP`H0ep*lw8<}4=g2Azo)*<509u3XQy{8Ef{$sQXNq>0qjnlntybD zd|;_X>3jf?seIfM)rOLYw`1i!Ry2@^W=A7DNo=sx5b)Iih+*R}^Lah5z4h3x^7lTB zqy&&HXQq$w;lX#N_LgmXsszPD8E`LOtd zP(?!404|qH1dnSaF$-DS+mCLj7p)TQ34lX3^&table^ok$%P*CV5vg&8-HKzH`7C$ zK4{`U{}Sr+5COm>i9$Y1f(?XXDT%d+WZhmf@VV?z4X}$zPk4s?IrVge1qr|c7CeUj(>Y{`e5Ld-Qcjt zHhEd;_TtUe+wk7|J9OK_3FLeL5DbOw>G=Ta=XV+f05NVi`mk75Mhb@A&3*DY=!}xb{n1?cQd+QaJD{s(^GJ7-sSlA z$O&xTaUdocXJ@71!GBvWN9PW0fV!of2H&Bzufxo!bo)@TWj_|K{M`6SB2^uY1_4m- zg?_G=Q_|hyh#-++q`v&Sug7(l#eQVq)n%Vy(W-4>%bj;lCLX%2FM4!72R23jfu~iQ z_hI(JkTa+uAtKC~oQpQ8F>lnZXU8{3@u%mb+Tj%e%Bh3-@Gg4KN zd$n;#BM%*`GJi}~V`zBYtNH+tY|bA44O_m((Mo;EuX6f!hus!=r;Zu;ciCqV^&LVX zD7uLRw13+$c?}_w&H)o%{25Ri0Kt6w z=CSOfJ#c#ix@6qi?-CG2H$*vbtU6|W?wZIFeM>dy{Pt}#(6v+BnDsSf>4xpPYOru9 zzzCqe36R&BrwZ_R11KrqsY}L%9kOuM#pg%$%rPBJPjyZBfR$` zBBI8p;(yh$&4$Pd1w-Bl)CK@E8&`LQp!oeA@T>ar9NpQ!H=?Nosyx2%g+k!*wH^Rk z1LwERNI~zPoEx*QrW7uC-_&0}0I()|0Dy40T%z`x6;r9K_F`FuzBVoU{C2qdrx!+C z-lL=0QMJ&)s;Pcxfs=V0AGza(nDsPe+rGotw0}Jwx6p6~z$7Z%+1W7Zj-95wv+hf% zn!Y=iM&$H~c%sK2h`q)M)!zs@|76Y5pLGnuS~H-xevd5ji|j{ zD=z#{>A`ZHlQieIZ-bl&=LIx_>(Qpp2Y|;$+-QhwBEqy+*Xjz|Xkmr>3jo=1(+J?r zHGkW5*8+DAxD1(T&amZ_C`S#g(US8o?{xvXb~I+TZvChGuzAOKhRBK(mVw@aiMqy9 z=?_18P^z;pkeTMdh(UeAmb2@ehOR?Xea)Ot1Wdf+dPC$NJ5ht#3*R?HRy0T{vIQvq z$(`O@y)CMVmX^r5syljhZGGiB)v140E`RvTZ$2mR$Q}QM6sP_Q*c%UtB9e6?DI$26Zv1h316Z(9e>(hO*Y`r7?j2kF?7XvMyI(Tk_oGXPmY;q4p&^F! zEe;)XW6qn=?>8_K2HOQ7)2uR}w0sx7|3Uwf=cK!?#kprS-pY{bv?Kexv!a&e_xs@w z1d!^qL5Rkqi2Qr{q0`y=w@hf7#DDMSEY&SXFT^ASq|nz;>Oj>bUS6Vq&O0kT1y7E< z8RxfeQ~zH7%d?~28RYl-5eS@|JsdOis`}TXbFaWvQOrVyf{5_UtLt<(e+EI6JGn>` z!u*> z0f@NYR@oB%fQC75Haom(8h^exIv)tm_$3-lB!!eXYPBJCY}tDlWgnWe53V6TpATvr zoeuzZMd0e*`ezS~L;wLH1Sd=Y0KmMZpWyIu!!O6G#|r1yG4amp(XNeU(=N?mC^dpX zN31raAs%l4g^SGTELrJ%08j*>aMCce&5V7D+DHhf7GUT*xnTm^_J1D2+v|)S63 zI#L`qJonhIn$28V0TB)e2J{`FF^SifeU9DV8q+%YyxxRxejQG`g4vUAL6?rvPgNTU zk=QE~qJ#_pRg;+d+J=bt=ZC`Q^|rdf(<&4}c>1AS^z3ZiX?y~06H*~-W?&-V(6MSv ze|v#B&%q)=9fE1Wy`OO~-8p)r}wI}gOPVB}43=hqT2+?ll1cTsreN6{4V^KoVg3J@tAh-mo2uH$=XJ$m{h&GsyXxWW2Rz8(t~djDyF_ z8J-dW1@{lcg&mALS{4o#q6#2Z0HDWpw_Qd+-?(XyflqcFM1O~N8OZL`ddJB~=MxeB z{L(V4*|Z0{zCMDIjoV=p0vBf+cM7NuL4=#H?2Z*5?S{{9euq^E+t%F`#V-l~5E2_q z*QgU_#!4_ZFfzIgpMytO8L+L~BslkUWy?;T)@ z?1uPBDFSL!#qQql_K6C3PbCqCVE5JxLL_(jk2AOyi%Qv*%vJ8aStvtC~x zQtsA02hr)AEOhB;e7k+_S?M_8_F<1f^B_%O7QPj;$A3KnG{_LbLKvNm$W)epv zl;QY~Ri-#!lN|Q!!t4d>@#TJVX41#xU4aybaoI*1LdwZb|H%MgKBWSHnXz-R#6efID4V14!e)iAkvb z8c0n;m4C;FDbFs(Gq0{grQ5i@E&d44FERs@3X4ry!Td$f=n`T?2D7xK%&GgUJ^;L+ef7@l)UHO_yFG>Ha4h8QD*I_C|+0pcf${d zyB0b;9^W?v7(dgY7v|uddNFqRdUS4&%X^)V>`v`)cH4BMr#RrSE45>8f|L?|Rl}iU z)qi+n<>%P4C$==PKrmVLt^F>=FD^bGS!qrX5eUsw#5Vke69}N-*7h&<9l~qNK0%e+ z*s}vHNme;M8Rau4*B?e~7N>dnMNb2mVyI@_aPV@aR(|j3jspj9n6%MU$oh(djsp8&q?PS0fF3Q&pnU{P_uDmh#G(x zK!M42g&^sCqY;X2T1(CcTD?7-DKEe1BY-Y9%dln|Swi*IB%N;{M54Ov+3{^c1%E&* z$8m`z<4b8 zd`WVWgo%Uj+G;=PeB&Wu9~rJp*Z^4i%;+x(Vx}=BHHMktPgeV;KtkD2HtW6>;mSpn zl7rGbF0kCI->j3clu&(cAnAM)Ab-D>iXoAdj3@vW7mW9S#Qpk=Y5+4-e~n4Yok_@M zpR(fV@ewT}Mzv@;B)_PTfJb68D@bst=Se!>EQHv!Z1w|JL|i-?+0|+4`iaIab zlIf$iDgtApd4{Eg>Q9dI%|s~n8D+D^E{XQJn6B8~x$*6-7hU`7EFxSJt}IIp0e^Cw zZze>xin7`F-yX}eF=u8>`^uRwf#TN61b_KS=bH%$@qHH`$9!v5%mJ`y(d}A#n)7Zc zWs7IGB?qhhWQWf@NGR26T7TfO7hfD7bEZq(rx1t!{>sCzG2?VAs?@Clo( zPg&tuT{my&PR?8Wx4RFig#IkC9|$@>Ik#^v1X6_^*XngXU_bx>K6Xsn^()}?p5+^0*X#feO8l+rdM77@#!xQwcC>;G|M!Sq`7Ro`RWuK{#5Z|k5 z{;ozlA21;R0O0L{QHQg==uATS*bMn+5=6F&E?(-o^6w9uk}bmYWHf^wd9hGRRo4pQ znF+IEb4)9lHO|yydVl6;BLXmJ;=hKn=3U5)lz8Yn^$|6SV!y4V@IKR%cElwB0N|Dh zFSo6Me-$+C=kd~cDndf}*y&Vmj&@ZqW_|Hc(vZOu=1$V2|Lp~`+sH_E@0x|B0Z>QoqjU2$f564W=~mkk4~RrHDYk;rSz|3fg`E%q5QHgb z;y?cvYG5+s^b7<7xrJhzR#G^&)#F<6B!L2;4yJ*R{%ZmS0>5KOYZB=j41o?op{L3U z$3L4Wj;|vD1ApKoxsT4hiBTs!{ zH<5H&X%DmTk%Fy6Vu7@!%xRc}@l@cH3xK8!eCYW;ihQDsV8+c-suuyAVOkAA%pj#o zkg|&itNf%Ct(xh%{5h{{goT