Compare commits

...

22 Commits

Author SHA1 Message Date
aed2ecc0b4 Scripts version 2366 2024-10-24 21:11:45 +03:00
3224aaa754 fixed func: gui_vkbasalt 2024-10-24 20:56:14 +03:00
c0fe4fc425 Merge branch 'Htylol-fixed-for-tray-1' into devel 2024-10-24 20:46:56 +03:00
826c8decc1 Merge branch 'fixed-for-tray-1' of github.com:Htylol/PortWINE into Htylol-fixed-for-tray-1 2024-10-24 20:46:46 +03:00
3c5bf173fd Merge branch 'Htylol-added-gitea' into devel 2024-10-24 20:46:07 +03:00
d1542aaad5 Merge branch 'added-gitea' of github.com:Htylol/PortWINE into Htylol-added-gitea 2024-10-24 20:46:00 +03:00
7433ebf445 make spellcheck happy =) 2024-10-24 20:38:07 +03:00
eb6c2f2e61 Merge branch 'Htylol-update-name_desktop_1' into devel 2024-10-24 20:01:46 +03:00
848fd8df77 Merge branch 'update-name_desktop_1' of github.com:Htylol/PortWINE into Htylol-update-name_desktop_1 2024-10-24 20:01:26 +03:00
e4d828134c Merge branch 'Boria138-es' into devel 2024-10-24 19:47:56 +03:00
0a3f015384 Merge branch 'es' of github.com:Boria138/PortWINE into Boria138-es 2024-10-24 19:47:39 +03:00
b50c69085e Merge branch 'Boria138-pw_start_progress_bar_block' into devel 2024-10-24 19:47:00 +03:00
62f1dcf45b Merge branch 'pw_start_progress_bar_block' of github.com:Boria138/PortWINE into Boria138-pw_start_progress_bar_block 2024-10-24 19:46:45 +03:00
13d75e02e9 fixes new 2024-10-24 21:17:54 +05:00
49b9b0feb2 Fixes 2024-10-24 19:12:42 +05:00
7977a8011d Added pw_exit_tray for new tray 2024-10-24 18:44:12 +05:00
e27b3f761a Added PP_GITEA in pw_port_update 2024-10-24 16:56:32 +05:00
9fb5fb25f7 Replace == on -z 2024-10-24 14:59:53 +05:00
b4bc665575 Update es translate 2024-10-24 13:52:01 +05:00
8ca1ae91fa Updates for name_desktop and create_pw_comment 2024-10-24 13:47:11 +05:00
cb09d6981c Use pw_start_progress_bar_block in add_in_steam.sh 2024-10-24 13:45:22 +05:00
bfc997f491 Added translate 2024-10-24 13:44:50 +05:00
11 changed files with 358 additions and 248 deletions

View File

@ -2,14 +2,21 @@ You can help us in the development of the project on the website: https://linux-
---------------------------------------- ----------------------------------------
Changelog: Changelog:
###Scripts version 2366### / Date: 24.10.2024 / Download update size: 4 megabytes
* auto-installation of "CatsLauncher" was removed due to the move of the game "Front Edge" to "vkPlay"
* updated version of the tray menu (thanks to Htylol)
* improved title detection functionality for creating shortcuts (thanks to Htylol)
* updated Spanish language (thanks Boria138)
* improved and optimized cover download function for Steam (thanks to Boria138)
###Scripts version 2365### / Date: 23.10.2024 / Download update size: 4 megabytes ###Scripts version 2365### / Date: 23.10.2024 / Download update size: 4 megabytes
* added translations for using system wine and downloading other versions of wine (thanks to Htylol) * added translations for using system wine and downloading other versions of wine (thanks to Htylol)
* improved title detection functionality for creating shortcuts (thanks to Htylol) * improved title detection functionality for creating shortcuts (thanks to Htylol)
* added check for duplicate shortcuts (thanks to Htylol) * added check for duplicate shortcuts (thanks to Htylol)
* added ZINK support for NVK (thanks to Htylol) * added ZINK support for NVK (thanks to Htylol)
* added automatic installation of games (thanks to Chal55rus): * added automatic installation of games (thanks to Chal55rus):
*Broken Ranks * Broken Ranks
*DC Universe Online * DC Universe Online
* The Lord of the Rings Online * The Lord of the Rings Online
* fixed link in the text when creating a log * fixed link in the text when creating a log

View File

@ -2,7 +2,13 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2366### / Дата: 24.10.2024 / Размер скачиваемого обновления: 4 мегабайта
* удалена автоустановка "CatsLauncher" по причине переезда игры "Передний край" в "vkPlay" * удалена автоустановка "CatsLauncher" по причине переезда игры "Передний край" в "vkPlay"
* обновлена версия меню трея (спасибо Htylol)
* улучшен функционал создания ярлыков и комментариев (спасибо Htylol)
* обновлен испанский язык (спасибо Boria138)
* улучшена и оптимизирована функция скачивания обложек для Steam (спасибо Boria138)
* другие небольшие улучшения интерфейса настроек (спасибо Htylol)
###Scripts version 2365### / Дата: 23.10.2024 / Размер скачиваемого обновления: 4 мегабайта ###Scripts version 2365### / Дата: 23.10.2024 / Размер скачиваемого обновления: 4 мегабайта
* добавлены переводы для использования системного wine и скачивания других версий wine (спасибо Htylol) * добавлены переводы для использования системного wine и скачивания других версий wine (спасибо Htylol)

View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "Project-Id-Version: PACKAGE VERSION\n" msgstr "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-23 14:40+0300\n" "POT-Creation-Date: 2024-10-24 12:43+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1582,8 +1582,8 @@ msgid "MIT License\n"
"\n" "\n"
"Permission is hereby granted, free of charge, to any person " "Permission is hereby granted, free of charge, to any person "
"obtaining a copy\n" "obtaining a copy\n"
"of this software and associated documentation files (the \"Software" "of this software and associated documentation files (the "
"\"), to deal\n" "\"Software\"), to deal\n"
"in the Software without restriction, including without limitation " "in the Software without restriction, including without limitation "
"the rights\n" "the rights\n"
"to use, copy, modify, merge, publish, distribute, sublicense, and/or " "to use, copy, modify, merge, publish, distribute, sublicense, and/or "
@ -1665,3 +1665,9 @@ msgstr ""
msgid "THIRD PARTY LIBRARIES" msgid "THIRD PARTY LIBRARIES"
msgstr "" msgstr ""
msgid "SteamGridDB is not responding, forcing cover download to be disabled"
msgstr ""
msgid "Please wait. downloading covers for"
msgstr ""

View File

@ -8,15 +8,15 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-23 14:40+0300\n" "POT-Creation-Date: 2024-10-24 13:48+0500\n"
"PO-Revision-Date: 2024-10-15 13:28+0500\n" "PO-Revision-Date: 2024-10-24 13:51+0500\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: es_ES\n" "Language: es_ES\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 3.4.4\n" "X-Generator: Poedit 3.4.2\n"
msgid "" msgid ""
"A running PortProton session was detected.\\nDo you want to end the previous " "A running PortProton session was detected.\\nDo you want to end the previous "
@ -32,7 +32,7 @@ msgid "Unpack is DONE for prefix:"
msgstr "El desempaquetado se ha COMPLETADO para el prefijo:" msgstr "El desempaquetado se ha COMPLETADO para el prefijo:"
msgid "USE_SYSTEM_WINE" msgid "USE_SYSTEM_WINE"
msgstr "" msgstr "Usar Wine del sistema"
msgid "WineD3D OpenGL (For video cards without Vulkan)" msgid "WineD3D OpenGL (For video cards without Vulkan)"
msgstr "WineD3D OpenGL (Para tarjetas de video sin Vulkan)" msgstr "WineD3D OpenGL (Para tarjetas de video sin Vulkan)"
@ -56,7 +56,7 @@ msgid "Gallium Zink (OpenGL to Vulkan)"
msgstr "Gallium Zink (OpenGL a Vulkan)" msgstr "Gallium Zink (OpenGL a Vulkan)"
msgid "GET-OTHER-WINE" msgid "GET-OTHER-WINE"
msgstr "" msgstr "OBTENER OTRO WINE"
msgid "CREATE SHORTCUT" msgid "CREATE SHORTCUT"
msgstr "CREAR ACCESO DIRECTO" msgstr "CREAR ACCESO DIRECTO"
@ -76,15 +76,14 @@ msgstr "Configuración básica"
msgid "Edit database file for" msgid "Edit database file for"
msgstr "Editar archivo de base de datos para" msgstr "Editar archivo de base de datos para"
#, fuzzy
msgid "Global settings" msgid "Global settings"
msgstr "Configuración básica" msgstr "Configuraciones globales"
msgid "Settings for user.conf" msgid "Settings for user.conf"
msgstr "Configuración user.conf" msgstr "Configuración user.conf"
msgid "Open directory" msgid "Open directory"
msgstr "directorio abierto" msgstr "Abrir directorio"
msgid "Open directory with <b>.ppdb</b> file" msgid "Open directory with <b>.ppdb</b> file"
msgstr "Abrir directorio con el archivo <b>.ppdb</b>" msgstr "Abrir directorio con el archivo <b>.ppdb</b>"
@ -123,7 +122,7 @@ msgid "MAIN MENU"
msgstr "MENÚ PRINCIPAL" msgstr "MENÚ PRINCIPAL"
msgid "Main menu" msgid "Main menu"
msgstr "menú principal" msgstr "Menú principal"
msgid "DEBUG" msgid "DEBUG"
msgstr "DEPURAR" msgstr "DEPURAR"
@ -155,7 +154,6 @@ msgstr "Lista de cambios"
msgid "Change language" msgid "Change language"
msgstr "Cambiar idioma" msgstr "Cambiar idioma"
#, fuzzy
msgid "Global settings (user.conf)" msgid "Global settings (user.conf)"
msgstr "Configuración user.conf" msgstr "Configuración user.conf"
@ -218,7 +216,6 @@ msgstr "Ejecutar wine regedit"
msgid "AUTOINSTALLS" msgid "AUTOINSTALLS"
msgstr "INSTALACIONES AUTOMÁTICAS" msgstr "INSTALACIONES AUTOMÁTICAS"
#, fuzzy
msgid "EMULATORS" msgid "EMULATORS"
msgstr "EMULADORES" msgstr "EMULADORES"
@ -254,47 +251,43 @@ msgid "Launching"
msgstr "Lanzamiento" msgstr "Lanzamiento"
msgid "day" msgid "day"
msgstr "" msgstr "día"
msgid "days" msgid "days"
msgstr "" msgstr "días"
msgid "hour" msgid "hour"
msgstr "" msgstr "hora"
msgid "and" msgid "and"
msgstr "" msgstr "y"
msgid "hours" msgid "hours"
msgstr "" msgstr "horas"
msgid "less than a minute" msgid "less than a minute"
msgstr "" msgstr "menos de un minuto"
msgid "minute" msgid "minute"
msgstr "" msgstr "minuto"
msgid "minutes" msgid "minutes"
msgstr "" msgstr "minutos"
msgid "Time spent" msgid "Time spent"
msgstr "" msgstr "Tiempo transcurrido"
#, fuzzy
msgid "Disabled" msgid "Disabled"
msgstr "Desactivada" msgstr "Deshabilitado"
#, fuzzy
msgid "Enable" msgid "Enable"
msgstr "Permitir" msgstr "Habilitar"
#, fuzzy
msgid "Disable" msgid "Disable"
msgstr "Desactivar" msgstr "Deshabilitar"
#, fuzzy
msgid "Enabled" msgid "Enabled"
msgstr "Activada" msgstr "Habilitado"
msgid "" msgid ""
"Do you really want to reinstall PortProton?\\nFor this, an internet " "Do you really want to reinstall PortProton?\\nFor this, an internet "
@ -526,14 +519,14 @@ msgstr ""
"Uso de monitoreo de FPS y carga del sistema (Se activa y desactiva con la " "Uso de monitoreo de FPS y carga del sistema (Se activa y desactiva con la "
"combinación de teclas - Shift derecho + F12)" "combinación de teclas - Shift derecho + F12)"
#, fuzzy
msgid "" msgid ""
"Using automatic system optimization to improve performance in games " "Using automatic system optimization to improve performance in games "
"(provided the gamemode package is installed on the system, doesn't work with " "(provided the gamemode package is installed on the system, doesn't work with "
"ananicy)" "ananicy)"
msgstr "" msgstr ""
"Uso de optimización automática del sistema para mejorar el rendimiento en " "Utilizando optimización automática del sistema para mejorar el rendimiento "
"juegos (siempre que el paquete gamemode esté instalado en el sistema)" "en juegos (siempre que el paquete gamemode esté instalado en el sistema, no "
"funciona con ananicy)."
msgid "" msgid ""
"Forced use of built-in DXGI library (in rare cases it solves problems with " "Forced use of built-in DXGI library (in rare cases it solves problems with "
@ -730,7 +723,7 @@ msgstr "Seleccionar forzosamente el nivel de características de VKD3D"
msgid "You can set a forced feature level VKD3D for games on DirectX12" msgid "You can set a forced feature level VKD3D for games on DirectX12"
msgstr "" msgstr ""
"Puedes establecer un nivel de características forzado para VKD3D en juegos " "Puedes establecer un nivel de características forzado para VKD3D en juegos "
"con DirectX 12." "con DirectX 12"
msgid "Force certain locale for an app:" msgid "Force certain locale for an app:"
msgstr "Forzar cierta configuración regional para una aplicación:" msgstr "Forzar cierta configuración regional para una aplicación:"
@ -1039,7 +1032,7 @@ msgstr ""
"Restore default settings for (Restaurar configuraciones predeterminadas para)" "Restore default settings for (Restaurar configuraciones predeterminadas para)"
msgid "DISABLE" msgid "DISABLE"
msgstr "DESACTIVAR " msgstr "DESACTIVAR"
msgid "Disable vkBasalt and go to the previous menu" msgid "Disable vkBasalt and go to the previous menu"
msgstr "Desactivar vkBasalt y volver al menú anterior" msgstr "Desactivar vkBasalt y volver al menú anterior"
@ -1190,16 +1183,15 @@ msgstr ""
msgid "Show temperature in Fahrenheit" msgid "Show temperature in Fahrenheit"
msgstr "Mostrar temperatura en Fahrenheit" msgstr "Mostrar temperatura en Fahrenheit"
#, fuzzy
msgid "" msgid ""
"Show if GPU is throttling based on Power, current, temp or other (Only shows " "Show if GPU is throttling based on Power, current, temp or other (Only shows "
"if throttling is currently happening). Currently disabled by default for " "if throttling is currently happening). Currently disabled by default for "
"Nvidia as it causes lag on 3000 series" "Nvidia as it causes lag on 3000 series"
msgstr "" msgstr ""
"Mostrar si la GPU está limitando basado en Potencia, corriente, temperatura " "Mostrar si la GPU está limitando el rendimiento basado en energía, "
"u \"otro\" (Solo se muestra si actualmente está ocurriendo limitación). " "corriente, temperatura u otros factores (solo se muestra si actualmente está "
"Actualmente desactivado por defecto para Nvidia ya que causa lag en la serie " "ocurriendo limitación). Actualmente deshabilitado por defecto para Nvidia, "
"3000" "ya que causa retrasos en la serie 3000"
msgid "" msgid ""
"Same as throttling_status but displays throttling in the frametime graph and " "Same as throttling_status but displays throttling in the frametime graph and "
@ -1307,8 +1299,8 @@ msgid ""
"if enabled then forced filtering affects only non-point sampled textures. " "if enabled then forced filtering affects only non-point sampled textures. "
"(Direct3D settings)" "(Direct3D settings)"
msgstr "" msgstr ""
"Si está habilitado, el filtrado forzado afecta solo a las texturas no " "si está habilitado, entonces el filtrado forzado afecta solo a las texturas "
"muestreadas puntualmente. (Configuraciones de Direct3D)" "que no se muestrean por puntos. (Configuraciones de Direct3D)"
msgid "" msgid ""
"Enable fast memory access. (Enable if games have poor performance, using " "Enable fast memory access. (Enable if games have poor performance, using "
@ -1412,7 +1404,6 @@ msgstr ""
"cuando pierden el enfoque, por lo que esto puede usarse para permitir que la " "cuando pierden el enfoque, por lo que esto puede usarse para permitir que la "
"aplicación se ejecute en segundo plano. (Configuraciones de Glide)" "aplicación se ejecute en segundo plano. (Configuraciones de Glide)"
#, fuzzy
msgid "" msgid ""
"dgVoodoo2 settings\\n<b>NOTE:</b> To display help for each item, simply " "dgVoodoo2 settings\\n<b>NOTE:</b> To display help for each item, simply "
"hover over the text" "hover over the text"
@ -1654,12 +1645,11 @@ msgid ""
"VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and " "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
"copied)</b>" "copied)</b>"
msgstr "" msgstr ""
" <b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el " "<b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el "
"comando en el terminal:\\n flatpak install -y runtime/org.freedesktop." "comando en el terminal:\\n flatpak install -y runtime/org.freedesktop."
"Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n (Se puede " "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n (Se puede "
"seleccionar y copiar)</b>." "seleccionar y copiar)</b>"
#, fuzzy
msgid "" msgid ""
"<b>Gamescope is not detected on the system, please contact the manufacturer " "<b>Gamescope is not detected on the system, please contact the manufacturer "
"of your distribution\\nor search the Internet for information on how to " "of your distribution\\nor search the Internet for information on how to "
@ -1735,7 +1725,7 @@ msgid ""
"number amount" "number amount"
msgstr "" msgstr ""
"Sensibilidad del ratón configurable, multiplica el movimiento del ratón por " "Sensibilidad del ratón configurable, multiplica el movimiento del ratón por "
"la cantidad de números decimales especificada." "la cantidad de números decimales especificada"
msgid "HDR SDR nits" msgid "HDR SDR nits"
msgstr "HDR SDR nits" msgstr "HDR SDR nits"
@ -1767,9 +1757,8 @@ msgstr ""
msgid "Disable GameScope and go to the previous menu" msgid "Disable GameScope and go to the previous menu"
msgstr "Desactivar GameScope e ir al menú anterior" msgstr "Desactivar GameScope e ir al menú anterior"
#, fuzzy
msgid "Change global settings" msgid "Change global settings"
msgstr "Cambiar la configuración de" msgstr "Cambiar configuraciones globales"
msgid "Change mirror to" msgid "Change mirror to"
msgstr "Cambiar el espejo a" msgstr "Cambiar el espejo a"
@ -1838,22 +1827,23 @@ msgid "Allows you to select a theme for PortProton"
msgstr "Le permite seleccionar un tema para PortProton" msgstr "Le permite seleccionar un tema para PortProton"
msgid "Time display" msgid "Time display"
msgstr "" msgstr "Mostrar tiempo"
msgid "Displays time spent in an application or game" msgid "Displays time spent in an application or game"
msgstr "" msgstr "Muestra el tiempo transcurrido en una aplicación o juego"
msgid "Sort shortcuts by time" msgid "Sort shortcuts by time"
msgstr "" msgstr "Ordenar accesos directos por tiempo"
msgid "" msgid ""
"This setting sorts the shortcuts in the main menu depending on the time " "This setting sorts the shortcuts in the main menu depending on the time "
"spent in the application or game" "spent in the application or game"
msgstr "" msgstr ""
"Esta configuración ordena los accesos directos en el menú principal según el "
"tiempo transcurrido en la aplicación o juego"
#, fuzzy
msgid "GLOBAL SETTINGS (USER.CONF)" msgid "GLOBAL SETTINGS (USER.CONF)"
msgstr "AJUSTES USUARIO.CONF" msgstr "CONFIGURACIONES GLOBALES (USER.CONF)"
msgid "" msgid ""
"Open the <b>user.conf</b> settings file in a system text editor to view and " "Open the <b>user.conf</b> settings file in a system text editor to view and "
@ -1884,6 +1874,8 @@ msgid ""
"A higher number of duplicate desktop files were found for this file." "A higher number of duplicate desktop files were found for this file."
"\\nShould I delete the extra ones or not?" "\\nShould I delete the extra ones or not?"
msgstr "" msgstr ""
"Se encontraron un mayor número de archivos de escritorio duplicados para "
"este archivo.\\n¿Debería eliminar los adicionales o no?"
msgid "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" msgid "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?"
msgstr "" msgstr ""
@ -1932,7 +1924,7 @@ msgid "FORCE INSTALL"
msgstr "INSTALACIÓN FORZADA" msgstr "INSTALACIÓN FORZADA"
msgid "Installation with forced redownload of libraries" msgid "Installation with forced redownload of libraries"
msgstr "Instalación con recarga forzada de bibliotecas." msgstr "Instalación con recarga forzada de bibliotecas"
msgid "INSTALL" msgid "INSTALL"
msgstr "INSTALAR" msgstr "INSTALAR"
@ -1960,11 +1952,8 @@ msgstr ""
"PortProton fue lanzado en modo de creación PortProton.log y se almacena " "PortProton fue lanzado en modo de creación PortProton.log y se almacena "
"correctamente en el directorio raíz del puerto" "correctamente en el directorio raíz del puerto"
#, fuzzy
msgid "To diagnose the problem, copy ALL of the log to:" msgid "To diagnose the problem, copy ALL of the log to:"
msgstr "" msgstr "Para diagnosticar el problema, copia TODO el registro en:"
"Para diagnosticar el problema, copia TODO el log al servidor de discordia: "
"https://discord.gg/FTaheP99wE"
msgid "Please wait! After finishing the PortProton, click STOP." msgid "Please wait! After finishing the PortProton, click STOP."
msgstr "" msgstr ""
@ -2003,10 +1992,10 @@ msgid "Branch changed to:"
msgstr "Rama cambiada a:" msgstr "Rama cambiada a:"
msgid "Cover downloads are disabled" msgid "Cover downloads are disabled"
msgstr "Las descargas de portadas están deshabilitadas." msgstr "Las descargas de portadas están deshabilitadas"
msgid "Cover downloads are enabled" msgid "Cover downloads are enabled"
msgstr "Las descargas de portadas están habilitadas." msgstr "Las descargas de portadas están habilitadas"
msgid "Gui start changed to:" msgid "Gui start changed to:"
msgstr "Inicio Gui cambiado a:" msgstr "Inicio Gui cambiado a:"
@ -2025,20 +2014,27 @@ msgid ""
"PortProton v. ${install_ver}\n" "PortProton v. ${install_ver}\n"
"scripts v. ${scripts_install_ver}" "scripts v. ${scripts_install_ver}"
msgstr "" msgstr ""
"PortProton v. ${install_ver}\n"
"scripts v. ${scripts_install_ver}"
msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)" msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
msgstr "" msgstr "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
msgid "" msgid ""
"This program comes with absolutely no warranty.\n" "This program comes with absolutely no warranty.\n"
"See the License for details." "See the License for details."
msgstr "" msgstr ""
"Este programa se proporciona sin ninguna garantía.\n"
"Consulta la licencia para más detalles."
msgid "" msgid ""
"Author: Casro-Fidel (Mikhail Tergoev)\n" "Author: Casro-Fidel (Mikhail Tergoev)\n"
"\n" "\n"
"Developer assistants and testers:" "Developer assistants and testers:"
msgstr "" msgstr ""
"Autor: Casro-Fidel (Mikhail Tergoev)\n"
"\n"
"Asistentes de desarrollo y testers:"
msgid "" msgid ""
"MIT License\n" "MIT License\n"
@ -2069,17 +2065,41 @@ msgid ""
"THE\n" "THE\n"
"SOFTWARE." "SOFTWARE."
msgstr "" msgstr ""
"Licencia MIT\n"
"\n"
"Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
"\n"
"Por la presente se otorga permiso, de forma gratuita, a cualquier persona "
"que obtenga una copia de este software y los archivos de documentación "
"asociados (el \"Software\"), para tratar en el Software sin restricción, "
"incluyendo, sin limitación, los derechos de usar, copiar, modificar, "
"combinar, publicar, distribuir, sublicenciar y/o vender copias del Software, "
"y permitir a las personas a quienes se les proporcione el Software hacer lo "
"mismo, sujeto a las siguientes condiciones:\n"
"\n"
"El aviso de copyright anterior y este aviso de permiso se incluirán en todas "
"las copias o partes sustanciales del Software.\n"
"\n"
"EL SOFTWARE SE PROPORCIONA \"TAL CUAL\", SIN GARANTÍA DE NINGÚN TIPO, "
"EXPRESA O IMPLÍCITA, INCLUYENDO, PERO NO LIMITÁNDOSE A, LAS GARANTÍAS DE "
"COMERCIALIZACIÓN, IDONEIDAD PARA UN PROPÓSITO PARTICULAR Y NO INFRACCIÓN. EN "
"NINGÚN CASO LOS AUTORES O TITULARES DE LOS DERECHOS DE AUTOR SERÁN "
"RESPONSABLES DE NINGUNA RECLAMACIÓN, DAÑO O OTRA RESPONSABILIDAD, YA SEA EN "
"UNA ACCIÓN DE CONTRATO, AGRAVIO O DE OTRA MANERA, QUE SURJA DE O EN CONEXIÓN "
"CON EL SOFTWARE O EL USO O CUALQUIER OTRA INTERACCIÓN EN EL SOFTWARE."
msgid "" msgid ""
"The project was supported:\n" "The project was supported:\n"
"https://boosty.to/portwine-linux.ru" "https://boosty.to/portwine-linux.ru"
msgstr "" msgstr ""
"El proyecto fue apoyado:\n"
"https://boosty.to/portwine-linux.ru"
msgid "The list will be updated..." msgid "The list will be updated..."
msgstr "" msgstr "La lista se actualizará..."
msgid "Do you want to join and help in the development of the project:" msgid "Do you want to join and help in the development of the project:"
msgstr "" msgstr "Quieres unirte y ayudar en el desarrollo del proyecto:"
msgid "" msgid ""
"Website: http://linux-gaming.ru\n" "Website: http://linux-gaming.ru\n"
@ -2091,6 +2111,14 @@ msgid ""
"Yandex wallet: 410012267513818\n" "Yandex wallet: 410012267513818\n"
"-------------------------------------------" "-------------------------------------------"
msgstr "" msgstr ""
"Sitio web: http://linux-gaming.ru\n"
"Discord: http://discord.gg/yJSEFjF\n"
"VK: https://vk.com/linuxgamingru\n"
"-------------------------------------------\n"
"Conviértete en suscriptor de pago:\n"
"boosty: https://boosty.to/portwine-linux.ru\n"
"Billetera de Yandex: 410012267513818\n"
"-------------------------------------------"
msgid "" msgid ""
" Third-party libraries that are used in " " Third-party libraries that are used in "
@ -2105,27 +2133,45 @@ msgid ""
"YAD: https://github.com/v1cont/yad\n" "YAD: https://github.com/v1cont/yad\n"
"DGVOODOO2: https://dege.fw.hu/" "DGVOODOO2: https://dege.fw.hu/"
msgstr "" msgstr ""
" Bibliotecas de terceros que se utilizan en "
"PortProton\n"
"\n"
" PortProton se basa en las siguientes bibliotecas de software libre:\n"
"\n"
"WINE-PROTON: https://github.com/ValveSoftware/Proton\n"
"WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/\n"
"Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds\n"
"YAD: https://github.com/v1cont/yad\n"
"DGVOODOO2: https://dege.fw.hu/"
msgid "ABOUT US" msgid "ABOUT US"
msgstr "" msgstr "SOBRE NOSOTROS"
msgid "ABOUT PORTPROTON" msgid "ABOUT PORTPROTON"
msgstr "" msgstr "SOBRE PORTPROTON"
msgid "AUTORS" msgid "AUTORS"
msgstr "" msgstr "AUTORES"
msgid "LICENSE" msgid "LICENSE"
msgstr "" msgstr "LICENCIA"
msgid "SPONSORS" msgid "SPONSORS"
msgstr "" msgstr "PATROCINADORES"
msgid "JOIN" msgid "JOIN"
msgstr "" msgstr "UNIRSE"
msgid "THIRD PARTY LIBRARIES" msgid "THIRD PARTY LIBRARIES"
msgstr "BIBLIOTECAS DE TERCEROS"
msgid "SteamGridDB is not responding, forcing cover download to be disabled"
msgstr "" msgstr ""
"SteamGridDB no está respondiendo, forzando la desactivación de la descarga "
"de portadas"
msgid "Please wait. downloading covers for"
msgstr "Por favor, espera. Descargando portadas para"
#~ msgid "Forced activation of vertical sync" #~ msgid "Forced activation of vertical sync"
#~ msgstr "Activación forzada de la sincronización vertical" #~ msgstr "Activación forzada de la sincronización vertical"

View File

@ -7,17 +7,17 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-23 14:40+0300\n" "POT-Creation-Date: 2024-10-24 12:43+0500\n"
"PO-Revision-Date: 2024-10-23 14:43+0300\n" "PO-Revision-Date: 2024-10-24 12:45+0500\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: ru_RU\n" "Language: ru_RU\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
"X-Generator: Poedit 3.5\n" "X-Generator: Poedit 3.4.2\n"
msgid "" msgid ""
"A running PortProton session was detected.\\nDo you want to end the previous " "A running PortProton session was detected.\\nDo you want to end the previous "
@ -2151,6 +2151,12 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
msgid "THIRD PARTY LIBRARIES" msgid "THIRD PARTY LIBRARIES"
msgstr "БИБЛИОТЕКИ" msgstr "БИБЛИОТЕКИ"
msgid "SteamGridDB is not responding, forcing cover download to be disabled"
msgstr "SteamGridDB не отвечает, принудительно отключаем загрузку обложек"
msgid "Please wait. downloading covers for"
msgstr "Пожалуйста, подождите. Загрузка обложек для"
#~ msgid "Forced activation of vertical sync" #~ msgid "Forced activation of vertical sync"
#~ msgstr "Принудительное включение вертикальной синхронизации" #~ msgstr "Принудительное включение вертикальной синхронизации"

View File

@ -35,6 +35,29 @@ function generateShortcutVDFAppId {
echo "-$(( 16#${seed} % 1000000000 ))" echo "-$(( 16#${seed} % 1000000000 ))"
} }
function pw_start_progress_bar_block () {
"${pw_yad}" --progress-old --text="$@" --pulsate --hide-text --borders="$PROGRESS_BAR_BORDERS_SIZE" \
--no-buttons --undecorated --skip-taskbar --no-escape --text-align="center" --height=90 --fixed \
--width="$PROGRESS_BAR_WIDTH_SIZE" --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null &
export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!"
return 0
}
function pw_stop_progress_bar () {
sleep 0.1
for PW_KILL_YAD_PID in "$PW_YAD_PID_PROGRESS_BAR_BLOCK" "$PW_YAD_PID_PROGRESS_BAR_CS" \
"$PW_YAD_PID_PFX_COVER_UI" "$PW_YAD_PID_PROGRESS_BAR_COVER"
do
kill -s SIGUSR1 "$PW_KILL_YAD_PID" &>/dev/null
done
unset PW_YAD_PID_PROGRESS_BAR_BLOCK PW_YAD_PID_PROGRESS_BAR_CS \
PW_YAD_PID_PFX_COVER_UI PW_YAD_PID_PROGRESS_BAR_COVER
return 0
}
function dec2hex { function dec2hex {
printf '%x\n' "$1" | cut -c 9- # cut removes the 'ffffffff' from the string (represents the sign) and starts from the 9th character printf '%x\n' "$1" | cut -c 9- # cut removes the 'ffffffff' from the string (represents the sign) and starts from the 9th character
} }
@ -150,16 +173,6 @@ function downloadArtFromSteamGridDB {
[[ -n "$SEARCHHUMOR" ]] && SGDB_ENDPOINT_STR+="&humor=${SEARCHHUMOR}" [[ -n "$SEARCHHUMOR" ]] && SGDB_ENDPOINT_STR+="&humor=${SEARCHHUMOR}"
[[ -n "$SEARCHEPILEPSY" ]] && SGDB_ENDPOINT_STR+="&epilepsy=${SEARCHEPILEPSY}" [[ -n "$SEARCHEPILEPSY" ]] && SGDB_ENDPOINT_STR+="&epilepsy=${SEARCHEPILEPSY}"
set -o pipefail
RESPONSE=$(curl -H "Authorization: Bearer $SGDBAPIKEY" -s "$SGDB_ENDPOINT_STR" 2> >(grep -v "SSL_INIT"))
if [[ "${PIPESTATUS[0]}" != 0 ]] && [[ "$DOWNLOAD_STEAM_GRID" != 0 ]] ; then
pw_notify_send -i info \
"$(gettext "SteamGridDB is not response, force disable cover download")"
sed -i 's/DOWNLOAD_STEAM_GRID=.*/DOWNLOAD_STEAM_GRID="0"/' "$USER_CONF"
export DOWNLOAD_STEAM_GRID="0"
return
fi
if ! jq -e '.success' <<< "$RESPONSE" > /dev/null; then if ! jq -e '.success' <<< "$RESPONSE" > /dev/null; then
echo "The server response wasn't 'success' for this batch of requested games." echo "The server response wasn't 'success' for this batch of requested games."
@ -204,12 +217,7 @@ function downloadArtFromSteamGridDB {
fi fi
if [[ "$STARTDL" -eq 1 ]] ; then if [[ "$STARTDL" -eq 1 ]] ; then
filename="$(basename "$DLDST")" curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$DLSRC" -o "$DLDST"
curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$DLSRC" -o "$DLDST" 2>&1 | \
tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
"$pw_yad" --progress --text="$(gettext "Downloading") $filename" --auto-close --no-escape \
--auto-kill --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders="$PROGRESS_BAR_BORDERS_SIZE"
fi fi
else else
echo "No grid found to download for '$SEARCHID' - maybe loosen filters?" echo "No grid found to download for '$SEARCHID' - maybe loosen filters?"
@ -295,15 +303,29 @@ function commandlineGetSteamGridDBArtwork {
SGDBSEARCHENDPOINT_HERO="${BASESTEAMGRIDDBAPI}/heroes/${SGDBENDPOINTTYPE}" SGDBSEARCHENDPOINT_HERO="${BASESTEAMGRIDDBAPI}/heroes/${SGDBENDPOINTTYPE}"
SGDBSEARCHENDPOINT_LOGO="${BASESTEAMGRIDDBAPI}/logos/${SGDBENDPOINTTYPE}" SGDBSEARCHENDPOINT_LOGO="${BASESTEAMGRIDDBAPI}/logos/${SGDBENDPOINTTYPE}"
SGDBSEARCHENDPOINT_BOXART="${BASESTEAMGRIDDBAPI}/grids/${SGDBENDPOINTTYPE}" # Grid endpoint is used for Boxart and Tenfoot, which SteamGridDB counts as vertical/horizontal grids respectively SGDBSEARCHENDPOINT_BOXART="${BASESTEAMGRIDDBAPI}/grids/${SGDBENDPOINTTYPE}" # Grid endpoint is used for Boxart and Tenfoot, which SteamGridDB counts as vertical/horizontal grids respectively
SGDB_ENDPOINT_STR="${SGDBSEARCHENDPOINT_HERO}/$(echo "$GSGDBA_APPID" | awk '{print $1}' | paste -s -d, -)?"
set -o pipefail
RESPONSE=$(curl -H "Authorization: Bearer $SGDBAPIKEY" -s "$SGDB_ENDPOINT_STR" 2> >(grep -v "SSL_INIT"))
if [[ "${PIPESTATUS[0]}" != 0 ]] && [[ "$DOWNLOAD_STEAM_GRID" != 0 ]]; then
pw_notify_send -i info \
"${translations[SteamGridDB is not responding, forcing cover download to be disabled]}"
sed -i 's/DOWNLOAD_STEAM_GRID=.*/DOWNLOAD_STEAM_GRID="0"/' "$USER_CONF"
export DOWNLOAD_STEAM_GRID="0"
return
fi
if [[ ! -z "$GSGDBA_FOUNDGAMEID" ]] ; then
pw_start_progress_bar_block "${translations[Please wait. downloading covers for]} $NOSTAPPNAME"
# Download Hero, Logo, Boxart, Tenfoot from SteamGridDB from given endpoint using given AppID
# On SteamGridDB tenfoot called horizontal Steam grid, so fetch it by passing specific dimensions matching this -- Users can override this, but default is what SteamGridDB expects for the tenfoot sizes
# Download Hero, Logo, Boxart, Tenfoot from SteamGridDB from given endpoint using given AppID downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_HERO" "${GSGDBA_FILENAME}_hero" "$SGDBHEROSTYLES" "$SGDBHERODIMS" "$SGDBHEROTYPES" "$SGDBHERONSFW" "$SGDBHEROHUMOR" "$SGDBHEROEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK"
# On SteamGridDB tenfoot called horizontal Steam grid, so fetch it by passing specific dimensions matching this -- Users can override this, but default is what SteamGridDB expects for the tenfoot sizes # Logo doesn't have dimensions, so it's left intentionally blank
downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_HERO" "${GSGDBA_FILENAME}_hero" "$SGDBHEROSTYLES" "$SGDBHERODIMS" "$SGDBHEROTYPES" "$SGDBHERONSFW" "$SGDBHEROHUMOR" "$SGDBHEROEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK" downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_LOGO" "${GSGDBA_FILENAME}_logo" "$SGDBLOGOSTYLES" "" "$SGDBLOGOTYPES" "$SGDBLOGONSFW" "$SGDBLOGOHUMOR" "$SGDBLOGOEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK"
# Logo doesn't have dimensions, so it's left intentionally blank downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_BOXART" "${GSGDBA_FILENAME}p" "$SGDBBOXARTSTYLES" "$SGDBBOXARTDIMS" "$SGDBBOXARTTYPES" "$SGDBBOXARTNSFW" "$SGDBBOXARTHUMOR" "$SGDBBOXARTEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK"
downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_LOGO" "${GSGDBA_FILENAME}_logo" "$SGDBLOGOSTYLES" "" "$SGDBLOGOTYPES" "$SGDBLOGONSFW" "$SGDBLOGOHUMOR" "$SGDBLOGOEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK" downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_BOXART" "${GSGDBA_FILENAME}" "$SGDBTENFOOTSTYLES" "$SGDBTENFOOTDIMS" "$SGDBTENFOOTTYPES" "$SGDBTENFOOTNSFW" "$SGDBTENFOOTHUMOR" "$SGDBTENFOOTEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK"
downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_BOXART" "${GSGDBA_FILENAME}p" "$SGDBBOXARTSTYLES" "$SGDBBOXARTDIMS" "$SGDBBOXARTTYPES" "$SGDBBOXARTNSFW" "$SGDBBOXARTHUMOR" "$SGDBBOXARTEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK" pw_stop_progress_bar
downloadArtFromSteamGridDB "$GSGDBA_APPID" "$SGDBSEARCHENDPOINT_BOXART" "${GSGDBA_FILENAME}" "$SGDBTENFOOTSTYLES" "$SGDBTENFOOTDIMS" "$SGDBTENFOOTTYPES" "$SGDBTENFOOTNSFW" "$SGDBTENFOOTHUMOR" "$SGDBTENFOOTEPILEPSY" "$GSGDBA_HASFILE" "$GSGDBA_APPLYARTWORK" fi
} }
## Fetch artwork from SteamGridDB ## Fetch artwork from SteamGridDB

View File

@ -186,6 +186,10 @@ generate_pot () {
sed -i 's/]}/")/g' setup.sh_tmp sed -i 's/]}/")/g' setup.sh_tmp
sed -i 's/eval_translations/gettext/g' setup.sh_tmp sed -i 's/eval_translations/gettext/g' setup.sh_tmp
sed 's/{translations\[/(gettext \"/g' add_in_steam.sh > add_in_steam.sh_tmp
sed -i 's/]}/")/g' add_in_steam.sh_tmp
sed -i 's/eval_translations/gettext/g' add_in_steam.sh_tmp
#Когда присходит предупреждение: синтаксис $"..." запрещен по соображениям безопасности; используйте eval_gettext #Когда присходит предупреждение: синтаксис $"..." запрещен по соображениям безопасности; используйте eval_gettext
#и ругается на строку в которой нет перевода, можно использовать sed -i '//d' и убрать эту строку #и ругается на строку в которой нет перевода, можно использовать sed -i '//d' и убрать эту строку
#либо отредактировать сам код, чтобы не было такой ошибки (к примеру вместо двойных ковычек использовать в таком месте одинарные) #либо отредактировать сам код, чтобы не было такой ошибки (к примеру вместо двойных ковычек использовать в таком месте одинарные)
@ -202,6 +206,7 @@ generate_pot () {
"data/scripts/start.sh_tmp" \ "data/scripts/start.sh_tmp" \
"data/scripts/setup.sh_tmp" \ "data/scripts/setup.sh_tmp" \
"data/scripts/functions_helper_tmp" \ "data/scripts/functions_helper_tmp" \
"data/scripts/add_in_steam.sh_tmp" \
-o "$TEMPLATE_POT" -o "$TEMPLATE_POT"
popd 1>/dev/null || fatal popd 1>/dev/null || fatal
if [[ -f "$LANG_PO" ]] ; then if [[ -f "$LANG_PO" ]] ; then
@ -216,6 +221,7 @@ generate_pot () {
try_remove_file "${PORT_SCRIPTS_PATH}/start.sh_tmp" try_remove_file "${PORT_SCRIPTS_PATH}/start.sh_tmp"
try_remove_file "${PORT_SCRIPTS_PATH}/setup.sh_tmp" try_remove_file "${PORT_SCRIPTS_PATH}/setup.sh_tmp"
try_remove_file "${PORT_SCRIPTS_PATH}/functions_helper_tmp" try_remove_file "${PORT_SCRIPTS_PATH}/functions_helper_tmp"
try_remove_file "${PORT_SCRIPTS_PATH}/add_in_steam.sh_tmp"
try_remove_dir "${PW_CACHE_LANG_PATH}" try_remove_dir "${PW_CACHE_LANG_PATH}"
} }
export -f generate_pot export -f generate_pot
@ -267,7 +273,7 @@ EOF
while [[ ! $line =~ msgid ]] ; do while [[ ! $line =~ msgid ]] ; do
msgstr+=$line msgstr+=$line
read -r line read -r line
if [[ $line == "" ]] ; then if [[ -z $line ]] ; then
break break
fi fi
done done
@ -756,8 +762,8 @@ background_pid () {
export bg_pid"${arg3}"="$PID" ;; export bg_pid"${arg3}"="$PID" ;;
--end) --end)
PID=$(get_bg_pid bg_pid"${arg3}") PID=$(get_bg_pid bg_pid"${arg3}")
[[ $PID == "" ]] && return 1 [[ -z $PID ]] && return 1
wait "$PID" && return 0 ;; wait "$PID" 2>/dev/null && return 0 ;;
esac esac
fi fi
} }
@ -802,6 +808,8 @@ debug_timer () {
START_UPDATE_ETERFUND=$START ;; START_UPDATE_ETERFUND=$START ;;
UPDATE_GITHUB) UPDATE_GITHUB)
START_UPDATE_GITHUB=$START ;; START_UPDATE_GITHUB=$START ;;
UPDATE_PP_GITEA)
START_UPDATE_PP_GITEA=$START ;;
esac esac
fi fi
elif [[ "$1" == "--end" ]] ; then elif [[ "$1" == "--end" ]] ; then
@ -815,6 +823,8 @@ debug_timer () {
START=$START_UPDATE_ETERFUND ;; START=$START_UPDATE_ETERFUND ;;
UPDATE_GITHUB) UPDATE_GITHUB)
START=$START_UPDATE_GITHUB ;; START=$START_UPDATE_GITHUB ;;
UPDATE_PP_GITEA)
START=$START_UPDATE_PP_GITEA ;;
esac esac
export "$3"="$((( END - START )/1000000 ))" export "$3"="$((( END - START )/1000000 ))"
else else
@ -905,70 +915,70 @@ search_desktop_file () {
fi fi
} }
create_pw_comment () { create_name_desktop () {
search_desktop_file search_desktop_file
unset DESKTOP_NAME_FILE PW_SHORTCUT_PROXY unset DESKTOP_NAME_FILE
if [[ -n ${DESKTOP_FILES_ARRAY[0]} ]] ; then if [[ -n $DESKTOP_NAME_YAD ]] ; then
for df in "${DESKTOP_FILES_ARRAY[@]}" ; do DESKTOP_NAME_FILE="${DESKTOP_NAME_YAD//.desktop/}"
df="${df//"$PORT_WINE_PATH/"/}" unset DESKTOP_NAME_YAD
DESKTOP_NAME_FILE="${df//.desktop/}" elif [[ -n $name_desktop ]] ; then
done DESKTOP_NAME_FILE="$name_desktop"
unset name_desktop
elif [[ -n ${DESKTOP_FILES_ARRAY[0]} ]] \
&& [[ -z ${DESKTOP_FILES_ARRAY[1]} ]] ; then
DESKTOP_NAME_FILE="${DESKTOP_FILES_ARRAY[0]//"$PORT_WINE_PATH/"/}"
DESKTOP_NAME_FILE="${DESKTOP_NAME_FILE//.desktop/}"
fi fi
if [[ -z "${PW_COMMENT_DB}" ]] ; then
[[ $FILE_DESCRIPTION != "" ]] && FILE_DESCRIPTION_ABBR=$(make_abbreviation "$FILE_DESCRIPTION") [[ -n $PORTPROTON_NAME ]] && PORTPROTON_NAME_ABBR=$(make_abbreviation "$PORTPROTON_NAME")
[[ $PORTPROTON_NAME != "" ]] && PORTPROTON_NAME_ABBR=$(make_abbreviation "$PORTPROTON_NAME") [[ -n $FILE_DESCRIPTION ]] && FILE_DESCRIPTION_ABBR=$(make_abbreviation "$FILE_DESCRIPTION")
if [[ -n $DESKTOP_NAME_FILE ]] && [[ $DESKTOP_NAME_FILE != "" ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$DESKTOP_NAME_FILE" "50")</b>$(seconds_to_time "$TIME_CURRENT")" if [[ -z $PORTWINE_DB ]] ; then
PW_SHORTCUT_PROXY="$DESKTOP_NAME_FILE" PORTWINE_DB_DESKTOP="$(basename "${portwine_exe%.[Ee][Xx][Ee]}")"
elif [[ ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB^^} ]] && [[ ${PORTPROTON_NAME^^} != "${PORTWINE_DB^^}" ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
elif (( ${#PORTPROTON_NAME_ABBR} > 2 )) && [[ ${PORTPROTON_NAME_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
elif [[ ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB^^} ]] && [[ ${FILE_DESCRIPTION^^} != "${PORTWINE_DB^^}" ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
elif (( ${#FILE_DESCRIPTION_ABBR} > 2 )) && [[ ${FILE_DESCRIPTION_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
else
unset PORTWINE_DB_PROXY PORTWINE_DB_NEW
PORTWINE_DB="${PORTWINE_DB//_/ }"
if [[ ${PORTWINE_DB:0:1} =~ [a-z] ]] ; then
PORTWINE_DB_UPPER="${PORTWINE_DB^^}"
PORTWINE_DB="${PORTWINE_DB_UPPER:0:1}${PORTWINE_DB:1}"
fi
if (( ${#PORTWINE_DB} > 3 )) ; then
for ((i=0 ; i<${#PORTWINE_DB} ; i++)) ; do
if [[ ${PORTWINE_DB:i:2} =~ ([a-z][A-Z]|[a-z][0-9]) ]] \
&& [[ ! ${PORTWINE_DB:i:3} =~ ([a-z][A-Z]" "|[a-z][0-9]" ") ]] ; then
PORTWINE_DB_PROXY+="${PORTWINE_DB:i:1} "
elif [[ ${PORTWINE_DB:i:3} =~ [0-9][0-9][a-zA-Z] ]] ; then
PORTWINE_DB_PROXY+="${PORTWINE_DB:i:2} "
((i++))
else
PORTWINE_DB_PROXY+="${PORTWINE_DB:i:1}"
fi
done
for ((i=0 ; i<${#PORTWINE_DB_PROXY} ; i++)) ; do
if [[ ${PORTWINE_DB_PROXY:i:2} =~ " "[a-z] ]] ; then
PORTWINE_DB_UPPER="${PORTWINE_DB_PROXY:i:2}"
PORTWINE_DB_NEW+="${PORTWINE_DB_UPPER^^}"
((i++))
else
PORTWINE_DB_NEW+="${PORTWINE_DB_PROXY:i:1}"
fi
done
else
PORTWINE_DB_NEW="$PORTWINE_DB"
fi
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTWINE_DB_NEW" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
PW_SHORTCUT_PROXY="$PORTWINE_DB_NEW"
fi
else else
PW_COMMENT_DB="$PW_COMMENT_DB$(seconds_to_time "$TIME_CURRENT")" PORTWINE_DB_DESKTOP="$PORTWINE_DB"
PW_SHORTCUT_PROXY="$DESKTOP_NAME_FILE" fi
if [[ -n $DESKTOP_NAME_FILE ]] ; then
PW_NAME_DESKTOP_PROXY="$DESKTOP_NAME_FILE"
elif [[ -n $PORTPROTON_NAME && ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB_DESKTOP^^} && $PORTPROTON_NAME != "$PORTWINE_DB_DESKTOP" ]] \
|| [[ -n $PORTPROTON_NAME && ${#PORTPROTON_NAME_ABBR} -gt 2 && ${PORTPROTON_NAME_ABBR^^} =~ ${PORTWINE_DB_DESKTOP^^} ]] ; then
PW_NAME_DESKTOP_PROXY="$PORTPROTON_NAME"
elif [[ -n $FILE_DESCRIPTION && ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB_DESKTOP^^} && $FILE_DESCRIPTION != "$PORTWINE_DB_DESKTOP" ]] \
|| [[ -n $FILE_DESCRIPTION && ${#FILE_DESCRIPTION_ABBR} -gt 2 && ${FILE_DESCRIPTION_ABBR^^} =~ ${PORTWINE_DB_DESKTOP^^} ]] ; then
PW_NAME_DESKTOP_PROXY="$FILE_DESCRIPTION"
else
unset PORTWINE_DB_PROXY PORTWINE_DB_NEW
PORTWINE_DB_DESKTOP="${PORTWINE_DB_DESKTOP//_/ }"
if [[ ${PORTWINE_DB_DESKTOP:0:1} =~ [a-z] ]] ; then
PORTWINE_DB_UPPER="${PORTWINE_DB_DESKTOP^^}"
PORTWINE_DB_DESKTOP="${PORTWINE_DB_UPPER:0:1}${PORTWINE_DB_DESKTOP:1}"
fi
if (( ${#PORTWINE_DB_DESKTOP} > 3 )) ; then
for ((i=0 ; i<${#PORTWINE_DB_DESKTOP} ; i++)) ; do
if [[ ${PORTWINE_DB_DESKTOP:i:2} =~ ([a-z][A-Z]|[a-z][0-9]) ]] \
&& [[ ! ${PORTWINE_DB_DESKTOP:i:3} =~ ([a-z][A-Z]" "|[a-z][0-9]" ") ]] ; then
PORTWINE_DB_PROXY+="${PORTWINE_DB_DESKTOP:i:1} "
elif [[ ${PORTWINE_DB_DESKTOP:i:3} =~ [0-9][0-9][a-zA-Z] ]] ; then
PORTWINE_DB_PROXY+="${PORTWINE_DB_DESKTOP:i:2} "
((i++))
else
PORTWINE_DB_PROXY+="${PORTWINE_DB_DESKTOP:i:1}"
fi
done
for ((i=0 ; i<${#PORTWINE_DB_PROXY} ; i++)) ; do
if [[ ${PORTWINE_DB_PROXY:i:2} =~ " "[a-z] ]] ; then
PORTWINE_DB_UPPER="${PORTWINE_DB_PROXY:i:2}"
PORTWINE_DB_NEW+="${PORTWINE_DB_UPPER^^}"
((i++))
else
PORTWINE_DB_NEW+="${PORTWINE_DB_PROXY:i:1}"
fi
done
else
PORTWINE_DB_NEW="$PORTWINE_DB_DESKTOP"
fi
PW_NAME_DESKTOP_PROXY="$PORTWINE_DB_NEW"
fi fi
} }
@ -1015,10 +1025,10 @@ seconds_to_time () {
if [[ $minutes =~ ^0$ ]] ; then if [[ $minutes =~ ^0$ ]] ; then
hours=${hours//" ${translations[and]} "/} hours=${hours//" ${translations[and]} "/}
minutes= minutes=
if [[ $days == "" ]] || [[ $hours == "" ]] ; then if [[ -z $days ]] || [[ -z $hours ]] ; then
days=${days//","/} days=${days//","/}
fi fi
if [[ $days == "" ]] && [[ $hours == "" ]] ; then if [[ -z $days ]] && [[ -z $hours ]] ; then
minutes="${translations[less than a minute]}" minutes="${translations[less than a minute]}"
fi fi
elif [[ $minutes =~ ^1$ ]] ; then elif [[ $minutes =~ ^1$ ]] ; then
@ -2048,6 +2058,7 @@ pw_port_update () {
URL_ETERFUND="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine/scripts/var" URL_ETERFUND="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine/scripts/var"
URL_GITHUB="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine/scripts/var" URL_GITHUB="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine/scripts/var"
URL_PP_GITEA="https://git.linux-gaming.ru/CastroFidel/PortWINE/raw/branch/${BRANCH}/data_from_portwine/scripts/var"
pw_check_update () { pw_check_update () {
debug_timer --start -s "UPDATE_ETERFUND" debug_timer --start -s "UPDATE_ETERFUND"
@ -2066,13 +2077,22 @@ pw_port_update () {
fi fi
debug_timer --end -s "UPDATE_GITHUB" debug_timer --end -s "UPDATE_GITHUB"
debug_timer --start -s "UPDATE_PP_GITEA"
if ! timeout 2 curl -f -s --list-only "$URL_PP_GITEA" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
then
print_warning "https://git.linux-gaming.ru/ broken. Skip it..."
UPDATE_SKIP_PP_GITEA="1"
fi
debug_timer --end -s "UPDATE_PP_GITEA"
if [[ "$UPDATE_SKIP_ETERFUND" == "1" ]] \ if [[ "$UPDATE_SKIP_ETERFUND" == "1" ]] \
&& [[ "$UPDATE_SKIP_GITHUB" == "1" ]] ; then && [[ "$UPDATE_SKIP_GITHUB" == "1" ]] \
&& [[ "$UPDATE_SKIP_PP_GITEA" == "1" ]] ; then
print_error "Unable to determine the version on the server. Skip it..." print_error "Unable to determine the version on the server. Skip it..."
return 1 return 1
fi fi
PW_UPDATE_ALL_LIST=($UPDATE_ETERFUND $UPDATE_GITHUB) PW_UPDATE_ALL_LIST=($UPDATE_ETERFUND $UPDATE_GITHUB $UPDATE_PP_GITEA)
UPDATE_MIN=${PW_UPDATE_ALL_LIST[0]} UPDATE_MIN=${PW_UPDATE_ALL_LIST[0]}
for i in "${!PW_UPDATE_ALL_LIST[@]}"; do for i in "${!PW_UPDATE_ALL_LIST[@]}"; do
@ -2084,13 +2104,17 @@ pw_port_update () {
UPDATE_DAYS=$(date +%-j) UPDATE_DAYS=$(date +%-j)
UPDATE_MINUTES=$(($(date +%-H) * 60 + $(date +%-M))) UPDATE_MINUTES=$(($(date +%-H) * 60 + $(date +%-M)))
if [[ "$UPDATE_ETERFUND" == "$UPDATE_MIN" ]] ; then if [[ "$UPDATE_ETERFUND" == "$UPDATE_MIN" ]] ; then
# print_info "Selected https://gitlab.eterfund.ru/" print_info "Selected https://gitlab.eterfund.ru/"
echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_ETERFUND $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror" echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_ETERFUND $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror"
UPDATE_URL_MIRROR="UPDATE_ETERFUND" UPDATE_URL_MIRROR="UPDATE_ETERFUND"
elif [[ "$UPDATE_GITHUB" == "$UPDATE_MIN" ]] ; then elif [[ "$UPDATE_GITHUB" == "$UPDATE_MIN" ]] ; then
# print_info "Selected https://raw.githubusercontent.com/" print_info "Selected https://raw.githubusercontent.com/"
echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_GITHUB $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror" echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_GITHUB $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror"
UPDATE_URL_MIRROR="UPDATE_GITHUB" UPDATE_URL_MIRROR="UPDATE_GITHUB"
elif [[ "$UPDATE_PP_GITEA" == "$UPDATE_MIN" ]] ; then
print_info "Selected https://git.linux-gaming.ru/"
echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_PP_GITEA $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror"
UPDATE_URL_MIRROR="UPDATE_PP_GITEA"
fi fi
PW_FORCE_UPDATE="1" PW_FORCE_UPDATE="1"
} }
@ -2152,6 +2176,16 @@ pw_port_update () {
URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine" URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine"
URL_TO_PW_BRANCH="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/${BRANCH}.tar.gz" URL_TO_PW_BRANCH="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/${BRANCH}.tar.gz"
;; ;;
UPDATE_PP_GITEA)
if [[ ! -f "${PORT_WINE_TMP_PATH}/curent_var_ver" ]] \
&& ! timeout 2 curl -f -s --list-only "$URL_PP_GITEA" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
then
pw_check_update
fi
URL_FOR_CHANGELOG="https://git.linux-gaming.ru/CastroFidel/PortWINE/raw/branch/${BRANCH}/data_from_portwine"
URL_TO_PW_BRANCH="https://git.linux-gaming.ru/CastroFidel/PortWINE/archive/${BRANCH}.tar.gz"
UPDATE_PP_GITEA_FIX=1
;;
esac esac
else else
return 0 return 0
@ -2209,6 +2243,12 @@ pw_port_update () {
20) 20)
echo "######################################################" echo "######################################################"
print_info "Update scripts..." print_info "Update scripts..."
if [[ $UPDATE_PP_GITEA_FIX == 1 ]] ; then
unset UPDATE_PP_GITEA_FIX
PW_NAME_ARCHIVE="portwine"
else
PW_NAME_ARCHIVE="PortWINE-${BRANCH}"
fi
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz"
if try_download "${URL_TO_PW_BRANCH}" "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" no_mirror ; then if try_download "${URL_TO_PW_BRANCH}" "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" no_mirror ; then
if unpack "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" "${PORT_WINE_TMP_PATH}" if unpack "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" "${PORT_WINE_TMP_PATH}"
@ -2218,9 +2258,9 @@ pw_port_update () {
tar -czpf "${PORT_WINE_TMP_PATH}/scripts_backup/scripts_v.${scripts_install_ver}.tar.gz" \ tar -czpf "${PORT_WINE_TMP_PATH}/scripts_backup/scripts_v.${scripts_install_ver}.tar.gz" \
./scripts ./img/gui ./locales ./themes ./changelog* ./dxvk.conf ./vkBasalt.conf ./tmp/scripts_ver ./scripts ./img/gui ./locales ./themes ./changelog* ./dxvk.conf ./vkBasalt.conf ./tmp/scripts_ver
try_remove_dir "${PORT_WINE_PATH}/data/scripts/" try_remove_dir "${PORT_WINE_PATH}/data/scripts/"
cp -fr "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}/data_from_portwine/"* "${PORT_WINE_PATH}/data/" cp -fr "${PORT_WINE_TMP_PATH}/$PW_NAME_ARCHIVE/data_from_portwine/"* "${PORT_WINE_PATH}/data/"
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz"
try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}/" try_remove_dir "${PORT_WINE_TMP_PATH}/$PW_NAME_ARCHIVE/"
echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver" echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
unset SKIP_CHECK_UPDATES unset SKIP_CHECK_UPDATES
echo "Restarting PP after update..." echo "Restarting PP after update..."
@ -2504,8 +2544,7 @@ pw_find_exe () {
if [[ -n "${PW_SET_FIND_EXE}" ]] ; then if [[ -n "${PW_SET_FIND_EXE}" ]] ; then
portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')" portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')"
portwine_create_shortcut silent portwine_create_shortcut
restart_pp
fi fi
} }
@ -2690,10 +2729,6 @@ start_portwine () {
|| ! grep "${PW_WINE_USE}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" &>/dev/null || ! grep "${PW_WINE_USE}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" &>/dev/null
then then
pw_update_pfx_cover_gui pw_update_pfx_cover_gui
# # HOTFIX - update prefix for vkPlay
# if echo "$portwine_exe" | grep -i vkplay &>/dev/null
# then pw_kill_autostart GameCe 5 please & :
# fi
pw_wineboot -r pw_wineboot -r
fi fi
fi fi
@ -3170,10 +3205,10 @@ start_portwine () {
[[ "${PW_DGV2_FILTERING}" == "Anisotropic 8x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 8/" "$DGV2CONF" [[ "${PW_DGV2_FILTERING}" == "Anisotropic 8x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 8/" "$DGV2CONF"
[[ "${PW_DGV2_FILTERING}" == "Anisotropic 16x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 16/" "$DGV2CONF" [[ "${PW_DGV2_FILTERING}" == "Anisotropic 16x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 16/" "$DGV2CONF"
case "${PW_DGV2_FILTERING}" in case "${PW_DGV2_FILTERING}" in
"Point sampled") "Point sampled")
sed -i "s/TMUFiltering = appdriven/TMUFiltering = pointsampled/" "$DGV2CONF" ;; sed -i "s/TMUFiltering = appdriven/TMUFiltering = pointsampled/" "$DGV2CONF" ;;
"Bilinear"|"Linear mip"|"Trilinear"|"Anisotropic 2x"|"Anisotropic 4x"|"Anisotropic 8x"|"Anisotropic 16x") "Bilinear"|"Linear mip"|"Trilinear"|"Anisotropic 2x"|"Anisotropic 4x"|"Anisotropic 8x"|"Anisotropic 16x")
sed -i "s/TMUFiltering = appdriven/TMUFiltering = bilinear/" "$DGV2CONF" ;; sed -i "s/TMUFiltering = appdriven/TMUFiltering = bilinear/" "$DGV2CONF" ;;
esac esac
fi fi
@ -4379,7 +4414,7 @@ gui_proton_downloader () {
try_remove_file "${PORT_WINE_PATH}/data/tmp/${FILENAME}" try_remove_file "${PORT_WINE_PATH}/data/tmp/${FILENAME}"
try_remove_dir "${PORT_WINE_PATH}/data/dist/${FILENAME}" try_remove_dir "${PORT_WINE_PATH}/data/dist/${FILENAME}"
if yad_error_download if yad_error_download
then gui_proton_downloader $@ then gui_proton_downloader ""
else else
export PW_WINE_VER="$PW_WINE_USE" export PW_WINE_VER="$PW_WINE_USE"
init_wine_ver init_wine_ver
@ -4387,7 +4422,7 @@ gui_proton_downloader () {
fi fi
else else
if yad_error_download if yad_error_download
then gui_proton_downloader $@ then gui_proton_downloader ""
else else
export PW_WINE_VER="$PW_WINE_USE" export PW_WINE_VER="$PW_WINE_USE"
init_wine_ver init_wine_ver
@ -4411,7 +4446,7 @@ gui_proton_downloader () {
export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"
fi fi
done done
pw_download_get_wine pw_download_get_wine ""
done done
edit_db_from_gui edit_db_from_gui
restart_pp restart_pp
@ -4422,7 +4457,7 @@ gui_proton_downloader () {
export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"
fi fi
done done
pw_download_get_wine pw_download_get_wine ""
fi fi
} }
export -f gui_proton_downloader export -f gui_proton_downloader
@ -4586,7 +4621,7 @@ relaxed - Same as fifo but allows tearing when below the monitors refresh rate.]
1> "$PW_TMPFS_PATH/tmp_output_yad_fps_limit" 2>/dev/null & 1> "$PW_TMPFS_PATH/tmp_output_yad_fps_limit" 2>/dev/null &
"${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "${translations[EDIT DB]}" --text-align=center \ "${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "${translations[EDIT DB]}" --text-align=center \
--text "${translations[Change settings in database file for]} <b>${PORTWINE_DB}</b>\n ${translations[<b>NOTE:</b> To display help for each item, simply hover your mouse over the text]}" \ --text "${translations[Change settings in database file for]} <b>$PW_NAME_DESKTOP_PROXY</b>\n ${translations[<b>NOTE:</b> 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 \
--gui-type="settings-base" \ --gui-type="settings-base" \
--gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \ --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
@ -4735,20 +4770,14 @@ gui_vkbasalt () {
fi fi
done done
if [[ -n "${PW_VKBASALT_FFX_CAS}" ]] ; then case "$PW_VKBASALT_FFX_CAS" in
if [[ "$PW_VKBASALT_FFX_CAS" == "0" ]] \ 0|-1) VKBASALT_FFX_CAS_GUI="0" ;;
|| [[ "$PW_VKBASALT_FFX_CAS" == "-1" ]] 1) VKBASALT_FFX_CAS_GUI="100" ;;
then export VKBASALT_FFX_CAS_GUI="0" 0.0*) VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.0' '{print $2}')" ;;
elif [[ "$PW_VKBASALT_FFX_CAS" == "1" ]] *) VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.' '{print $2}')" ;;
then export VKBASALT_FFX_CAS_GUI="100" esac
elif [[ "$PW_VKBASALT_FFX_CAS" == 0.0* ]] export VKBASALT_FFX_CAS_GUI
then VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.0' '{print $2}')"
else VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.' '{print $2}')"
fi
export VKBASALT_FFX_CAS_GUI
else
VKBASALT_FFX_CAS_GUI=66
fi
IFS="%" IFS="%"
"${pw_yad}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \ "${pw_yad}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \
--text-align=center --text="${translations[VkBasalt settings for adding effects to games running under Vulkan. (The <b>HOME</b> key disables vkbasalt)\\n<b>NOTE:</b> To display help for each item, simply hover over the text]}" \ --text-align=center --text="${translations[VkBasalt settings for adding effects to games running under Vulkan. (The <b>HOME</b> key disables vkbasalt)\\n<b>NOTE:</b> To display help for each item, simply hover over the text]}" \
@ -5227,7 +5256,7 @@ gui_gamescope () {
unset ADD_CHK_BOX_GS unset ADD_CHK_BOX_GS
if [[ "${GAMESCOPE_INSTALLED}" == 1 ]] ; then if [[ "${GAMESCOPE_INSTALLED}" == 1 ]] ; then
GAMESCOPE_NEED_INSTALL="${translations[Change settings gamescope for]} <b>${PORTWINE_DB}</b>\n ${translations[<b>NOTE:</b> To display help for each item, simply hover your mouse over the text]}" GAMESCOPE_NEED_INSTALL="${translations[Change settings gamescope for]} <b>$PW_NAME_DESKTOP_PROXY</b>\n ${translations[<b>NOTE:</b> To display help for each item, simply hover your mouse over the text]}"
GS_CB="CB" && GS_CBE="CBE" && GS_NUM="NUM" && GS_NUMN="NUMN" GS_CB="CB" && GS_CBE="CBE" && GS_NUM="NUM" && GS_NUMN="NUMN"
for int_to_boole in ${PW_GS_LIST[@]} ; do for int_to_boole in ${PW_GS_LIST[@]} ; do
if [[ "${!int_to_boole}" == "1" ]] if [[ "${!int_to_boole}" == "1" ]]
@ -5534,66 +5563,47 @@ portwine_create_shortcut () {
[[ -z "${PW_SHORTCUT_DESKTOP}" ]] && PW_SHORTCUT_DESKTOP="TRUE" [[ -z "${PW_SHORTCUT_DESKTOP}" ]] && PW_SHORTCUT_DESKTOP="TRUE"
[[ -z "${PW_SHORTCUT_STEAM}" ]] && PW_SHORTCUT_STEAM="FALSE" [[ -z "${PW_SHORTCUT_STEAM}" ]] && PW_SHORTCUT_STEAM="FALSE"
[[ -z $PW_SHORTCUT_PROXY ]] && create_pw_comment unset name_desktop
export name_desktop="$PW_SHORTCUT_PROXY" create_name_desktop
export name_desktop="$PW_NAME_DESKTOP_PROXY"
[[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}" [[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ "$1" == "block_name" ]] ; then OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \
OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \ --gui-type="settings-shortcut" \
--gui-type="settings-shortcut" \ --gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
--gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \ --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \
--gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \ --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \ --image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
--image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \ --text-align="center" --text "${translations[The shortcut will be created in the PortProton directory.]}" \
--text-align="center" --text "${translations[The shortcut will be created in the PortProton directory.]}" \ --field="${translations[Name]}" "${name_desktop}" \
--field=" ${name_desktop}":LBL "" \ --field=" ${translations[Add shortcut to MENU -> GAMES]}":CHK "$PW_SHORTCUT_MENU" \
--field=" ${translations[Add shortcut to MENU -> GAMES]}":CHK "$PW_SHORTCUT_MENU" \ --field=" ${translations[Add shortcut to Desktop]}":CHK "$PW_SHORTCUT_DESKTOP" \
--field=" ${translations[Add shortcut to Desktop]}":CHK "$PW_SHORTCUT_DESKTOP" \ --field=" ${translations[Add shortcut to STEAM library]}":CHK "$PW_SHORTCUT_STEAM" \
--field=" ${translations[Add shortcut to STEAM library]}":CHK "$PW_SHORTCUT_STEAM" \ --button="${translations[CANCEL]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \
--button="${translations[CANCEL]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \ --button="${translations[CREATE SHORTCUT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
--button="${translations[CREATE SHORTCUT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null) PW_YAD_OUT=$?
PW_YAD_OUT=$?
else
OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \
--gui-type="settings-shortcut" \
--gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
--gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
--text-align="center" --text "${translations[The shortcut will be created in the PortProton directory.]}" \
--field="${translations[Name]}" "${name_desktop}" \
--field=" ${translations[Add shortcut to MENU -> GAMES]}":CHK "$PW_SHORTCUT_MENU" \
--field=" ${translations[Add shortcut to Desktop]}":CHK "$PW_SHORTCUT_DESKTOP" \
--field=" ${translations[Add shortcut to STEAM library]}":CHK "$PW_SHORTCUT_STEAM" \
--button="${translations[CANCEL]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \
--button="${translations[CREATE SHORTCUT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
PW_YAD_OUT=$?
fi
if [[ "$PW_YAD_OUT" == "0" ]] ; then if [[ "$PW_YAD_OUT" == "0" ]] ; then
if [[ "$1" == "block_name" ]] name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $1}' | sed "s/\`//g" | sed "s/\"//g" | sed "s/'//g" | sed "s/\!//g")
then name_desktop="$PORTWINE_CREATE_SHORTCUT_NAME"
else name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $1}')
fi
name_desktop="$(echo "${name_desktop}" | sed "s/\`//g" | sed "s/\"//g" | sed "s/'//g" | sed "s/\!//g")"
PW_SHORTCUT_MENU=$(echo "$OUTPUT" | awk -F'|' '{print $2}') PW_SHORTCUT_MENU=$(echo "$OUTPUT" | awk -F'|' '{print $2}')
PW_SHORTCUT_DESKTOP=$(echo "$OUTPUT" | awk -F'|' '{print $3}') PW_SHORTCUT_DESKTOP=$(echo "$OUTPUT" | awk -F'|' '{print $3}')
PW_SHORTCUT_STEAM=$(echo "$OUTPUT" | awk -F'|' '{print $4}') PW_SHORTCUT_STEAM=$(echo "$OUTPUT" | awk -F'|' '{print $4}')
edit_user_conf_from_gui PW_SHORTCUT_MENU PW_SHORTCUT_DESKTOP PW_SHORTCUT_STEAM edit_user_conf_from_gui PW_SHORTCUT_MENU PW_SHORTCUT_DESKTOP PW_SHORTCUT_STEAM
if [[ -n ${DESKTOP_FILES_ARRAY[0]} && $name_desktop != $DESKTOP_NAME_FILE ]] || [[ -n ${DESKTOP_FILES_ARRAY[1]} ]] ; then if [[ -n ${DESKTOP_FILES_ARRAY[0]} && $name_desktop != "$DESKTOP_NAME_FILE" ]] || [[ -n ${DESKTOP_FILES_ARRAY[1]} ]] ; then
if yad_question "${translations[A higher number of duplicate desktop files were found for this file.\\nShould I delete the extra ones or not?]}" ; then if yad_question "${translations[A higher number of duplicate desktop files were found for this file.\\nShould I delete the extra ones or not?]}" ; then
for rm in "${DESKTOP_FILES_ARRAY[@]}" ; do for rm in "${DESKTOP_FILES_ARRAY[@]}" ; do
rm -f "$rm" rm -f "$rm"
done done
[[ $name_desktop == "" ]] && create_pw_comment && export name_desktop="$PW_SHORTCUT_PROXY"
fi fi
else else
try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop" try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop"
fi fi
[[ -z $name_desktop ]] && create_name_desktop && export name_desktop="$PW_NAME_DESKTOP_PROXY"
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
if check_flatpak if check_flatpak
@ -5641,7 +5651,8 @@ portwine_create_shortcut () {
create_new_dir "${STUIDPATH}/config/grid" create_new_dir "${STUIDPATH}/config/grid"
export SCPATH="${STUIDPATH}/config/$SCVDF" export SCPATH="${STUIDPATH}/config/$SCVDF"
export SGGRIDDIR="${STUIDPATH}/config/grid" export SGGRIDDIR="${STUIDPATH}/config/grid"
"${PORT_SCRIPTS_PATH}/add_in_steam.sh" # shellcheck source=/dev/null
source "${PORT_SCRIPTS_PATH}/add_in_steam.sh"
done done
if [[ "${PW_SKIP_RESTART_STEAM}" != 1 ]] && pgrep -i steam &>/dev/null ; then if [[ "${PW_SKIP_RESTART_STEAM}" != 1 ]] && pgrep -i steam &>/dev/null ; then
if yad_question "${translations[For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?]}" ; then if yad_question "${translations[For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?]}" ; then
@ -6178,6 +6189,7 @@ button_click () {
(( count++ )) (( count++ ))
done done
fi fi
export DESKTOP_NAME_YAD="${PW_YAD_SET//"$PORT_WINE_PATH/"/}"
if check_flatpak if check_flatpak
then PW_EXEC_FROM_DESKTOP="$(grep Exec "$PW_YAD_SET" | head -n 1 | sed 's|flatpak run ru.linux_gaming.PortProton|\"${PORT_SCRIPTS_PATH}/start.sh\"|' | awk -F'=' '{print $2}')" then PW_EXEC_FROM_DESKTOP="$(grep Exec "$PW_YAD_SET" | head -n 1 | sed 's|flatpak run ru.linux_gaming.PortProton|\"${PORT_SCRIPTS_PATH}/start.sh\"|' | awk -F'=' '{print $2}')"
else PW_EXEC_FROM_DESKTOP="$(grep Exec "$PW_YAD_SET" | head -n 1 | awk -F"=env " '{print $2}')" else PW_EXEC_FROM_DESKTOP="$(grep Exec "$PW_YAD_SET" | head -n 1 | awk -F"=env " '{print $2}')"

View File

@ -497,7 +497,12 @@ if [[ -f "${portwine_exe}" ]] ; then
PW_SHORTCUT="${translations[DELETE SHORTCUT]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Delete shortcut for select file...]}:98" PW_SHORTCUT="${translations[DELETE SHORTCUT]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Delete shortcut for select file...]}:98"
fi fi
create_pw_comment create_name_desktop
if [[ -z "${PW_COMMENT_DB}" ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PW_NAME_DESKTOP_PROXY" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
else
PW_COMMENT_DB="$PW_COMMENT_DB$(seconds_to_time "$TIME_CURRENT")"
fi
export KEY_START="$RANDOM" export KEY_START="$RANDOM"
if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2365 #SCRIPTS_NEXT_VERSION=2366
#SCRIPTS_STABLE_VERSION=2360 #SCRIPTS_STABLE_VERSION=2360
######################################################################## ########################################################################
export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT" export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"
@ -63,7 +63,7 @@ export VKD3D_STABLE_VER="1.1-2602"
export VKD3D_GIT_VER="1.1-4240" export VKD3D_GIT_VER="1.1-4240"
###VKBASALT### ###VKBASALT###
export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_EFFECTS="Curves:cas"
export PW_VKBASALT_FFX_CAS="0.66" export PW_VKBASALT_FFX_CAS="0.50"
###MANGOHUD### ###MANGOHUD###
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" 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"
###DGVOODOO2### ###DGVOODOO2###

View File

@ -55,6 +55,6 @@ Cartoon = /run/pressure-vessel/pv-from-host/reshade/shaders/Cartoon.fx
Border = /run/pressure-vessel/pv-from-host/reshade/shaders/Border.fx Border = /run/pressure-vessel/pv-from-host/reshade/shaders/Border.fx
AspectRatio = /run/pressure-vessel/pv-from-host/reshade/shaders/AspectRatio.fx AspectRatio = /run/pressure-vessel/pv-from-host/reshade/shaders/AspectRatio.fx
casSharpness = 0.7 casSharpness = 0.5
toggleKey = Home toggleKey = Home
effects = FakeHDR:cas effects = FakeHDR:cas