CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pw-tray-for-wayland' of github.com:Htylol/PortWINE into Htylol-pw-tray-for-wayland

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-07-26 12:32:54 +03:00
commit 2b6d65b9aa
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
data_from_portwine/scripts/functions_helper
View File

@ -438,6 +438,7 @@ check_wayland_session () {
return 1 return 1
fi fi
} }
export -f check_wayland_session
check_flatpak () { check_flatpak () {
if [[ ! -z "$FLATPAK_IN_USE" ]] if [[ ! -z "$FLATPAK_IN_USE" ]]
@ -991,8 +992,11 @@ stop_portwine () {
kill_portwine && kill_portwine &&
try_remove_dir "${PW_WINELIB}/var" try_remove_dir "${PW_WINELIB}/var"
find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete
if [[ ! -z "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ]] ; then if [[ ! -z "$(pgrep -a pw_tray)" ]] ; then
kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" 2>/dev/null kill -s SIGUSR1 $(pgrep -a pw_tray) 2>/dev/null
fi
if [[ ! -z "$(pgrep -a yad_gui_pp)" ]] ; then
kill -s SIGUSR1 $(pgrep -a pw_yad_pp) 2>/dev/null
fi fi
pw_auto_create_shortcut pw_auto_create_shortcut
add_in_stop_portwine add_in_stop_portwine
@ -3461,15 +3465,10 @@ open_changelog () {
export -f open_changelog export -f open_changelog
pw_tray_icon () { pw_tray_icon () {
if [ ! -z "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ] ; then if [[ ! -z "$(pgrep -a pw_tray)" ]] ; then
kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" kill -s SIGUSR1 $(pgrep -a pw_tray) 2>/dev/null
fi fi
tray_icon_click () {
echo ""
}
export -f tray_icon_click
pw_tray_winefile () { pw_tray_winefile () {
pw_run winefile "C:\\users\\${USER}\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\" pw_run winefile "C:\\users\\${USER}\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\"
} }
@ -3486,15 +3485,10 @@ pw_tray_icon () {
} }
export -f tray_icon_click_exit export -f tray_icon_click_exit
"${pw_yad}" --notification --no-middle \ export PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray"
--image="$PW_GUI_ICON_PATH/portproton_tray_flatpak.svg" \ cd ${PW_GUI_TRAY_PATH}
--command="bash -c tray_icon_click" \ env LD_LIBRARY_PATH="${PW_GUI_TRAY_PATH}" "${PW_GUI_TRAY_PATH}/pw_tray" &
--tooltip="PortProton" \ cd -
--icon-size=32 --menu="| \
$(gettext "WINEFILE")!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.svg"|| \
$(gettext "TASKMGR")!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.svg"|| \
$(gettext "CHANGELOG")!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.svg"|| \
$(gettext "FORCE EXIT") !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.svg"||" 2>/dev/null &
return 0 return 0
} }