From e26cc989b4a5065673376043f268bbe6fbc3d838 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 30 May 2023 11:01:12 +0300 Subject: [PATCH] Scripts version 2192 --- data_from_portwine/changelog_eng | 4 ++++ data_from_portwine/changelog_rus | 4 ++++ data_from_portwine/scripts/credits | 4 ++-- data_from_portwine/scripts/functions_helper | 8 ++++---- data_from_portwine/scripts/start.sh | 16 ++++++++-------- data_from_portwine/scripts/var | 2 +- data_from_portwine/scripts/zen_yad_gui | 4 ++-- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 6e5cc69f..06a3d495 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2192### +* fixed interface window when changing its size +* HOTFIX - transition on the way to .exe file + ###Scripts version 2191### * the libs_v43 library package has been updated pressure-vessel 0.20230418.0 diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index e317af0a..a63300c6 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2192### +* исправлено "убегание" окна интерфейса при изменении его размера +* HOTFIX - переход по пути до .exe файла + ###Scripts version 2191### * обновлен пакет библиотек libs_v43 pressure-vessel 0.20230418.0 diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index 9436f3ed..8a47f220 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -336,7 +336,7 @@ YAD: https://github.com/v1cont/yad ZENITY: https://github.com/GNOME/zenity" & "${pw_yad_v12_3}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ ---center --notebook --no-buttons --tab-pos=bottom \ + --notebook --no-buttons --tab-pos=bottom \ --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \ --tab="БИБЛИОТЕКИ" echo "Exit from credits" @@ -675,7 +675,7 @@ ZENITY: https://github.com/GNOME/zenity" & "${pw_yad_v12_3}" --title "ABOUT US" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ ---center --notebook --no-buttons --tab-pos=bottom \ +--notebook --no-buttons --tab-pos=bottom \ --tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \ --tab="THIRD PARTY LIBRARIES" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ffa7e70c..8d56aa50 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -792,7 +792,7 @@ pw_init_db () { export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}!${ADD_CB_DBFILE}" fi done - PORTWINE_DB_FILE=`"${pw_yad_v12_3}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form --center \ + PORTWINE_DB_FILE=`"${pw_yad_v12_3}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form \ --title "Database file selection..." --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --form --separator="" \ --field="DB FILE: :CB" "${ADD_CB_DBFILE}"` if [[ "$?" == "1" || "$?" == "252" ]] ; then exit 0 ; fi @@ -819,7 +819,7 @@ pw_init_db () { print_info "Use ${PORTWINE_DB_FILE} db file." fi if [ -z "$PATH_TO_GAME" ] ; then - export PATH_TO_GAME="$(dirname $(readlink -f "${portwine_exe}"))" + export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" fi fi return 0 @@ -846,7 +846,7 @@ pw_port_update () { curl -s --list-only "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" | sszen CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' ` xcsd=`"${pw_yad_v12_3}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ - --borders=5 --form --separator='%%%' --width=1200 --height=600 --center \ + --borders=5 --form --separator='%%%' --width=1200 --height=600 \ --field=":TXT" "${CHANGLOG_NEWS}" \ --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" ` YAD_STATUS="$?" @@ -992,7 +992,7 @@ pw_find_exe () { done < "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" OrigIFS="$IFS" && IFS=% - PW_SET_FIND_EXE="$("${pw_yad_v12_3}" --height="300" --width="1000" --center --list \ + PW_SET_FIND_EXE="$("${pw_yad_v12_3}" --height="300" --width="1000" --list \ --text-align=center --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "Create shortcut for..." \ --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI})" YAD_STATUS="$?" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1ab19878..5d3b3fb5 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -200,7 +200,7 @@ portwine_start_debug () { PW_TIMER=1 fi done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v12_3}" --text-info --tail --button="STOP":0 --title="DEBUG" \ - --skip-taskbar --center --width=800 --height=400 --text "${port_debug}" && + --skip-taskbar --width=800 --height=400 --text "${port_debug}" && kill_portwine # sleep 1 && zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap &> /dev/null && kill_portwine sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" @@ -211,7 +211,7 @@ portwine_start_debug () { deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++') echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log" "$pw_yad" --title="${portname}.log" --borders=5 --no-buttons --text-align=center \ - --text-info --show-uri --wrap --center --width=1200 --height=550 --uri-color=red \ + --text-info --show-uri --wrap --width=1200 --height=550 --uri-color=red \ --filename="${PORT_WINE_PATH}/${portname}.log" stop_portwine } @@ -302,7 +302,7 @@ pw_prefix_manager () { --text="Change config for prefix: \"${PW_PREFIX_NAME}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & - "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=1 --width=900 --height=800 --center \ + "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=1 --width=900 --height=800 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS" YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then @@ -380,7 +380,7 @@ pw_start_cont_xterm () { pw_create_prefix_backup () { cd "$HOME" - PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=1 --width=650 --height=500 --auto-close --center \ + PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=1 --width=650 --height=500 --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO...") YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -569,7 +569,7 @@ if [ -n "${portwine_exe}" ]; then else PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_delete_shortcut}:98" fi - OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=1 --form --center \ + OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=1 --form \ --title "${portname}-${install_ver} (${scripts_install_ver})" --image "${PW_ICON_FOR_YAD}" --separator=";" --keep-icon-size \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --field="3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ @@ -666,7 +666,7 @@ else gui_open_scripts_from_backup () { cd "${PORT_WINE_TMP_PATH}/scripts_backup/" - PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=5 --width=650 --height=500 --auto-close --center \ + PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=5 --width=650 --height=500 --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz") YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -793,7 +793,7 @@ else fi & if [[ -z "${PW_ALL_DF}" ]] ; then - "${pw_yad_v12_3}" --key=$KEY --notebook --borders=1 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ + "${pw_yad_v12_3}" --key=$KEY --notebook --borders=1 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ @@ -803,7 +803,7 @@ else --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" YAD_STATUS="$?" else - "${pw_yad_v12_3}" --key=$KEY --notebook --borders=1 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ + "${pw_yad_v12_3}" --key=$KEY --notebook --borders=1 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index fba72960..1654fed6 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2191 +#SCRIPTS_NEXT_VERSION=2192 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 018f6b61..003496c6 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -103,7 +103,7 @@ export -f pw_stop_progress_bar_cover open_changelog () { "${pw_yad}" --title="$loc_gui_changelog" --borders=10 --no-buttons --text-align=center \ - --text-info --show-uri --wrap --center --width=1200 --height=700 --uri-color=red \ + --text-info --show-uri --wrap --width=1200 --height=700 --uri-color=red \ --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" } export -f open_changelog @@ -308,7 +308,7 @@ gui_proton_downloader () { --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"` & `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --separator="" --listen \ --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"` & - `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --center \ + `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "WINE MANAGER" --separator="" \ --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine"` YAD_WINE_STATUS="$?"