Scripts version 2273

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

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

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"
 

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

data_from_portwine/scripts/portwine_db/CatsLauncher

+#!/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="

data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER

+#!/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

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"

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"!"" \

data_from_portwine/scripts/var

 #!/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="