From b273ffb08c52e27a00e191408138e9cc557c55a1 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 12 Jun 2024 17:51:14 +0300 Subject: [PATCH] Scripts version 2305 --- data_from_portwine/changelog_en | 20 ++++++++++++++ data_from_portwine/changelog_ru | 2 ++ data_from_portwine/scripts/functions_helper | 29 ++++++++++++--------- data_from_portwine/scripts/start.sh | 6 ++--- data_from_portwine/themes/classic.pptheme | 1 + data_from_portwine/themes/compact.pptheme | 2 ++ data_from_portwine/themes/default.pptheme | 2 ++ 7 files changed, 46 insertions(+), 16 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 16cae7f..c9763a5 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,26 @@ 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 +* 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 diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index b788d48..08cbfb8 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,7 @@ ----------------------------------------- История изменений: +###Scripts version 2305### Дата: 12.06.2024 / Размер скачиваемого обновления: 183 мегабайта * обновлен пакет plugins до v16: * обновлена версия yad - добавлено множество патчей улучшающих интерфейс (спасибо Htylol) * исправлена информация о проекте при наведении курсора на иконку в трее (спасибо Htylol) @@ -19,6 +20,7 @@ * добавлено переключение вида основного интерфейса запуска exe и ярлыков в меню "PortProton -> Настройки PortProton -> Изменить интерфейс запуска" (спасибо Htylol) * настройки GameScope вынесены в отдельное окно (для будущего расширения функционала) * улучшен интерфейс загрузки wine и добавлена возможность выбора нескольких версий одновременно +* множество небольших улучшений графического интерфейса и скриптов ###Scripts version 2304### Дата: 10.06.2024 / Размер скачиваемого обновления: 3 мегабайта * HOTFIX - определения драйвера Vulkan на системах Alt Linux + NVIDIA diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c74d506..a424da3 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2605,26 +2605,28 @@ pw_start_cont_xterm () { ${PW_TERM} bash } +# GUI INFO yad_info () { print_info "$@" if [[ ! -f "${pw_yad}" ]] ; then local pw_yad="yad" command -v "${pw_yad}" &>/dev/null || fatal "yad not found" fi - "${pw_yad}" --no-wrap --text "$@" --width=400 --height=50 --borders=15 --title "INFO" \ + "${pw_yad}" --no-wrap --text "$@" --width=400 --height=150 --borders=15 --title "INFO" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.svg" \ --center --text-align=center --fixed \ --button="$(eval_gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } export -f yad_info +# GUI ERROR yad_error () { print_error "$@" if [[ ! -f "${pw_yad}" ]] ; then local pw_yad="yad" command -v "${pw_yad}" &>/dev/null || fatal "yad not found" fi - "${pw_yad}" --no-wrap --text "$@" --width=400 --borders=15 --title "ERROR" \ + "${pw_yad}" --no-wrap --text "$@" --width=400 --height=150 --borders=15 --title "ERROR" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.svg" \ --center --text-align=center --fixed \ --button="$(eval_gettext "EXIT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null @@ -2645,12 +2647,13 @@ yad_error_download () { [[ "$?" != 0 ]] && return 1 || return 0 } +# GUI QUESTIONS yad_question () { if [[ ! -f "${pw_yad}" ]] ; then local pw_yad="yad" command -v "${pw_yad}" &>/dev/null || fatal "yad not found" fi - "${pw_yad}" --text "${1}" --width=400 --borders=15 --title "$(eval_gettext "Choices")" \ + "${pw_yad}" --text "${1}" --width=400 --height=150 --borders=15 --title "$(eval_gettext "Choices")" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.svg" \ --no-wrap --center --text-align=center --fixed \ --button="$(eval_gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ @@ -2925,7 +2928,7 @@ pw_gui_for_edit_db () { *) ADD_WINVER_EDIT_DB="10!7!XP" ;; esac - "${pw_yad}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 --scroll \ + "${pw_yad}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 \ --field="$(eval_gettext "Change the version of WINDOWS emulation")!$(eval_gettext "Changing the WINDOWS emulation version may be required to run older games. WINDOWS versions below 10 do not support new games with DirectX 12") :CB" "${ADD_WINVER_EDIT_DB}" \ --field="$(eval_gettext "AUTOINSTALL WITH WINETRICKS")!$(eval_gettext "Automatically install with WINETRICKS additional libraries required to run the game/program. List of libraries separated by spaces") :CBE" "${PW_DLL_INSTALL}!vcrun2019 corefonts lucida" \ --field="$(eval_gettext "Forced to use/disable libraries")!$(eval_gettext "Forced to use/disable the library only for the given application. (There are examples in the drop-down list) @@ -2948,9 +2951,9 @@ A brief instruction: --field="$(eval_gettext "Force certain locale for an app:")!$(eval_gettext "Fixes encoding issues in legacy software") :CB" "${PW_LOCALE_SELECT}!disabled!$LOCALE_LIST" \ 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & - "${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "$(eval_gettext "EDIT DB")" --text-align=center --height="600" \ + "${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "$(eval_gettext "EDIT DB")" --text-align=center \ --text "$(eval_gettext "Change settings in database file for") ${PORTWINE_DB}\n $(eval_gettext "NOTE: To display help for each item, simply hover your mouse over the text")" \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --separator=" " --expand \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --separator=" " --expand --fixed --center \ --tab="$(eval_gettext "MAIN")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(eval_gettext "ADVANCED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \ @@ -3039,9 +3042,9 @@ gui_gamescope () { 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db" 2>/dev/null & IFS=$old_IFS - output_yad_gamescope="$("${pw_yad}" --title "GAMESCOPE" --text-align=center --height="300" \ + output_yad_gamescope="$("${pw_yad}" --title "GAMESCOPE" --text-align=center --height="350" \ --text "$(eval_gettext "Change settings gamescope for") ${PORTWINE_DB}\n $(eval_gettext "NOTE: To display help for each item, simply hover your mouse over the text")" \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --separator=" " --expand --form \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --separator=" " --expand --form --center --fixed \ --field="$(eval_gettext "Add arguments for GAMESCOPE:")!$(eval_gettext " -W, -H: set the resolution used by gamescope. Resizing the gamescope window will update these settings. Ignored in embedded mode. If -H is specified but -W isn't, a 16:9 aspect ratio is assumed. Defaults to 1280×720. -w, -h: set the resolution used by the game. If -h is specified but -w isn't, a 16:9 aspect ratio is assumed. Defaults to the values specified in -W and -H. @@ -3418,7 +3421,7 @@ gui_vkBasalt () { --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$(eval_gettext "AMD FidelityFX - CAS is designed to dramatically improve texture sharpness without additional modification settings for games, with minimal loss of performance. (For older games it is recommended to set value = 100)")":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null & - "${pw_yad}" --paned --key="$KEY_FX_GUI" --height="600" --title="vkBasalt" \ + "${pw_yad}" --paned --key="$KEY_FX_GUI" --center --fixed --title="vkBasalt" \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(eval_gettext "DISABLE") VKBASALT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Disable vkBasalt and go to the previous menu")":180 \ @@ -3576,8 +3579,8 @@ gui_MangoHud () { ${ADD_GUI_MH_FPS} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null & IFS=$old_IFS - "${pw_yad}" --paned --key="$KEY_MH_GUI" --height="650" --title="MangoHud" \ - --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ + "${pw_yad}" --paned --key="$KEY_MH_GUI" --title="MangoHud" \ + --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --center --fixed \ --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(eval_gettext "DISABLE") MANGOHUD"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Disable MangoHud and go to the previous menu")":182 \ --button="$(eval_gettext "PREVIEW CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Start vkcube for preview changes")":184 \ @@ -3713,7 +3716,7 @@ gui_dgVoodoo2 () { --field="${CHKBOX_SPACE}ANTIALIASING!$(eval_gettext "Forced antialiasing in Direct3D and Glide games") :CB" "${PW_DGV2_ANTIALIASING}!disabled!2!4!8" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_dgv2_set_cb" 2>/dev/null & "${pw_yad}" --paned --key=$KEY_DGV2_GUI --height="350" --title="dgVoodoo2" \ - --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ + --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --center --fixed \ --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(eval_gettext "DISABLE") DGVOODOO2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Disable dgVoodoo2 and go to the previous menu")":162 \ --button="$(eval_gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Save the current changes, and go to the previous menu")":166 \ @@ -3885,7 +3888,7 @@ portwine_delete_shortcut () { portwine_missing_shortcut () { "${pw_yad}" --title="$(eval_gettext "Error")" --form \ - --window-icon "$PW_GUI_ICON_PATH/portproton.svg" --fixed \ + --window-icon "$PW_GUI_ICON_PATH/portproton.svg" --fixed --center \ --image "$PW_GUI_ICON_PATH/error.svg" \ --text "\n$(eval_gettext "Could not find the file:")\n${portwine_exe}\n\n$(eval_gettext "ATTENTION:\nIf you forgot to mount the disk with the running application, click CANCEL!")\n" \ --button="$(eval_gettext "DELETE SHORTCUT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index fe2ae5a..eac0382 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -436,7 +436,7 @@ if [[ -f "${portwine_exe}" ]] ; then --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 \ + "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns=3 --align-buttons --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"' \ @@ -455,7 +455,7 @@ if [[ -f "${portwine_exe}" ]] ; then "${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 --buttons-layout=expand \ + --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"!"" \ @@ -491,7 +491,7 @@ if [[ -f "${portwine_exe}" ]] ; then "${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})" --buttons-layout=expand \ + --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 \ diff --git a/data_from_portwine/themes/classic.pptheme b/data_from_portwine/themes/classic.pptheme index 86416b2..4ea07e4 100755 --- a/data_from_portwine/themes/classic.pptheme +++ b/data_from_portwine/themes/classic.pptheme @@ -8,6 +8,7 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \ --borders=5 \ --tab-borders=3 \ --keep-icon-size \ +--class=PortProton \ " export THEME_CHKBOX=CHK diff --git a/data_from_portwine/themes/compact.pptheme b/data_from_portwine/themes/compact.pptheme index c03794a..7ca0d3d 100755 --- a/data_from_portwine/themes/compact.pptheme +++ b/data_from_portwine/themes/compact.pptheme @@ -9,6 +9,8 @@ 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=" " diff --git a/data_from_portwine/themes/default.pptheme b/data_from_portwine/themes/default.pptheme index 1238141..c47e2cc 100755 --- a/data_from_portwine/themes/default.pptheme +++ b/data_from_portwine/themes/default.pptheme @@ -11,6 +11,8 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \ --borders=3 \ --tab-borders=0 \ --keep-icon-size \ +--buttons-layout=expand \ +--class=PortProton \ " # настройка переключателей