diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index fefc9e6..3357658 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,13 @@ You can help us in the development of the project on the website: https://linux-
----------------------------------------
Changelog:
+###Scripts version 2273### Date: 04.04.2024 / Download update size: 15 megabytes
+* the PortProton interface has been updated
+* improved the quality of the tray icon
+* added the CatsLauncher (the Front Edge game) to the AUTOINSTALL
+* added initial support .css (GTK+)
+* updated DOTNET prefix
+
###Scripts version 2272### Date: 04.04.2024 / Download update size: 15 megabytes
* script refactoring:
- yad_gui script combined with functions_helper
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index d439e6e..23c2cb2 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,14 @@
-----------------------------------------
История изменений:
+###Scripts version 2273### Дата: 06.04.2024 / Размер скачиваемого обновления: 15 мегабайт
+* обновлён интерфейс PortProton
+* улучшено качество иконки в трее
+* улучшена локализация
+* добавлен лончер CatsLauncher (игра "Передний край") в "АВТОУСТАНОВКИ"
+* добавлена начальная поддержка стилей .css (GTK+)
+* обновлен префикс DOTNET
+
###Scripts version 2272### Дата: 04.04.2024 / Размер скачиваемого обновления: 15 мегабайт
* рефакторинг скриптов:
- скрипт yad_gui объединён с functions_helper
diff --git a/data_from_portwine/img/gui/Alt_PP.jpg b/data_from_portwine/img/gui/Alt_PP.jpg
new file mode 100644
index 0000000..f43a65e
Binary files /dev/null and b/data_from_portwine/img/gui/Alt_PP.jpg differ
diff --git a/data_from_portwine/img/gui/catslauncher.png b/data_from_portwine/img/gui/catslauncher.png
new file mode 100644
index 0000000..7d99cef
Binary files /dev/null and b/data_from_portwine/img/gui/catslauncher.png differ
diff --git a/data_from_portwine/img/gui/covers/lol_cover.jpg b/data_from_portwine/img/gui/covers/lol_cover.jpg
new file mode 100755
index 0000000..40c7c41
Binary files /dev/null and b/data_from_portwine/img/gui/covers/lol_cover.jpg differ
diff --git a/data_from_portwine/img/gui/covers/pw_loading_cover.gif b/data_from_portwine/img/gui/covers/pw_loading_cover.gif
new file mode 100755
index 0000000..eb311ab
Binary files /dev/null and b/data_from_portwine/img/gui/covers/pw_loading_cover.gif differ
diff --git a/data_from_portwine/img/gui/covers/pw_update_pfx_cover.gif b/data_from_portwine/img/gui/covers/pw_update_pfx_cover.gif
new file mode 100755
index 0000000..b9de46a
Binary files /dev/null and b/data_from_portwine/img/gui/covers/pw_update_pfx_cover.gif differ
diff --git a/data_from_portwine/img/gui/fulqrumgames.png b/data_from_portwine/img/gui/fulqrumgames.png
new file mode 100644
index 0000000..7c01a8b
Binary files /dev/null and b/data_from_portwine/img/gui/fulqrumgames.png differ
diff --git a/data_from_portwine/img/gui/port_changelog.png b/data_from_portwine/img/gui/port_changelog.png
index eac25da..b4cd62f 100755
Binary files a/data_from_portwine/img/gui/port_changelog.png and b/data_from_portwine/img/gui/port_changelog.png differ
diff --git a/data_from_portwine/img/gui/port_exit.png b/data_from_portwine/img/gui/port_exit.png
index 5986fc4..247f1d0 100755
Binary files a/data_from_portwine/img/gui/port_exit.png and b/data_from_portwine/img/gui/port_exit.png differ
diff --git a/data_from_portwine/img/gui/port_winefile.png b/data_from_portwine/img/gui/port_winefile.png
index 88d8dc5..d6f92c8 100755
Binary files a/data_from_portwine/img/gui/port_winefile.png and b/data_from_portwine/img/gui/port_winefile.png differ
diff --git a/data_from_portwine/img/gui/separator.png b/data_from_portwine/img/gui/separator.png
index 1cdab36..fd07b79 100755
Binary files a/data_from_portwine/img/gui/separator.png and b/data_from_portwine/img/gui/separator.png differ
diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits
index 6dd9237..0847b87 100755
--- a/data_from_portwine/scripts/credits
+++ b/data_from_portwine/scripts/credits
@@ -360,7 +360,7 @@ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds
YAD: https://github.com/v1cont/yad" 2>/dev/null &
"${pw_yad_v13_0}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
- --notebook --no-buttons --tab-pos=bottom \
+ --notebook --no-buttons --tab-pos=bottom --expand \
--tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \
--tab="БИБЛИОТЕКИ"
echo "Exit from credits"
@@ -729,7 +729,7 @@ YAD: https://github.com/v1cont/yad" 2>/dev/null &
"${pw_yad_v13_0}" --title "ABOUT US" --key="${KEY_CREDITS}" ---window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
---notebook --no-buttons --tab-pos=bottom \
+--notebook --no-buttons --tab-pos=bottom --expand \
--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 9cdfd80..9fa1d04 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -552,7 +552,8 @@ init_wine_ver () {
export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/gstreamer_tmp/video.foz
export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/gstreamer_tmp/transcoded_video.foz
else
- var_winedlloverride_update "winegstreamer="
+ # var_winedlloverride_update "winegstreamer="
+ echo
fi
return 0
@@ -1095,6 +1096,12 @@ check_dirs_and_files_in_pfx () {
done
fi
done
+
+ LIST_COPY_WIN_DLL="ntdll shell32"
+ for copy_win_dll in $LIST_COPY_WIN_DLL ; do
+ try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${copy_win_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${copy_win_dll}.dll"
+ try_copy_file "${WINEDIR}/lib/wine/i386-windows/${copy_win_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${copy_win_dll}.dll"
+ done
}
check_nvidia_rtx () {
@@ -1234,7 +1241,7 @@ pw_port_update () {
curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver"
CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' `
xcsd=`"${pw_yad_v13_0}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
- --borders=${YAD_BORDERS} --form --separator='%%%' --width=1200 --height=600 \
+ --form --separator='%%%' --width=1200 --height=600 \
--field=":TXT" "${CHANGLOG_NEWS}" \
--field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" 2>/dev/null`
YAD_STATUS="$?"
@@ -1476,7 +1483,9 @@ start_portwine () {
if [[ "${PW_PREFIX_NAME}" == "DOTNET" ]] && [[ ! -f "${WINEPREFIX}"/.dotnet${DOTPFX_VER} ]] ; then
print_info "Download and install DOTNET pfx..."
if try_download "${DOTPFX_URL}" "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" ; then
- unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/"
+ if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/"
+ then touch "${WINEPREFIX}"/.dotnet${DOTPFX_VER}
+ fi
try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz"
else
try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz"
@@ -1509,11 +1518,12 @@ start_portwine () {
pw_wineboot () {
LIST_RM_WIN_DLL="winevulkan amd_ags_x64 ir50_32 atl100 ntdll \
libvkd3d-1 libvkd3d-shader-1 dxvk_config nvapi nvapi64 d3d12core d3d12 \
-d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d vulkan-1"
+d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d vulkan-1 shell32"
for rm_win_dll in $LIST_RM_WIN_DLL ; do
try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${rm_win_dll}.dll"
try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${rm_win_dll}.dll"
done
+
print_info "Used wineboot $@ for prefix: ${PW_PREFIX_NAME}"
${pw_runtime} env GST_PLUGIN_SYSTEM_PATH_1_0="" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" \
@@ -2321,8 +2331,8 @@ yad_question () {
pw_start_progress_bar_cover () {
if ! check_start_from_steam ; then
PW_GIF_FILE="$1"
- PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 20}'`
- PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 20}'`
+ PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 7}'`
+ PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 7}'`
"${pw_yad}" --picture --filename="${PW_GIF_FILE}" --close-on-unfocus --no-buttons --undecorated --center \
--skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --window-icon="$PW_GUI_ICON_PATH/portproton.svg" > /dev/null 2>&1 &
export PW_YAD_PID_PROGRESS_BAR_COVER="$!"
@@ -2334,8 +2344,8 @@ pw_start_progress_bar_cover_block () {
if ! check_start_from_steam ; then
[[ ! -f "${pw_yad}" ]] && local pw_yad="yad"
PW_GIF_FILE="$1"
- PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 20}'`
- PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 20}'`
+ PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 7}'`
+ PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 7}'`
"${pw_yad}" --picture --filename="${PW_GIF_FILE}" --close-on-unfocus --no-buttons --undecorated --center \
--skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --window-icon="$PW_GUI_ICON_PATH/portproton.svg" > /dev/null 2>&1 &
export PW_YAD_PID_PROGRESS_BAR_COVER_BLOCK="$!"
@@ -2345,12 +2355,12 @@ pw_start_progress_bar_cover_block () {
pw_update_pfx_cover_gui () {
if [[ "$1" == "winetricks" ]] ; then
- TAB_PLACE='--tab=TERMINAL --tab=LOGO'
+ TAB_PLACE="--tab=$loc_gui_terminal --tab=$loc_gui_logo"
TAB_N1=2
TAB_N2=1
YAD_UNDECORATED=""
else
- TAB_PLACE='--tab=LOGO --tab=TERMINAL'
+ TAB_PLACE="--tab=$loc_gui_logo --tab=$loc_gui_terminal"
TAB_N1=1
TAB_N2=2
YAD_UNDECORATED="--undecorated --center"
@@ -2359,8 +2369,8 @@ pw_update_pfx_cover_gui () {
if ! check_start_from_steam && ! pgrep -a yad | grep "yad_v13_0 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" &>/dev/null ; then
PW_KEY_PROGRESS_BAR_UP=$RANDOM
PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/update_prefix_${update_loc}.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}'`
+ PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 20}'`
+ PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 60}'`
echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log"
export PW_TIMER=0
while read -r line || [[ ! -z `pgrep -a yad | grep "yad_v13_0 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" | awk '{print $1}'` ]] ; do
@@ -2378,9 +2388,9 @@ pw_update_pfx_cover_gui () {
done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v13_0}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N2 --text-info --tail 2>/dev/null &
"${pw_yad_v13_0}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N1 --picture --filename="${PW_GIF_FILE}" --image-on-top 2>/dev/null &
- "${pw_yad_v13_0}" --notebook --key="$PW_KEY_PROGRESS_BAR_UP" $TAB_PLACE --no-buttons \
+ "${pw_yad_v13_0}" --notebook --key="$PW_KEY_PROGRESS_BAR_UP" $TAB_PLACE --no-buttons --expand \
--auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y $YAD_UNDECORATED \
- --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "PortProton" --tab-pos=bottom 2>/dev/null &
+ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "PortProton" --tab-pos=bottom --expand 2>/dev/null &
export PW_YAD_PID_PFX_COVER_UI="$!"
return 0
fi
@@ -2388,7 +2398,8 @@ pw_update_pfx_cover_gui () {
pw_start_progress_bar_cs () {
if ! check_start_from_steam ; then
- "${pw_yad}" --progress --progress-text="$@" --pulsate --close-on-unfocus \
+ "${pw_yad}" --progress --progress-text="$@
+ " --pulsate --close-on-unfocus --borders=20 \
--no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null &
export PW_YAD_PID_PROGRESS_BAR_CS="$!"
@@ -2398,7 +2409,8 @@ pw_start_progress_bar_cs () {
pw_start_progress_bar_block () {
if ! check_start_from_steam ; then
- "${pw_yad}" --progress --progress-text="$@" --pulsate \
+ "${pw_yad}" --progress --progress-text="$@
+ " --pulsate --borders=20 \
--no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null &
export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!"
@@ -2429,7 +2441,7 @@ pw_stop_progress_bar_cover_block () {
export -f pw_stop_progress_bar_cover_block
open_changelog () {
- "${pw_yad}" --title="$loc_gui_changelog" --borders=${YAD_BORDERS} --no-buttons --text-align=center \
+ "${pw_yad}" --title="$loc_gui_changelog" --no-buttons --text-align=center \
--text-info --show-uri --wrap --width=1200 --height=700 --uri-color=red \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" &>/dev/null
@@ -2467,7 +2479,7 @@ pw_tray_icon () {
--image="$PW_GUI_ICON_PATH/portproton_tray.png" \
--command="bash -c tray_icon_click" \
--tooltip="PortProton" \
- --menu="| \
+ --icon-size=32 --menu="| \
${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"|| \
${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \
${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"|| \
@@ -2512,14 +2524,14 @@ pw_gui_for_edit_db () {
else export ${int_to_boole}="FALSE"
fi
TMP_HELP_FOR_GUI="${int_to_boole}_INFO"
- int_to_boole_non_pw="`echo ${int_to_boole} | sed 's/^PW_//' `"
- ADD_CHK_BOX_EDIT_DB+="--field= ${int_to_boole_non_pw} !${!TMP_HELP_FOR_GUI}:CHK%${!int_to_boole}%"
+ int_to_boole_non_pw="`echo ${int_to_boole} | sed 's/^PW_//' | sed 's/_/ /g' `"
+ ADD_CHK_BOX_EDIT_DB+="--field= ${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:SW%${!int_to_boole}%"
done
}
edit_db_field_add $@
old_IFS=$IFS
IFS="%"
- "${pw_yad_v13_0}" --plug=$KEY_EDIT_DB_GUI --tabnum="1" --form --separator=" " --columns=4 ${ADD_CHK_BOX_EDIT_DB} \
+ "${pw_yad_v13_0}" --plug=$KEY_EDIT_DB_GUI --tabnum="1" --form --separator=" " --columns=3 ${ADD_CHK_BOX_EDIT_DB} \
1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db" 2>/dev/null &
IFS=$old_IFS
@@ -2542,13 +2554,13 @@ pw_gui_for_edit_db () {
--field="${loc_gui_gpu_select}!${loc_gui_gpu_select_help} :CB" "${GPU_VAR}!disabled!${GET_GPU_NAMES}" \
--field="${loc_gui_arg_gamescope}!${loc_gui_arg_gamescope_help} :CBE" "\\${GAMESCOPE_ARGS}!-r 60 -F fsr!" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null &
- "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \
- --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=${YAD_BORDERS} \
+ "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="675" \
+ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
- --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \
- --button="${loc_gui_reset_db}"!!"${loc_gui_reset_db_help}":2 \
- --button="${loc_gui_open_db}"!!"${loc_gui_open_db_help}":150 \
- --button="${loc_gui_save_changes}"!!"${loc_gui_save_changes_help}":0 2>/dev/null
+ --button="${loc_gui_cancel}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_cancel_help}":1 \
+ --button="${loc_gui_reset_db}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_reset_db_help}":2 \
+ --button="${loc_gui_open_db}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_open_db_help}":150 \
+ --button="${loc_gui_save_changes}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_save_changes_help}":0 2>/dev/null
YAD_STATUS="$?"
export SKIP_CHECK_UPDATES=1
case "$YAD_STATUS" in
@@ -2669,7 +2681,7 @@ gui_proton_downloader () {
sed -i '/plugins/d' "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
fi
pw_stop_progress_bar
- if [[ -z "${PROTON_GE_GIT}" ]] || [[ -z "${PROTON_PW_GIT}" ]] ; then
+ if [[ -z "${PROTON_PW_GIT}" ]] ; then
yad_error "$loc_gui_check_new_wine_error"
export SKIP_CHECK_UPDATES=1
/usr/bin/env bash -c ${pw_full_command_line[*]} &
@@ -2692,19 +2704,21 @@ gui_proton_downloader () {
try_remove_file "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"
try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"
- `"${pw_yad}" --plug=$KEY_WINE --tabnum=1 --list --separator="" --listen \
+ `"${pw_yad_v13_0}" --plug=$KEY_WINE --tabnum=1 --list --separator="" --listen \
--column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" 2>/dev/null` &
- `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \
+ `"${pw_yad_v13_0}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \
--column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" 1> "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" 2>/dev/null` &
- `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --separator="" --listen \
+ `"${pw_yad_v13_0}" --plug=$KEY_WINE --tabnum=3 --list --separator="" --listen \
--column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_set" 2>/dev/null` &
- `"${pw_yad}" --plug=$KEY_WINE --tabnum=4 --list --separator="" --listen \
+ `"${pw_yad_v13_0}" --plug=$KEY_WINE --tabnum=4 --list --separator="" --listen \
--column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" 2>/dev/null` &
- `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --separator="" --listen \
+ `"${pw_yad_v13_0}" --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" 2>/dev/null` &
- `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center \
- --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --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" 2>/dev/null`
+ `"${pw_yad_v13_0}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --no-button \
+ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "WINE MANAGER" --separator="" --expand \
+ --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" \
+ --button="$loc_cancel"!"$PW_GUI_ICON_PATH/separator.png"!"":1 \
+ --button="OK"!"$PW_GUI_ICON_PATH/separator.png"!"":0 2>/dev/null`
YAD_WINE_STATUS="$?"
if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then
export SKIP_CHECK_UPDATES=1
@@ -2796,9 +2810,9 @@ gui_vkBasalt () {
for add_list_fx in ${LIST_FX[@]} ; do
PW_VKBASALT_GUI_HELP="PW_${add_list_fx}_INFO"
if [[ ! -z `echo " ${GET_FX_IN_FILE[@]} " | grep " ${add_list_fx} "` ]] ; then
- ADD_GUI_FX+="--field=$add_list_fx!${!PW_VKBASALT_GUI_HELP}:CHK%TRUE%"
+ ADD_GUI_FX+="--field= $add_list_fx!${!PW_VKBASALT_GUI_HELP}:SW%TRUE%"
else
- ADD_GUI_FX+="--field=$add_list_fx!${!PW_VKBASALT_GUI_HELP}:CHK%FALSE%"
+ ADD_GUI_FX+="--field= $add_list_fx!${!PW_VKBASALT_GUI_HELP}:SW%FALSE%"
fi
done
if [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then
@@ -2815,7 +2829,7 @@ gui_vkBasalt () {
fi
export old_IFS=$IFS
export IFS="%"
- "${pw_yad_v13_0}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \
+ "${pw_yad_v13_0}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \
--text-align=center --text="$loc_gui_vkbasalt_top" \
${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" 2>/dev/null &
export IFS="${old_IFS}"
@@ -2824,7 +2838,7 @@ gui_vkBasalt () {
--field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \
1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null &
- "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="650" --title="vkBasalt" --center --borders=${YAD_BORDERS} \
+ "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="600" --title="vkBasalt" --center \
--separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \
--button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \
@@ -2898,18 +2912,20 @@ gui_MangoHud () {
PW_MANGOHUD_CONFIG=($(echo "$DEFAULT_MANGOHUD_CONFIG" | tr ',' '\n' | grep -v '='))
fi
+ # !!!
+
for add_list_mh in "${LIST_MH[@]}"; do
PW_MH_GUI_HELP="PW_MH_${add_list_mh}_INFO"
- if [[ -n "$(grep -wo "$add_list_mh" <<<"${PW_MANGOHUD_CONFIG[@]}")" ]]; then
- ADD_GUI_MH+="--field= $add_list_mh !${!PW_MH_GUI_HELP}:CHK%TRUE%"
+ if [[ -n "$(grep -wo "$add_list_mh" <<<"${PW_MANGOHUD_CONFIG[@]}")" ]] ; then
+ ADD_GUI_MH+="--field= $(echo $add_list_mh | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:SW%TRUE%"
else
- ADD_GUI_MH+="--field= $add_list_mh !${!PW_MH_GUI_HELP}:CHK%FALSE%"
+ ADD_GUI_MH+="--field= $(echo $add_list_mh | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:SW%FALSE%"
fi
done
export old_IFS=$IFS
export IFS="%"
- "${pw_yad_v13_0}" --plug=$KEY_MH_GUI --tabnum="1" --form --columns=5 --separator=" " \
+ "${pw_yad_v13_0}" --plug=$KEY_MH_GUI --tabnum="1" --form --columns=4 --separator=" " \
--text-align=center --text="$loc_gui_mh_top" \
${ADD_GUI_MH} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_set" 2>/dev/null &
export IFS="${old_IFS}"
@@ -2918,7 +2934,7 @@ gui_MangoHud () {
--field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRESH_RATE}" \
1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null &
- "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="650" --title="MangoHud" --center --borders=${YAD_BORDERS} \
+ "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="550" --title="MangoHud" --center \
--separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \
--button="$loc_gui_disabled_mh"!!"$loc_gui_disabled_mh_help":182 \
@@ -2954,7 +2970,7 @@ gui_MangoHud () {
export INT_COUNT_MH=0
for read_list_mh in ${YAD_MH_SET} ; do
if [[ "$read_list_mh" == "TRUE" ]]
- then export GUI_MH_RESULT+="${LIST_MH[$INT_COUNT_MH]},"
+ then export GUI_MH_RESULT+="$(echo "${LIST_MH[$INT_COUNT_MH]}," | sed 's/ /_/g' | tr [[:upper:]] [[:lower:]] )"
fi
((INT_COUNT_MH++))
done
@@ -2990,7 +3006,7 @@ portwine_create_shortcut () {
if [[ "$1" == "block_name" ]] ; then
export name_desktop="${PORTPROTON_NAME}"
- OUTPUT=$("${pw_yad}" --title="${inst_set}." --form --borders=${YAD_BORDERS} \
+ OUTPUT=$("${pw_yad}" --title="${inst_set}." --form \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
--field="${sc_info}":LBL "" \
@@ -3002,7 +3018,7 @@ portwine_create_shortcut () {
PW_YAD_OUT=$?
else
export name_desktop="${PORTPROTON_NAME}"
- OUTPUT=$("${pw_yad}" --title="${inst_set}." --form --borders=${YAD_BORDERS} \
+ OUTPUT=$("${pw_yad}" --title="${inst_set}." --form \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
--field="${sc_info}":LBL "" \
@@ -3108,7 +3124,7 @@ portwine_delete_shortcut () {
}
portwine_missing_shortcut () {
- "${pw_yad}" --title="${loc_gui_error}." --form --borders=${YAD_BORDERS} \
+ "${pw_yad}" --title="${loc_gui_error}." --form \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "$PW_GUI_ICON_PATH/error_file.png" \
--text "$loc_gui_missing_shortcut" \
@@ -3127,14 +3143,12 @@ pw_prefix_manager () {
touch "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"
fi
- pw_start_progress_bar_block "Starting prefix manager..."
+ pw_start_progress_bar_block "$loc_start_pfx_manager $PW_PREFIX_NAME"
"${PORT_WINE_TMP_PATH}/winetricks" dlls list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/dll_list"
"${PORT_WINE_TMP_PATH}/winetricks" fonts list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/fonts_list"
"${PORT_WINE_TMP_PATH}/winetricks" settings list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/settings_list"
- pw_stop_progress_bar
gui_prefix_manager () {
- pw_start_progress_bar_block "Starting prefix manager..."
unset SET_FROM_PFX_MANAGER_TMP SET_FROM_PFX_MANAGER
old_IFS=$IFS
IFS=$'\n'
@@ -3183,11 +3197,17 @@ pw_prefix_manager () {
--text="${loc_prefix_manager_conf} \"${PW_PREFIX_NAME}\"" \
--column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null &
- "${pw_yad_v13_0}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=${YAD_BORDERS} --width=900 --height=800 \
- --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_pm" --tab-pos=bottom --tab="$loc_pm_dlls" --tab="$loc_pm_fonts" --tab="$loc_pm_settings" 2>/dev/null
+ "${pw_yad_v13_0}" --key=$KEY_EDIT_MANAGER_GUI --notebook \
+ --width=900 --height=800 --expand \
+ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_pm" \
+ --button="$loc_cancel"!"$PW_GUI_ICON_PATH/separator.png"!"":1 \
+ --button="OK"!"$PW_GUI_ICON_PATH/separator.png"!"":0 \
+ --tab-pos=bottom --tab="$loc_pm_dlls" --tab="$loc_pm_fonts" --tab="$loc_pm_settings" 2>/dev/null
YAD_STATUS="$?"
if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then
- stop_portwine
+ print_info "Nothing to do. Restarting PortProton..."
+ stop_portwine &
+ /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0
fi
try_remove_file "${PORT_WINE_TMP_PATH}/dll_list_tmp"
@@ -3388,7 +3408,7 @@ portwine_start_debug () {
sed -i '/UDEV monitor/d' "${PORT_WINE_PATH}/${portname}.log"
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=${YAD_BORDERS} --no-buttons --text-align=center \
+ "$pw_yad" --title="${portname}.log" --no-buttons --text-align=center \
--text-info --show-uri --wrap --width=1200 --height=550 --uri-color=red \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--filename="${PORT_WINE_PATH}/${portname}.log"
@@ -3397,7 +3417,7 @@ portwine_start_debug () {
pw_create_prefix_backup () {
cd "$HOME"
- PW_PREFIX_TO_BACKUP=$("${pw_yad_v13_0}" --file --directory --borders=${YAD_BORDERS} --width=650 --height=500 --auto-close \
+ PW_PREFIX_TO_BACKUP=$("${pw_yad_v13_0}" --file --directory --width=650 --height=500 --auto-close \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_create_pfx_backup_path" 2>/dev/null )
YAD_STATUS="$?"
if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
@@ -3560,7 +3580,7 @@ export -f gui_open_user_conf
gui_open_scripts_from_backup () {
cd "${PORT_WINE_TMP_PATH}/scripts_backup/"
- PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v13_0}" --file --borders=${YAD_BORDERS} --width=650 --height=500 --auto-close \
+ PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v13_0}" --file --width=650 --height=500 --auto-close \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz" 2>/dev/null )
YAD_STATUS="$?"
if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index d7f5f11..3e5a0b1 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -429,14 +429,18 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_prefix_manager_font='Выберите шрифт для установки в префикс:'
export loc_prefix_manager_conf='Изменить дополнительные настройки префикса:'
export loc_prefix_manager_wine='используя wine:'
-
export loc_pm='МЕНЕДЖЕР ПРЕФИКСА'
export loc_pm_dlls='БИБЛИОТЕКИ'
export loc_pm_fonts='ШРИФТЫ'
export loc_pm_settings='НАСТРОЙКИ'
+ export loc_start_pfx_manager="Запускается менеджер префикса:"
export loc_warn_cyrillic_in_path="Путь до исполняемого файла содержит кириллические символы.\nИногда это может привести к неработоспособности приложения."
+ export loc_gui_terminal="ТЕРМИНАЛ"
+ export loc_gui_logo="ЛОГО"
+
+
elif [[ "${update_loc}" == "ENG" ]] ; then
export loc_gui_pw_reinstall_pp="REINSTALL ${portname}"
@@ -845,7 +849,12 @@ A brief instruction:
export loc_pm_dlls='DLLS'
export loc_pm_fonts='FONTS'
export loc_pm_settings='SETTINGS'
+ export loc_start_pfx_manager="Starting prefix manager:"
export loc_warn_cyrillic_in_path="The path to the executable file contains Cyrillic characters.\nSometimes this can cause the application to malfunction."
+ export loc_gui_terminal="TERMINAL"
+ export loc_gui_logo="LOGO"
+
+
fi
diff --git a/data_from_portwine/scripts/portwine_db/CatsLauncher b/data_from_portwine/scripts/portwine_db/CatsLauncher
new file mode 100644
index 0000000..f2556b6
--- /dev/null
+++ b/data_from_portwine/scripts/portwine_db/CatsLauncher
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#Author: fidel
+#CatsLauncher.exe
+#Rating=5
+#####################examples###########################
+export PW_WINDOWS_VER="10"
+export PW_VULKAN_USE="2"
+export PW_WINE_USE="WINE_LG"
+export PW_PREFIX_NAME="DOTNET"
+# export WINEDLLOVERRIDES="libglesv2="
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
new file mode 100755
index 0000000..d3abe26
--- /dev/null
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Author: Castro-Fidel (linux-gaming.ru)
+########################################################################
+export LAUNCH_PARAMETERS=("/q" )
+export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CatsLauncher.msi"
+export PW_PREFIX_NAME=DOTNET
+export PW_USE_D3D_EXTRAS=1
+export PORTWINE_CREATE_SHORTCUT_NAME="CatsLauncher"
+
+start_portwine
+if try_download_no_mirror "https://catswhoplay.com/downloads/CatsLauncher_0.1.10.msi" "${PW_AUTOINSTALL_EXE}"
+then
+ pw_start_progress_bar_block "${loc_gui_installing_the} CatsLauncher. ${loc_gui_please_wait} "
+ pw_run msiexec /i "${PW_AUTOINSTALL_EXE}"
+ portwine_exe="${WINEPREFIX}/drive_c/Program Files/CatsWhoPlay/Cats Launcher/CatsLauncher.exe"
+ try_remove_file "${PW_AUTOINSTALL_EXE}"
+ try_remove_file "${portwine_exe}.ppdb"
+ kill_portwine
+ pw_stop_progress_bar
+ portwine_create_shortcut
+fi
+stop_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
index 60f7cc8..ee92309 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
@@ -11,7 +11,7 @@ try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
start_portwine
if try_download_no_mirror "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}"
then
- pw_start_progress_bar_block "Installing Epic Games Launcher. ${loc_gui_please_wait} "
+ pw_start_progress_bar_block "${loc_gui_installing_the} Epic Games Launcher. ${loc_gui_please_wait} "
# try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Epic Online Services/"
# try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Launcher/"
# try_remove_dir "${WINEPREFIX}/drive_c/ProgramData/Epic"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index bfcd4c2..40d8916 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -22,7 +22,8 @@ fi
export PW_START_PID="$$"
export NO_AT_BRIDGE=1
export pw_full_command_line=("$0" $*)
-export YAD_BORDERS=5
+export YAD_OPTIONS="--borders=3 --tab-borders=0 --keep-icon-size"
+
MISSING_DESKTOP_FILE=0
if [[ -f "$1" ]] ; then
@@ -128,6 +129,9 @@ 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 YAD_OPTIONS+=" --css=$PW_GUI_THEMES_PATH/default.css"
+
. "${PORT_SCRIPTS_PATH}"/lang
export urlg="https://linux-gaming.ru/portproton/"
@@ -339,8 +343,9 @@ if [[ -f "${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" --borders=${YAD_BORDERS} --form \
- --title "${portname}-${install_ver} (${scripts_install_ver})" --image "${PW_ICON_FOR_YAD}" --separator=";" --keep-icon-size \
+ OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --form \
+ --title "${portname}-${install_ver} (${scripts_install_ver})" \
+ --image "${PW_ICON_FOR_YAD}" --separator=";" \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--field="3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \
--field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \
@@ -386,10 +391,10 @@ else
IFS="$orig_IFS"
old_IFS=$IFS && IFS="%"
- "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null &
+ "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --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 --keep-icon-size --separator=";" \
+ "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --separator=";" \
--field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
--field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
--field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
@@ -400,7 +405,7 @@ else
--field=" Xterm"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \
--field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null &
- "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \
+ "${pw_yad_v13_0}" --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}" \
@@ -414,7 +419,7 @@ else
--field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \
--field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &
- "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --keep-icon-size --scroll \
+ "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --scroll \
--field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"${loc_dolphin}":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
--field=" MAME"!"$PW_GUI_ICON_PATH/mame.png"!"${loc_mame}":"FBTN" '@bash -c "button_click PW_MAME"' \
--field=" RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"${loc_retroarch}":"FBTN" '@bash -c "button_click PW_RETROARCH"' \
@@ -430,7 +435,7 @@ else
--field=" xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"${loc_xemu}":"FBTN" '@bash -c "button_click PW_XEMU"' \
--field=" Demul"!"$PW_GUI_ICON_PATH/demul.png"!"${loc_demul}":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null &
- "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \
+ "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --scroll \
--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"' \
@@ -464,7 +469,8 @@ else
--field=" EA App (TEST)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \
--field=" Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' \
--field=" Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click PW_BDO"' \
- --field=" Pulse Online"!"$PW_GUI_ICON_PATH/pulseonline.png"!"":"FBTN" '@bash -c "button_click PW_PULSE_ONLINE"' 2>/dev/null &
+ --field=" Pulse Online"!"$PW_GUI_ICON_PATH/pulseonline.png"!"":"FBTN" '@bash -c "button_click PW_PULSE_ONLINE"' \
+ --field=" CatsLauncher (Front Edge)"!"$PW_GUI_ICON_PATH/catslauncher.png"!"":"FBTN" '@bash -c "button_click PW_CATSLAUNCHER"' 2>/dev/null &
# --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"'
# --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"'
@@ -484,9 +490,11 @@ else
export START_FROM_PP_GUI=1
if [[ -z "${PW_ALL_DF}" ]] ; then
- "${pw_yad_v13_0}" --key=$KEY --notebook --borders=${YAD_BORDERS} --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \
- --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "${portname}-${install_ver} (${scripts_install_ver})" \
- --tab-pos=bottom --keep-icon-size \
+ "${pw_yad_v13_0}" --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 "${portname}-${install_ver} (${scripts_install_ver})" \
+ --tab-pos=bottom \
--tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \
--tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \
--tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \
@@ -494,9 +502,11 @@ else
--tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null
YAD_STATUS="$?"
else
- "${pw_yad_v13_0}" --key=$KEY --notebook --borders=${YAD_BORDERS} --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \
- --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "${portname}-${install_ver} (${scripts_install_ver})" \
- --tab-pos=bottom --keep-icon-size \
+ "${pw_yad_v13_0}" --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 "${portname}-${install_ver} (${scripts_install_ver})" \
+ --tab-pos=bottom \
--tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \
--tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \
--tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 5a912a1..9571f9c 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=2272
+#SCRIPTS_NEXT_VERSION=2273
########################################################################
export PW_MANGOHUD="0"
export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"
@@ -54,7 +54,7 @@ export DXVK_GIT_VER="2.3.1"
export VKD3D_STABLE_VER="1.1-2602"
export VKD3D_GIT_VER="1.1-3973"
###PREFIX_VERSION###
-export DOTPFX_VER="48v2"
+export DOTPFX_VER="48v4"
export DEFPFX_VER="v1"
export PROGPFX_VER="v1"
export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;winemenubuilder.exe="
diff --git a/data_from_portwine/themes/default.css b/data_from_portwine/themes/default.css
new file mode 100644
index 0000000..e69de29