###Scripts version 2034###

data_from_portwine/changelog

@@ -7,6 +7,9 @@
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 2034###
+* добавлены всплывающие описания эффектов vkBasalt в интерфейсе для его настройки (будут еще дополняться)
+
 ###Scripts version 2033###
 * HOTFIX для winetricks для установки vcrun2019 (спасибо VHSgunzo)
 

data_from_portwine/scripts/functions_helper

@@ -433,21 +433,19 @@ update_winetricks () {
     print_info "Version winetricks on server: ${W_TRX_EXT_VER}"
     W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
     print_info "Version winetricks in port: ${W_TRX_INT_VER}"
-    if [[ ! -f "${PORT_WINE_TMP_PATH}/winetricks" && ! -z "$W_TRX_EXT_VER" ]] || [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" && ! -z "$W_TRX_EXT_VER" ]]; then
+    #if [[ ! -f "${PORT_WINE_TMP_PATH}/winetricks" && ! -z "$W_TRX_EXT_VER" ]] || [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" && ! -z "$W_TRX_EXT_VER" ]]; then
         if try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new" ; then
             mv -f "${PORT_WINE_TMP_PATH}/winetricks_new" "${PORT_WINE_TMP_PATH}/winetricks"
             W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})" 
             chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
         fi
-    fi
+    #fi
     if  [ -f "${PORT_WINE_TMP_PATH}/winetricks" ] ; then
         sed -i 's/w_metadata vcrun2015 dlls \\/w_metadata !dont_use_2015! dlls \\/' "${PORT_WINE_TMP_PATH}/winetricks"
         sed -i 's/w_metadata vcrun2017 dlls \\/w_metadata !dont_use_2017! dlls \\/' "${PORT_WINE_TMP_PATH}/winetricks"
         #HOTFIX SHA256SUM FOR VC_RUN2019
-        sed -i 's/vc_redist.x86.exe 1acd8d5ea1cdc3eb2eb4c87be3ab28722d0825c15449e5c9ceef95d897de52fa/vc_redist.x86.exe \
+        sed -i 's/vc_redist.x86.exe 1acd8d5ea1cdc3eb2eb4c87be3ab28722d0825c15449e5c9ceef95d897de52fa/vc_redist.x86.exe 80c7969f4e05002a0cd820b746e0acb7406d4b85e52ef096707315b390927824/g' "${PORT_WINE_TMP_PATH}/winetricks"
-        80c7969f4e05002a0cd820b746e0acb7406d4b85e52ef096707315b390927824/g' "${PORT_WINE_TMP_PATH}/winetricks"
+        sed -i 's/vc_redist.x64.exe 003063723b2131da23f40e2063fb79867bae275f7b5c099dbd1792e25845872b/vc_redist.x64.exe 9b9dd72c27ab1db081de56bb7b73bee9a00f60d14ed8e6fde45dab3e619b5f04/g' "${PORT_WINE_TMP_PATH}/winetricks"
-        sed -i 's/vc_redist.x64.exe 003063723b2131da23f40e2063fb79867bae275f7b5c099dbd1792e25845872b/vc_redist.x64.exe \
-        9b9dd72c27ab1db081de56bb7b73bee9a00f60d14ed8e6fde45dab3e619b5f04/g' "${PORT_WINE_TMP_PATH}/winetricks"
 
     fi
 }
@@ -834,10 +832,11 @@ gui_vkBasalt () {
     GET_FX_IN_FILE=(`echo ${PW_VKBASALT_EFFECTS} | sed s/"cas:"// | sed s/":"/" "/g`)
     unset ADD_GUI_FX GUI_FX_RESULT
     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:CHK TRUE")
+            ADD_GUI_FX+="--field=$add_list_fx!${!PW_VKBASALT_GUI_HELP}:CHK%TRUE%"
         else
-            ADD_GUI_FX+=("--field $add_list_fx:CHK FALSE")
+            ADD_GUI_FX+="--field=$add_list_fx!${!PW_VKBASALT_GUI_HELP}:CHK%FALSE%"
         fi
     done
     if [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then
@@ -845,15 +844,18 @@ gui_vkBasalt () {
     else
         VKBASALT_FFX_CAS_GUI=75
     fi
+    export old_IFS=$IFS
+    export IFS="%" 
     "${pw_yad_new}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \
-    ${ADD_GUI_FX[@]} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" &
+    ${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" &
+    export IFS="${old_IFS}" 
 
     "${pw_yad_new}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \
     --field="AMD FidelityFX - Contrast Adaptive Sharpening":SCL "${VKBASALT_FFX_CAS_GUI}" \
     1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" &
 
     "${pw_yad_new}" --paned --key="$KEY_FX_GUI" --height="600" --title="vkBasalt" --center --borders=10 \
-    --button="CANCEL":1 --button="DISABLED  VKBASALT":180 --button="ENABLED  VKBASALT":182
+    --separator=" " --button="CANCEL":1 --button="DISABLED  VKBASALT":180 --button="ENABLED  VKBASALT":182
     YAD_VKBASALT_STATUS="$?"
     case "${YAD_VKBASALT_STATUS}" in
         1|252)
@@ -864,7 +866,6 @@ gui_vkBasalt () {
         182)
             export ENABLE_VKBASALT=1 ;;
     esac
-
     YAD_BASALT_SET=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set"`
     YAD_CAS_SET=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" | sed s/" "//g`
 

data_from_portwine/scripts/portwine_db/EpicGamesLauncher

@@ -3,7 +3,7 @@
 #EpicGamesLauncher.exe
 #Rating=5
 ##############################################
-export PW_COMMENT_DB="For GTA5 it is recommended to use DXVK."
+export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher was found.\nFor GTA5 it is recommended to use DXVK."
 export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS="-opengl -SkipBuildPatchPrereq"

data_from_portwine/scripts/runlib

@@ -38,7 +38,7 @@ start_portwine () {
         xrdb -merge "${HOME}/.Xresources"
     fi
 
-    pw_start_progress_bar_cs "Start ${portname}... Please wait..."
+    pw_start_progress_bar_block "Start ${portname}... Please wait..."
 
     if [ "${PW_USE_GSTREAMER}" = 1 ] ; then 
         if [ -d "${WINEDIR}/lib64/gstreamer-1.0" ] ; then
@@ -235,7 +235,7 @@ start_portwine () {
         echo "Gamemod will be launched."
     else
         export PW_GAMEMODERUN=0
-        echo "Gamemod is not installed or disabled in vars script: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
+        echo "Gamemod is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
     fi
     #init_pfx
     if [[ ! -d "${WINEPREFIX}" || ! -d "${WINEPREFIX}"/drive_c/windows || ! -d "${WINEPREFIX}/dosdevices" || ! -f "${WINEPREFIX}"/userdef.reg || ! -f "${WINEPREFIX}"/system.reg || ! -f "${WINEPREFIX}"/user.reg ]]
@@ -260,9 +260,9 @@ start_portwine () {
         ${pw_runtime} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u
         wait_wineserver
         kill_portwine
-        pw_stop_progress_bar
-        pw_start_progress_bar_cs "Initialization prefix..."
     fi
+    pw_stop_progress_bar
+    pw_start_progress_bar_cs "Initialization prefix..."
     [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:"
     [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:"
     create_new_dir "${WINEPREFIX}/drive_c/users/steamuser"
@@ -351,7 +351,6 @@ start_portwine () {
     then export PW_DLL_INSTALL="${PW_MUST_HAVE_DLL} ${PW_DLL_INSTALL}"
     fi
     if [ ! -z "${PW_DLL_INSTALL}" ]; then
-        pw_stop_progress_bar
         export PW_DLL_NEED_INSTALL=""
         export USE_WT_FROM_DB=0
         if [ ! -e "${WINEPREFIX}/winetricks.log" ] ; then
@@ -392,7 +391,6 @@ start_portwine () {
                 exit 0
             fi
         fi
-        pw_start_progress_bar_cs "Start ${portname}... Please wait..."
     fi
     if [[ -z `cat "${WINEPREFIX}/system.reg" | grep "Windows $PW_WINDOWS_VER"` ]] ; then
         if [[ ! -z "${PW_WINDOWS_VER}" && `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ]] ; then
@@ -404,6 +402,8 @@ start_portwine () {
         wait_wineserver
     fi
     add_in_start_portwine
+    pw_stop_progress_bar
+    pw_start_progress_bar_cs "Start ${portname}... Please wait..."
 }
 
 pw_run () {

data_from_portwine/scripts/var

@@ -1,6 +1,6 @@
 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2033
+#SCRIPTS_NEXT_VERSION=2034
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=0