diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index bc6bcef1..e7efa760 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2173### +* added saving the size of the PortProton main menu window + ###Scripts version 2172### * minor improvements searching the .exe files diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 48223bf9..91bd7785 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2173### +* добавлено сохранение размера окна главного меню PortProton + ###Scripts version 2172### * небольшие улучшения поиска .exe файлов diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index 0ebef2fe..7d59e128 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -37,6 +37,8 @@ an9949an andrey4korop zorn Vano Majukin +Сергей 33(46)RUS +WelchDragon " & "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index efb64375..466a92a8 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -21,6 +21,14 @@ if [[ "${XDG_SESSION_TYPE}" = "wayland" ]] && [[ ! -f "${PORT_WINE_TMP_PATH}/che echo "1" > "${PORT_WINE_TMP_PATH}/check_wayland" fi +if [[ -f "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" ]] && [[ -n "$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size)" ]] ; then + export PW_MAIN_SIZE_W="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $1}')" + export PW_MAIN_SIZE_H="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $2}')" +else + export PW_MAIN_SIZE_W="1000" + export PW_MAIN_SIZE_H="260" +fi + if [[ -n $(basename "${portwine_exe}" | grep .ppack) ]] ; then export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" unset PW_SANDBOX_HOME_PATH @@ -760,8 +768,18 @@ else # --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' + if [[ `which wmctrl` ]] &>/dev/null ; then + while [[ $(pgrep -a yad_new | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do + sleep 1 + PW_MAIN_GUI_SIZE_TMP="$(wmctrl -lG | grep PortProton-1.0 | awk '{print $5" "$6}' 2>/dev/null)" + if [[ -n "${PW_MAIN_GUI_SIZE_TMP}" ]] ; then + echo "${PW_MAIN_GUI_SIZE_TMP}" > "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" + fi + done & + fi + if [[ -z "${PW_ALL_DF}" ]] ; then - "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width=1000 --height=235 --no-buttons --auto-close --center \ + "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ --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"!"" \ @@ -771,7 +789,7 @@ else --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" YAD_STATUS="$?" else - "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width=1000 --height=235 --no-buttons --auto-close --center \ + "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ --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"!"" \ @@ -781,6 +799,7 @@ else --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" YAD_STATUS="$?" fi + if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi if [[ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form" ]]; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index f6ae465b..f8931800 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=2172 +#SCRIPTS_NEXT_VERSION=2173 ######################################################################## 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 47a02885..dbd9e331 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -28,7 +28,7 @@ sszen() { gui_question () { `zenity --question --title "${inst_set}." --text "$1" --no-wrap ` &> /dev/null - [ $? -eq "0" ] && return 0 || return 1 + [ $? -eq "0" ] && return 0 || return 1 } @@ -43,31 +43,31 @@ pw_start_progress_bar_cover () { } pw_update_pfx_cover_gui () { - PW_KEY_PROGRESS_BAR=$RANDOM - PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/pw_update_pfx_cover.gif" - PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 40}'` - PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'` - echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" - unset PW_TIMER - while read -r line || [[ ! -z `pgrep -a yad | grep "yad_new --notebook --key="$PW_KEY_PROGRESS_BAR"" | awk '{print $1}'` ]] ; do - sleep 0.005 - if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \ - && [[ -z "`echo "${line}" | grep -i "kerberos"`" ]] \ - && [[ -z "`echo "${line}" | grep -i "ntlm"`" ]] - then - echo "# ${line}" - fi - if [[ "${PW_TIMER}" != 1 ]] ; then - sleep 3 - PW_TIMER=1 - fi - done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="2" --text-info --tail & - "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top & + PW_KEY_PROGRESS_BAR=$RANDOM + PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/pw_update_pfx_cover.gif" + PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 40}'` + PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'` + echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" + unset PW_TIMER + while read -r line || [[ ! -z `pgrep -a yad | grep "yad_new --notebook --key="$PW_KEY_PROGRESS_BAR"" | awk '{print $1}'` ]] ; do + sleep 0.005 + if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \ + && [[ -z "`echo "${line}" | grep -i "kerberos"`" ]] \ + && [[ -z "`echo "${line}" | grep -i "ntlm"`" ]] + then + echo "# ${line}" + fi + if [[ "${PW_TIMER}" != 1 ]] ; then + sleep 3 + PW_TIMER=1 + fi + done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="2" --text-info --tail & + "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top & - "${pw_yad_new}" --notebook --key="$PW_KEY_PROGRESS_BAR" --tab=LOGO --tab=TERMINAL --no-buttons --undecorated \ - --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom & - export PW_YAD_PID_PFX_COVER_UI="$!" - return 0 + "${pw_yad_new}" --notebook --key="$PW_KEY_PROGRESS_BAR" --tab=LOGO --tab=TERMINAL --no-buttons --undecorated \ + --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom & + export PW_YAD_PID_PFX_COVER_UI="$!" + return 0 } pw_start_progress_bar_cs () { @@ -188,7 +188,7 @@ pw_gui_for_edit_db () { --field=":LBL" "" \ --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :SCL" ${FPS_LIMIT_VAR} 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & - "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="450" \ + "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="550" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=10 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \