Merge branch 'master' into update-locale-window

data_from_portwine/changelog_en

@@ -2,6 +2,33 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2305### Date: 12.06.2024 / Download update size: 183 megabytes
+* ATTENTION: after updating the scripts, you need to restart PortProton once to download the new version of plugins!
+
+* the plugins package has been updated to v16:
+    * the yad version has been updated - many patches have been added to improve the interface (thanks Htylol)
+    * information about the project has been fixed when hovering over the tray icon (thanks Htylol)
+    * the exe launch interface has been updated, a tab with settings has been added (thanks Htylol)
+    * creation of new prefixes has been accelerated (in 1.5 or more times, depending on the characteristics of the PC)
+    * updated dxvk-nvapi to v0.7.0-5
+    * added a portable version of icoextract for better extraction of icons from exe files (thanks to Boria138)
+
+* updated versions:
+    * DXVK_GIT "2.3.1-72"
+    * VKD3D_GIT "1.1-4051"
+
+* optimized the speed of switching PortProton interface settings
+* added a symbolic link to the home directory for the flatpak version of PortProton
+* Improved PortProton interface
+* added theme: compact (thanks Htylol)
+* added switching the view of the main exe launch interface and shortcuts in the menu "PortProton -> PortProton Settings -> Change the launch interface" (thanks Htylol)
+* GameScope settings are placed in a separate window (for future functionality expansion)
+* Improved the wine download interface and added the ability to select multiple versions at the same time
+* many small improvements to the GUI and scripts
+
+###Scripts version 2304### Date: 10.06.2024 / Download update size: 3 megabytes
+* HOTFIX for ALT Linux + NVIDIA
+
 ###Scripts version 2303### Date: 06.06.2024 / Download update size: 190 megabytes
 * updated WINE_LG to version "9-10"
 * updated the GOG installer
@@ -210,7 +237,7 @@ Special thanks:
 * the faudio component has been added to the DEFAULT prefix (required for games running on the Creation Engine, example The Elder Scrolls)
 * the plugins_v14 library package has been updated:
     transferred from the libs package: d3d_extras, reshade and default_pfx
-    portable versions have been added: yad_v13_0, perl, exiftool (thanks to Boria138)
+    portable versions have been added: yad_gui_pp, perl, exiftool (thanks to Boria138)
 * the libs_v47 library package has been updated:
     pressure-vessel 0.20240306.0
     sniper 0.20240307.80401

data_from_portwine/changelog_ru

@@ -2,10 +2,37 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2305### Дата: 12.06.2024 / Размер скачиваемого обновления: 183 мегабайта
+* ВНИМАНИЕ: после обновления скриптов необходимо один раз перезапустить PortProton что бы скачалась новая версия plugins!
+
+* обновлен пакет plugins до v16:
+    * обновлена версия yad - добавлено множество патчей улучшающих интерфейс (спасибо Htylol)
+    * исправлена информация о проекте при наведении курсора на иконку в трее (спасибо Htylol)
+    * обновлен интерфейс запуска exe и ярлыков, добавлена вкладка с настройками (спасибо Htylol)
+    * ускорено создание новых префиксов (в 1.5 и более раз в зависимости от характеристик ПК)
+    * обновлен dxvk-nvapi до v0.7.0-5
+    * добавлена портативная версия icoextract для лучшего извлечения иконок из exe файлов (спасибо Boria138)
+
+* обновлены версии:
+    * DXVK_GIT "2.3.1-72"
+    * VKD3D_GIT "1.1-4051"
+
+* оптимизирована скорость переключения настроек интерфейса PortProton
+* добавлена символьная ссылка в домашний каталог для flatpak версии PortProton
+* улучшен интерфейс PortProton
+* добавлена тема: compact (спасибо Htylol)
+* добавлено переключение вида основного интерфейса запуска exe и ярлыков в меню "PortProton -> Настройки PortProton -> Изменить интерфейс запуска" (спасибо Htylol)
+* настройки GameScope вынесены в отдельное окно (для будущего расширения функционала)
+* улучшен интерфейс загрузки wine и добавлена возможность выбора нескольких версий одновременно
+* множество небольших улучшений графического интерфейса и скриптов
+
+###Scripts version 2304### Дата: 10.06.2024 / Размер скачиваемого обновления: 3 мегабайта
+* HOTFIX - определения драйвера Vulkan на системах Alt Linux + NVIDIA
+
 ###Scripts version 2303### Дата: 06.06.2024 / Размер скачиваемого обновления: 190 мегабайт
 * обновлен WINE_LG до версии "9-10"
 * обновлен установщик GOG
-* исправлено отоброжение правильных иконок .exe файлов
+* исправлено отображение правильных иконок .exe файлов
 
 ###Scripts version 2302### Дата: 03.06.2024 / Размер скачиваемого обновления: 405 мегабайт
 * обновлен WINE_LG до версии "9-9"
@@ -217,7 +244,7 @@
 * в префикс DEFAULT добавлен компонент faudio (необходим для игр на движке Creation Engine, пример The Elder Scrolls)
 * обновлен пакет библиотек plugins_v14:
     перенесены из пакета libs: d3d_extras, reshade и default_pfx
-    добавлены портативные версии: yad_v13_0, perl, exiftool (спасибо Boria138)
+    добавлены портативные версии: yad_gui_pp, perl, exiftool (спасибо Boria138)
 * обновлен пакет библиотек libs_v47:
     pressure-vessel 0.20240306.0
     sniper 0.20240307.80401

data_from_portwine/scripts/credits

@@ -5,7 +5,7 @@ if [[ "$LANGUAGE" == "ru" ]]
 then
     KEY_CREDITS=$RANDOM
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \
 --image-path="$PW_GUI_ICON_PATH" --image="port_proton" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
 --text-align=center --scroll --text="PortProton v. ${install_ver}
 scripts v. ${scripts_install_ver}
@@ -18,7 +18,7 @@ https://linux-gaming.ru
 Подробнее см. в Лицензия." 2>/dev/null &
 
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=2 \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 \
 --text-align=center --scroll --text="Автор:   Casro-Fidel (Михаил Тергоев)
 
 Помощники разработчика и тестировщики:
@@ -46,7 +46,7 @@ Htylol
 Eljeyna
 " 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "          Лицензия Массачусетского технологического института (MIT License)
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "          Лицензия Массачусетского технологического института (MIT License)
 
               Авторские права © $(date +'%Y') Castro-Fidel (linux-gaming.ru)
 
@@ -69,7 +69,7 @@ Eljeyna
 ВНЕ ИЛИ В СВЯЗИ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ИЛИ ДРУГИМИ СДЕЛКАМИ В
 ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ." 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=4 \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \
 --text-info --fontname="Serif bold italic 12" --show-uri --scroll \
 <<< '                                            Проект поддержали:
                                     https://boosty.to/portwine-linux.ru
@@ -339,7 +339,7 @@ Eljeyna
 
                                     Список будет дополняться...' 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \
 --title=JOIN --window-icon=group  --image=system-config-users --uri-color=red --show-uri \
 --text-info --scroll <<< \
 "Website:  https://linux-gaming.ru/
@@ -351,7 +351,7 @@ boosty: https://boosty.to/portwine-linux.ru
 Yandex кошелек:   410012267513818
 -------------------------------------------" 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
 --fontname="Serif bold italic 10" --text-info <<< "                   Сторонние библиотеки, которые используются в PortProton
 
     PortProton собран на основе бесплатных библиотек программного обеспечения:
@@ -362,7 +362,7 @@ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds
 YAD: https://github.com/v1cont/yad
 DGVOODOO2: https://dege.fw.hu/" 2>/dev/null &
 
-"${pw_yad_v13_0}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
+"${pw_yad}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
  --notebook --no-buttons  --tab-pos=bottom --expand \
 --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \
 --tab="БИБЛИОТЕКИ"
@@ -375,7 +375,7 @@ else
     KEY_CREDITS=$RANDOM
 
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \
 --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \
 --text-align=center --scroll --text="PortProton v. ${install_ver}
 scripts v. ${scripts_install_ver}
@@ -389,7 +389,7 @@ This program comes with absolutely no warranty.
 See the License for details." 2>/dev/null &
 
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=2 \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 \
 --text-align=center --scroll --text="Author:   Casro-Fidel (Mikhail Tergoev)
 
 Developer assistants and testers:
@@ -417,7 +417,7 @@ Htylol
 Eljeyna
 " 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License
 
 Copyright (©) 2024 Castro-Fidel (linux-gaming.ru)
 
@@ -439,7 +439,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE." 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=4 \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \
 --text-info --fontname="Serif bold italic 12" --show-uri --scroll \
 <<< '                                    The project was supported:
                               https://boosty.to/portwine-linux.ru:
@@ -710,7 +710,7 @@ SOFTWARE." 2>/dev/null &
 
                                       The list will be updated...' 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \
 --title=JOIN --window-icon=group  --image=system-config-users --uri-color=red --show-uri \
 --text-info --scroll <<< \
 "Website:  http://linux-gaming.ru
@@ -722,7 +722,7 @@ boosty:  https://boosty.to/portwine-linux.ru
 Yandex wallet:   410012267513818
 -------------------------------------------" 2>/dev/null &
 
-"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
+"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
 --fontname="Serif bold italic 10" --text-info <<< "                               Third-party libraries that are used in PortProton
 
               PortProton is built on the basis of the following free software libraries:
@@ -734,7 +734,7 @@ YAD: https://github.com/v1cont/yad
 DGVOODOO2: https://dege.fw.hu/" 2>/dev/null &
 
 
-"${pw_yad_v13_0}" --title "ABOUT US" --key="${KEY_CREDITS}" ---window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
+"${pw_yad}" --title "ABOUT US" --key="${KEY_CREDITS}" ---window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
 --notebook --no-buttons  --tab-pos=bottom --expand \
 --tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \
 --tab="THIRD PARTY LIBRARIES"

data_from_portwine/scripts/portwine_db/ACOdyssey

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#Author: Alek V., Dervart
+#ACOdyssey.exe
+#Rating=4
+#####################examples###########################
+export PW_NO_ESYNC="0"
+export PW_USE_GSTREAMER="0"
+export PW_PREFIX_NAME="ACO"
+export PW_WINE_USE="WINE_LG"

data_from_portwine/scripts/start.sh

@@ -13,8 +13,8 @@ echo '
 ██╔═══╝░██║░░██║██╔══██╗░░░██║░░░██╔═══╝░██╔══██╗██║░░██║░░░██║░░░██║░░██║██║╚████║
 ██║░░░░░╚█████╔╝██║░░██║░░░██║░░░██║░░░░░██║░░██║╚█████╔╝░░░██║░░░╚█████╔╝██║░╚███║
 ╚═╝░░░░░░╚════╝░╚═╝░░╚═╝░░░╚═╝░░░╚═╝░░░░░╚═╝░░╚═╝░╚════╝░░░░╚═╝░░░░╚════╝░╚═╝░░╚══╝
-
 '
+
 if [[ $(id -u) = 0 ]] ; then
     echo "Do not run this script as root!"
     exit 1
@@ -61,7 +61,9 @@ fi
 source "${PORT_SCRIPTS_PATH}/functions_helper"
 
 create_new_dir "${HOME}/.local/share/applications"
-if [[ "${PW_SILENT_RESTART}" == 1 ]] || [[ "${START_FROM_STEAM}" == 1 ]] ; then
+if [[ "${PW_SILENT_RESTART}" == 1 ]] \
+|| [[ "${START_FROM_STEAM}" == 1 ]]
+then
     export PW_GUI_DISABLED_CS=1
     unset PW_SILENT_RESTART
 else
@@ -70,11 +72,11 @@ 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 RADV_PERFTEST
-unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME FLATPAK_IN_USE
+unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PW_PATH
 unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
 unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
 unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
-unset PW_LOCALE_SELECT
+unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START
 
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
 rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
@@ -113,21 +115,6 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono
 export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN"
 create_new_dir "${PW_VULKAN_DIR}"
 
-LSPCI_VGA="$(lspci -k 2>/dev/null | grep -E 'VGA|3D' | tr -d '\n')"
-export LSPCI_VGA
-
-if command -v xrandr &>/dev/null ; then
-    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_screen_configuration"
-    if [[ $(xrandr | grep "primary" | awk '{print $1}') ]] ; then
-        PW_SCREEN_RESOLUTION="$(xrandr | sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
-        PW_SCREEN_PRIMARY="$(xrandr | grep "primary" | awk '{print $1}')"
-    fi
-    export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION
-    print_var PW_SCREEN_RESOLUTION PW_SCREEN_PRIMARY
-else
-    print_error "xrandr - not found!"
-fi
-
 cd "${PORT_SCRIPTS_PATH}" || fatal
 
 # shellcheck source=./var
@@ -137,6 +124,7 @@ export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts"
 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"
+export pw_yad="$PW_GUI_THEMES_PATH/gui/yad_gui_pp"
 
 change_locale
 
@@ -184,21 +172,47 @@ if [[ "${INSTALLING_PORT}" == 1 ]] ; then
     return 0
 fi
 
+# choose gui start
+case "$PW_GUI_START" in
+       PANED) : ;;
+    NOTEBOOK) : ;;
+           *)
+              sed -i '/export PW_GUI_START=/d' "$USER_CONF"
+              echo 'export PW_GUI_START="NOTEBOOK"' >> "$USER_CONF"
+              export PW_GUI_START="NOTEBOOK"
+              ;;
+esac
+
+pw_check_and_download_plugins
+export PW_VULKANINFO_PORTABLE="$PW_PLUGINS_PATH/portable/bin/x86_64-linux-gnu-vulkaninfo"
+
 # check skip update
 if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \
 && [[ ! -f "/tmp/portproton.lock" ]]
 then
     pw_port_update
+    VULKAN_DRIVER_NAME="$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | grep driverName | awk '{print$3}' | head -1)"
+    GET_GPU_NAMES=$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | awk -F '=' '/deviceName/{print $2}' | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!')
+    LSPCI_VGA="$(lspci -k 2>/dev/null | grep -E 'VGA|3D' | tr -d '\n')"
+    export LSPCI_VGA VULKAN_DRIVER_NAME GET_GPU_NAMES
+
+    if command -v xrandr &>/dev/null ; then
+        try_remove_file "${PORT_WINE_TMP_PATH}/tmp_screen_configuration"
+        if [[ $(xrandr | grep "primary" | awk '{print $1}') ]] ; then
+            PW_SCREEN_RESOLUTION="$(xrandr | sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
+            PW_SCREEN_PRIMARY="$(xrandr | grep "primary" | awk '{print $1}')"
+        fi
+        export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION
+        echo ""
+        print_var PW_SCREEN_RESOLUTION PW_SCREEN_PRIMARY
+    else
+        print_error "xrandr - not found!"
+    fi
+    echo ""
 else
     scripts_install_ver=$(head -n 1 "${PORT_WINE_TMP_PATH}/scripts_ver")
     export scripts_install_ver
 fi
-unset SKIP_CHECK_UPDATES
-
-pw_check_and_download_plugins
-export PW_VULKANINFO_PORTABLE="$PW_PLUGINS_PATH/portable/bin/x86_64-linux-gnu-vulkaninfo"
-VULKAN_DRIVER_NAME="$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | grep driverName | awk '{print$3}' | head -1)"
-export VULKAN_DRIVER_NAME
 
 # create lock file
 if [[ -f "/tmp/portproton.lock" ]] ; then
@@ -219,12 +233,19 @@ fi
 
 pw_init_db
 
+if [[ ! -d "${HOME}/PortProton" ]] \
+&& check_flatpak 
+then
+    ln -s "${PORT_WINE_PATH}" "${HOME}/PortProton"
+fi
+
 pw_check_and_download_dxvk_and_vkd3d
 # shellcheck source=/dev/null
 source "${USER_CONF}"
 
+if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
     kill_portwine
-killall -15 yad_v13_0 2>/dev/null
+    killall -15 yad_gui_pp 2>/dev/null
     kill -TERM "$(pgrep -a yad | grep PortProton | head -n 1 | awk '{print $1}')" 2>/dev/null
 
     if [[ -f "/usr/bin/portproton" ]] \
@@ -239,6 +260,7 @@ then
         cp -f "${PORT_WINE_PATH}/PortProton.desktop" "${HOME}/.local/share/applications/"
         update-desktop-database -q "${HOME}/.local/share/applications"
     fi
+fi
 
 [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut
 
@@ -247,7 +269,7 @@ if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then
     pw_init_runtime
     if check_flatpak
     then TMP_ALL_PATH=""
-    else TMP_ALL_PATH="env PATH=\"${PATH}\" LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\""
+    else TMP_ALL_PATH="LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\""
     fi
     PW_PREFIX_NAME=$(basename "$1" | awk -F'.' '{print $1}')
 cat << EOF > "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack.sh
@@ -288,7 +310,10 @@ use: [--reinstall] [--autoinstall]
 --autoinstall [script_frome_pw_autoinstall]         autoinstall from the list below:
 "
         echo ${files_from_autoinstall}
-        echo ""
+
+        echo "
+--generate-pot                                      generated pot file
+"
         exit 0 ;;
 
     '--reinstall' )
@@ -335,14 +360,15 @@ for DAIG in ./* ; do
 done
 popd 1>/dev/null || fatal
 
-check_nvidia_rtx && check_variables PW_VULKAN_USE "2"
+# [[ "${PW_DGVOODOO2}" == "1" ]] && DGV2_TXT='<b>dgVoodoo2 </b>' || unset DGV2_TXT
+# [[ "${PW_VKBASALT}" == "1" ]] && VKBASALT_TXT='<b>vkBasalt </b>' || unset VKBASALT_TXT
+# [[ "${PW_MANGOHUD}" == "1" ]] && MANGOHUD_TXT='<b>MangoHud </b>' || unset MANGOHUD_TXT
 
-[[ "${PW_USE_DGVOODOO2}" == "1" ]] && DGV_TXT="$(eval_gettext 'and dgVoodoo2 ')" || unset DGV_TXT
+SORT_OPENGL="$(eval_gettext 'WineD3D OpenGL (For video cards without Vulkan)')"
-SORT_OPENGL="$(eval_gettext 'WineD3D OpenGL ${DGV_TXT}(For video cards without Vulkan)')"
+SORT_VULKAN="$(eval_gettext 'WineD3D Vulkan (Damavand experimental)')"
-SORT_VULKAN="$(eval_gettext 'WineD3D Vulkan ${DGV_TXT}(Damavand experimental)')"
+SORT_LEGACY="$(eval_gettext 'Legacy DXVK (Vulkan v1.1)')"
-SORT_LEGACY="$(eval_gettext 'Legacy DXVK ${DGV_TXT}(Vulkan v1.1)')"
+SORT_STABLE="$(eval_gettext 'Stable DXVK, VKD3D (Vulkan v1.2)')"
-SORT_STABLE="$(eval_gettext 'Stable DXVK, VKD3D ${DGV_TXT}(Vulkan v1.2)')"
+SORT_NEWEST="$(eval_gettext 'Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)')"
-SORT_NEWEST="$(eval_gettext 'Newest DXVK, VKD3D, D8VK ${DGV_TXT}(Vulkan v1.3+)')"
 SORT_G_NINE="$(eval_gettext 'Gallium Nine (DirectX 9 for MESA)')"
 SORT_G_ZINK="$(eval_gettext 'Gallium Zink (OpenGL to Vulkan)')"
 
@@ -357,7 +383,7 @@ case "${PW_VULKAN_USE}" in
 esac
 
 if [[ ! -z "${PORTWINE_DB_FILE}" ]] ; then
-    [[ -z "${PW_COMMENT_DB}" ]] && PW_COMMENT_DB="$(eval_gettext "PortProton database file was found for") <b>${PORTWINE_DB}</b>."
+    [[ -z "${PW_COMMENT_DB}" ]] && PW_COMMENT_DB="$(eval_gettext "Launching") <b>${PORTWINE_DB}</b>."
     if [[ ! -z $(echo "${PW_WINE_USE}" | grep "^PROTON_LG$") ]] ; then
         PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
     elif [[ ! -z $(echo "${PW_WINE_USE}" | grep "^PROTON_GE$") ]] ; then
@@ -389,6 +415,7 @@ else
     fi
     unset PW_GUI_DISABLED_CS
 fi
+
 if [[ -f "${portwine_exe}" ]] ; then
     if [[ "${PW_GUI_DISABLED_CS}" != 1 ]] ; then
         pw_create_gui_png
@@ -398,31 +425,85 @@ if [[ -f "${portwine_exe}" ]] ; then
         else
             PW_SHORTCUT="$(eval_gettext "DELETE SHORTCUT")!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!$(eval_gettext "Delete shortcut for select file..."):98"
         fi
-        OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --form \
+        try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form"
-        --title "PortProton-${install_ver} (${scripts_install_ver})" \
+
-        --image "${PW_ICON_FOR_YAD}" --separator=";" \
+        export KEY_START="$RANDOM"
-        --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
+        if [[ "${PW_GUI_START}" = NOTEBOOK ]] ; then
+            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" --gui-type=start-old \
+            --image="${PW_ICON_FOR_YAD}" --text-align="center" --text "$PW_COMMENT_DB" \
             --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" "" \
+            1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
-        --button="$(eval_gettext "VKBASALT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)")":120 \
+
-        --button="$(eval_gettext "MANGOHUD")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":122 \
+            "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns=3 --align-buttons --homogeneous-column \
-        --button="$(eval_gettext "EDIT DB")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Edit database file for") ${PORTWINE_DB}":118 \
+            --field="   $(eval_gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
+            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)")":"FBTN" '@bash -c "button_click_start 120"' \
+            --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click_start 122"' \
+            --field="   dgVoodoo2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable dgVoodoo2 by default (This wrapper fixes many compatibility and rendering issues when running old games)")":"FBTN" '@bash -c "button_click_start 124"' \
+            --field="   GameScope"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable GameScope by default (Wayland micro compositor)")":"FBTN" '@bash -c "button_click_start 126"' \
+            2>/dev/null &
+
+            if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_tab" ]] \
+            && [[ ! -z "$TAB_START" ]]
+            then
+                export TAB_START=2
+                try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_tab"
+            else
+                export TAB_START=1
+            fi
+
+            "${pw_yad}" --key=$KEY_START --notebook --active-tab=$TAB_START \
+            --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" --center \
+            --title "PortProton-${install_ver} (${scripts_install_ver})" --expand \
+            --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
+            --tab="$(eval_gettext "GENERAL")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+            --tab="$(eval_gettext "SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
             --button="${PW_SHORTCUT}" \
             --button="$(eval_gettext "DEBUG")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Launch with the creation of a .log file at the root PortProton")":102 \
-        --button="$(eval_gettext "LAUNCH")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Run file ...")":106 2>/dev/null)
+            --button="$(eval_gettext "LAUNCH")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Run file ...")":106 2>/dev/null
             PW_YAD_SET="$?"
             if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi
-        VULKAN_MOD=$(echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}')
+            if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form" ]]; then
-        PW_WINE_VER=$(echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $2}')
+                PW_YAD_SET=$(head -n 1 "${PORT_WINE_TMP_PATH}/tmp_yad_form" | awk '{print $1}')
-        PW_PREFIX_NAME=$(echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $3}' | sed -e s/[[:blank:]]/_/g)
+                export PW_YAD_SET
-        if [[ -z "${PW_PREFIX_NAME}" ]] || [[ ! -z "$(echo "${PW_PREFIX_NAME}" | grep -E '^_.*' )" ]] ; then
+                touch "${PORT_WINE_TMP_PATH}/tmp_yad_form_tab"
-            PW_PREFIX_NAME="DEFAULT"
-        else
-            PW_PREFIX_NAME="${PW_PREFIX_NAME^^}"
             fi
-        export PW_PREFIX_NAME PW_WINE_VER VULKAN_MOD
+            sed -i 's/$/\;/' "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
+            pw_yad_form_vulkan
+
+        elif [[ "${PW_GUI_START}" = PANED ]] ; then
+            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" --gui-type=start-old \
+            --image="${PW_ICON_FOR_YAD}" --text-align="center" --text "$PW_COMMENT_DB" \
+            --field="   3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
+            --field="     WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
+            --field="   PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
+            1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
+
+            "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns=3 \
+            --align-buttons --homogeneous-row --homogeneous-column \
+            --field="   $(eval_gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
+            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)")":"FBTN" '@bash -c "button_click_start 120"' \
+            --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click_start 122"' \
+            --field="   dgVoodoo2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable dgVoodoo2 by default (This wrapper fixes many compatibility and rendering issues when running old games)")":"FBTN" '@bash -c "button_click_start 124"' \
+            --field="   GameScope"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable GameScope by default (Wayland micro compositor)")":"FBTN" '@bash -c "button_click_start 126"' \
+            2>/dev/null &
+
+            "${pw_yad}" --key=$KEY_START --paned --center --fixed \
+            --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" \
+            --title "PortProton-${install_ver} (${scripts_install_ver})" \
+            --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
+            --button="${PW_SHORTCUT}" \
+            --button="$(eval_gettext "DEBUG")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Launch with the creation of a .log file at the root PortProton")":102 \
+            --button="$(eval_gettext "LAUNCH")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Run file ...")":106 2>/dev/null
+
+            PW_YAD_SET="$?"
+            if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi
+            pw_yad_set_form
+            sed -i 's/$/\;/' "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
+            pw_yad_form_vulkan
+        fi
+
     elif [[ -f "${PORTWINE_DB_FILE}" ]] ; then
         portwine_launch
     fi
@@ -434,6 +515,11 @@ else
     else NEW_MIRROR="CDN"
     fi
 
+    if [[ "$PW_GUI_START" == "NOTEBOOK" ]]
+    then NEW_PW_GUI_START="PANED"
+    else NEW_PW_GUI_START="NOTEBOOK"
+    fi
+
     orig_IFS="$IFS" && IFS=$'\n'
     PW_ALL_DF="$(ls "${PORT_WINE_PATH}"/ | grep .desktop | grep -vE '(PortProton|readme)')"
     if [[ -z "${PW_ALL_DF}" ]]
@@ -455,11 +541,11 @@ else
 
     IFS="$orig_IFS"
     old_IFS=$IFS && IFS="%"
-    "${pw_yad_v13_0}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" \
+    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" --homogeneous-column \
     --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null &
     IFS="$orig_IFS"
 
-    "${pw_yad_v13_0}" --plug=${KEY} --tabnum="${PW_GUI_SORT_TABS[3]}" --form --columns=3 --align-buttons --separator=";" \
+    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[3]}" --form --columns=3 --align-buttons --separator=";" --homogeneous-column \
     --field="   $(eval_gettext "Reinstall PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
     --field="   $(eval_gettext "Remove PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
     --field="   $(eval_gettext "Update PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
@@ -470,13 +556,14 @@ else
     --field="   Xterm"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \
     --field="   $(eval_gettext "Credits")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_credits"' \
     --field="   $(eval_gettext "Change mirror to") $NEW_MIRROR"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_mirror"' \
+    --field="   $(eval_gettext "Change start gui")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_gui_start"' \
     2>/dev/null &
 
-    "${pw_yad_v13_0}" --plug=${KEY} --tabnum="${PW_GUI_SORT_TABS[2]}" --form --columns=3 --align-buttons --separator=";" \
+    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[2]}" --form --columns=3 --align-buttons --separator=";" \
     --field="   3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
     --field="   PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
     --field="     WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
-    --field="              $(eval_gettext "Create prefix backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \
+    --field="$(eval_gettext "Create prefix backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"CFBTN" '@bash -c "button_click pw_create_prefix_backup"' \
     --field="   Winetricks"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run winetricks to install additional libraries to the selected prefix")":"FBTN" '@bash -c "button_click WINETRICKS"' \
     --field="   $(eval_gettext "Clear prefix")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Clear the prefix to fix problems")":"FBTN" '@bash -c "button_click gui_clear_pfx"' \
     --field="   $(eval_gettext "Get other Wine")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Open the menu to download other versions of WINE or PROTON")":"FBTN" '@bash -c "button_click gui_proton_downloader"' \
@@ -484,9 +571,9 @@ else
     --field="   $(eval_gettext "Prefix Manager")     "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run winecfg to edit the settings of the selected prefix")":"FBTN" '@bash -c "button_click WINECFG"' \
     --field="   $(eval_gettext "File Manager")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine file manager")":"FBTN" '@bash -c "button_click WINEFILE"' \
     --field="   $(eval_gettext "Command line")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine cmd")":"FBTN" '@bash -c "button_click WINECMD"' \
-    --field="   $(eval_gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &
+    --field="   $(eval_gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
 
-    "${pw_yad_v13_0}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \
+    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
     --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"$(eval_gettext "Emulator for Nintendo game consoles with high compatibility")":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
     --field="   MAME"!"$PW_GUI_ICON_PATH/mame.png"!"$(eval_gettext "Multi-arcade emulator that allows you to play old arcade games")":"FBTN" '@bash -c "button_click PW_MAME"' \
     --field="   RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"$(eval_gettext "Multi-platform frontend for emulators with extensive settings")":"FBTN" '@bash -c "button_click PW_RETROARCH"' \
@@ -502,7 +589,7 @@ else
     --field="   xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"$(eval_gettext "Emulator for the Xbox game console")":"FBTN" '@bash -c "button_click PW_XEMU"' \
     --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"$(eval_gettext "Emulator for the Sega Dreamcast game console")":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null &
 
-    "${pw_yad_v13_0}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[0]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \
+    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[0]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
     --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \
     --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \
     --field="   Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \
@@ -549,7 +636,7 @@ else
     export START_FROM_PP_GUI=1
 
     if [[ -z "${PW_ALL_DF}" ]] ; then
-        "${pw_yad_v13_0}" --key=$KEY --notebook --expand \
+        "${pw_yad}" --key=$KEY --notebook --expand \
         --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \
         --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
         --title "PortProton-${install_ver} (${scripts_install_ver})" \
@@ -561,7 +648,7 @@ else
         --tab="$(eval_gettext "INSTALLED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null
         YAD_STATUS="$?"
     else
-        "${pw_yad_v13_0}" --key=$KEY --notebook --expand \
+        "${pw_yad}" --key=$KEY --notebook --expand \
         --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \
         --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
         --title "PortProton-${install_ver} (${scripts_install_ver})" \
@@ -575,11 +662,7 @@ else
     fi
 
     if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
-
+    pw_yad_set_form
-    if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form" ]]; then
-        PW_YAD_SET=$(head -n 1 "${PORT_WINE_TMP_PATH}/tmp_yad_form" | awk '{print $1}')
-        export PW_YAD_SET
-    fi
     if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ]] ; then
         VULKAN_MOD="$(grep \;\; "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | awk -F";" '{print $1}')"
         PW_PREFIX_NAME="$(grep \;\; "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | awk -F";" '{print $2}' | sed -e "s/[[:blank:]]/_/g" )"
@@ -636,8 +719,11 @@ fi
     open_changelog) open_changelog ;;
     change_loc) change_loc ;;
     change_mirror) change_mirror ;;
+    change_gui_start) change_gui_start ;;
     120) gui_vkBasalt ;;
     122) gui_MangoHud ;;
+    124) gui_dgVoodoo2 ;;
+    126) gui_gamescope ;;
     pw_create_prefix_backup) pw_create_prefix_backup ;;
     gui_credits) gui_credits ;;
     pw_start_cont_xterm) pw_start_cont_xterm ;;

data_from_portwine/scripts/var

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2303
+#SCRIPTS_NEXT_VERSION=2305
 ########################################################################
 export LANGUAGES_LIST="ru es"
 export PW_MANGOHUD="0"
@@ -42,7 +42,7 @@ export PW_DINPUT_PROTOCOL="0"
 # export GTK_THEME="Adwaita:dark"
 ###DEFAULT_WINE###
 export PW_WINE_USE="PROTON_LG"
-export PW_PLUGINS_VER="_v15"
+export PW_PLUGINS_VER="_v16"
 export PW_FAKE_DLSS_VER="230506"
 export PW_FAKE_DLSS_3_VER="090"
 export PW_GALLIUM_NINE_VER="0.9"
@@ -55,13 +55,16 @@ export WINE_FULLSCREEN_FSR_MODE="ultra"
 export PW_VULKAN_USE="2"
 export VKD3D_LIMIT_TESS_FACTORS="64"
 export D8VK_VER="1.7.1-2367"
-export DGV2_VER="2.81.3"
 export DXVK_LEGACY_VER="1.6.1"
 export DXVK_STABLE_VER="1.10.3-28"
-export DXVK_GIT_VER="2.3.1-37"
+export DXVK_GIT_VER="2.3.1-72"
 export VKD3D_STABLE_VER="1.1-2602"
+export VKD3D_GIT_VER="1.1-4051"
+###DGVOODOO2###
+export DGV2_VER="2.81.3"
 export VKD3D_DGV2_VER="1.1-3622"
-export VKD3D_GIT_VER="1.1-4022"
+export PW_DGV2_ANTIALIASING="disabled"
+export PW_DGV2_FILTERING="disabled"
 ###PREFIX_VERSION###
 export DOTPFX_VER="48v7"
 export DEFPFX_VER="v1"

data_from_portwine/themes/classic.pptheme

@@ -8,10 +8,12 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \
 --borders=5 \
 --tab-borders=3 \
 --keep-icon-size \
+--class=PortProton \
 "
 
 export THEME_CHKBOX=CHK
 export CHKBOX_SPACE="  "
+export PW_YAD_CENTER=""
 
 export BUTTON_SIZE_MM=32
 export BUTTON_SIZE=24
@@ -20,7 +22,13 @@ export TAB_SIZE=28
 export PW_MAIN_SIZE_W=1100
 export PW_MAIN_SIZE_H=350
 
+export PW_START_SIZE_W=600
+export PW_START_SIZE_H=350
+export PW_TAB_POSITON=top
+
 export MAIN_GUI_COLUMNS=3
+export START_NOTEBOOK_GUI_COLUMNS=3
+export START_PANED_GUI_COLUMNS=3
 
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500

data_from_portwine/themes/classic/style.css

@@ -0,0 +1,8 @@
+arrow {margin: 0px 5px}
+window>box>image {margin: 15px 10px 0px 5px}
+box>box>label {margin: 1px 0px 0px 0px}
+switch {margin: 5px 20px 0px 0px}
+box>box>grid>switch>slider {min-height: 0px; min-width: 22px}
+scale>contents>trough>slider {min-height: 24px; min-width: 24px}
+box>box>grid>label {margin: 0px 10px 0px 0px}
+separator {margin-bottom:0px; background-size:0px}

data_from_portwine/themes/compact.pptheme

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# export GTK_DEBUG=interactive
+
+export THEME_NAME=compact
+export THEME_PATH="$PW_GUI_THEMES_PATH/$THEME_NAME"
+export COVERS_PATH="$PW_GUI_THEMES_PATH/classic"
+
+export YAD_OPTIONS="--css=$THEME_PATH/style.css \
+--borders=3 \
+--tab-borders=0 \
+--keep-icon-size \
+--buttons-layout=expand \
+--class=PortProton \
+"
+export THEME_CHKBOX=SW
+export CHKBOX_SPACE="     "
+export PW_YAD_CENTER="--center"
+
+export BUTTON_SIZE_MM=32 # 24, 28, 32, 36, 40
+
+export BUTTON_SIZE=32 # 24, 28, 32, 36, 40
+
+export TAB_SIZE=32 # 24, 28, 32, 36, 40
+
+export PW_MAIN_SIZE_W=1
+export PW_MAIN_SIZE_H=350
+
+export PW_START_SIZE_W=1
+export PW_START_SIZE_H=350
+export PW_START_TAB_POSITON=top
+
+export MAIN_GUI_COLUMNS=3
+export START_GUI_NOTEBOOK_COLUMNS=3
+export START_GUI_PANED_COLUMNS=3
+
+export PROGRESS_BAR_BORDERS_SIZE=20
+export PROGRESS_BAR_WIDTH_SIZE=500

data_from_portwine/themes/compact/style.css

@@ -0,0 +1,12 @@
+arrow {margin: 0px 5px}
+window>box>image {margin: 15px 10px 0px 5px}
+box>box>label {margin: 1px 0px 0px 0px}
+switch {margin: 5px 20px 0px 0px}
+box>box>grid>switch>slider {min-height: 0px; min-width: 22px}
+scale>contents>trough>slider {min-height: 24px; min-width: 24px}
+box>box>grid>label {margin: 0px 10px 0px 0px}
+separator {margin-bottom:0px; background-size:0px}
+window>box>box>image {margin: 5px 5px 0px 5px}
+check {padding: 3px}
+box>grid>entry {margin: 0px 10px 0px 0px}
+checkbutton {margin: 0px 10px 0px 0px}

data_from_portwine/themes/default.pptheme

@@ -11,11 +11,14 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \
 --borders=3 \
 --tab-borders=0 \
 --keep-icon-size \
+--buttons-layout=expand \
+--class=PortProton \
 "
 
 # настройка переключателей
 export THEME_CHKBOX=SW           # CHK - галки, SW - слайдер
-export CHKBOX_SPACE="          " # растояние перед текстом
+export CHKBOX_SPACE="          " # расстояние перед текстом у CHKBOX
+export PW_YAD_CENTER=""         # окно yad по центру, нужно добавить "--center"
 
 # размер кнопок в главном меню
 export BUTTON_SIZE_MM=36 # 24, 28, 32, 36, 40
@@ -27,11 +30,18 @@ export BUTTON_SIZE=28 # 24, 28, 32, 36, 40
 export TAB_SIZE=32 # 24, 28, 32, 36, 40
 
 # размер главного меню
-export PW_MAIN_SIZE_W=1100
+export PW_MAIN_SIZE_W=1
-export PW_MAIN_SIZE_H=350
+export PW_MAIN_SIZE_H=330
+
+# размер меню запуска и положения табов
+export PW_START_SIZE_W=800
+export PW_START_SIZE_H=330
+export PW_TAB_POSITON=top
 
 # количество столбцов в главном меню
-export MAIN_GUI_COLUMNS=4
+export MAIN_GUI_COLUMNS=3
+export START_GUI_NOTEBOOK_COLUMNS=3
+export START_GUI_PANED_COLUMNS=3
 
 # настройки индикатора прогресса
 export PROGRESS_BAR_BORDERS_SIZE=20

data_from_portwine/themes/default/style.css

@@ -0,0 +1,12 @@
+arrow {margin: 0px 5px}
+window>box>image {margin: 15px 10px 0px 5px}
+box>box>label {margin: 1px 0px 0px 0px}
+switch {margin: 5px 20px 0px 0px}
+box>box>grid>switch>slider {min-height: 0px; min-width: 22px}
+scale>contents>trough>slider {min-height: 24px; min-width: 24px}
+box>box>grid>label {margin: 0px 10px 0px 0px}
+separator {margin-bottom:0px; background-size:0px}
+window>box>box>image {margin: 5px 5px 0px 5px}
+check {padding: 3px}
+box>grid>entry {margin: 0px 10px 0px 0px}
+checkbutton {margin: 0px 10px 0px 0px}

data_from_portwine/themes/gui/COPYING.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

data_from_portwine/themes/gui/source

@@ -0,0 +1 @@
+https://github.com/Castro-Fidel/yad_portproton

portwine_install_script/PortProton_1.0

@@ -1,174 +0,0 @@
-#!/usr/bin/env bash
-# Author: Mikhail Tergoev (linux-gaming.ru)
-# License MIT
-########################################################################
-unset PW_AUTOPLAY PW_SET_LANG PW_SILENT_INSTALL
-export portname="PortProton"
-export port_ver=1.5
-########################################################################
-cd "$(dirname "$(readlink -f "$0")")"
-script_path="$(pwd)"
-def_path="${HOME}/PortProton"
-########################################################################
-fatal () {
-	echo -e "\n${1}\n"
-	exit 1
-}
-########################################################################
-if [ "$(id -u)" == "0" ] ; then
-	$yad_gui --error --text "\nDo not run PortProton from the superuser!" 2>/dev/null
-	fatal "Do not run the script from the superuser!"
-fi
-########################################################################
-[ -z "${XDG_DATA_HOME}" ] && export XDG_DATA_HOME="$HOME/.local/share"
-PP_CONFIG_FILE="${HOME}/.config/PortProton.conf"
-if [ -f "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" ] ; then
-	echo "${XDG_DATA_HOME}/PortWINE/PortProton" > "${PP_CONFIG_FILE}"
-elif [ -f "${HOME}/PortWINE/PortProton/data/scripts/start.sh" ] ; then
-	echo "${XDG_DATA_HOME}/PortWINE/PortProton" > "${PP_CONFIG_FILE}"
-fi
-
-if [ "$script_path" == "/usr/bin" ] && [ -f "${PP_CONFIG_FILE}" ] ; then
-	export PORT_WINE_PATH="$(cat "${PP_CONFIG_FILE}" | head -n 1)"
-	if [ -f "${PORT_WINE_PATH}/data/scripts/start.sh" ] ; then
-		echo "${port_ver}" > "${PORT_WINE_PATH}/data/tmp/PortProton_ver"
-		/usr/bin/env bash "${PORT_WINE_PATH}/data/scripts/start.sh" "$@"
-		exit 0
-	else
-		rm -f "${PP_CONFIG_FILE}"
-	fi
-fi
-if [[ "${LANG}" == "ru_RU.UTF-8" ]]
-then PW_SET_LANG="Russian"
-else PW_SET_LANG="English"
-fi
-########################################################################
-pw_notify_send () {
-	if command -v notify-send &>/dev/null ; then
-		if [[ -f "/usr/share/icons/hicolor/scalable/apps/portproton.svg" ]]
-		then notify-send -u normal -a PortProton -i "/usr/share/icons/hicolor/scalable/apps/portproton.svg" $@ "${PW_NOTIFY_TEXT}"
-		else notify-send -u normal -a PortProton $@ "${PW_NOTIFY_TEXT}"
-		fi
-	fi
-}
-########################################################################
-unset PW_USE_NS
-YAD_PORTABLE_VER="12_3"
-if command -v yad &>/dev/null ; then
-	yad_gui="yad --window-icon=portproton.svg --borders=10 --center --text-align=center"
-elif curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \
-	-H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' \
-	-L "https://github.com/Castro-Fidel/PortWINE/releases/download/yad_portable_v${YAD_PORTABLE_VER}/yad_portable_v${YAD_PORTABLE_VER}.tar.xz" \
-	-o "${HOME}/yad_portable_v${YAD_PORTABLE_VER}.tar.xz"
-then
-	mkdir -p "${HOME}/.local/bin/" &>/dev/null
-	tar -Jxhvf "${HOME}/yad_portable_v${YAD_PORTABLE_VER}.tar.xz" -C "${HOME}/.local/bin/"
-	if [[ -f "${HOME}/.local/bin/yad_portable_v${YAD_PORTABLE_VER}" ]]
-	then yad_gui="${HOME}/.local/bin/yad_portable_v${YAD_PORTABLE_VER} --borders=10 --center --text-align=center"
-	else PW_USE_NS=1
-	fi
-else
-	PW_USE_NS=1
-fi
-########################################################################
-export PW_SILENT_INSTALL=1
-export PW_AUTOPLAY=1
-export INSTALLING_PORT=1
-########################################################################
-if [[ "${PW_USE_NS}" != "1" ]] ; then
-	case $PW_SET_LANG in
-		"Russian")
-			inst1=$($yad_gui --title  "Install PortProton" --text "Выберите путь для установки (обновления) PortProton,\nили оставьте его по умолчанию.\n\nВнимание:\nУстанавливать необходимо на файловую систему Linux (ext4, btrfs и прочие)." --list --radiolist --width=600 --height=200 \
-			--column="Выбор" --column "Путь:" \
-			TRUE "${def_path}" \
-			FALSE "Другой путь...")
-			[ "$?" != "0" ] && exit 1
-			inst1="$(echo $inst1 | awk -F'|' '{print $2}')"
-			case $inst1 in
-				"${def_path}")
-					D_PATH="${def_path}" ;;
-				"Другой путь...")
-					D_PATH="$($yad_gui --file --directory --title="Выберите путь..." --width=800 --height=800)" ;;
-			esac ;;
-		"English")
-			inst1=$($yad_gui --title  "Install PortProton" --text "Select the installation path (update) port,\nor leave it in default." --list --radiolist --width=600 --height=200 \
-			--column="Set..." --column "Path:" \
-			TRUE "${def_path}" \
-			FALSE "Other path...")
-			inst1="$(echo $inst1 | awk -F'|' '{print $2}')"
-			[ "$?" != "0" ] && exit 1
-			case $inst1 in
-				"${def_path}")
-					D_PATH="${def_path}" ;;
-				"Other path...")
-					D_PATH="$($yad_gui --file --directory --title="Select the path...")" ;;
-			esac ;;
-	esac
-	[[ -z "${D_PATH}" ]] && fatal
-	echo "${D_PATH}" | grep -i "PortProton" 2>/dev/null || D_PATH="${D_PATH}/PortProton"
-
-	case $PW_SET_LANG in
-		"Russian")
-			progress_bar() {
-			$yad_gui --progress --title="Установка..." --text="Настройка PortProton" --pulsate --auto-close --auto-kill --width=500
-			} ;;
-		"English")
-			progress_bar() {
-			$yad_gui --progress --title="Install..." --text="Install PortProton" --pulsate --auto-close --auto-kill --width=500
-			} ;;
-	esac
-else
-	D_PATH="${def_path}"
-	PW_NOTIFY_TEXT="Installing PortProton..."
-	pw_notify_send
-fi
-########################################################################
-export PORT_WINE_PATH="${D_PATH}"
-echo "${PORT_WINE_PATH}" > "${PP_CONFIG_FILE}"
-if [ ! -d "${PORT_WINE_PATH}" ] ; then
-    mkdir -p "$PORT_WINE_PATH" || fatal "Cannot create a directory: $PORT_WINE_PATH"
-else
-	rm -fr "${PORT_WINE_PATH}/data/tmp"
-	rm -f "${PORT_WINE_PATH}/data/scripts/"* 2>/dev/null
-fi
-########################################################################
-mkdir -p "${PORT_WINE_PATH}/data/tmp"
-echo "${port_ver}" > "${PORT_WINE_PATH}/data/tmp/PortProton_ver"
-case "${PW_SET_LANG}" in
-	"Russian") echo "RUS" > "${PORT_WINE_PATH}/data/tmp/PortProton_loc" ;;
-	"English") echo "ENG" > "${PORT_WINE_PATH}/data/tmp/PortProton_loc" ;;
-esac
-########################################################################
-if [[ "${PW_USE_NS}" != "1" ]] ; then
-	PW_NOTIFY_TEXT="Installing PortProton..."
-	pw_notify_send
-fi
-export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
-cd "${PORT_WINE_PATH}"
-echo -e "\nTry download scripts from gitlab.eterfund.ru..."
-if ! curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' \
-	-L "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/-/archive/master/PortWINE-master.tar.gz" \
-	-o "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
-then
-	echo -e "\nError.\nTry download scripts from github.com..."
-	curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' \
-	-L "https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" \
-	-o "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
-	[ "$?" != "0" ] && fatal "Critical error during file download!"
-fi
-echo "Try unpacking scripts..."
-tar -xvzf "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -C "${PORT_WINE_TMP_PATH}"
-if [ "$?" = "0" ] ; then
-	[ ! -d "${PORT_WINE_PATH}/data/" ] && mkdir "${PORT_WINE_PATH}/data/"
-	cp -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/data_from_portwine/"* "${PORT_WINE_PATH}/data/"
-	rm -f "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
-	rm -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/"
-	export scripts_current_ver=$(cat "${PORT_WINE_PATH}/data/scripts/var" | grep SCRIPTS_NEXT_VERSION | awk -F "=" '{print $2}')
-	echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
-else
-	rm -f "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
-	[ "$?" != "0" ] && fatal "Critical error during file unpacking!"
-fi
-########################################################################
-cd "${PORT_WINE_PATH}/data/scripts"
-/usr/bin/env bash "${PORT_WINE_PATH}/data/scripts/setup.sh" && exit 0