Merge branch 'improve_reg_func' of github.com:Htylol/PortWINE into Htylol-improve_reg_func

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: 2024-11-01 02:46+0500\n"
+        "POT-Creation-Date: 2024-11-02 10:04+0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1381,6 +1381,9 @@ msgid   "If downloading steam covers is enabled, they will be downloaded and "
         "is unavailable for some reason)"
 msgstr  ""
 
+msgid   "Recommended value"
+msgstr  ""
+
 msgid   "Choose a graphics card to run the game"
 msgstr  ""
 
@@ -1388,10 +1391,10 @@ msgid   "Select which video card will be used to run the game (used for all "
         "running games and programs in PortProton)"
 msgstr  ""
 
-msgid   "Force dpi for fonts"
+msgid   "Force dpi"
 msgstr  ""
 
-msgid   "Here you can set forced dpi for fonts in wine"
+msgid   "Here you can set forced dpi for applications wine"
 msgstr  ""
 
 msgid   "Choice wine audio driver"

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: 2024-11-01 02:43+0500\n"
+"POT-Creation-Date: 2024-11-02 10:04+0500\n"
 "PO-Revision-Date: 2024-10-26 13:58+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1804,6 +1804,9 @@ msgstr ""
 "crearán. (La desactivación se proporciona en los casos en que su descarga no "
 "esté disponible por algún motivo)"
 
+msgid "Recommended value"
+msgstr ""
+
 msgid "Choose a graphics card to run the game"
 msgstr "Elige una tarjeta gráfica para ejecutar el juego"
 
@@ -1814,10 +1817,10 @@ msgstr ""
 "Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se "
 "utiliza para todos los juegos y programas en ejecución en PortProton)"
 
-msgid "Force dpi for fonts"
+msgid "Force dpi"
 msgstr ""
 
-msgid "Here you can set forced dpi for fonts in wine"
+msgid "Here you can set forced dpi for applications wine"
 msgstr ""
 
 msgid "Choice wine audio driver"

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: 2024-11-01 02:43+0500\n"
-"PO-Revision-Date: 2024-11-01 02:44+0500\n"
+"POT-Creation-Date: 2024-11-02 10:04+0500\n"
+"PO-Revision-Date: 2024-11-02 10:05+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -1782,6 +1782,9 @@ msgstr ""
 "создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание по "
 "каким-то причинам недоступно)"
 
+msgid "Recommended value"
+msgstr "Рекомендуемое значение"
+
 msgid "Choose a graphics card to run the game"
 msgstr "Выбрать видеокарту для запуска игры"
 
@@ -1792,12 +1795,11 @@ msgstr ""
 "Выбор видеокарты для запуска игры (используется для всех запущенных игр и "
 "программ в PortProton)"
 
-msgid "Force dpi for fonts"
-msgstr "Принудительное разрешение шрифтов"
+msgid "Force dpi"
+msgstr "Принудительный масштаб"
 
-msgid "Here you can set forced dpi for fonts in wine"
-msgstr ""
-"Здесь вы можете установить принудительное разрешение для шрифтов в Wine"
+msgid "Here you can set forced dpi for applications wine"
+msgstr "Здесь вы можете установить принудительный масштаб для приложений wine"
 
 msgid "Choice wine audio driver"
 msgstr "Выбрать звуковой драйвер"

data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT

@@ -18,7 +18,7 @@ then
     pw_kill_autostart launcher.exe 3 &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Crossout/launcher.exe"
-    pw_run reg add "HKEY_CURRENT_USER\Software\Wine\X11 Driver" /v "Decorated" /t REG_SZ /d "N" /f
+    get_and_set_reg_file --add 'Software\Wine\X11' 'Decorated' 'REG_SZ' "N" "user"
     pw_create_unique_exe "crossout_launcher_pp"
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     try_remove_file "${portwine_exe}.ppdb"

data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY

@@ -20,7 +20,7 @@ then
     export PATH_TO_GAME="${PW_USER_TEMP}"
     pw_run "${PW_AUTOINSTALL_EXE}"
     export portwine_exe="$WINEPREFIX/drive_c/Program Files/HoYoPlay/launcher.exe"
-    pw_run reg add "HKEY_CURRENT_USER\Software\Wine\X11 Driver" /v "Decorated" /t REG_SZ /d "N" /f
+    get_and_set_reg_file --add 'Software\Wine\X11' 'Decorated' 'REG_SZ' "N" "user"
     pw_create_unique_exe "hoyoplay_launcher_pp"
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     try_remove_file "${portwine_exe}.ppdb"

data_from_portwine/scripts/start.sh

@@ -248,6 +248,17 @@ if [[ ! $PW_GUI_START =~ (PANED|NOTEBOOK) ]] ; then
     export PW_GUI_START="NOTEBOOK"
 fi
 
+# TODO:fixes_after_update
+if fixes_after_update "2371: Reset PW_WINE_DPI_VALUE in user.conf" ; then
+    sed -i '/export PW_WINE_DPI_VALUE=/d' "$USER_CONF"
+    unset PW_WINE_DPI_VALUE
+fi
+# choose wine dpi default
+if [[ -z $PW_WINE_DPI_VALUE ]] ; then
+    echo 'export PW_WINE_DPI_VALUE="recommended"' >> "$USER_CONF"
+    export PW_WINE_DPI_VALUE="recommended"
+fi
+
 if check_flatpak ; then
     if check_gamescope_session
     then PW_TERM="env LANG=C xterm -fullscreen -bg black -fg white -e"