diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index 466e591d..ba388726 100644 --- a/data_from_portwine/locales/PortProton.pot +++ b/data_from_portwine/locales/PortProton.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2025-03-06 03:47+0500\n" + "POT-Creation-Date: 2025-03-07 17:18+0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1375,6 +1375,39 @@ msgstr "" msgid "Disable GameScope and go to the previous menu" msgstr "" +msgid "Recommended value" +msgstr "" + +msgid "default" +msgstr "" + +msgid "compact" +msgstr "" + +msgid "classic" +msgstr "" + +msgid "light" +msgstr "" + +msgid "dark" +msgstr "" + +msgid "Show in hours and minutes" +msgstr "" + +msgid "Show in days, hours, minutes" +msgstr "" + +msgid "According to last launch" +msgstr "" + +msgid "By time" +msgstr "" + +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "" + msgid "Change global settings" msgstr "" @@ -1401,7 +1434,7 @@ msgid "When using PANED in the game start menu, additional buttons are " "several." msgstr "" -msgid "steam covers download" +msgid "Steam covers download" msgstr "" msgid "If downloading steam covers is enabled, they will be downloaded and " @@ -1409,36 +1442,6 @@ msgid "If downloading steam covers is enabled, they will be downloaded and " "is unavailable for some reason)" msgstr "" -msgid "Show in hours and minutes" -msgstr "" - -msgid "Show in days, hours, minutes" -msgstr "" - -msgid "According to last launch" -msgstr "" - -msgid "By time" -msgstr "" - -msgid "Recommended value" -msgstr "" - -msgid "default" -msgstr "" - -msgid "compact" -msgstr "" - -msgid "classic" -msgstr "" - -msgid "light" -msgstr "" - -msgid "dark" -msgstr "" - msgid "Choose a graphics card to run the game" msgstr "" @@ -1482,9 +1485,6 @@ msgstr "" msgid "This setting sorts the shortcuts in the main menu" msgstr "" -msgid "GLOBAL SETTINGS (USER.CONF)" -msgstr "" - msgid "Open the user.conf settings file in a system text editor to " "view and change variables manually" msgstr "" @@ -1492,6 +1492,12 @@ msgstr "" msgid "Do you really want to reset settings for" msgstr "" +msgid "Do you actually want to change the scripts version to:" +msgstr "" + +msgid "Branch changed to:" +msgstr "" + msgid "The shortcut will be created in the PortProton directory." msgstr "" @@ -1600,24 +1606,6 @@ msgstr "" msgid "Do you really want to remove PortProton?" msgstr "" -msgid "Mirror changed to:" -msgstr "" - -msgid "Do you actually want to change the scripts version to:" -msgstr "" - -msgid "Branch changed to:" -msgstr "" - -msgid "Cover downloads are disabled" -msgstr "" - -msgid "Cover downloads are enabled" -msgstr "" - -msgid "Gui start changed to:" -msgstr "" - msgid "EDIT USER CONFIG" msgstr "" @@ -1690,12 +1678,3 @@ msgstr "" msgid "THIRD PARTY LIBRARIES" msgstr "" - -msgid "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" -msgstr "" - -msgid "Restarting STEAM... Please wait." -msgstr "" - -msgid "Please wait. downloading covers for" -msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 5fc474f2..518ad5a8 100644 --- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-05 23:40+0500\n" +"POT-Creation-Date: 2025-03-07 17:14+0500\n" "PO-Revision-Date: 2024-11-13 08:18+0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -1786,6 +1786,40 @@ msgstr "" msgid "Disable GameScope and go to the previous menu" msgstr "Desactivar GameScope e ir al menú anterior" +msgid "Recommended value" +msgstr "" + +msgid "default" +msgstr "por defecto" + +msgid "compact" +msgstr "compacto" + +msgid "classic" +msgstr "clásico" + +msgid "light" +msgstr "ligero" + +msgid "dark" +msgstr "oscuro" + +msgid "Show in hours and minutes" +msgstr "" + +msgid "Show in days, hours, minutes" +msgstr "" + +msgid "According to last launch" +msgstr "" + +#, fuzzy +msgid "By time" +msgstr "Mostrar tiempo" + +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "CONFIGURACIONES GLOBALES (USER.CONF)" + msgid "Change global settings" msgstr "Cambiar configuraciones globales" @@ -1821,7 +1855,8 @@ msgstr "" "se encuentran en una página grande; si CUADERNO, entonces se dividen en " "varios." -msgid "steam covers download" +#, fuzzy +msgid "Steam covers download" msgstr "descargar portadas de steam" msgid "" @@ -1833,37 +1868,6 @@ msgstr "" "crearán. (La desactivación se proporciona en los casos en que su descarga no " "esté disponible por algún motivo)" -msgid "Show in hours and minutes" -msgstr "" - -msgid "Show in days, hours, minutes" -msgstr "" - -msgid "According to last launch" -msgstr "" - -#, fuzzy -msgid "By time" -msgstr "Mostrar tiempo" - -msgid "Recommended value" -msgstr "" - -msgid "default" -msgstr "por defecto" - -msgid "compact" -msgstr "compacto" - -msgid "classic" -msgstr "clásico" - -msgid "light" -msgstr "ligero" - -msgid "dark" -msgstr "oscuro" - msgid "Choose a graphics card to run the game" msgstr "Elige una tarjeta gráfica para ejecutar el juego" @@ -1914,9 +1918,6 @@ msgstr "" "Esta configuración ordena los accesos directos en el menú principal según el " "tiempo transcurrido en la aplicación o juego" -msgid "GLOBAL SETTINGS (USER.CONF)" -msgstr "CONFIGURACIONES GLOBALES (USER.CONF)" - msgid "" "Open the user.conf settings file in a system text editor to view and " "change variables manually" @@ -1927,6 +1928,12 @@ msgstr "" msgid "Do you really want to reset settings for" msgstr "¿Realmente deseas restablecer la configuración de" +msgid "Do you actually want to change the scripts version to:" +msgstr "¿Realmente desea cambiar la versión de los scripts a:" + +msgid "Branch changed to:" +msgstr "Rama cambiada a:" + msgid "The shortcut will be created in the PortProton directory." msgstr "El acceso directo se creará en el directorio de PortProton." @@ -2048,24 +2055,6 @@ msgstr "¿Quieres borrar prefijo en PortProton?" msgid "Do you really want to remove PortProton?" msgstr "¿Realmente desea eliminar PortProton?" -msgid "Mirror changed to:" -msgstr "Espejo cambiado a:" - -msgid "Do you actually want to change the scripts version to:" -msgstr "¿Realmente desea cambiar la versión de los scripts a:" - -msgid "Branch changed to:" -msgstr "Rama cambiada a:" - -msgid "Cover downloads are disabled" -msgstr "Las descargas de portadas están deshabilitadas" - -msgid "Cover downloads are enabled" -msgstr "Las descargas de portadas están habilitadas" - -msgid "Gui start changed to:" -msgstr "Inicio Gui cambiado a:" - msgid "EDIT USER CONFIG" msgstr "EDITAR CONFIGURACIÓN DE USUARIO" @@ -2168,16 +2157,29 @@ msgstr "UNIRSE" msgid "THIRD PARTY LIBRARIES" msgstr "BIBLIOTECAS DE TERCEROS" -msgid "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" -msgstr "" -"Para agregar el acceso directo a STEAM, es necesario reiniciar.\\n\\¿Quieres " -"reiniciar STEAM ahora?" +#~ msgid "Mirror changed to:" +#~ msgstr "Espejo cambiado a:" -msgid "Restarting STEAM... Please wait." -msgstr "Restarting STEAM... Please wait." +#~ msgid "Cover downloads are disabled" +#~ msgstr "Las descargas de portadas están deshabilitadas" -msgid "Please wait. downloading covers for" -msgstr "Por favor, espera. Descargando portadas para" +#~ msgid "Cover downloads are enabled" +#~ msgstr "Las descargas de portadas están habilitadas" + +#~ msgid "Gui start changed to:" +#~ msgstr "Inicio Gui cambiado a:" + +#~ msgid "" +#~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" +#~ msgstr "" +#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar." +#~ "\\n\\¿Quieres reiniciar STEAM ahora?" + +#~ msgid "Restarting STEAM... Please wait." +#~ msgstr "Restarting STEAM... Please wait." + +#~ msgid "Please wait. downloading covers for" +#~ msgstr "Por favor, espera. Descargando portadas para" #~ msgid "" #~ "Gamescope is not detected on the system, to install it, run the " diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index b582f60b..23f20a7c 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-05 23:40+0500\n" -"PO-Revision-Date: 2025-03-06 03:43+0500\n" +"POT-Creation-Date: 2025-03-07 17:14+0500\n" +"PO-Revision-Date: 2025-03-07 17:18+0500\n" "Last-Translator: \n" "Language-Team: \n" "Language: ru_RU\n" @@ -1775,6 +1775,39 @@ msgstr "" msgid "Disable GameScope and go to the previous menu" msgstr "Отключить Gamescope и перейти в предыдущее меню" +msgid "Recommended value" +msgstr "Рекомендуемое значение" + +msgid "default" +msgstr "по умолчанию" + +msgid "compact" +msgstr "компактная" + +msgid "classic" +msgstr "классическая" + +msgid "light" +msgstr "светлая" + +msgid "dark" +msgstr "тёмная" + +msgid "Show in hours and minutes" +msgstr "Отображать в часах и минутах" + +msgid "Show in days, hours, minutes" +msgstr "Отображать в днях, часах и минутах" + +msgid "According to last launch" +msgstr "По данным последнего запуска" + +msgid "By time" +msgstr "По проведённому времени" + +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" + msgid "Change global settings" msgstr "Изменить глобальные настройки" @@ -1809,8 +1842,8 @@ msgstr "" "При использовании PANED в меню запуске игры дополнительные кнопки находятся " "на одной большой странице, если NOTEBOOK, то поделены на несколько." -msgid "steam covers download" -msgstr "скачивание обложек для steam" +msgid "Steam covers download" +msgstr "Скачивание обложек для steam" msgid "" "If downloading steam covers is enabled, they will be downloaded and created. " @@ -1821,36 +1854,6 @@ msgstr "" "создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание по " "каким-то причинам недоступно)" -msgid "Show in hours and minutes" -msgstr "Отображать в часах и минутах" - -msgid "Show in days, hours, minutes" -msgstr "Отображать в днях, часах и минутах" - -msgid "According to last launch" -msgstr "По данным последнего запуска" - -msgid "By time" -msgstr "По проведённому времени" - -msgid "Recommended value" -msgstr "Рекомендуемое значение" - -msgid "default" -msgstr "по умолчанию" - -msgid "compact" -msgstr "компактная" - -msgid "classic" -msgstr "классическая" - -msgid "light" -msgstr "светлая" - -msgid "dark" -msgstr "тёмная" - msgid "Choose a graphics card to run the game" msgstr "Выбрать видеокарту для запуска игры" @@ -1897,9 +1900,6 @@ msgstr "Сортировка ярлыков по" msgid "This setting sorts the shortcuts in the main menu" msgstr "Эта настройка сортирует ярлыки в главном меню" -msgid "GLOBAL SETTINGS (USER.CONF)" -msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" - msgid "" "Open the user.conf settings file in a system text editor to view and " "change variables manually" @@ -1910,6 +1910,12 @@ msgstr "" msgid "Do you really want to reset settings for" msgstr "Вы действительно хотите сбросить настройки для" +msgid "Do you actually want to change the scripts version to:" +msgstr "Вы действительно хотите изменить версию скриптов на:" + +msgid "Branch changed to:" +msgstr "Версия изменена на:" + msgid "The shortcut will be created in the PortProton directory." msgstr "Ярлык будет создан в каталоге PortProton." @@ -2030,24 +2036,6 @@ msgstr "Хотите очистить префикс в PortProton?" msgid "Do you really want to remove PortProton?" msgstr "Вы действительно хотите удалить PortProton?" -msgid "Mirror changed to:" -msgstr "Зеркало для скачивания изменено на:" - -msgid "Do you actually want to change the scripts version to:" -msgstr "Вы действительно хотите изменить версию скриптов на:" - -msgid "Branch changed to:" -msgstr "Версия изменена на:" - -msgid "Cover downloads are disabled" -msgstr "Скачивание обложек выключено" - -msgid "Cover downloads are enabled" -msgstr "Скачивание обложек включено" - -msgid "Gui start changed to:" -msgstr "Интерфейс запуска изменён на:" - msgid "EDIT USER CONFIG" msgstr "РЕДАКТИРОВАТЬ USER.CONF" @@ -2150,16 +2138,29 @@ msgstr "ПРИСОЕДЕНИТЬСЯ" msgid "THIRD PARTY LIBRARIES" msgstr "БИБЛИОТЕКИ" -msgid "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" -msgstr "" -"Для добавления ярлыка в STEAM требуется перезапуск.\\n\\nПерезапустить STEAM " -"сейчас?" +#~ msgid "Mirror changed to:" +#~ msgstr "Зеркало для скачивания изменено на:" -msgid "Restarting STEAM... Please wait." -msgstr "Перезапускаем STEAM... Пожалуйста, подождите." +#~ msgid "Cover downloads are disabled" +#~ msgstr "Скачивание обложек выключено" -msgid "Please wait. downloading covers for" -msgstr "Пожалуйста, подождите. Загрузка обложек для" +#~ msgid "Cover downloads are enabled" +#~ msgstr "Скачивание обложек включено" + +#~ msgid "Gui start changed to:" +#~ msgstr "Интерфейс запуска изменён на:" + +#~ msgid "" +#~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" +#~ msgstr "" +#~ "Для добавления ярлыка в STEAM требуется перезапуск.\\n\\nПерезапустить " +#~ "STEAM сейчас?" + +#~ msgid "Restarting STEAM... Please wait." +#~ msgstr "Перезапускаем STEAM... Пожалуйста, подождите." + +#~ msgid "Please wait. downloading covers for" +#~ msgstr "Пожалуйста, подождите. Загрузка обложек для" #~ msgid "" #~ "Gamescope is not detected on the system, to install it, run the " diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 6b37ced9..bd6a33b3 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -5967,41 +5967,55 @@ gui_gamescope () { # GUI USERCONF gui_userconf () { - if [[ -f "${portwine_exe}" ]] ; then + if [[ -f $portwine_exe ]] ; then export PW_YAD_FORM_TAB="1" export TAB_START="2" fi - if [[ "$MIRROR" == "CLOUD" ]] + if [[ $MIRROR == "CLOUD" ]] then NEW_MIRROR="GITHUB" else NEW_MIRROR="CLOUD" fi - if [[ "$BRANCH" == "master" ]] - then NEW_BRANCH="DEVEL" - else NEW_BRANCH="STABLE" + if [[ $BRANCH == "master" ]] ; then + BRANCH="STABLE" + NEW_BRANCH="DEVEL" + else + BRANCH="DEVEL" + NEW_BRANCH="STABLE" fi - if [[ "$DOWNLOAD_STEAM_GRID" == "1" ]] - then NEW_STEAM_BEHAVIOR="${translations[Disable]}" - else NEW_STEAM_BEHAVIOR="${translations[Enable]}" - fi - - if [[ "$PW_GUI_START" == "NOTEBOOK" ]] + if [[ $PW_GUI_START == "NOTEBOOK" ]] then NEW_START_GUI="PANED" else NEW_START_GUI="NOTEBOOK" fi - KEY_USERCONF_GUI=$RANDOM + if [[ $DOWNLOAD_STEAM_GRID == "1" ]] ; then + DOWNLOAD_STEAM_GRID="${translations[Enabled]}" + NEW_STEAM_BEHAVIOR="${translations[Disable]}" + else + DOWNLOAD_STEAM_GRID="${translations[Disabled]}" + NEW_STEAM_BEHAVIOR="${translations[Enable]}" + fi - "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="1" --form --columns=2 --separator=" " --text-align=center \ - --text "${translations[Change global settings]} (edit user.conf)\n ${translations[NOTE: To display help for each item, simply hover your mouse over the text]}" \ - --align-buttons --homogeneous-column --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \ - --field=" ${translations[Change mirror to]} $NEW_MIRROR!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[Depending on which mirror is selected, updates will be downloaded from there.]}":"FBTN" '@bash -c "button_click --userconf change_mirror"' \ - --field=" ${translations[Change branch to]} $NEW_BRANCH!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[Depending on the version of the scripts, PortProton will receive the latest changes first (the DEVEL branch), the STABLE branch is updated later and is stable.]}":"FBTN" '@bash -c "button_click --userconf change_branch"' \ - --field=" ${translations[Change start gui to]} $NEW_START_GUI!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[When using PANED in the game start menu, additional buttons are located on one large page; if NOTEBOOK, then they are divided into several.]}":"FBTN" '@bash -c "button_click --userconf change_gui_start"' \ - --field=" $NEW_STEAM_BEHAVIOR ${translations[steam covers download]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[If downloading steam covers is enabled, they will be downloaded and created. (Disablement is provided in cases where their downloading is unavailable for some reason)]}":"FBTN" '@bash -c "button_click --userconf change_download_grid"' \ - 2>/dev/null & + if [[ -n $PW_GPU_USE ]] \ + && [[ $PW_GPU_USE != "disabled" ]] + then + GPU_VAR="$PW_GPU_USE" + else + GPU_VAR="disabled" + fi + + if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then + PW_WINE_DPI_VALUE="${translations[Recommended value]}" + fi + if [[ -n $PW_WINE_DPI_VALUE ]] \ + && [[ $PW_WINE_DPI_VALUE != "disabled" ]] + then + YAD_DPI_VAR="$PW_WINE_DPI_VALUE" + else + YAD_DPI_VAR="disabled" + fi if [[ -n "$PW_SOUND_DRIVER_USE" ]] \ && [[ "$PW_SOUND_DRIVER_USE" != "disabled" ]] @@ -6011,12 +6025,19 @@ gui_userconf () { SOUND_DRIVER_VAR="disabled" fi - if [[ -n "$PW_GPU_USE" ]] \ - && [[ "$PW_GPU_USE" != "disabled" ]] - then - GPU_VAR="$PW_GPU_USE" - else - GPU_VAR="disabled" + if [[ $GUI_THEME == "default" ]] ; then GUI_THEME=${translations[default]} + elif [[ $GUI_THEME == "compact" ]] ; then GUI_THEME=${translations[compact]} + elif [[ $GUI_THEME == "classic" ]] ; then GUI_THEME=${translations[classic]} + fi + + if command -v gsettings &>/dev/null ; then + YAD_GTK_THEME=$(gsettings get org.gnome.desktop.interface gtk-theme) + [[ $YAD_GTK_THEME == \'Adwaita\' ]] && unset YAD_GTK_THEME + [[ -n $YAD_GTK_THEME ]] && YAD_GTK_THEME="${YAD_GTK_THEME//\'/}!" + fi + if [[ -z $GTK_THEME ]] ; then GTK_THEME_PROXY=${translations[default]} + elif [[ $GTK_THEME =~ light$ ]] ; then GTK_THEME_PROXY="${GTK_THEME//light/${translations[light]}}" + elif [[ $GTK_THEME =~ dark$ ]] ; then GTK_THEME_PROXY="${GTK_THEME//dark/${translations[dark]}}" fi if [[ $DESKTOP_WITH_TIME == "posnumber1" ]] ; then @@ -6035,52 +6056,27 @@ gui_userconf () { SORT_WITH_TIME="disabled" fi - if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then - PW_WINE_DPI_VALUE="${translations[Recommended value]}" - fi - if [[ -n "$PW_WINE_DPI_VALUE" ]] \ - && [[ "$PW_WINE_DPI_VALUE" != "disabled" ]] - then - YAD_DPI_VAR="$PW_WINE_DPI_VALUE" - else - YAD_DPI_VAR="disabled" - fi - - if [[ $GUI_THEME == "default" ]] ; then GUI_THEME=${translations[default]} - elif [[ $GUI_THEME == "compact" ]] ; then GUI_THEME=${translations[compact]} - elif [[ $GUI_THEME == "classic" ]] ; then GUI_THEME=${translations[classic]} - fi - - if command -v gsettings &>/dev/null ; then - YAD_GTK_THEME=$(gsettings get org.gnome.desktop.interface gtk-theme) - [[ $YAD_GTK_THEME == \'Adwaita\' ]] && unset YAD_GTK_THEME - [[ -n $YAD_GTK_THEME ]] && YAD_GTK_THEME="${YAD_GTK_THEME//\'/}!" - fi - if [[ -z $GTK_THEME ]] ; then GTK_THEME=${translations[default]} - elif [[ $GTK_THEME =~ light$ ]] ; then GTK_THEME="${GTK_THEME//light/${translations[light]}}" - elif [[ $GTK_THEME =~ dark$ ]] ; then GTK_THEME="${GTK_THEME//dark/${translations[dark]}}" - fi - - "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="2" --form --columns=1 --separator="%" --homogeneous-row \ - --gui-type-text="$PANED_GUI_TYPE_TEXT_DOWN" --gui-type-layout="$PANED_GUI_TYPE_LAYOUT_DOWN" \ + "${pw_yad}" --title="${translations[GLOBAL SETTINGS (USER.CONF)]}" --form \ + --gui-type="settings-shortcut" --separator="%" \ + --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \ + --text-align="center" --homogeneous-row \ + --text "${translations[Change global settings]} (edit user.conf)\n ${translations[NOTE: To display help for each item, simply hover your mouse over the text]}" \ + --field="${translations[Change mirror to]}!${translations[Depending on which mirror is selected, updates will be downloaded from there.]} :CB" "$(combobox_fix "$MIRROR" "$NEW_MIRROR")" \ + --field="${translations[Change branch to]}!${translations[Depending on the version of the scripts, PortProton will receive the latest changes first (the DEVEL branch), the STABLE branch is updated later and is stable.]} :CB" "$(combobox_fix "$BRANCH" "$NEW_BRANCH")" \ + --field="${translations[Change start gui to]}!${translations[When using PANED in the game start menu, additional buttons are located on one large page; if NOTEBOOK, then they are divided into several.]} :CB" "$(combobox_fix "$PW_GUI_START" "$NEW_START_GUI")" \ + --field="${translations[Steam covers download]}!${translations[If downloading steam covers is enabled, they will be downloaded and created. (Disablement is provided in cases where their downloading is unavailable for some reason)]} :CB" "$(combobox_fix "$DOWNLOAD_STEAM_GRID" "$NEW_STEAM_BEHAVIOR")" \ --field="${translations[Choose a graphics card to run the game]}!${translations[Select which video card will be used to run the game (used for all running games and programs in PortProton)]} :CB" "$(combobox_fix --disabled "$GPU_VAR" "$GET_GPU_NAMES")" \ --field="${translations[Force dpi]}!${translations[Here you can set forced dpi for applications wine]} :CB" "$(combobox_fix --disabled "$YAD_DPI_VAR" "${translations[Recommended value]}!80!96!120!144!168!192!216!240")" \ --field="${translations[Choice wine audio driver]}!${translations[Fixes sound popling if choice alsa]} :CB" "$(combobox_fix --disabled "$SOUND_DRIVER_VAR" "alsa!oss!pulse")" \ --field="${translations[Select PortProton theme]}!${translations[Allows you to select a theme for PortProton]} :CB" "$(combobox_fix "$GUI_THEME" "${translations[default]}!${translations[compact]}!${translations[classic]}")" \ - --field="${translations[Select gtk theme]}!${translations[Allows you to select a theme for GTK.]} :CB" "$(combobox_fix "$GTK_THEME" "${YAD_GTK_THEME}Adwaita:${translations[light]}!Adwaita:${translations[dark]}!${translations[default]}")" \ + --field="${translations[Select gtk theme]}!${translations[Allows you to select a theme for GTK.]} :CB" "$(combobox_fix "$GTK_THEME_PROXY" "${YAD_GTK_THEME}Adwaita:${translations[light]}!Adwaita:${translations[dark]}!${translations[default]}")" \ --field="${translations[Time display]}!${translations[Displays time spent in an application or game]} :CB" "$(combobox_fix --disabled "$DESKTOP_WITH_TIME" "${translations[Show in hours and minutes]}!${translations[Show in days, hours, minutes]}")" \ --field="${translations[Sort shortcuts by]}!${translations[This setting sorts the shortcuts in the main menu]} :CB" "$(combobox_fix --disabled "$SORT_WITH_TIME" "${translations[According to last launch]}!${translations[By time]}")" \ - 1> "${PW_TMPFS_PATH}/tmp_yad_userconf_set_cb" 2>/dev/null & - - "${pw_yad}" --key=$KEY_USERCONF_GUI --paned --sensitive \ - --title="${translations[GLOBAL SETTINGS (USER.CONF)]}" \ - --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --gui-type="settings-paned" \ --button="${translations[CANCEL THE CHANGES]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Cancel the current changes and return to the previous menu]}":1 \ --button="${translations[RESET]} USER.CONF!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Restore default settings for]} user.conf":2 \ --button="${translations[OPEN THE SETTINGS FILE]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Open the user.conf settings file in a system text editor to view and change variables manually]}":164 \ --button="${translations[SAVE CHANGES]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Save the current changes, and go to the previous menu]}":166 \ - 2>/dev/null + 1> "${PW_TMPFS_PATH}/tmp_yad_userconf_set_cb" 2>/dev/null YAD_USERCONF_STATUS="$?" case "$YAD_USERCONF_STATUS" in @@ -6101,14 +6097,44 @@ gui_userconf () { ;; 166) IFS='%' read -r -a PW_ADD_SETTINGS_UC <"${PW_TMPFS_PATH}/tmp_yad_userconf_set_cb" - PW_GPU_USE="${PW_ADD_SETTINGS_UC[0]}" - PW_WINE_DPI_VALUE="${PW_ADD_SETTINGS_UC[1]}" - PW_SOUND_DRIVER_USE="${PW_ADD_SETTINGS_UC[2]}" - GUI_THEME="${PW_ADD_SETTINGS_UC[3]}" - GTK_THEME="${PW_ADD_SETTINGS_UC[4]}" - DESKTOP_WITH_TIME="${PW_ADD_SETTINGS_UC[5]}" - SORT_WITH_TIME="${PW_ADD_SETTINGS_UC[6]}" + MIRROR="${PW_ADD_SETTINGS_UC[0]}" + if [[ $BRANCH != "${PW_ADD_SETTINGS_UC[1]}" ]] ; then + if [[ ${PW_ADD_SETTINGS_UC[1]} == "DEVEL" ]] ; then + if yad_question "${translations[Do you actually want to change the scripts version to:]} DEVEL?" ; then + export MIRROR="GITHUB" + pw_notify_send -i info \ + "${translations[Branch changed to:]}" "DEVEL" + BRANCH="devel" + else + BRANCH="master" + fi + else + if yad_question "${translations[Do you actually want to change the scripts version to:]} STABLE?" ; then + echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver" + pw_notify_send -i info \ + "${translations[Branch changed to:]}" "STABLE" + BRANCH="master" + else + BRANCH="devel" + fi + fi + unset SKIP_CHECK_UPDATES + export PW_CHANGE_BRANCH="1" + export PW_FORCE_UPDATE="1" + fi + PW_GUI_START="${PW_ADD_SETTINGS_UC[2]}" + DOWNLOAD_STEAM_GRID="${PW_ADD_SETTINGS_UC[3]}" + PW_GPU_USE="${PW_ADD_SETTINGS_UC[4]}" + PW_WINE_DPI_VALUE="${PW_ADD_SETTINGS_UC[5]}" + PW_SOUND_DRIVER_USE="${PW_ADD_SETTINGS_UC[6]}" + GUI_THEME="${PW_ADD_SETTINGS_UC[7]}" + GTK_THEME="${PW_ADD_SETTINGS_UC[8]}" + DESKTOP_WITH_TIME="${PW_ADD_SETTINGS_UC[9]}" + SORT_WITH_TIME="${PW_ADD_SETTINGS_UC[10]}" + if [[ $DOWNLOAD_STEAM_GRID =~ (${translations[Enabled]}|${translations[Enable]}) ]] ; then DOWNLOAD_STEAM_GRID="1" + elif [[ $DOWNLOAD_STEAM_GRID =~ (${translations[Disabled]}|${translations[Disable]}) ]] ; then DOWNLOAD_STEAM_GRID="0" + fi if [[ $PW_WINE_DPI_VALUE == "${translations[Recommended value]}" ]] ; then PW_WINE_DPI_VALUE="recommended" fi @@ -6127,26 +6153,11 @@ gui_userconf () { elif [[ $SORT_WITH_TIME == "${translations[By time]}" ]] ; then SORT_WITH_TIME="bytime" fi - edit_user_conf_from_gui PW_GPU_USE PW_WINE_DPI_VALUE PW_SOUND_DRIVER_USE GUI_THEME GTK_THEME DESKTOP_WITH_TIME SORT_WITH_TIME + edit_user_conf_from_gui MIRROR BRANCH PW_GUI_START DOWNLOAD_STEAM_GRID PW_GPU_USE PW_WINE_DPI_VALUE PW_SOUND_DRIVER_USE \ + GUI_THEME GTK_THEME DESKTOP_WITH_TIME SORT_WITH_TIME restart_pp ;; esac - - pw_yad_set_form - case "$PW_YAD_SET" in - change_mirror) - change_mirror - ;; - change_branch) - change_branch - ;; - change_gui_start) - change_gui_start - ;; - change_download_grid) - change_download_grid - ;; - esac } # RESIZE PNG FILE @@ -6949,62 +6960,6 @@ change_loc () { } export -f change_loc -change_mirror () { - if [[ "$MIRROR" == "CLOUD" ]] ; then - sed -i 's/="CLOUD"/="GITHUB"/g' "$USER_CONF" - pw_notify_send -i info \ - "${translations[Mirror changed to:]}" "https://github.com/Castro-Fidel" - else - sed -i 's/="GITHUB"/="CLOUD"/g' "$USER_CONF" - pw_notify_send -i info \ - "${translations[Mirror changed to:]}" "https://cloud.linux-gaming.ru" - fi - print_info "Restarting PP for change mirror..." - restart_pp --userconf -} -export -f change_mirror - -change_branch () { - if [[ "$BRANCH" == "master" ]] ; then - if yad_question "${translations[Do you actually want to change the scripts version to:]} DEVEL?" ; then - sed -i 's/="master"/="devel"/g' "$USER_CONF" - export MIRROR="GITHUB" - pw_notify_send -i info \ - "${translations[Branch changed to:]}" "DEVEL" - unset SKIP_CHECK_UPDATES - export PW_FORCE_UPDATE="1" - fi - else - if yad_question "${translations[Do you actually want to change the scripts version to:]} STABLE?" ; then - sed -i 's/="devel"/="master"/g' "$USER_CONF" - echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver" - export PW_CHANGE_BRANCH="1" - pw_notify_send -i info \ - "${translations[Branch changed to:]}" "STABLE" - unset SKIP_CHECK_UPDATES - export PW_FORCE_UPDATE="1" - fi - fi - print_info "Restarting PP for change branch..." - restart_pp --userconf -} -export -f change_branch - -change_download_grid () { - if [[ "$DOWNLOAD_STEAM_GRID" == "1" ]] ; then - sed -i 's/DOWNLOAD_STEAM_GRID=.*/DOWNLOAD_STEAM_GRID="0"/' "$USER_CONF" - pw_notify_send -i info \ - "${translations[Cover downloads are disabled]}" - else - sed -i 's/DOWNLOAD_STEAM_GRID=.*/DOWNLOAD_STEAM_GRID="1"/' "$USER_CONF" - pw_notify_send -i info \ - "${translations[Cover downloads are enabled]}" - fi - print_info "Restarting PP for change cover download behavior..." - restart_pp --userconf -} -export -f change_download_grid - open_game_folder () { xdg-open "${PATH_TO_GAME}" print_info "Restarting PP after open game folder..." @@ -7012,21 +6967,6 @@ open_game_folder () { } export -f open_game_folder -change_gui_start () { - if [[ "$PW_GUI_START" == "NOTEBOOK" ]] ; then - sed -i 's/="NOTEBOOK"/="PANED"/g' "$USER_CONF" - pw_notify_send -i info \ - "${translations[Gui start changed to:]}" "PANED" - else - sed -i 's/="PANED"/="NOTEBOOK"/g' "$USER_CONF" - pw_notify_send -i info \ - "${translations[Gui start changed to:]}" "NOTEBOOK" - fi - print_info "Restarting PP for change gui start..." - restart_pp --userconf -} -export -f change_gui_start - gui_wine_uninstaller () { start_portwine pw_run uninstaller diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index d0a34cb2..abdbc575 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -1005,10 +1005,6 @@ case "$PW_YAD_SET" in gui_open_scripts_from_backup) gui_open_scripts_from_backup ;; open_changelog) open_changelog ;; change_loc) change_loc ;; - change_mirror) change_mirror ;; - change_branch) change_branch ;; - change_gui_start) change_gui_start ;; - change_download_grid) change_download_grid ;; open_game_folder) open_game_folder ;; 118) gui_edit_db ;; 120) gui_vkbasalt ;;