From 180b7917a39e013e803f10c71d7358cad7e465c9 Mon Sep 17 00:00:00 2001 From: Agampreet Singh <68941022+agam778@users.noreply.github.com> Date: Sun, 20 Mar 2022 18:50:58 +0530 Subject: [PATCH] Update to v0.5.2 Changelog: - Move icons to /assets/icons folder - Mentioned Microsoft in README.md and About Me's copyright text. - Set overlay icon when download is started, finished and successful accordingly. --- README.md | 4 +- assets/icons/download-fail.png | Bin 0 -> 4092 bytes assets/icons/download-success.png | Bin 0 -> 3681 bytes assets/icons/download.png | Bin 0 -> 3102 bytes icon.icns => assets/icons/icon.icns | Bin icon.ico => assets/icons/icon.ico | Bin icon.png => assets/icons/icon.png | Bin build.sh | 9 +-- MSlogo.svg => docs/loading/MSlogo.svg | 0 docs/loading/index.html | 4 +- icon2.png | Bin 24688 -> 0 bytes main.js | 75 +++++++++++++++++------- package.json | 13 ++--- yarn.lock | 79 ++++++-------------------- 14 files changed, 87 insertions(+), 97 deletions(-) create mode 100644 assets/icons/download-fail.png create mode 100644 assets/icons/download-success.png create mode 100644 assets/icons/download.png rename icon.icns => assets/icons/icon.icns (100%) rename icon.ico => assets/icons/icon.ico (100%) rename icon.png => assets/icons/icon.png (100%) rename MSlogo.svg => docs/loading/MSlogo.svg (100%) delete mode 100644 icon2.png diff --git a/README.md b/README.md index 52ed7bc..e3ba185 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ - [📸 Ubuntu Preview](#-ubuntu-preview) - [💻 Developing Locally](#-developing-locally) - [📃 MIT License](#-mit-license) - - [*Disclaimer: Not affiliated with Microsoft*](#disclaimer-not-affiliated-with-microsoft) + - [*Disclaimer: Not affiliated with Microsoft. Office, the name, website, images/icons are the intellectual properties of Microsoft.*](#disclaimer-not-affiliated-with-microsoft-office-the-name-website-imagesicons-are-the-intellectual-properties-of-microsoft) # Introduction @@ -172,4 +172,4 @@ To build the app, run `yarn dist` # 📃 MIT License -#### *Disclaimer: Not affiliated with Microsoft* +#### *Disclaimer: Not affiliated with Microsoft. Office, the name, website, images/icons are the intellectual properties of Microsoft.* \ No newline at end of file diff --git a/assets/icons/download-fail.png b/assets/icons/download-fail.png new file mode 100644 index 0000000000000000000000000000000000000000..ea7df3ed5bacb84f0d78e2d3aad17059a9bea350 GIT binary patch literal 4092 zcmVXlu~u@<{_Wq7^X)nN?7e?`2k_&^j~_pN{P^+X$B!RBe*F0H(*e}k z0o>`-?T?OADtH|O_X7X}{}cpT8a|<>L`r>rLEPlZH&KTHh}|ZhyQ^-0bXw1`Xdv4`PvX0Q9)!RGn2Jr1Ttrw%XkwI^_;wW+C6$_=HVKdICL-&KCm!Q~*7L zRw^wpHZIuBtZ-%!KB1<>YNKQV{S`n1fCdolmMR9&33o_d)s;jN6*~Zo^tErdAUT+MY_30gwcgFH-5*4}V>S6!@(`W^(1$mXGM}6tmCxYx|R^%Ja8;Qiv0l59< z(TRi;)6N28<2q*c$+hzOBkO9X&ipY;=p=O|n0ZeFht3?|mztfGeQ{gC0|dMcfSGvS zt52qV?W!NIs($Fy#juu8^VfH}7yv*-4|NmFUmiMjv7?UQ^|HWL05Je!iSf2Oe!M1# zUeBtaprFqHOz@VEPT=04prE~FWgO@&2VN0`nT3{6%XVrX0sT2a!1xAb<4#Af#Y{X8 zKsCTsV4mk@{qmD<7nRzS`iE_l?R-^8yu_~-;d=@VB z!1uko9u>v;_|urFm^v`M%ZLF00fGWk2d3kttf{Ctk%zC}+u(u~jVY|O%#|w!SsL{s zgGpmk(ka|N>Uk5j#&T?YZYCZdmW8PU)9uG|stx$+bOFliFQUcPCPzpP84?+d)#Ii+ zEc3V0JZ#q=!GbNjpovRxR^=tAc(ALZ#Ey{Vk#%(l-LV(|kh^~m!h?b_B{9W*?1Q3% zIC|EAIU~j)wRb$!0bOC>7x-mj3ih5ZMDG4Qc;Kn$ofVJZ7U5+8zxULy$Ni9^YD;YU ze1=mDx+BQc_O(Bza;gnDde(q9CeFf`*u*X)1^_4p1v0e>FzAkSSZ1JBjR9IU0Dy?+ z7FJneJoW3bAT}E>fs6AQmoL^LI_&z`;#a2&FlWR#gsRk@hT#>WL%XB?!ubx*^UYra z*(NUb)Tc*+=xQ1w0d~1TYiVhQIzVavUUB&%QhUccu;^TZlq$3|H+6WvthO0twb%Pj zOqh49x}m2hK0OlTYC?kaY>;MaTbFuF$v}uoB#-7#JbYx)Y|rew9tSHu%MN0|qiZ5r zki0XdA@EIhh)>y+D=AszI!vRB${PkrHJ2=iK=hDQ+n+n4AWW5ND_IZ*#!I!8!sTWQ zE;n1e?&se}PV%@87NlPrNgYGIo>eU{XGwMHE{AGL@n6M<0A@TkcoZfk40FluLemv& z)_;#W(`7u8n1Q?F20OKJrHoS;ckA`6l9Ed-Ns!hMQwAV}I4>y=y9{|)xn(UPdiKQ9 zCw>Q!8Ta=c?$D;nREKxUkKu(a*|3-`Sn%j?FhUcL?tzY93J+GE!nk;kMG0vRZb}1i z)LlbKk1UZCuKkJ1MEBrOG+t?dHYN($A8o@MR8uCU6ef?h*Es98e2*ZVcC|o z(8fd||Hv_HSh)sIr;JCpz#yN+%p~m^NfLw!J{2TByeD2tpMrHSuEL4jJZNL0@ap!h z*jrtUzn7n|m(!gu$GfG6vErRKp^b^c$)aNXW#LPBV%S*Rn;_{ARx$)13POO-$2(#} zdthnWWUT*>S8yUX51J?~vOn62FVE`n_wp0?uBrsvN{?an`x_Az8-tP`e#DAr7Gl>*ihi2(pB?)tSn!Lqb#By~Q-X|kBNh!2az(zHp)Ua}I4 zUt5LY=_$zmXbS*98xw`93L}=yosY)`jmCX_-GBEOu5o*rNJmJzMpEyPP>FW3a7~o8 ze_Ua2=(RCXIDfVVfBNko@MvPDBryPB*}=cc6{b%G>2%JSF2mB)1Qu=fV}hVSfQOkY zr~XyrX=olHRglJOA5;N^M2#BBaUn?5sG$n*{*sepH3n=cJb)FOU&n~dbX1fXaJr<- z-lpuWD#mwJl9q|fiAjo)R6*>{;v)hPrdB{8AWW@5e1zB1UIDa=QFH*yH@}YI=_#lv zGvMWC7Gu@3i%@#B7V**A!>2)`dT4$mjwi`CD)fRjbV?VZQ1__QJ)y7LuYi^m~!{TjK0w2mQAdF`{g z<>ve_ORFsTVz+TkjOClM?T@LeV%&pak+B#Y5sif@6Y%vCXl45M~P!uWN$HBtqjA3W)xLf zV7SnXRx3L)mBiNK|HVt|*WA=*%ul)pLnEVaD?2nY28+}0$E%B%LHB(Qv@uaw_1=2C zqyJ9!xE#SZTqAdo_P}SGUXq;@S70zR;`$|^ytG}6VfSEYWXCB`LnCAG$Mnf~ZOKaH ze0vZ|r4mY&vcvM;fSFE8v6J-Dt}=(|T0+fcT;KG?YY+&(89o*Zr_X^XiddL-KZf+Y z{m!_Rp^-6II%*0wzp@Ub5b%d&UrumRBi9AxNwIWW5I#O5&f5IgI&M)0iV$E{4aK?O zhtaCgO7ZU!W1|ORRPX)}NPvP|@8=ATh{mRS9`jmU9mC&cWRRpJWw!+3<1^x{0aOS^ z1aTV_0K!`e5Yk!#L-&!P#2MP^vv$6V!#Tv5|Pg7YEHH){w~2i+trse_`mp zqODE1x_~OC>Jda&&-h9E9=)_U*LcPL{ek`|*sebUQ)}lehrW@<)@JO`AHuH^Q|-sj znd;HKm&>p7EdaggX&i3%LulmAD%`SnNxpI8Rshcc0F!`@+LOeLEF9neH~dz#K`AIO zDkc%9>ds;DKXzbF^4&<)_Cb)+x62cn+FDUqTZtX|Ll_yIh|K7I0Dv~phTPgS7%|z! z6lS7#)8a!s9x#)oB|cW&&{Js>P63E?RPI7$1vdO{24)Ta1*Q#1vmZZRa~k^$g)m&I z^~s{o8wpe>kr<)HuM$)3VgSIN5*Oa-U`k?2m+6JKi8kyjE5Oc^ zN6{}i15f;Uy$icJ(Bahh;Jb)OmSJvLI}iEgO?{xS<>RM!d$wbTA!TrIR+F2@F)Dhc*fWGJb)KNz+`}C;+(nPjGorItHAsw!f2M!rJus&==&c*DHcBvrt%R{`BXtwck&|*qPcVWR@*&<}aD(Z7`Sw zab7^$E|>RK>fVZkSdj&{_Ezi&ujT9{ zB~h!TscAYK?T>!v@r^pjGIhWJl0TE99j~U6jvd^~6xbLt1&p2E^y3qVKEEP{JeZ`> z*t0fC5a)qW%|I0aZtbnup&L0WaRxIBg+}vQCM@)YKbc`Bypa|c@}gXulsUqulNbe+ z=4s6Q0bJP1sf*A+;HOgigvpi??+l;MDixh+>T4tG4uHn^+P8bqVG@PMQ~L&;@u^o| zI=colQ$eM9HW+I`=+zl9IG~<@RVncyn|$$zx|L3ych%K2L{h6_6%o$`;N7%&=QM-p zy+E?A^mLNR6S~Aic>6EyJV&5~@csHlGl2I6L3k}CF8HjEecwix5ab&Asw)xAHen_S zc-+~jvFC6O5w@#H+}W9T#I1N$5Kn%#p|HAPAX|lL3`_vgSb#lT*GP>Z{+>j93x#cO zYFxK6&+79IULEhg;b$Ar{<94(uWwI@4KD@oI)K-8I#vpiO&J7E5{U;Aco2yC5OWxV zy5ssH)J6hdW+D@qjSMOwrV?h-HzWk<#uHiP{y)mi9q~(_?Rl~}?f-t(cy;K+lb>zy u2m=mdMZm0000c20@XTj=Dxxhy|Qc8Aw2|KqLVqPZOym@`@z6 z_ncq3v) zryC^N4Y<~6DjA&Na_B0B82}193`2f?!#xd^cIt}@5+G-`r|$x+}I34;i zkaAVAFTJMRk~*`YF3|d&A!%ip(ef>B?{#103&zc=j1U+pN~Q`)z_);;j-oBVm!h<& zP@`yth#Xawa%W4zJ{dKqJp|3M00rpi8CQz|@GX~v7lAo}RvxoGM5{O4WGVNnAyZME z1SAGoWedWGg1l!~-nS)ZQAMzAJhMIhEO31{U!P5$-k2O{oiQbdHoVr~@_6Q|CG!#T z!|F^Z6O~sDr}erFS=eN!ik=0LGs)8%`UT#s7(lDm5AtF>DIz~2_?{3bZ74+!)BC*S zEe>eRKfOKuO@Rlx{8D5~^0bD(2(&R#6-1A37+^Yi9#{ytquCaq9g+2pcF!|1Z1ETV z7@XZXc!XNI8{a&3IZa-Nack<-&*}qhL{tP(Ei}y9p^u^ZBG5k?ZRmm1B2s8%Cj5uU z9J9B=zQfYEF13<=^Y98=b6$LyG1m!gnPE@xz%$n9!z>gx~FVv{;ug=U9Pl*&-;r11F zL9~2}+f2OhDk1?dl46Xv9BR&$oJFm@6>OgT@OKei4Jg9$lt2Eq*k31M9kR4y-SuWt zYw4R=Khl{4~_{1|*0-la;q-!^0?B{Hd?D<`g9*A5(guic=@g;A!&&(wvatN^sGC zU^3&zl#9oZ-2vZri18YJi1ByNZsE}3Iw}e#Q+xYp)QIT%v|El?7MUL%M2kP9rml(S z{(eqxqVzM>+^AYODO78e!0tp3la*DI^L>9-;A__GTT6=5z6_2*bjVEc!&FsM< zx_A@Zv|s2xP{sPZ1ncvX&TE0?T3^)bgwqp231WFXa|z-dxTD<@Q^QmUNV2>H_5LKd z9%9M-VC-X&^uxhL2Pp(~PizaK)f;XKd#Fwn82xrh?}d6q#_5SyN7%KtEr_MvguleW zGOXElZSD6Em}=KHmO1#qtf1>q4BPj{mLOWb#f>n*uG3hiag^=R<}!4OmT$53v|>vT zZ&KS>E(JJWQ{-2C%HkuRa>voGH)w;M)H_J>B({&SV`xhdL-@8GyJ$1{;1O2Mn9kb5 zzv0Ju!$@pC{k1Z|PwGAlu}0alvtwi_q3G8UWzwMv{^7g#GGV-LL;7q>3+m|pEo`tT zV(T8+5=78zN|1>MkMR7gnM|B;CjiCUcJNAL0~eBe4%+%C(jgeJ^DM6&GI*?YhwZ7YbJiH9rs#f$>wvMb1SHtl-F)!N3; zj0^ylESSsF={GX0CNNPZ9IoWKf@xRu41dG`82j3rfj7EqA}UDOIG>iv>fL)ddh{p& zOBOuB(*x7VtNF|?`w8VodA?v8cTbrJ1SSSRYE`YhhKC5df}HRC%bA2RumDHqT#SL! z!5RE|vE;TwC_izB=!9AqqCCE6K0i$zK<-t;*F`Z3rriz1 zgct~y?olAveeCTVXtnLi$QNxtWv9xnxlEL!mA*OU2TSJjbpJH6>OTkIj`E{CGkIc6 zi2)+%9>X?C;IO%p3jQJB<}feFV9cC zn_1I+yWLxhxASaiS=7Y z;p=iSR_-aKY(#8`0br@)6FYXc1aY<`?8BGnC9-r3Un|xWb&68FZ96N=Vq=)PjPtIh zmXGWh20UbG*&`X=);CwtW+Z@st3M=;KpYWzU)9l5mT!84JcP2oZVty#&*zHdJXo@VGb35*CuAd2w*sNuXH8E*k2$a{8e0~)ft4q1hE zksnGu=vPPVw&5FxVexz0wgHy!{t#y<*B{q5yCrwNttTu9>E>cgWO|A^qVj4m_JInr zquXz6Y?+vD7tZ!jWZer5&bGE-V~tx3XWJXWR1lCLrseoK@a5NQaUqE#d$o7>b>nQm z^zd;eeGsWt0q2Pf8>v-woEL29To-yx9};$47g`zq-Y%-| zycABA)O?!$X@0+nZF3r~e+jl70k1>kj?Hykm2J~oGvj4cANLgyx|>hNjmf2M=O-Mo zEYvXgA}@!2^^Htevx&-rDV)m9!kZA;;|b2Tc2cWq8UEfb8gCxX7kN1V7^X@3@e_-nE$SOU+%{xEfrC%*0V@R)OaGD%$=SUg+XwZ+EAvyFZLl!of zRU4jBq3f}#gUrnS+;`s?w0IZi2Bp!Q>B~XzMPAMoHzV4l)YLQb54)H>JKrBM0R34g z#DEY!_8QqIehs>(w{lCDO=I-8Gs%DbEwaiEV3@t8HH;XBX_8&KpZv{lam#lyS+v-n zAa>d1$Xc*IRBZ_9;z3Vr$}$aeKV4^g?!;?atXsR2ci!2D=ei^shh}p=HM*%au4`&0 z{dg6wmamvSJD)|1r}~##1I9@9g6@y%21v+PbKaVwhfw*AKV@rcPx0=%|4Zq9U-Fsu z*66HB+Pu8L&B=ej>#09BTf#44BgywJCRM9PJR zwsA+xSFsE63ovw=%+=) zEeH22at|1kjL(x z{*fCVA(v!d_a^CnX6_94?(dx6$$mNe+x@*3A|fIpA|fIpA|fIpA|fIpB9b8K4xpz~ zQ*rj-xT%jS6aXl^Y#6fO^lPejc<~nr;*z?}1GfN9-|OBRS5tBJ;FziZ1p2otR%_WZ zDtAJ4m0SO@K%xv8-BzAq^*KC7Fh;5}Lf`^XhNzGOoB`w{iZ%eXqBN*bspxhQ`LC*M zi#24vAs0<)4j>!{P=G{cv=;;5jJU}nV2WGk-8MsXPw9n@a-$kD9@VixwojK02!9de z6~nQfm!Y?A_Zwr~=7IIVCz2el?|a>Qeck%(R)T2tx;&?)rAQr_jxZ+F%7oWMWsMPY zo{>Q_YP`5OwIEX0_qytS?!)Q^=$gZNl z+p*)Ru}ouh?)Z22xeX#Mf~b}l_TJ&Qpt=aiOGgZ+;Gl?<7(+6j5Se0kR=D-Hmqm(B z06^pg%aFUhhyiI3M61@EXFFPka%rmTc8C7WlvuIk7w<}Ctwt&T2oPpYPo4wHa-f>O+|e{qrzjcA-nDtDRIKCD|A70TX}|^ePj(H zt{;-R8NV{sE|Q_QHg;CIGr|OtQuJ zt!`hL>_PAtqDz5ufI+A(b5luZT_?J&Ji|V%=~+~-39F8Y6Tjc#@4x%q{UOyT*Vf$!V%Ry2Yf&u-!~Y44xf-UX$fIA zun)9K4P&+&=b>bXT{-MAU~(9~Ph$8;12B7-IN;y?y~ljelcjj?k-uKG*-Iz>ES5L z1B$IDuu?0_h6U*`ur@@s#IV&^2e|HX?!ol4)n2Pw64-fknIXv=E2nbk*Lubic;H-a z?;SQPC}*x3^<<5ezEe8DhJ`@|)#Ffppl|>DS6%HTJ{5taTA~ZReHZlq6aDRYyd(%m zz6H^JYX{Lfp7DQ&an|)1XH7_a(^*=z`W)Xr{W`EM=RVRuxRfUJ_%E53EqD9%=t~f- zUY7?1)}Zw?ocAkm-mf_NU0}BETb=92r!PUAmX;z?KL*~N$#E=vji30-5J#r_vG0v2 z_&O(^1<^gF7luAnr$-`}>8>>+yjpt}#L*mAlnVgpF=8L@;dJ@DCKJCTM3#v+8{bApJ znwqQtqUkz@I2U=c^J3&Ep6?>upsGCi)QilU_cZUlU+dY=!MelTdDm)IJ^jZ3qdPT< zcsfU(1Q9fJK~$9|mQ?V<3;&{)EEe3qp8fmlT>Gi5ZQ$Pd>!_}`+4$=>SzGp(5TZR9 zQ746hC_}v1b(Pl4c!?KZ{5LxD9-Mm?QJ2-9d*_$A%9PsL2IhbJ8TL0Q_MHoH=9EzW z-0S>&Rrr}ABKcnIyxnC9r+cyMDod7Bu<7^zKxf_qpS=vSbFk)okGhP0EckZUGUcO> z>bd*AGTv_hXWk=7?pZMWLhReW%f{#5q%7o2QM{caug@W!PZsmR`R5NrMPbj|$A0Y7 z7kl0#)Ma*_DIa`T&%Fzt;iE>up8GK54mf&DKB&gATWHr)8wQ@vkykS^;CZyBPpO~QY$ zN=jkjXbb}uFWvyhw<&+#1ix5LQ5xEe_Bd+3<;BjEAhCwbH|(6o2GTetGGW4K4j*Y| z#q#Hncm|j;^fzlME*_V5F@Qtynua&M7`hfjUzNiMm)#fzaULG-n$gRPkS6Qw_zSRvfJA6gDTzp-Fsd5OUnH%+>f z#v?7LYIhL>L0<7{>q-#IltKA-Er>SQ`vtm$W=W>L|Vo^9I*GA6^} zH(uj#d&x?^h|}%!$C#^O_(<6KR;tzoc1|!cZIxluJ>6kJpo>0T?m>`Ptl55{=54c< z`WminW8lDktXMIJ+h#2V(WC!9-gjG>&SG+dsI2i5w_8D8CfWW_0d<+ISoyU;{B-0m zXx|;sV8og>bY3huuDaiC$6NrM{NLAzBiR@DiKADbuv7-$cEFDhR~eEuX6+7rZR#j1 zCW}xK`$NTEmA+%I$H7>TYh(8pBqd)|aK{IOX-K7tx@Kl$LcD|Ly-mp&C>9!k6?~}8q1v2gs*ln+I z?yjHNl|yHMT-GIn*I(^E&mX>!EoT1oRY9$L4RixD-Bp%v8}{Gnc(>=?$Uze>mUF+d zJ1B>N&N`7{#g#~+aqs;o=*%F+fDonu#qwu7tHNVJ`|WNhx+r$;jEzD24Q0P1X|_D*caX^s-Q$%<@01R(Oua)y?!x2RJRdZuvN9IaAIjhv?{;21T)KrI zZD`es{*Ikdr06YO?ltz#RzcSqX3P3?W<+~J6~xbL8+7OD^Bt2L6}bi&i~n_vhd}-; z@CU;-o|oapZ+C8zdcqats++5T#BiWi_5af^J*{uoH&2 echo 'Installing nodejs now; this may take a while.' @@ -153,7 +154,7 @@ else echo 'Please install git manually.' fi fi - git clone --depth=1 https://github.com/agam778/MS-Office-Electron; cd MS-Office-Electron + git clone --depth=1 https://github.com/agam778/MS-Office-Electron; cd MS-Office-Electron || echo "Failed to change directory." && return 1 echo 'Cloned the repository' fi @@ -171,10 +172,10 @@ echo '1. Run the app' echo '2. Build the app' echo '3. Exit' echo 'Enter your choice:'; read choice; -if [ $choice -eq 1 ]; then +if [ "$choice" -eq "1" ]; then echo 'Running the app...' yarn start - elif [ $choice -eq 2 ]; then + elif [ "$choice" -eq "2" ]; then echo 'Building the app...' if [ "$(id -u)" != "0" ]; then if [ "$(uname -m)" == "arm64" ]; then @@ -189,7 +190,7 @@ if [ $choice -eq 1 ]; then yarn dist --x64 fi fi - elif [ $choice -eq 3 ]; then + elif [ "$choice" -eq "3" ]; then echo 'Exiting...' exit 1 fi diff --git a/MSlogo.svg b/docs/loading/MSlogo.svg similarity index 100% rename from MSlogo.svg rename to docs/loading/MSlogo.svg diff --git a/docs/loading/index.html b/docs/loading/index.html index 2eeedfa..3d0e1d1 100644 --- a/docs/loading/index.html +++ b/docs/loading/index.html @@ -15,9 +15,7 @@ diff --git a/icon2.png b/icon2.png deleted file mode 100644 index b0e14eea5e2422731d9a07a7ef2c04bb8abdbf3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24688 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 diff --git a/main.js b/main.js index 429d1df..e549a5b 100644 --- a/main.js +++ b/main.js @@ -21,6 +21,12 @@ console.log = log.log; ElectronDl({ dlPath: "./downloads", onStarted: (item) => { + BrowserWindow.getAllWindows().forEach((window) => { + window.setOverlayIcon( + __dirname + "/assets/icons/download.png", + "Downloading" + ); + }); dialog.showMessageBox({ type: "info", title: "Downloading File", @@ -29,12 +35,23 @@ ElectronDl({ }); }, onCompleted: () => { + BrowserWindow.getAllWindows().forEach((window) => { + window.setOverlayIcon( + __dirname + "/assets/icons/download-success.png", + "Download Successful" + ); + }); dialog.showMessageBox({ type: "info", title: "Download Completed", message: `Downloading Completed! Please check your "Downloads" folder.`, buttons: ["OK"], }); + setTimeout(() => { + BrowserWindow.getAllWindows().forEach((window) => { + window.setOverlayIcon(null, ""); + }); + }, 7000); }, onError: (item) => { dialog.showMessageBox({ @@ -43,6 +60,17 @@ ElectronDl({ message: `Downloading "${item.getFilename()}" failed :(`, buttons: ["OK"], }); + BrowserWindow.getAllWindows().forEach((window) => { + window.setOverlayIcon( + __dirname + "/download-fail.png", + "Download Failed" + ); + }); + setTimeout(() => { + BrowserWindow.getAllWindows().forEach((window) => { + window.setOverlayIcon(null, ""); + }); + }, 7000); }, }); @@ -78,9 +106,10 @@ const menulayout = [ click: () => openAboutWindow({ icon_path: - "https://github.com/agam778/MS-Office-Electron/blob/main/icon2.png?raw=true", + "https://raw.githubusercontent.com/agam778/MS-Office-Electron/main/assets/icons/icon.png", product_name: "MS Office - Electron", - copyright: "Copyright (c) 2021 Agampreet Singh Bajaj", + copyright: + "Copyright (c) 2022 Agampreet Singh\nOffice, the name, website, images/icons\nare the intellectual properties of Microsoft.", package_json_dir: __dirname, bug_report_url: "https://github.com/agam778/Microsoft-Office-Electron/issues/", @@ -358,13 +387,17 @@ Menu.setApplicationMenu(menu); function discordrpc(title) { if (store.get("discordrpcstatus") === "true") { - rpc.setActivity({ - details: `${title}`, - largeImageKey: "logo", - largeImageText: "MS-Office-Electron", - startTimestamp: Date.now(), - instance: false, - }); + rpc + .setActivity({ + details: `${title}`, + largeImageKey: "logo", + largeImageText: "MS-Office-Electron", + startTimestamp: Date.now(), + instance: false, + }) + .catch((err) => { + console.log(err); + }); } else { // don't do anything } @@ -372,20 +405,24 @@ function discordrpc(title) { function discordrpcupdate(title) { rpc.clearActivity(); - rpc.setActivity({ - details: `${title}`, - largeImageKey: "logo", - largeImageText: "MS-Office-Electron", - startTimestamp: Date.now(), - instance: false, - }); + rpc + .setActivity({ + details: `${title}`, + largeImageKey: "logo", + largeImageText: "MS-Office-Electron", + startTimestamp: Date.now(), + instance: false, + }) + .catch((err) => { + console.log(err); + }); } function createWindow() { const win = new BrowserWindow({ width: 1181, height: 670, - icon: path.join(__dirname, "/icon.png"), + icon: path.join(__dirname, "/assets/icons/icon.png"), show: false, webPreferences: { nodeIntegration: true, @@ -405,11 +442,11 @@ function createWindow() { transparent: true, frame: false, alwaysOnTop: true, - icon: "./icon.png", + icon: path.join(__dirname, "/assets/icons/icon.png"), }); splash.loadURL(`https://agam778.github.io/MS-Office-Electron/loading`); - win.loadURL("https://office.com/?auth=1", { + win.loadURL("https://www.office.com/?auth=1", { userAgent: "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36", }); diff --git a/package.json b/package.json index c149004..5b03e1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ms-office-electron", - "version": "0.5.1", + "version": "0.5.2", "description": "An Unofficial Microsoft Office Online Desktop Client. Free of Cost.", "main": "main.js", "repository": { @@ -9,9 +9,8 @@ }, "build": { "extraFiles": [ - "icon.png", - "LICENSE", - "icon2.png" + "/assets", + "LICENSE" ], "appId": "com.agampreet.ms-office-electron", "productName": "MS-Office-Electron", @@ -26,7 +25,7 @@ "Type": "Application", "Categories": "Office;" }, - "icon": "icon.png", + "icon": "./assets/icons/icon.png", "executableName": "MS-Office-Electron", "maintainer": "Agampreet Singh ", "target": [ @@ -43,7 +42,7 @@ "target": [ "dmg" ], - "icon": "icon.icns" + "icon": "./assets/icons/icon.icns" }, "nsis": { "oneClick": false, @@ -55,7 +54,7 @@ "target": [ "nsis" ], - "icon": "icon.ico" + "icon": "./assets/icons/icon.ico" }, "directories": { "output": "release" diff --git a/yarn.lock b/yarn.lock index 0de1701..45861a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -131,9 +131,9 @@ integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== "@types/keyv@*": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.3.tgz#1c9aae32872ec1f20dcdaee89a9f3ba88f465e41" - integrity sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg== + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== dependencies: "@types/node" "*" @@ -188,9 +188,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.9" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.9.tgz#f1f931a4e5ae2c0134dea10f501088636a50b46a" - integrity sha512-Ci8+4/DOtkHRylcisKmVMtmVO5g7weUVCKcsu1sJvF1bn0wExTmbHmhFKj7AnEm0de800iovGhdSKzYnzbaHpg== + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" + integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== dependencies: "@types/yargs-parser" "*" @@ -258,13 +258,6 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -531,16 +524,7 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -597,13 +581,6 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -611,11 +588,6 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -740,9 +712,9 @@ debounce-fn@^4.0.0: mimic-fn "^3.0.0" debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -1036,11 +1008,6 @@ escape-goat@^2.0.0: resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -1270,11 +1237,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -1482,12 +1444,12 @@ isexe@^2.0.0: integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + version "10.8.4" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a" + integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA== dependencies: async "0.9.x" - chalk "^2.4.2" + chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" @@ -2183,13 +2145,6 @@ sumchecker@^3.0.1: dependencies: debug "^4.1.0" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -2433,9 +2388,9 @@ yargs-parser@^21.0.0: integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== yargs@^17.0.1: - version "17.3.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" - integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== + version "17.4.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz#9fc9efc96bd3aa2c1240446af28499f0e7593d00" + integrity sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA== dependencies: cliui "^7.0.2" escalade "^3.1.1"