From a5727d66f4b4ed20bbfeff181a0e1fc2769e1c0d Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Thu, 11 Apr 2024 18:43:53 +0500
Subject: [PATCH] Added changing the tray icon depending on the theme variant
---
.../img/gui/portproton_tray_dark.png | Bin 0 -> 1255 bytes
...ton_tray.png => portproton_tray_light.png} | Bin
data_from_portwine/scripts/functions_helper | 33 ++++++++++++------
data_from_portwine/scripts/start.sh | 4 +++
4 files changed, 27 insertions(+), 10 deletions(-)
create mode 100644 data_from_portwine/img/gui/portproton_tray_dark.png
rename data_from_portwine/img/gui/{portproton_tray.png => portproton_tray_light.png} (100%)
diff --git a/data_from_portwine/img/gui/portproton_tray_dark.png b/data_from_portwine/img/gui/portproton_tray_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5caa1c2fd6c911567325d483420b9fa7ab010054
GIT binary patch
literal 1255
zcmV<D1Q`2?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm0003l
z0003l0ef*8O#lD@8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11awJ6
zK~!jg)!JLg6;%`m@Za`QYM*H--U>`8yO8KZ6jWfCQDk6+*-L^1VMUZ;P>E4lKKNjg
z3H1>8(nW=$AfXp4D<X(g=$?v3NQPOd<SljgFmr00Z_b>VIp0^fV8hunYpwtPzh}>y
zJ$p`wF*=iN!2eC4TN~70i9-k%U_8!~4Ak$~huyIcFMH^#Tp@%Bn1fq!6-KpjJ%Fuv
z59?x#KXwHiW9+Ko8oYy(h&9_OY{K+3*F-GFYuJcaFdsc_@w*^C4sSLf-L7rL@iymv
z#r!@KfFbz2BC!)V)JGzh)fRxk>1Yql9Uq2OIe=q$8w)TE!!rIuaYZ^MHsEkW5wklA
zkW`I(usI#UR`AzYis2dGr|>79!?+q(aYVrYRB1b;#ivjJ#^R$6N%r9COw6c;Q}OYJ
zSK<0X0qDWDib)RP$}TI|#)bkOY30a2iJ!q#)vO1vh7h`Wnh$LlH?sBPAMg;uNIY0G
z(NxT8NP^^{*2MO=eq=}QW=VOhYqvEd0UtMv`?U2VD`0ZNWEVG#gY}XMR>!u)7`L=K
zSplITiGdB{#2EKrMU9Y?SeQMK6|k!zkJ7jh!dW4NvZ=WoZ&biJg$H7cr%$^~NgJ>I
zTBNMaZBrs|!e=RP#1`D%#y4P*<mN2G_zp8Wu7$9+CiyQhsDRKs?N_G{mpm7GaF^t%
z{t}kp1`KE$lS?oPyDO4EjOz+WjK;x|xMP^u;Gs7P^GXGzj+5|B2l5ASV;i9P6~r&D
zNcvpN#_AOFi;e=)z#;gy0C+E6#F!G$Co2e8T~WY&`FkPnQ}|9CV>}u{_z9O~4zG+c
zK3e3Tv!5&Y?5W@bXXpBd^A2U}n1i`~Pessoairw@3A|M?*M+(M{=7q(fStMilq!fZ
z#=R)JQp;kD+pFZl<+*<E4S<sQcembE=bRc<V-CL0#P8DPy|zvKK*?52mc#v(ZsIh-
zMS9<Sa~hPtu^8VVZe{`g)XD<VB>5NjO?8PhZIXpv7JEmLU#FLm^|}6x5W=+`V!E~v
z!W79A%-Xs_=MJMV5`Q>-B(^D7KJ?+p55NaG%p;gk=wBh>GQH>G%6=5^SOMOew*D0o
z4wqDre9{FKV#lTfuuW3`590@{!KDTMbM;;X{({ks1*C~*_;*>{YNxQMB<4=N%V2&{
zw>0B_uj1u=Y2~YPX_vGi@;c7X`QG954Y9JeLbARpI`@1>UNz_E%WZ)6;gZy69Db`v
zzN~Ff@*dDsK)}-lU`M4};CQwV$gjoVN}TEl$Ou^=*-dBxzMnbwRTspM<B3{ang~dV
zPL}NJM9G&Hk{bS3L-JcNtu~LQ0y08oVPR&9<*QZIHoXacpM4{1SqNdb<Wo^yn-pW*
zT{oydKC^CW5VO4rdHP4d3zBJ6$5u5)>-HXKb6+f1eeQpVfsL{HNx*>gN^~N>86&#F
z>JI@KA-CX@0^&RIP&XsrZ&j$sLI`6dTQp~3SBx>gVbDDHe<7eh?Tr7o%HKfX!$ja<
RKBE8t002ovPDHLkV1h{)R9651
literal 0
HcmV?d00001
diff --git a/data_from_portwine/img/gui/portproton_tray.png b/data_from_portwine/img/gui/portproton_tray_light.png
similarity index 100%
rename from data_from_portwine/img/gui/portproton_tray.png
rename to data_from_portwine/img/gui/portproton_tray_light.png
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 56cb23b3..946e73ee 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -2484,16 +2484,29 @@ pw_tray_icon () {
}
export -f tray_icon_click_exit
- # --window-icon="$PW_GUI_ICON_PATH/portproton_tray.png" \
- "${pw_yad_v13_0}" --notification --no-middle \
- --image="$PW_GUI_ICON_PATH/portproton_tray.png" \
- --command="bash -c tray_icon_click" \
- --tooltip="PortProton" \
- --icon-size=32 --menu="| \
- ${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 &
+ if [[ "$PW_DESKTOP_THEME" == "dark" ]] ; then
+ # --window-icon="$PW_GUI_ICON_PATH/portproton_tray.png" \
+ "${pw_yad_v13_0}" --notification --no-middle \
+ --image="$PW_GUI_ICON_PATH/portproton_tray_light.png" \
+ --command="bash -c tray_icon_click" \
+ --tooltip="PortProton" \
+ --icon-size=32 --menu="| \
+ ${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 &
+ else
+ # --window-icon="$PW_GUI_ICON_PATH/portproton_tray.png" \
+ "${pw_yad_v13_0}" --notification --no-middle \
+ --image="$PW_GUI_ICON_PATH/portproton_tray_dark.png" \
+ --command="bash -c tray_icon_click" \
+ --tooltip="PortProton" \
+ --icon-size=32 --menu="| \
+ ${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 &
+ fi
return 0
}
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 2e333c24..94750aa6 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -129,6 +129,10 @@ 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"
+if [[ $(gsettings get org.gnome.desktop.interface color-scheme) == "'prefer-dark'" ]]
+then export PW_DESKTOP_THEME="dark"
+fi
+
. "${PORT_SCRIPTS_PATH}"/lang
export urlg="https://linux-gaming.ru/portproton/"