Combined two pull requests into one to avoid conflicts

2023-10-16 12:16:50 +06:00
parent 61e56a08e3
commit bd2bbee60f
6 changed files with 275 additions and 26 deletions
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@ -30,6 +30,16 @@ if [[ "${update_loc}" == "RUS" ]] ; then
    export loc_gui_scripts_fb="Откатить версию скриптов"
    export loc_gui_credits="Авторы и спасибы =)"

+    export loc_gui_clear_pfx="Очистить префикс"
+    export loc_gui_download_other_wine="Скачать другую версию wine"
+    export loc_gui_create_pfx_backup="Создать резервную копию префикса"
+
+    export loc_gui_wine_uninstaller="Удаление программм"
+    export loc_gui_wine_cfg="Настройка префикса"
+    export loc_gui_wine_file="Файловый менеджер"
+    export loc_gui_wine_cmd="Коммандная строка"
+    export loc_gui_wine_reg="Редактор реестра"
+
 	export loc_tray_winefile="Файловый менеджер WINE"
 	export loc_tray_tascmng="Диспетчер задач WINE"
 	export loc_tray_cangelog="История изменений"
@ -96,10 +106,13 @@ if [[ "${update_loc}" == "RUS" ]] ; then
 	export loc_winefile="Запустить файловый менеждер встроенный в wine"
    export loc_winecmd="Запустить командную строку wine"
 	export loc_winereg="Запустить редактор реестра выбранного префикса"
+    export loc_wineuninstaller="Запустить средство удаление программ встроенное в wine"
    export loc_winetricks="Запустить префикс менеджер для установки доп. библиотек в выбранный префикс"
 	export loc_edit_db="Изменить файл настроек для"
 	export loc_download_other_wine="Открыть меню для скачивания других версий WINE-PROTON"

+	export loc_clear_pfx="Очистить префикс для исправления проблем"
+
 	export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)'
 	export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)'
 	export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)'
@ -194,6 +207,10 @@ if [[ "${update_loc}" == "RUS" ]] ; then
   
 	export PW_WAYLAND_INFO="Внимание! Вы запускаете ${portname} в сессии Wayland, некоторые функции могут быть недоступны!\nРекомендуется перезапустить сессию в X11!"

+	export PW_PFX_BACKUP_INFO="Внимание! Не передавайте резевную копию третьим лицам, есть риск потери аккаунтов"
+	export PW_PFX_BACKUP_SUCCESS="Резервная копия префикса: \"${PW_PREFIX_NAME}\" успешно создана"
+	export PW_PFX_BACKUP_ERROR="Во время создания резервной копии префикса: \"${PW_PREFIX_NAME}\" произошла ошибка"
+
 	export loc_find_d3dadapter9_error="не найден в системе.\nУстановите недостающий пакет: </Sb>d3dadapter9</b>"

 	export loc_gui_create_shortcut_for_exe="Выберите .exe файл для которого необходимо создать ярлык и нажмите ОК.\n"
@ -209,6 +226,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then
 	export loc_gui_cancel="ОТМЕНИТЬ ИЗМЕНЕНИЯ"
 	export loc_gui_cancel_help="Отменить текущие изменения и вернутся в предыдущее меню."

+	export loc_disabled="Отключено"
+
 	export loc_gui_open_db="ОТКРЫТЬ ФАЙЛ НАСТРОЕК"
 	export loc_gui_open_db_help="Открыть файл настроек <b>.ppdb</b> в системном текстовом редакторе для просмотра и изменений переменных вручную."

@ -287,6 +306,16 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
    export loc_gui_scripts_fb="SCRIPTS FROM BACKUP"
    export loc_gui_credits="CREDITS"

+	export loc_gui_clear_pfx="Clear prefix"
+    export loc_gui_download_other_wine="Get other Wine"
+    export loc_gui_create_pfx_backup="Create prefix backup"
+
+    export loc_gui_wine_uninstaller="Uninstaller"
+    export loc_gui_wine_cfg="Prefix configuration"
+    export loc_gui_wine_file="File manager"
+    export loc_gui_wine_cmd="CMD"
+    export loc_gui_wine_reg="Reg edit"
+
    export loc_tray_winefile="WINEFILE"
 	export loc_tray_tascmng="TASKMNR"
 	export loc_tray_cangelog="CHANGE  LOG"
@ -353,10 +382,13 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
    export loc_winefile="Run wine file manager"
    export loc_winecmd="Run wine cmd"
 	export loc_winereg="Run wine regedit"
+	export loc_wineuninstaller="Run the program uninstaller built into wine"
    export loc_winetricks="Run winetricks to install additional libraries to the selected prefix"
 	export loc_edit_db="Edit database file for"
 	export loc_download_other_wine="Open the menu to download other versions of WINE-PROTON "

+	export loc_clear_pfx="Clear the prefix to fix problems"
+
 	export ENABLE_VKBASALT_INFO='Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)'
 	export PW_NO_ESYNC_INFO='Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)'
 	export PW_NO_FSYNC_INFO='Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems without FUTEX_WAIT_MULTIPLE support) (It is recommended not to change the value)'
@ -451,6 +483,10 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
       
 	export PW_WAYLAND_INFO="Attention! You are running $portname in a Wayland session, some features may not be available!\nRestarting your session in X11 is recommended!"

+	export PW_PFX_BACKUP_INFO="Attention! Do not pass the resev copy to third parties, there is a risk of losing accounts"
+	export PW_PFX_BACKUP_SUCCESS="Prefix backup: \"${PW_PREFIX_NAME}\" has been successfully created"
+	export PW_PFX_BACKUP_ERROR="An error occurred while backing up the prefix: \"${PW_PREFIX_NAME}\" error occurred"
+
 	export loc_find_d3dadapter9_error="Not found in the system.\nInstall the missing package: </Sb>d3dadapter9</b>"

 	export loc_gui_create_shortcut_for_exe="Choose the .exe file for which you need to create a shortcut and click OK.\n"
@ -466,6 +502,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
 	export loc_gui_cancel="CANCEL THE CHANGES"
 	export loc_gui_cancel_help="Cancel the current changes and return to the previous menu."

+	export loc_disabled="Disabled"
+
 	export loc_gui_open_db="OPEN THE SETTINGS FILE"
 	export loc_gui_open_db_help="Open the <b>.ppdb</b> settings file in a system text editor to view and change variables manually."

--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@ -391,7 +391,7 @@ pw_start_cont_xterm () {
 pw_create_prefix_backup () {
    cd "$HOME"
    PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=3 --width=650 --height=500 --auto-close \
-    --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO..." 2>/dev/null )
+    --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "$loc_create_pfx_backup_path" 2>/dev/null )
    YAD_STATUS="$?"
    if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
    if [[ ! -z "$(grep "/${PW_PREFIX_NAME}/" "${PORT_WINE_PATH}"/*.desktop )" ]] ; then
@ -419,9 +419,13 @@ pw_create_prefix_backup () {
    done
    if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then
        mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack"
-        zenity_info "Backup for prefix \"${PW_PREFIX_NAME}\" successfully created."
+        zenity_info "$PW_PFX_BACKUP_SUCCESS"
    else 
-        zenity_error "An error occurred while creating a backup for prefix: \"${PW_PREFIX_NAME}\" !"
+        zenity_error "$PW_PFX_BACKUP_ERROR"
+    fi
+    if [[ ! -f "${PORT_WINE_TMP_PATH}/pfx_backup_info" ]]; then
+        zenity_info "$PW_PFX_BACKUP_INFO"
+        echo "1" > "${PORT_WINE_TMP_PATH}/pfx_backup_info"
    fi
    return 0
 }
@ -725,15 +729,15 @@ else
    --field="  3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
    --field="  PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
    --field="  WINE    : :CB" "${PW_DEFAULT_WINE_USE}" \
-    --field="              CREATE PFX BACKUP"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \
-    --field='   WINETRICKS'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \
-    --field="   CLEAR PREFIX"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_clear_pfx"' \
-    --field="   DOWNLOAD OTHER WINE"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \
-    --field="   WINE UNINSTALLER"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \
-    --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"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &
+    --field="              $loc_gui_create_pfx_backup"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \
+    --field="   WINETRICKS"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \
+    --field="   $loc_gui_clear_pfx"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_clear_pfx}":"FBTN" '@bash -c "button_click gui_clear_pfx"' \
+    --field="   $loc_gui_download_other_wine"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \
+    --field="   $loc_gui_wine_uninstaller"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_wineuninstaller}":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \
+    --field="   $loc_gui_wine_cfg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \
+    --field="   $loc_gui_wine_file"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \
+    --field="   $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \
+    --field="   $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &

    "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --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"' \
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@ -66,6 +66,7 @@ pw_install_dll_in_prefix ()
    case $PW_PREFIX_NAME in
        DEFAULT) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2022 sandbox" ;;
         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;;
+         PROGRAMS) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2019 riched20 corefonts msxml3 msxml4 msxml6" ;;
              *) export PW_MUST_HAVE_DLL="" ;;
    esac
 }
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@ -152,17 +152,17 @@ pw_gui_for_edit_db () {
    if echo "${MANGOHUD_CONFIG}" | grep "fps_limit" ; then
        FPS_LIMIT_VAR="$(echo ${MANGOHUD_CONFIG} | sed 's/.*fps_limit=//' | awk -F, '{print $1}')"
    else
-        FPS_LIMIT_VAR="disabled"
+        FPS_LIMIT_VAR="$loc_disabled"
    fi
-    if [[ ! -z "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "disabled" ]] ; then
+    if [[ ! -z "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "$loc_disabled" ]] ; then
        CPU_LIMIT_VAR="`echo ${PW_WINE_CPU_TOPOLOGY%%:*}`"
    else
-        CPU_LIMIT_VAR="disabled"
+        CPU_LIMIT_VAR="$loc_disabled"
    fi
-    if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "default" ]] ; then
+    if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "$loc_disabled" ]] ; then
        AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}"
    else
-        AMD_VULKAN_VAR="default"
+        AMD_VULKAN_VAR="$loc_disabled"
    fi

    GET_REFRASH_RATE="30!45!60!75!120!144!165!240"
@ -205,9 +205,9 @@ pw_gui_for_edit_db () {
    --field=":LBL" "" \
    --field="${loc_gui_arg_exe}!${loc_gui_arg_exe_help} :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \
    --field=":LBL" "" \
-    --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!disabled!${GET_LOGICAL_CORE}" \
-    --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!default!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \
-    --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRASH_RATE}"  2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null &
+    --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!${loc_disabled}!${GET_LOGICAL_CORE}" \
+    --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!${loc_disabled}!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \
+    --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!${loc_disabled}!${GET_REFRASH_RATE}"  2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null &
    "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \
    --text "${loc_gui_edit_db} <b>${PORTWINE_DB}</b>\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \
    --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
@ -241,19 +241,19 @@ pw_gui_for_edit_db () {
    PW_AMD_VULKAN_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`"
    FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $9}'`"

-    if [[ "${FPS_LIMIT}" != "disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "disabled" ]] ; then
+    if [[ "${FPS_LIMIT}" != "$loc_disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "$loc_disabled" ]] ; then
        export MANGOHUD_CONFIG="$(echo ${MANGOHUD_CONFIG} | sed "s/fps_limit=${FPS_LIMIT_VAR}/fps_limit=${FPS_LIMIT}/")"
        export PW_MANGOHUD=1
-    elif [[ "${FPS_LIMIT}" != "disabled" ]] && [[ "${FPS_LIMIT_VAR}" == "disabled" ]] ; then
+    elif [[ "${FPS_LIMIT}" != "$loc_disabled" ]] && [[ "${FPS_LIMIT_VAR}" == "$loc_disabled" ]] ; then
        export MANGOHUD_CONFIG=${MANGOHUD_CONFIG},fps_limit=${FPS_LIMIT}
        export PW_MANGOHUD=1
-    elif [[ "${FPS_LIMIT}" == "disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "disabled" ]] ; then
+    elif [[ "${FPS_LIMIT}" == "$loc_disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "$loc_disabled" ]] ; then
        export MANGOHUD_CONFIG="$(echo ${MANGOHUD_CONFIG} | sed "s/,fps_limit=${FPS_LIMIT_VAR}//")"
    fi
-    if [[ "${CPU_LIMIT}" != "disabled" ]] ; then
+    if [[ "${CPU_LIMIT}" != "$loc_disabled" ]] ; then
        export PW_WINE_CPU_TOPOLOGY="${CPU_LIMIT}:$(seq -s, 0 $((${CPU_LIMIT} - 1)))"
    else
-        export PW_WINE_CPU_TOPOLOGY="disabled"
+        export PW_WINE_CPU_TOPOLOGY="$loc_disabled"
    fi
    if [[ "${PW_AMD_VULKAN_USE}" == "amdvlk" ]] ; then
        export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1