diff --git a/README.md b/README.md index efd5767..381874f 100755 --- a/README.md +++ b/README.md @@ -70,11 +70,7 @@ If you have a video card from **NVIDIA** , be sure to check if the **lib32-nvidi * **openSUSE** -`sudo zypper ref && sudo zypper up && sudo zypper in curl icoutils wget zenity bubblewrap zstd cabextract tar steam zenity zenity-lang` - -Installing Gamemode is done with a separate command: - -`opi gamemode` +`sudo zypper in curl icoutils wget zenity bubblewrap zstd cabextract tar steam zenity zenity-lang gamemoded libgamemode0 libgamemodeauto0` * **Fedora** @@ -94,7 +90,7 @@ Install the required dependencies: * **ROSA DESKTOP FRESH R12** -`sudo dnf update && sudo dnf upgrade --refresh && sudo dnf install sysvinit-tools curl libcurl4 icoutils wget zenity bubblewrap zstd cabextract tar libvulkan1 lib64vulkan1 vulkan.x86_64 vulkan.i686 vkd3d.x86_64 vkd3d.i686 coreutils file libc6 libnss3 xz bubblewrap xdg-utils openssl bc libgl1 lib64freetype2 libfreetype2 lib64txc-dxtn libtxc-dxtn coreutils lib64opencl1 libopencl1 libdrm2 libdrm2.i686 mesa.i686` +`sudo dnf update && sudo dnf upgrade --refresh && sudo dnf install sysvinit-tools curl libcurl4 icoutils wget zenity bubblewrap zstd cabextract tar libvulkan1 lib64vulkan1 vulkan.x86_64 vulkan.i686 vkd3d.x86_64 vkd3d.i686 coreutils file libc6 libnss3 xz bubblewrap xdg-utils openssl bc libgl1 lib64freetype2 libfreetype2 lib64txc-dxtn libtxc-dxtn lib64opencl1 libopencl1 libdrm2 libdrm2.i686 mesa.i686` * **Solus 4.x** diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 7e27572..e9bbede 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,16 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2164### +* added support for the --autoinstall argument [script_id_pw_autoinstall] - to be able to install the game\program without running the main PortProton interface +* updated the output of the --help argument from the terminal +* added a forced shutdown of the virtual desktop for vkPlay (to apply, just re-install vkPlay) +* added a fix for displaying text on some systems when using steam (to apply, just re-install steam) +* Updated the libs_v40 library package +* Updated plugins_v10 library package + - updated Proton EAC to the current state +* increased buttons in the PortProton interface + ###Scripts version 2163### * Steam is working again and starts in Steam Deck mode by default * added automatic reset of the .ppdb file settings when reinstalling the launchers from the PortProton menu diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 6aeb2e7..cb58ed4 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,17 @@ ----------------------------------------- История изменений: +###Scripts version 2164### +* добавлена поддержка аргумента --autoinstall [имя_скрипта_из_pw_autoinstall] - для возможности установки игры\программы без запуска основного интерфейса PortProton +* обновлен вывод аргумента --help из терминала +* добавлено принудительное отключение виртуального рабочего столя для vkPlay (для применения просто запустите повторно установку vkPlay) +* добавлен фикс отображения текста на некоторых системах при использовании steam (для применения просто запустите повторно установку steam) +* Обновлен пакет библиотек libs_v40 + - предустановлены все версии vcrun от 2005 до 2022 +* Обновлен пакет библиотек plugins_v10 + - обновлен Proton EAC до актуального состояния +* увеличены кнопки в интерфейсе PortProton + ###Scripts version 2163### * Steam снова работает и по умолчанию запускается в Steam Deck режиме * добавлен автоматический сброс настроек файла .ppdb при переустановке лончеров из меню PortProton diff --git a/data_from_portwine/img/gui/separator.png b/data_from_portwine/img/gui/separator.png new file mode 100755 index 0000000..338f4f4 Binary files /dev/null and b/data_from_portwine/img/gui/separator.png differ diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index e9a6b4b..0ebef2f 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -36,6 +36,7 @@ aldiserg an9949an andrey4korop zorn +Vano Majukin " & "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 56e0d22..88ce140 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -203,10 +203,10 @@ then export loc_gui_vkbasalt_start="VKBASALT" export loc_gui_db_comments="Найден файл настроек PortProton для" - export loc_gui_vulkan_stable="Стабильные версии DXVK ${DXVK_STABLE_VER} и VKD3D ${VKD3D_STABLE_VER}" - export loc_gui_vulkan_git="Новейшие версии DXVK ${DXVK_GIT_VER} и VKD3D ${VKD3D_GIT_VER}" - export loc_gui_gallium_nine="GALLIUM_NINE (Аппаратный DX9 для MESA)" - export loc_gui_open_gl="OPENGL (Для видеокарт без API VULKAN)" + export loc_gui_vulkan_stable="Стабильные DXVK ${DXVK_STABLE_VER} и VKD3D ${VKD3D_STABLE_VER}" + export loc_gui_vulkan_git="Новейшие DXVK ${DXVK_GIT_VER} и VKD3D ${VKD3D_GIT_VER}" + export loc_gui_gallium_nine="GALLIUM_NINE (DX9 для MESA)" + export loc_gui_open_gl="OPENGL (Для видеокарт без VULKAN)" export loc_gui_installing_the="Устанавливаем" export loc_gui_please_wait="Пожалуйста подождите..." diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index dfc1485..10fc2dd 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -7,8 +7,9 @@ # export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq" -export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019" +export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2022" export PW_USE_D3D_EXTRAS=1 +export PW_WINE_USE="PROTON_LG" add_in_start_portwine () { regdlloverrides "RDR2.exe:vulkan-1=n" diff --git a/data_from_portwine/scripts/portwine_db/VKPlayLoader b/data_from_portwine/scripts/portwine_db/VKPlayLoader index 3ec25ae..1f75a2e 100755 --- a/data_from_portwine/scripts/portwine_db/VKPlayLoader +++ b/data_from_portwine/scripts/portwine_db/VKPlayLoader @@ -5,8 +5,12 @@ #####################examples########################### ##export PW_COMMENT_DB="blablabla" export PW_WINDOWS_VER="10" -export PW_WINE_USE="PROTON_LG" export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="VK_PLAY" -# export PW_VIRTUAL_DESKTOP="1" + +add_in_start_portwine () { + if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" ]] ; then + sed -i '/Software\\\\Wine\\\\Explorer/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" + fi +} diff --git a/data_from_portwine/scripts/portwine_db/steam b/data_from_portwine/scripts/portwine_db/steam index 83a0657..cf696c7 100755 --- a/data_from_portwine/scripts/portwine_db/steam +++ b/data_from_portwine/scripts/portwine_db/steam @@ -5,9 +5,9 @@ ################################################ export PW_COMMENT_DB="Steam" export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46" +export PW_DLL_INSTALL="vcrun2022 d3dcompiler_46" export WINEDLLOVERRIDES="" -export LAUNCH_PARAMETERS="-gamepadui -fullscreen" +export LAUNCH_PARAMETERS="-gamepadui -fullscreen -no-dwrite" export PW_VULKAN_USE="1" add_in_start_portwine () { diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index 25c80e1..02d64cf 100755 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -7,14 +7,14 @@ #Rating=5 export PW_COMMENT_DB="Wargaming and Lesta Game Centers" ################################################ -export PW_WINE_USE=PROTON_GE +export PW_WINE_USE="PROTON_LG" export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="" # Additional launch options #export PW_USE_TERMINAL=1 export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP #export PW_USE_NVAPI_AND_DLSS=0 export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n,b" -export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="lucida vcrun2022" # Install DDL in port prefix (used winetricks) ##export PW_GUI_DISABLED_CS=1 ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG export PW_USE_D3D_EXTRAS=0 diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 3bbea4d..c1b421a 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -611,7 +611,8 @@ fi unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_ICON_FOR_YAD unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PORTWINE_CREATE_SHORTCUT_NAME -unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD +unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD +unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP export portname=PortProton diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 48380bf..223f420 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: linux-gaming.ru -clear +# clear export NO_AT_BRIDGE=1 export pw_full_command_line=("$0" $*) if [ -f "$1" ]; then @@ -8,6 +8,7 @@ if [ -f "$1" ]; then fi . "$(dirname $(readlink -f "$0"))/runlib" kill_portwine +killall -9 yad_new 2>/dev/null pw_stop_progress_bar if [[ -f "/usr/bin/portproton" ]] && [[ -f "${HOME}/.local/share/applications/PortProton.desktop" ]] ; then @@ -454,18 +455,28 @@ if [[ ! -z "$(echo ${1} | grep '/Caliber/')" ]] ; then export PW_WINE_USE=PROTON_STEAM_6.3-8 fi +# CLI case "${1}" in '--help' ) - echo ' -usege: [--reinstall] + files_from_autoinstall=$(ls "${PORT_SCRIPTS_PATH}/pw_autoinstall") + echo -e " +usege: [--reinstall] [--autoinstall] ---reinstall reinstall portproton to default settings -' +--reinstall reinstall files of the portproton to default settings +--autoinstall [script_frome_pw_autoinstall] autoinstall from the list below: +" + echo ${files_from_autoinstall} + echo "" exit 0 ;; '--reinstall' ) export PW_REINSTALL_FROM_TERMINAL=1 pw_reinstall_pp ;; + + '--autoinstall' ) + export PW_YAD_SET="$2" + pw_autoinstall_from_db + exit 0 ;; esac PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)" @@ -541,22 +552,22 @@ if [ -n "${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}!!${loc_create_shortcut}:100" + PW_SHORTCUT="${loc_gui_create_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_create_shortcut}:100" else - PW_SHORTCUT="${loc_gui_delete_shortcut}!!${loc_delete_shortcut}:98" + PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_delete_shortcut}:98" fi OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=7 --form --center \ - --title "${portname}-${install_ver} (${scripts_install_ver})" --image "${PW_ICON_FOR_YAD}" --separator=";" \ + --title "${portname}-${install_ver} (${scripts_install_ver})" --image "${PW_ICON_FOR_YAD}" --separator=";" --keep-icon-size \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --field="3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ --field="PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=":LBL" "" \ - --button="${loc_gui_vkbasalt_start}"!!"${ENABLE_VKBASALT_INFO}":120 \ - --button="${loc_gui_edit_db_start}"!!"${loc_edit_db} ${PORTWINE_DB}":118 \ + --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_VKBASALT_INFO}":120 \ + --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ --button="${PW_SHORTCUT}" \ - --button="${loc_gui_debug}"!!"${loc_debug}":102 \ - --button="${loc_gui_launch}"!!"${loc_launch}":106 ) + --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 ) 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}') @@ -579,6 +590,22 @@ else } export -f button_click + run_desktop_b_click () { + [[ -n "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" + if [[ -n $(pidof -s yad) ]] || [[ -n $(pidof -s yad_new) ]] ; then + kill -s SIGUSR1 $(pgrep -a yad | grep "\-\-key=${KEY} \-\-notebook" | awk '{print $1}') > /dev/null 2>&1 + fi + + PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET}"* | grep Exec | head -n 1 | awk -F"=env " '{print $2}')" + echo ${PW_EXEC_FROM_DESKTOP[*]} + + echo "Restarting PP after choose desktop file..." + # stop_portwine + /usr/bin/env bash -c "${PW_EXEC_FROM_DESKTOP[*]}" & + exit 0 + } + export -f run_desktop_b_click + gui_clear_pfx () { if gui_question "${port_clear_pfx}" ; then pw_clear_pfx @@ -640,31 +667,32 @@ else } export -f gui_open_scripts_from_backup - export KEY=$RANDOM - "${pw_yad_new}" --plug=${KEY} --tabnum=4 --columns=3 --align-buttons --form --separator=";" \ - --field=" $loc_gui_pw_reinstall_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ - --field=" $loc_gui_rm_pp"!""!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ - --field=" $loc_gui_upd_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ - --field=" $loc_gui_changelog"!""!"":"FBTN" '@bash -c "button_click open_changelog"' \ - --field=" $loc_gui_change_loc"!""!"":"FBTN" '@bash -c "button_click change_loc"' \ - --field=" $loc_gui_edit_usc"!""!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \ - --field=" $loc_gui_scripts_fb"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \ - --field=" Xterm"!""!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ - --field=" $loc_gui_credits"!""!"":"FBTN" '@bash -c "button_click gui_credits"' & - "${pw_yad_new}" --plug=${KEY} --tabnum=3 --columns=3 --align-buttons --form --separator=";" \ + export KEY=$RANDOM + "${pw_yad_new}" --plug=${KEY} --tabnum=4 --form --columns=3 --align-buttons --keep-icon-size --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"' & + + "${pw_yad_new}" --plug=${KEY} --tabnum=3 --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ --field=" 3D API : :CB" "${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ - --field=" DOWNLOAD OTHER WINE "!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ - --field=' WINECFG'!""!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ - --field=' WINEFILE'!""!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ - --field=' WINECMD'!""!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ - --field=' WINEREG'!""!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' \ - --field=' WINETRICKS'!""!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ - --field=" WINE UNINSTALLER"!""!"":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ - --field=" CLEAR PREFIX"!""!"":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ - --field=" CREATE PFX BACKUP"!""!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & + --field=" DOWNLOAD OTHER WINE"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ + --field=' WINECFG'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ + --field=' WINEFILE'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ + --field=' WINECMD'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ + --field=' WINEREG'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' \ + --field=' WINETRICKS'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ + --field=" WINE UNINSTALLER"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ + --field=" CLEAR PREFIX"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ + --field=" CREATE PFX BACKUP"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & "${pw_yad_new}" --plug=$KEY --tabnum=2 --form --columns=3 --align-buttons --keep-icon-size --scroll \ --field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \ @@ -712,19 +740,36 @@ else # --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' - "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width=900 --height=235 --no-buttons --auto-close --center \ + orig_IFS="$IFS" && IFS=$'\n' + PW_ALL_DF="$(ls ${PORT_WINE_PATH}/ | grep .desktop | grep -v "PortProton" | grep -v "readme")" + IFS="$orig_IFS" + + for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do + PW_NAME_D_NAME="$(cat "${PORT_WINE_PATH}/$PW_DESKTOP_FILES" | grep Name | awk -F= '{print $2}')" + PW_NAME_D_ICON="$(cat "${PORT_WINE_PATH}/$PW_DESKTOP_FILES" | grep Icon | awk -F= '{print $2}')" + + PW_GENERATE_BUTTONS+="--field= ${PW_NAME_D_NAME}!${PW_NAME_D_ICON}!:FBTN%@bash -c \"run_desktop_b_click ${PW_DESKTOP_FILES}\"%" + done + + old_IFS=$IFS && IFS="%" + "${pw_yad_new}" --plug=$KEY --tabnum=5 --form --columns=2 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} & + IFS="$orig_IFS" + + + "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width=1000 --height=235 --no-buttons --auto-close --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ - --tab-pos=bottom \ - --tab=" $loc_mg_autoinstall"!!"" \ - --tab=" $loc_mg_emulators"!!"" \ - --tab=" $loc_mg_wine_settings"!!"" \ - --tab=" $loc_mg_portproton_settings"!!"" + --tab-pos=bottom --keep-icon-size \ + --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"!"" YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form" ]]; then export PW_YAD_SET=$(cat "${PORT_WINE_TMP_PATH}/tmp_yad_form" | head -n 1 | awk '{print $1}') - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form" + echo "from tmp_yad_form $PW_YAD_SET, and cat tmp_yad_form" + cat "${PORT_WINE_TMP_PATH}/tmp_yad_form" fi if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ]] ; then export VULKAN_MOD=$(cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk -F";" '{print $1}') diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e5786bd..4dbb2d7 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=2163 +#SCRIPTS_NEXT_VERSION=2164 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -20,7 +20,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v39" +export PW_LIBS_VER="_v40" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -31,11 +31,11 @@ export STAGING_SHARED_MEMORY="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_MANGOHUD_x32="0" ###DEFAULT_WINE### -export PW_WINE_USE="PROTON_GE" -export PW_PLUGINS_VER="_v9" +export PW_WINE_USE="PROTON_LG" +export PW_PLUGINS_VER="_v10" export PW_FAKE_DLSS_VER="091122" ###WINE_PROTON_LG### -export PW_LG_VER="7-47" +export PW_LG_VER="7-49" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### export PW_GE_VER="7-49" @@ -55,8 +55,8 @@ export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" pw_install_dll_in_prefix () { case $PW_PREFIX_NAME in - DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" ;; - DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;; + DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2022" ;; + DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2022 faudio dotnet48" ;; *) export PW_MUST_HAVE_DLL="" ;; esac }