From 1b81250f399652cac7ffe40282acbd7167881417 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 7 Apr 2024 18:13:46 +0300 Subject: [PATCH] Scripts version 2274 --- data_from_portwine/changelog_eng | 5 +- data_from_portwine/changelog_rus | 3 + data_from_portwine/img/gui/24.png | Bin 0 -> 4609 bytes .../img/gui/{separator.png => 28.png} | Bin data_from_portwine/img/gui/32.png | Bin 0 -> 4609 bytes data_from_portwine/img/gui/36.png | Bin 0 -> 4609 bytes data_from_portwine/img/gui/40.png | Bin 0 -> 4836 bytes data_from_portwine/img/gui/close.png | Bin 0 -> 1659 bytes data_from_portwine/img/gui/history.png | Bin 0 -> 1239 bytes .../img/gui/history_from_web.png | Bin 0 -> 14975 bytes data_from_portwine/img/gui/wine_file.png | Bin 0 -> 1336 bytes data_from_portwine/img/gui/wine_file.svg | 602 ++++++++++++ data_from_portwine/img/gui/wine_system.png | Bin 0 -> 1378 bytes data_from_portwine/img/gui/wine_system.svg | 866 ++++++++++++++++++ data_from_portwine/scripts/functions_helper | 108 ++- data_from_portwine/scripts/start.sh | 111 ++- data_from_portwine/scripts/var | 2 +- data_from_portwine/themes/classic.pptheme | 22 + .../themes/{default.css => classic/style.css} | 0 data_from_portwine/themes/default.pptheme | 34 + data_from_portwine/themes/default/style.css | 0 21 files changed, 1646 insertions(+), 107 deletions(-) create mode 100755 data_from_portwine/img/gui/24.png rename data_from_portwine/img/gui/{separator.png => 28.png} (100%) create mode 100755 data_from_portwine/img/gui/32.png create mode 100755 data_from_portwine/img/gui/36.png create mode 100755 data_from_portwine/img/gui/40.png create mode 100644 data_from_portwine/img/gui/close.png create mode 100644 data_from_portwine/img/gui/history.png create mode 100644 data_from_portwine/img/gui/history_from_web.png create mode 100644 data_from_portwine/img/gui/wine_file.png create mode 100644 data_from_portwine/img/gui/wine_file.svg create mode 100644 data_from_portwine/img/gui/wine_system.png create mode 100644 data_from_portwine/img/gui/wine_system.svg create mode 100755 data_from_portwine/themes/classic.pptheme rename data_from_portwine/themes/{default.css => classic/style.css} (100%) create mode 100755 data_from_portwine/themes/default.pptheme create mode 100644 data_from_portwine/themes/default/style.css diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 3357658..1df44ae 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,7 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: -###Scripts version 2273### Date: 04.04.2024 / Download update size: 15 megabytes +###Scripts version 2274### Date: 07.04.2024 / Download update size: 15 megabytes +* added the previous theme for PortProton, enabled by adding "export GUI_THEME=classic" to "data/user.conf" + +###Scripts version 2273### Date: 06.04.2024 / Download update size: 15 megabytes * the PortProton interface has been updated * improved the quality of the tray icon * added the CatsLauncher (the Front Edge game) to the AUTOINSTALL diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 23c2cb2..f722712 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2274### Дата: 07.04.2024 / Размер скачиваемого обновления: 15 мегабайт +* добавлена предыдущая тема для PortProton, включается добавлением "export GUI_THEME=classic" в "data/user.conf" + ###Scripts version 2273### Дата: 06.04.2024 / Размер скачиваемого обновления: 15 мегабайт * обновлён интерфейс PortProton * улучшено качество иконки в трее diff --git a/data_from_portwine/img/gui/24.png b/data_from_portwine/img/gui/24.png new file mode 100755 index 0000000000000000000000000000000000000000..6a2739e6bed45375a6a8269d2c20c73f7dafbaac GIT binary patch literal 4609 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 F^AB0N2)6(L literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/36.png b/data_from_portwine/img/gui/36.png new file mode 100755 index 0000000000000000000000000000000000000000..30a9544b1611793f9331c861a944dd4d0cb1889e GIT binary patch literal 4609 zcmeHLdu&rx7{7H0V=_P?#DKwTHx6vD$-5L6Zw6g7YvkQjwOh;JvxNPHyt-P^8gN@AwsU+eAZ`OZ1t z`JM0kecw5!?Y+%S_2p#~%Lsxf4>ts7LhXV=mJWx{4^Lh)5vm=yB^(QfuO&*MF%lGp zIXbqUt00pgU*IYsN}%q7atX-JILH%S7dmn`$dd~4Qjn(jI)2>W86lAdiQ7 zEfo7z>O8x_L6xX`IPZn!RZ-Am2emyR9(=1diht9-MxE+s9T+;i2ucJI=oWzq!K zMTg#=d!qW_oNcqm4hxOlzVr0Q4K2NucMLl;FV?$njepe|{`mc?>psv&*LZr5ZU1E3 zORHNB&u=|-sJ1(N=dKeiA0A39S-kH^AhP+h2RAP`)BBrgJ-_j?l1Gm%xq8%r_PaMN zsrY8=Gr9U#j_m*Xxt{u-nwv&XxqZt|+RE1P@y)-lKl;$V*c+R=Ze26HN!qsjMYE@( z=Pv)w#77@Il|H=YUHZMo?^gM{Yaf``lc>CA$36ERc=n^++Rrc3(Npi=ICj|;i|;Q_ z-lpxp&pYMT8+UDddShtDJMkUsvuB>zv|{q*&$aiCsy(pti#=m%zVSTLxc2m-Z#z$p z`=NR-e(ig@p=rgF8&-XN?D!RyvGYD$==O($VT}^vUOYek}2M5|tmTKR!kfW2WiR7ON#PT~>{h2Wf_aJ-JlI ziD^}JE`!vC*di4i*V6%a@2ju7NnH!L=ZX;~lBvZBy`d|MXLU72)vkrAUvpPaE33-M z0Fc5KB6F!^+LUtvw}UH#YAGJmnlY&R^FjOd~w{z}kWn@)Wi^(&C zbp;4$1>6bC%E&a`(b3`Q;5|k*PP2Z$pJq6k<0#Oe%+9oha#Y%^up#moL2Rm7J!9!c znzS*IVzgNSw;RUEKKoLcNTdj#HVZ5OA9N07Xx78fsTAFRhG~V`0i~EC~r2!O&d<=v9h>}D>r3A^(P<}50C=ub9S7BHYa}JcI z%5_FIg&>@I3dJ#?b0#_?c35O^28cy=o&tc=55CB?S&S?r8#Rn%z+F5| zi^CDvP8zaM5Lp;Ni|1>!?|hxg@G?{6U5*%<9_#!&ZF}>ORr!!N=q9Y+>2&3H)GT~k zzLjq#b!RJ)q_Zhxq~={PQ9ITgI{_;{q$W^0j^Xquq-$TlevVWSB<#fk(kNEoG{`1J zq7 z;#ipz3xv_<-$hC6su_aN^vbC829nI9L-cJ)+)n>8H?IN4U_Hi|Rol!l9<%)*EiQ F^AB0N2)6(L literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/40.png b/data_from_portwine/img/gui/40.png new file mode 100755 index 0000000000000000000000000000000000000000..020d3257a016b387a4c4fbcd000eb36e6b76d379 GIT binary patch literal 4836 zcmeHLYitx%6rNIqQYls;#)!dXX|yV{^PbrmyEe7k$6B@&SfJno?#$fX4s>_cooTym zG!#Vx;sb&P@qvO0rU>DoXb=P%6ci2sSj!D>QsW4mgRTW9#Xy(`Dhi7b_UOcp_c+0l)U(`1Clq?*2WLC6i|0;RqD(>{s=c^AHqbhtor?#Bj zy#4vcqqFCnJyO{jdSu7fjh`QBTC`yQ@j$ri%cr^?xX|;5WxuuVru-L9ExL8&!Pdvt zFPd;>(;MlU_l_Uc!2=-?6$U zbU!L@YdUu5wZzd?pHQFH{kT%@tbB4-cT>r2TOVI?@Xcd8^#8Py9NW4kb>ZdpE5_Ztp|xjZ<-u*=?z*PpjPKdH)#o4nq5YfD zKbP;tAN)ks)~|SF?aJ>@ogQzSdw-jLf89@eKNQaeX7AWIvt;+AIZBZkJN#Vd9`bE! z=C-bl*6+mGaQoV^C(1j~$**?(lJEC5m3*Q7@*+VLk2fNXc4K&wqM30Y(oGfn(($Cb zre)>nB+}+%+oR%`kqCHu-rw!@7<#}vQwY=HWF>AgYCBSRT1S0E>zJ>}y0`qU!m_ji z0C8+1PdeV5u#|Mb>*6XPJKdDm36?)22dQ_Pj ztjGdz342N^@2`kG2@Ij?fl45)`6^~PWEiAjL6+p5MUDCpev?nn& z6V*Ar5ORUE|jh* z)n+P=U^$IAieW05h`9p};YvkADBxv%8OPn8hGt|(!64wBWF%VB7gZxh98a^6!zLp! zEYAoWFEWzM3w^9-;FJZK=wP~MqHFFfivqy_vB=3&0C4*u7Ns(Uk!_|Trr8|u=1$Yx za2U3ej%*Y}HU`k#`5NgxU+LqiXi=e zA^Iha)m2zPRg_thkMbhv7o!Zx`9)S2Sys}8OseN{FsM3!L<){;b8i?2tph~fLz?k0NJOZrKDg=bxsUt>3Tj8C literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/close.png b/data_from_portwine/img/gui/close.png new file mode 100644 index 0000000000000000000000000000000000000000..de254cac7a8fe92f86d58e5e9367ed5e45784ed6 GIT binary patch literal 1659 zcmV->288*EP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11_((+ zK~zYIjh0PpRM!>9f9Jk8Gk%^4_)B0z0*Q_JFu{O<@kaq;uxlw&q;9H4>Z*>^w2G>> zixgTZT_Cj~{gBdhQM#e4ASH_`n^Ypk9ve|+#^7LVFc8O3wZ+0o4F=nc$20GpE<9tH z8Ep9P-hJnPKK}Qfb1$ljsuGGshgB6(RRHbmjsjqcBk`fm?kHzEngJFqI=iC^aHgYK zP*ql)jU`nTyR$p0O+e(%q#A&a5ANZ_=q;ou5^X=2(rz#7WOXF&HKje_3H1BTwa(d$N&I)U2m<)x;naj z6TcrBqr&e4Ac@Ld+Nx#Dp6(6*_cYGC#Ef~R}kS;%P!Uj9e#9Sh}(0C z+|&W%TGEn~#|PlIySDQ8L;L8uFhpl}lqx5{nT}>kGm-+_uw=1Dr{{e2X6*4wudud! z4A_#s-`3>IQ57KAH!xA@dR3JQwnD-v{}#go;mt%_7_{w<#KG`w$UEdtfBXkQms1-&k5HzbZ$!9b%-xx`aMhEJ3cBM-IFWdlh5ja_ zQdz3XDpiUAJ2Qb?g$02*gnI@ah?z{Gzk0I$@=*}5sQ*%j-*Z2E$y47tPch37m&4*9 zgmGiia~7}7w>EY^HK5aTzS=ha>zh5#U-2B1=XsC-MlDItX?jcI$o^Z9>0&1m?+S@; zJe+oOg8g{Y20l8_Kxb9Oij^9mv#NrR4m9v~?S`dw2WUvE{Sv-$Clc=h5T`HR?6`Vi zr|aR%b5!Q{adi78c2$%xn@aPCkujoE(>XRxTa{;P~ z0vvs{mi0l0sre*R^GVhP9ggm(WnEF=nS2j}tGZx&o}By|ep&(ug;kdOef)AqEj!9q z^Kc=>yMv=#y!QZry=AL;XGbl6JJ7($y$8HEGFGsESxgy789AAKY)sU+T2+-N>o2xd zbNI!zBwd$3kB-xGcj_rAL3?F6KdGxBU|ID3caq;-zm@a;jD<i!dw79V6Tm8TGu>>)Gk@Bvu^W zSrqpSG$Z;w5e^x2tEdD(!H{%SZmJT&l8+y?hNI8&^?&=##GxLg7UKW_002ovPDHLk FV1kAHEARjS literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/history.png b/data_from_portwine/img/gui/history.png new file mode 100644 index 0000000000000000000000000000000000000000..c6b424d2612328e5b4100a273d3cfde57a6b3a14 GIT binary patch literal 1239 zcmV;|1StE7P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Y}7> zK~zYIjh0JnRAm&$f9KA$(>o(p3dGO^2-RxaG(r_-tQzRFR2RNCV#2~uHoB5T;>sl} zSH$=rCg2Jm8#P7}Q)H$?)XoeLi>a+zivp3Vg<2lHGtL z&UeoF2318>F=NRwRmD#p1qjAdY6Rn{F@R6I9{@m9m0&!j09G_2h4|5|s)89yYJBd7 znz5uB05_LcIMLmXG{r~vh{`GVA~qm~2(~H!w!xE_vC*s*ETb`kl~T^PXIGU zaryqW%>Z!>X%+9fIe9Co5 zS5T2+xzxjtA&+6}4{qZtg-jLM90>66-Jvp@qHZdBe0j}-ZNziBDT7v+6aw}a*oIcoJq4tf`I0^QrKhA5K@ z{gJM+z^2owLBn7epjfu~{VBF*$5u3AIDy5o`l#!E_TIbB@ygmZLle_{IXhROYy?Nr zSBu6*LwIxQ5&(y$E}_8i+&s^3XemhwodAARD>8Vf5NsL-*LLm9CoP_Gz6WEeBYtnt z+wEIw<)?(`tCcssDkM;$IC|q2vy01Rw&ymi^}1cC2>j;yJbz|$^#g5r&987k;8;oV zHs^2NuDeldAUs;Q$8-*~v1d()?{{=pIXWw2uJ9jD$rXd^DXI7dGkrV0 z1y7NiiPV0vIbIPVGGq0HTgyz|?r>wqQ$qrWsnTXu5t&idx7_Vl;o=o+N}L-s?3I&1 z!>UATvt%1Qo!uQdRaG$G#*LHiy!NaKajK`Q>I8!PW4dpAs;ud%39G%-kr{a6B7gyf z)EN!a-b*~RrIn!1;N2^K(>Xfk{NA}T1Hi({3d3{roDV<53$BLs&>%*`v>8tg0T{tV zy4PK&)wrC^@m|MPCVRK@K}Q>xvx@-S<@0g4Z8IPK^$%Ok05|)>JhQ%{ivSQf7EGjj z#f&A#fNj;BPIR~P;)WJxa*O6xrZCe%k^An_WSNEh#d7> z{gH#gcaMmDjE6VzwM>W>^W0IX=FRbayFv1r$xLba$CBQRk_Bdy?_i6hB9 zqB5NKDN*(`*TJqFlWN;Ml^rNeo2s+aJd@sPEZZklq;pkD9t0+Ad+FKYbSe8*Z+I68 zo=*27x)(!sqjqPhsx=4l3(5#S`OMlK9=+3A{{tXC4`~%+sXhPz002ovPDHLkV1h20 BQON)R literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/history_from_web.png b/data_from_portwine/img/gui/history_from_web.png new file mode 100644 index 0000000000000000000000000000000000000000..28195a2ecac99a3a00a562e82caef00effefad1e GIT binary patch literal 14975 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 O0BXwGN;L{Lk^ci@l3}g@ literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/wine_file.png b/data_from_portwine/img/gui/wine_file.png new file mode 100644 index 0000000000000000000000000000000000000000..350d466e3dfd3f767d199f249338f68c1d664dad GIT binary patch literal 1336 zcmV-81;_e{P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11jR{2 zK~zYIotABE6jc<4pF7s0iZ+#!*&F~wM>PGpa(;L ziU`<4qaq@*zr9mv9UYU$&$o$)h|+^Cn?e1OC^8LrNq`Wo)r_EXsebJ$uWOm{fNPm3 zv_?dP*Z=Ae5s{-;d*s{xK@kzrgCRj=?q>u;2lZfR+-PW77vqu^o(R`6mB+9hiTNGw z=wUJvWq5WL!*<%xgCP+SIdY|2V*g{Fo|w$uiZc9~mL#1t5)!OM?Z~vCLDw=1mB_!m zVLJ{GSh(`ISdO|g{7~RZ;-hsG1U_9|g;%Lec{B`<@>y>`VawE%VTTThu>XsDt7sUy zfuhKo`J}oMfa84w6#3>J&e#2e>?&HCBA_Xe+J)pZ z#f21ly`1bzpA@fAZwyr^QCBh+myFb>szB+sa{;JMoi96GtLB>|$3*1X&I1BRfek>H zg0Chl^UbtN1y~epzDrX%?KfFs$hFLk$u%}OmeL4jQQx#{nf|%5M3inj(dSEx*p|N} zW5$dKFI;Fx6fJJ8xk>54&_!Tn;<*DDi$vJh-btRvlf)nE?8UWArSxD(0QQs>Gb?lZ zywvCAjmqVzMUIY9_uB=O$lGzb4^~#hCm6QF;f@{v4pc5@Z$%jZ+WbBirJhbcW%GFL zj#6C9#I;N+b$?1+L5U|#9*-2{@nP3BejFU3e(kE1xWKPz9XIDK=60ViZ4!WndR0TQ zYhmEb^&z^Zra0Ewo5Y{&8w6n73j98QkX!pfmZgOChIm`)&N{9Pz3bfDoLW$ zP1bF?3=1~7VLLm4QwtN6&^A$Lu1@A8rK`>bK-ucniXL@5=k3doRh=8%bk4G^>>VV(zVRfp4`UP^)WMm9YqBh4Z5eMInzHx z=hPIhtSF(>?@Q?piMU%&x;{?jHnptth{*eiZ2iD6Yi=`AF3}$bNBDkVI6giy-y8t8 z7v}Tm(!3PI`xYBXV~J=-J;3@za(iKZiW$K9u?gx2hB0!IW0O%~x!;%8Fbx78pqDJR z{hqR7nn%a@_?}A27y0MSqU`?T5_`&uvoQnc))bt$^*ku>dN{kLno_@y_pbKx?$sVV zN^y2gH3itUMTB7RV@V3CuF(Pd*)tg!?RaCx2*q9Q`4(CM4v*FsBj)j4Y%{vjfO)d8`tDX?0 uwg9C->}u}@dPS+G9MpH?wHwagO6wnKDMMb*T2e~@0000 + + + diff --git a/data_from_portwine/img/gui/wine_system.png b/data_from_portwine/img/gui/wine_system.png new file mode 100644 index 0000000000000000000000000000000000000000..daca8c204eb91df5ac61b2454e2e3f298a2b9096 GIT binary patch literal 1378 zcmV-o1)chdP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11n)^i zK~zYIot0luRCN@`Kfk*Ra_=Ieg`|vs63ws>6@d%+kHzYtrfJgb-}F??)I*MAO>a$9 zIyF)1Vz!jbu-{Zl4+LW!G2#ddjy3S;-3vGx>TlIzk*~LPu;5q& zAFW=&(NI4?zBlGvpK0*<+B{xuxfo9!XYM`MiG6D@p;EOoRY9S!-^^AblXkbNEi&*1feD!?KeqQATxrktlWAt<0Blb2!-5 znhWsXB zze!zj0YJJ@W7h$Ab<1vz1+Mk!oGvYl6MydMfk8r}V-vPf7NvW6>-?p7oGA62mPouYGRkN9 zdE+~40)x>g2Rg12P5$3Yl86BL^^IKGT*Sxst)R7h1MQJJ^i8P872#BTK}^M8#RY6R zb=I|a4Yff-vD?)<0|x!2O%oTnp$B9UKz&I8>oa{xfr(ejk?88-%7@zHBWGClbs%RZ zC2^>X>@Y2uGUSG3?*e|DN>D<}P^I}mvQ6Cg@%R-B?gq7=8HQvE+EBb5sW1-?ka>|A)$}hwPjhf)Ii28nNvYhlZ_AFbRQcMH(EzjlO;X71ayv*{9c~q@jibp95 zgH1{I5O_N5HxDbrvWrFJq+7zN+aM8t_T8d1E0Zj*hXWl~_@MJDnu6n-3fMT`$D!-J zyxiQL#8DonNa=x~1yr~t%{O%ZHVZj&qYt0Q!@yWH$v-AS-{=^xExjkn{>VSgoan#p zmNKC9K=3w@>DmU+WUlAy?j8bt1B{46TR4K_GJkf-I=;Ks%cqySQ>6kJ)PSy;A~rTO zv3)@nUp=@ApU0CVmaZw@T%Jq+_EJ9VygHj0z!hZ#g6|2uGg~A;o}R%I*$a7N`4Soj zhxn$um)}A+2}hmT$$&tWLPY77-2&V{Cl=!y^I%s`%Gccuv90435al=5>Xuyxl(_}_ zJQ`~ZJ^pQYG?rzgvvL0T@{B|sTEmf<^iG5;&8_3Y37bZ@>bEPjqd@wcOP?7d;;4rs zJ4%no46eIWuWeYV9Qii(;{Feu5G5~0D#|*iI#Mq0MEGj!H!`N46s5KTxxms1*A<{k kl&bZhjto|mG|ramKj|4!?Q;+_J^%m!07*qoM6N<$f~xj|3jhEB literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/wine_system.svg b/data_from_portwine/img/gui/wine_system.svg new file mode 100644 index 0000000..6abe618 --- /dev/null +++ b/data_from_portwine/img/gui/wine_system.svg @@ -0,0 +1,866 @@ + + + + diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 9fa1d04..56cb23b 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2290,7 +2290,8 @@ yad_info () { fi "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --height=50 --borders=15 --title "INFO" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.png" \ - --center --text-align=center --button=OK 2>/dev/null + --center --text-align=center \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } export -f yad_info @@ -2302,7 +2303,8 @@ yad_error () { fi "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --borders=15 --title "ERROR" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.png" \ - --center --text-align=center --button=EXIT 2>/dev/null + --center --text-align=center \ + --button="EXIT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } export -f yad_error @@ -2313,7 +2315,9 @@ yad_error_download () { fi "${pw_yad_v13_0}" --text "$loc_gui_error_download" --width=400 --borders=15 --title "$loc_gui_error" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/download.png" \ - --no-wrap --center --text-align=center --button=SKIP:1 --button=REPEAT:0 2>/dev/null + --no-wrap --center --text-align=center\ + --button="SKIP"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ + --button="REPEAT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null [[ "$?" != 0 ]] && return 1 || return 0 } @@ -2324,7 +2328,9 @@ yad_question () { fi "${pw_yad_v13_0}" --text "${1}" --width=400 --borders=15 --title "${inst_set}." \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.png" \ - --no-wrap --center --text-align=center 2>/dev/null + --no-wrap --center --text-align=center \ + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null [[ "$?" != 0 ]] && return 1 || return 0 } @@ -2355,17 +2361,17 @@ pw_start_progress_bar_cover_block () { pw_update_pfx_cover_gui () { if [[ "$1" == "winetricks" ]] ; then - TAB_PLACE="--tab=$loc_gui_terminal --tab=$loc_gui_logo" + TAB_PLACE="--tab=$loc_gui_terminal!$PW_GUI_ICON_PATH/$TAB_SIZE.png --tab=$loc_gui_logo!$PW_GUI_ICON_PATH/$TAB_SIZE.png" TAB_N1=2 TAB_N2=1 YAD_UNDECORATED="" else - TAB_PLACE="--tab=$loc_gui_logo --tab=$loc_gui_terminal" + TAB_PLACE="--tab=$loc_gui_logo!$PW_GUI_ICON_PATH/$TAB_SIZE.png --tab=$loc_gui_terminal!$PW_GUI_ICON_PATH/$TAB_SIZE.png" TAB_N1=1 TAB_N2=2 YAD_UNDECORATED="--undecorated --center" - fi + if ! check_start_from_steam && ! pgrep -a yad | grep "yad_v13_0 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" &>/dev/null ; then PW_KEY_PROGRESS_BAR_UP=$RANDOM PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/update_prefix_${update_loc}.gif" @@ -2399,8 +2405,10 @@ pw_update_pfx_cover_gui () { pw_start_progress_bar_cs () { if ! check_start_from_steam ; then "${pw_yad}" --progress --progress-text="$@ - " --pulsate --close-on-unfocus --borders=20 \ - --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 \ + " --pulsate --close-on-unfocus --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + --no-buttons --undecorated --center --skip-taskbar \ + --width="$PROGRESS_BAR_WIDTH_SIZE" \ + --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null & export PW_YAD_PID_PROGRESS_BAR_CS="$!" return 0 @@ -2410,8 +2418,10 @@ pw_start_progress_bar_cs () { pw_start_progress_bar_block () { if ! check_start_from_steam ; then "${pw_yad}" --progress --progress-text="$@ - " --pulsate --borders=20 \ - --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 \ + " --pulsate --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + --no-buttons --undecorated --center --skip-taskbar \ + --width="$PROGRESS_BAR_WIDTH_SIZE" \ + --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null & export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!" return 0 @@ -2480,10 +2490,10 @@ pw_tray_icon () { --command="bash -c tray_icon_click" \ --tooltip="PortProton" \ --icon-size=32 --menu="| \ - ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ - ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ - ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"|| \ - ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" 2>/dev/null & + ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.png"|| \ + ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.png"|| \ + ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.png"|| \ + ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.png"||" 2>/dev/null & return 0 } @@ -2525,7 +2535,7 @@ pw_gui_for_edit_db () { fi TMP_HELP_FOR_GUI="${int_to_boole}_INFO" int_to_boole_non_pw="`echo ${int_to_boole} | sed 's/^PW_//' | sed 's/_/ /g' `" - ADD_CHK_BOX_EDIT_DB+="--field= ${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:SW%${!int_to_boole}%" + ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%" done } edit_db_field_add $@ @@ -2554,13 +2564,13 @@ pw_gui_for_edit_db () { --field="${loc_gui_gpu_select}!${loc_gui_gpu_select_help} :CB" "${GPU_VAR}!disabled!${GET_GPU_NAMES}" \ --field="${loc_gui_arg_gamescope}!${loc_gui_arg_gamescope_help} :CBE" "\\${GAMESCOPE_ARGS}!-r 60 -F fsr!" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & - "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="675" \ + "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="700" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --button="${loc_gui_cancel}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_cancel_help}":1 \ - --button="${loc_gui_reset_db}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_reset_db_help}":2 \ - --button="${loc_gui_open_db}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_open_db_help}":150 \ - --button="${loc_gui_save_changes}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_save_changes_help}":0 2>/dev/null + --button="${loc_gui_cancel}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_cancel_help}":1 \ + --button="${loc_gui_reset_db}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_reset_db_help}":2 \ + --button="${loc_gui_open_db}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_open_db_help}":150 \ + --button="${loc_gui_save_changes}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_save_changes_help}":0 2>/dev/null YAD_STATUS="$?" export SKIP_CHECK_UPDATES=1 case "$YAD_STATUS" in @@ -2716,9 +2726,14 @@ gui_proton_downloader () { --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" 2>/dev/null` & `"${pw_yad_v13_0}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --no-button \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "WINE MANAGER" --separator="" --expand \ - --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" \ - --button="$loc_cancel"!"$PW_GUI_ICON_PATH/separator.png"!"":1 \ - --button="OK"!"$PW_GUI_ICON_PATH/separator.png"!"":0 2>/dev/null` + --tab-pos=top \ + --tab="PROTON-LG"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="WINE-KRON4EK"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="PROTON-GE"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="WINE-GE-CUSTOM"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_gui_installed_wine"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":1 \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 2>/dev/null` YAD_WINE_STATUS="$?" if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then export SKIP_CHECK_UPDATES=1 @@ -2810,9 +2825,9 @@ gui_vkBasalt () { for add_list_fx in ${LIST_FX[@]} ; do PW_VKBASALT_GUI_HELP="PW_${add_list_fx}_INFO" if [[ ! -z `echo " ${GET_FX_IN_FILE[@]} " | grep " ${add_list_fx} "` ]] ; then - ADD_GUI_FX+="--field= $add_list_fx!${!PW_VKBASALT_GUI_HELP}:SW%TRUE%" + ADD_GUI_FX+="--field=${CHKBOX_SPACE}${add_list_fx}!${!PW_VKBASALT_GUI_HELP}:${THEME_CHKBOX}%TRUE%" else - ADD_GUI_FX+="--field= $add_list_fx!${!PW_VKBASALT_GUI_HELP}:SW%FALSE%" + ADD_GUI_FX+="--field=${CHKBOX_SPACE}${add_list_fx}!${!PW_VKBASALT_GUI_HELP}:${THEME_CHKBOX}%FALSE%" fi done if [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then @@ -2838,11 +2853,11 @@ gui_vkBasalt () { --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null & - "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="600" --title="vkBasalt" --center \ + "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="625" --title="vkBasalt" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ - --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ - --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":182 2>/dev/null + --button="$loc_gui_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_cancel_help":1 \ + --button="$loc_gui_disabled_vkbas"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_disabled_vkbas_help":180 \ + --button="$loc_gui_save_changes"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_save_changes_help":182 2>/dev/null YAD_VKBASALT_STATUS="$?" case "${YAD_VKBASALT_STATUS}" in 1|252) @@ -2917,9 +2932,9 @@ gui_MangoHud () { for add_list_mh in "${LIST_MH[@]}"; do PW_MH_GUI_HELP="PW_MH_${add_list_mh}_INFO" if [[ -n "$(grep -wo "$add_list_mh" <<<"${PW_MANGOHUD_CONFIG[@]}")" ]] ; then - ADD_GUI_MH+="--field= $(echo $add_list_mh | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:SW%TRUE%" + ADD_GUI_MH+="--field=${CHKBOX_SPACE}$(echo ${add_list_mh} | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:${THEME_CHKBOX}%TRUE%" else - ADD_GUI_MH+="--field= $(echo $add_list_mh | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:SW%FALSE%" + ADD_GUI_MH+="--field=${CHKBOX_SPACE}$(echo ${add_list_mh} | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:${THEME_CHKBOX}%FALSE%" fi done @@ -2934,11 +2949,11 @@ gui_MangoHud () { --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRESH_RATE}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null & - "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="550" --title="MangoHud" --center \ + "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="575" --title="MangoHud" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ - --button="$loc_gui_disabled_mh"!!"$loc_gui_disabled_mh_help":182 \ - --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":184 2>/dev/null + --button="$loc_gui_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_cancel_help":1 \ + --button="$loc_gui_disabled_mh"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_disabled_mh_help":182 \ + --button="$loc_gui_save_changes"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_save_changes_help":184 2>/dev/null YAD_MANGOHUD_STATUS="$?" case "${YAD_MANGOHUD_STATUS}" in @@ -3014,7 +3029,7 @@ portwine_create_shortcut () { --field=" ${sc_menu_desktop}":CHK "TRUE" \ --field=" ${sc_desktop_desktop}":CHK "TRUE" \ --field=" ${sc_add_in_steam}":CHK "FALSE" \ - --button="$loc_gui_create_shortcut":0) + --button="$loc_gui_create_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0) PW_YAD_OUT=$? else export name_desktop="${PORTPROTON_NAME}" @@ -3026,7 +3041,7 @@ portwine_create_shortcut () { --field=" ${sc_menu_desktop}":CHK "TRUE" \ --field=" ${sc_desktop_desktop}":CHK "TRUE" \ --field=" ${sc_add_in_steam}":CHK "FALSE" \ - --button="$loc_gui_create_shortcut":0) + --button="$loc_gui_create_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0) PW_YAD_OUT=$? fi @@ -3128,8 +3143,8 @@ portwine_missing_shortcut () { --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \ --image "$PW_GUI_ICON_PATH/error_file.png" \ --text "$loc_gui_missing_shortcut" \ - --button="$loc_gui_delete_shortcut":0 \ - --button="$loc_cancel":1 + --button="$loc_gui_delete_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 \ + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 if [ $? -eq "0" ] ; then portwine_delete_shortcut fi @@ -3200,9 +3215,12 @@ pw_prefix_manager () { "${pw_yad_v13_0}" --key=$KEY_EDIT_MANAGER_GUI --notebook \ --width=900 --height=800 --expand \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_pm" \ - --button="$loc_cancel"!"$PW_GUI_ICON_PATH/separator.png"!"":1 \ - --button="OK"!"$PW_GUI_ICON_PATH/separator.png"!"":0 \ - --tab-pos=bottom --tab="$loc_pm_dlls" --tab="$loc_pm_fonts" --tab="$loc_pm_settings" 2>/dev/null + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":1 \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 \ + --tab-pos=bottom \ + --tab="$loc_pm_dlls"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_pm_fonts"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_pm_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then print_info "Nothing to do. Restarting PortProton..." @@ -3386,7 +3404,7 @@ portwine_start_debug () { sleep 3 pw_stop_progress_bar_cover unset PW_TIMER - while read -r line || [[ ! -z $(pgrep -a yad | grep "yad_v13_0 --text-info --tail --button="STOP":0 --title="DEBUG"" | awk '{print $1}') ]] ; do + while read -r line || [[ ! -z $(pgrep -a yad | grep "yad_v13_0 --text-info --tail --button="STOP"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 --title="DEBUG"" | awk '{print $1}') ]] ; do sleep 0.005 if [[ ! -z "${line}" ]] && [[ -z "$(echo "${line}" | grep -i "kerberos")" ]] \ && [[ -z "$(echo "${line}" | grep -i "ntlm")" ]] @@ -3397,7 +3415,7 @@ portwine_start_debug () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v13_0}" --text-info --tail --button="STOP":0 --title="DEBUG" \ + done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v13_0}" --text-info --tail --button="STOP"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 --title="DEBUG" \ --skip-taskbar --width=800 --height=400 --text "${port_debug}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" 2>/dev/null && kill_portwine sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 40d8916..2e333c2 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -22,7 +22,6 @@ fi export PW_START_PID="$$" export NO_AT_BRIDGE=1 export pw_full_command_line=("$0" $*) -export YAD_OPTIONS="--borders=3 --tab-borders=0 --keep-icon-size" MISSING_DESKTOP_FILE=0 @@ -128,9 +127,7 @@ cd "${PORT_SCRIPTS_PATH}" export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts" export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" - export PW_GUI_THEMES_PATH="${PORT_WINE_PATH}/data/themes" -export YAD_OPTIONS+=" --css=$PW_GUI_THEMES_PATH/default.css" . "${PORT_SCRIPTS_PATH}"/lang @@ -148,12 +145,24 @@ try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" # TODO: remove this later... try_remove_file "${PORT_SCRIPTS_PATH}/runlib" try_remove_file "${PORT_SCRIPTS_PATH}/yad_gui" +try_remove_file "${PW_GUI_THEMES_PATH}/default.css" if [[ "${INSTALLING_PORT}" == 1 ]] ; then return 0 fi . "${USER_CONF}" + +# подключаем тему: +if [[ ! -z "$GUI_THEME" ]] \ +&& [[ -f "$PW_GUI_THEMES_PATH/$GUI_THEME.pptheme" ]] +then +. "$PW_GUI_THEMES_PATH/$GUI_THEME.pptheme" +else +. "$PW_GUI_THEMES_PATH/default.pptheme" +echo 'export GUI_THEME="default"' >> "$USER_CONF" +fi + if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \ && [[ ! -f "/tmp/portproton.lock" ]] then @@ -202,14 +211,6 @@ fi [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut -if [[ -f "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" ]] && [[ ! -z "$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size)" ]] ; then - export PW_MAIN_SIZE_W="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $1}')" - export PW_MAIN_SIZE_H="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $2}')" -else - export PW_MAIN_SIZE_W="1100" - export PW_MAIN_SIZE_H="350" -fi - if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" unset PW_SANDBOX_HOME_PATH @@ -339,9 +340,9 @@ if [[ -f "${portwine_exe}" ]] ; then pw_create_gui_png grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop if [[ "$?" != "0" ]] ; then - PW_SHORTCUT="${loc_gui_create_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_create_shortcut}:100" + PW_SHORTCUT="${loc_gui_create_shortcut}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${loc_create_shortcut}:100" else - PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_delete_shortcut}:98" + PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${loc_delete_shortcut}:98" fi OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --form \ --title "${portname}-${install_ver} (${scripts_install_ver})" \ @@ -351,12 +352,12 @@ if [[ -f "${portwine_exe}" ]] ; then --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ --field="PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=":LBL" "" \ - --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_VKBASALT_INFO}":120 \ - --button="${loc_gui_mh_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_MANGOHUD_INFO}":122 \ - --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ + --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${ENABLE_VKBASALT_INFO}":120 \ + --button="${loc_gui_mh_start}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${ENABLE_MANGOHUD_INFO}":122 \ + --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ --button="${PW_SHORTCUT}" \ - --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_debug}":102 \ - --button="${loc_gui_launch}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_launch}":106 2>/dev/null) + --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_debug}":102 \ + --button="${loc_gui_launch}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_launch}":106 2>/dev/null) export PW_YAD_SET="$?" if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi export VULKAN_MOD=$(echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}') @@ -391,35 +392,36 @@ else IFS="$orig_IFS" old_IFS=$IFS && IFS="%" - "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns="$MAIN_GUI_COLUMNS" \ + --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & IFS="$orig_IFS" "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --separator=";" \ - --field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ - --field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ - --field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ - --field=" $loc_gui_changelog"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \ - --field=" $loc_gui_change_loc"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click change_loc"' \ - --field=" $loc_gui_edit_usc"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \ - --field=" $loc_gui_scripts_fb"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \ - --field=" Xterm"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ - --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & + --field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ + --field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ + --field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ + --field=" $loc_gui_changelog"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \ + --field=" $loc_gui_change_loc"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_loc"' \ + --field=" $loc_gui_edit_usc"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \ + --field=" $loc_gui_scripts_fb"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \ + --field=" Xterm"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ + --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --separator=";" \ --field=" 3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ - --field=" $loc_gui_create_pfx_backup"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \ - --field=" WINETRICKS"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ - --field=" $loc_gui_clear_pfx"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_clear_pfx}":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ - --field=" $loc_gui_download_other_wine"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ - --field=" $loc_gui_wine_uninstaller"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_wineuninstaller}":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ - --field=" $loc_gui_wine_cfg "!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ - --field=" $loc_gui_wine_file"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ - --field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ - --field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & + --field=" $loc_gui_create_pfx_backup"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \ + --field=" WINETRICKS"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ + --field=" $loc_gui_clear_pfx"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_clear_pfx}":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ + --field=" $loc_gui_download_other_wine"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ + --field=" $loc_gui_wine_uninstaller"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_wineuninstaller}":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ + --field=" $loc_gui_wine_cfg "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ + --field=" $loc_gui_wine_file"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ + --field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ + --field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & - "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --scroll \ + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \ --field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"${loc_dolphin}":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \ --field=" MAME"!"$PW_GUI_ICON_PATH/mame.png"!"${loc_mame}":"FBTN" '@bash -c "button_click PW_MAME"' \ --field=" RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"${loc_retroarch}":"FBTN" '@bash -c "button_click PW_RETROARCH"' \ @@ -435,7 +437,7 @@ else --field=" xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"${loc_xemu}":"FBTN" '@bash -c "button_click PW_XEMU"' \ --field=" Demul"!"$PW_GUI_ICON_PATH/demul.png"!"${loc_demul}":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null & - "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --scroll \ + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \ --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ --field=" Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \ @@ -476,17 +478,6 @@ else # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' # --field=" ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"' - # if command -v wmctrl &>/dev/null ; then - # sleep 2 - # while [[ -n $(pgrep -a yad_v13_0 | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do - # sleep 2 - # PW_MAIN_GUI_SIZE_TMP="$(wmctrl -lG | grep "PortProton-${install_ver}" | awk '{print $5" "$6}' 2>/dev/null)" - # if [[ ! -z "${PW_MAIN_GUI_SIZE_TMP}" ]] ; then - # echo "${PW_MAIN_GUI_SIZE_TMP}" > "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" - # fi - # done - # fi & - export START_FROM_PP_GUI=1 if [[ -z "${PW_ALL_DF}" ]] ; then @@ -495,11 +486,11 @@ else --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom \ - --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null + --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null YAD_STATUS="$?" else "${pw_yad_v13_0}" --key=$KEY --notebook --expand \ @@ -507,11 +498,11 @@ else --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom \ - --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null + --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null YAD_STATUS="$?" fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 9571f9c..304b58c 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2273 +#SCRIPTS_NEXT_VERSION=2274 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine" diff --git a/data_from_portwine/themes/classic.pptheme b/data_from_portwine/themes/classic.pptheme new file mode 100755 index 0000000..ba2779b --- /dev/null +++ b/data_from_portwine/themes/classic.pptheme @@ -0,0 +1,22 @@ +export THEME_NAME="$(basename .pptheme)" +export THEME_PATH="$PW_GUI_THEMES_PATH/$THEME_NAME" +export YAD_OPTIONS="--css=$THEME_PATH/style.css \ +--borders=5 \ +--tab-borders=3 \ +--keep-icon-size \ +" + +export THEME_CHKBOX=CHK +export CHKBOX_SPACE=" " + +export BUTTON_SIZE_MM=32 +export BUTTON_SIZE=24 +export TAB_SIZE=28 + +export PW_MAIN_SIZE_W=1100 +export PW_MAIN_SIZE_H=350 + +export MAIN_GUI_COLUMNS=3 + +export PROGRESS_BAR_BORDERS_SIZE=20 +export PROGRESS_BAR_WIDTH_SIZE=500 diff --git a/data_from_portwine/themes/default.css b/data_from_portwine/themes/classic/style.css similarity index 100% rename from data_from_portwine/themes/default.css rename to data_from_portwine/themes/classic/style.css diff --git a/data_from_portwine/themes/default.pptheme b/data_from_portwine/themes/default.pptheme new file mode 100755 index 0000000..aa6b06b --- /dev/null +++ b/data_from_portwine/themes/default.pptheme @@ -0,0 +1,34 @@ +# определение названия и пути темы +export THEME_NAME="$(basename .pptheme)" +export THEME_PATH="$PW_GUI_THEMES_PATH/$THEME_NAME" + +# глобальные настройки YAD +export YAD_OPTIONS="--css=$THEME_PATH/style.css \ +--borders=3 \ +--tab-borders=0 \ +--keep-icon-size \ +" + +# настройка переключателей +export THEME_CHKBOX=SW # CHK - галки, SW - слайдер +export CHKBOX_SPACE=" " # растояние перед текстом + +# размер кнопок в главном меню +export BUTTON_SIZE_MM=36 # 24, 28, 32, 36, 40 + +# размер остальных кнопок +export BUTTON_SIZE=28 # 24, 28, 32, 36, 40 + +# размер вкладок +export TAB_SIZE=32 # 24, 28, 32, 36, 40 + +# размер главного меню +export PW_MAIN_SIZE_W=1100 +export PW_MAIN_SIZE_H=350 + +# количество столбцов в главном меню +export MAIN_GUI_COLUMNS=4 + +# настройки индикатора прогресса +export PROGRESS_BAR_BORDERS_SIZE=20 +export PROGRESS_BAR_WIDTH_SIZE=500 diff --git a/data_from_portwine/themes/default/style.css b/data_from_portwine/themes/default/style.css new file mode 100644 index 0000000..e69de29