Merge branch 'Boria138-update-tray'

data_from_portwine/scripts/functions_helper

@@ -2497,16 +2497,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
 }

data_from_portwine/scripts/start.sh

@@ -135,6 +135,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/"