diff --git a/docs/provider-architecture.md b/docs/provider-architecture.md index 7d7ebfe5..52a35fb5 100644 --- a/docs/provider-architecture.md +++ b/docs/provider-architecture.md @@ -151,11 +151,12 @@ These are behavioural checks. Do not replace them with source-text searches or t ## TinkerGame successor integration -`TinkerGameContext` selects `TinkerGameWorkflow`. It specializes the archive -workflow's staged preparation and metadata hooks because directory staging, -promotion and backup restoration have identical requirements. It stages the -complete modular runtime and Steam manifests together; it does not reuse -SteamTinkerLaunch's external command or global executable-link lifecycle. +`InstallationService` selects `TinkerGameWorkflow` for jobs in `TINKER_GAME` +mode. The workflow specializes the archive workflow's staged preparation and +metadata hooks while sharing directory staging, promotion and backup +restoration. It stages the complete modular runtime and Steam manifests +together. SteamTinkerLaunch uses a separate external command and global +executable-link lifecycle. See [TinkerGame](tinkergame.md) for automatic release discovery (including prereleases), ownership, dependency policy, unsupported targets and explicit configuration migration. diff --git a/po/POTFILES b/po/POTFILES index ecff9baf..c67e45df 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -37,8 +37,6 @@ src/models/steam-profile.vala src/models/steam-restart-operation.vala src/models/steam-restart-target.vala src/models/steam-runtime-repair-candidate.vala -src/models/steam/library-folder.vala -src/models/steam/steam-library-config.vala src/models/tool-variant-preferences.vala src/models/tool.vala src/models/tools/provider-tool.vala @@ -82,7 +80,6 @@ src/services/steam-session-service.vala src/services/steam-tinker-launch-context.vala src/services/steam-tinker-launch-workflow.vala src/services/steam-tinker-launch-yad-compatibility.vala -src/services/tinker-game-context.vala src/services/tinker-game-migration.vala src/services/tinker-game-workflow.vala src/utils/archive-helper.vala diff --git a/po/com.vysp3r.ProtonPlus.pot b/po/com.vysp3r.ProtonPlus.pot index 6f5d82d1..bfebcca9 100644 --- a/po/com.vysp3r.ProtonPlus.pot +++ b/po/com.vysp3r.ProtonPlus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: com.vysp3r.ProtonPlus\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-11-13 12:19-0500\n" +"POT-Creation-Date: 2026-11-21 12:10-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -696,19 +696,19 @@ msgstr "" msgid "The operation could not be completed." msgstr "" -#: src/services/install-job.vala:68 +#: src/services/install-job.vala:66 #, c-format msgid "Waiting to retry in %d second (attempt %d)" msgid_plural "Waiting to retry in %d seconds (attempt %d)" msgstr[0] "" msgstr[1] "" -#: src/services/install-job.vala:72 +#: src/services/install-job.vala:70 #, c-format msgid "Reconnecting (attempt %d)" msgstr "" -#: src/services/install-job.vala:74 +#: src/services/install-job.vala:72 msgid "Downloading" msgstr "" @@ -735,11 +735,11 @@ msgstr "" msgid "Failed to save compatibility tool metadata" msgstr "" -#: src/services/standard-archive-workflow.vala:390 +#: src/services/standard-archive-workflow.vala:388 msgid "Failed to update compatibilitytool.vdf" msgstr "" -#: src/services/standard-archive-workflow.vala:407 +#: src/services/standard-archive-workflow.vala:405 msgid "The compatibility tool manifest is invalid or incomplete" msgstr "" @@ -774,7 +774,7 @@ msgstr "" #: src/services/steam-tinker-launch-workflow.vala:99 #: src/services/steam-tinker-launch-workflow.vala:155 #: src/services/steam-tinker-launch-workflow.vala:177 -#: src/services/steam-tinker-launch-workflow.vala:233 +#: src/services/steam-tinker-launch-workflow.vala:231 msgid "Failed to update SteamTinkerLaunch compatibility registration" msgstr "" @@ -1396,7 +1396,7 @@ msgid "Extra control over the final Steam launch command." msgstr "" #: src/widgets/games/launch-options-editor/groups/advanced-options-group.vala:17 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1338 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1322 msgid "Custom game arguments" msgstr "" @@ -1413,7 +1413,7 @@ msgid "Audio-related launch options." msgstr "" #: src/widgets/games/launch-options-editor/groups/audio-options-group.vala:18 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1328 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1312 msgid "PulseAudio latency" msgstr "" @@ -1466,7 +1466,7 @@ msgstr "" #. Graphics translation #: src/widgets/games/launch-options-editor/groups/dxvk-options-group.vala:24 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 msgid "DXVK frame limit" msgstr "" @@ -1525,36 +1525,36 @@ msgstr "" #: src/widgets/games/launch-options-editor/groups/gpu-vendor-options-group.vala:55 #: src/widgets/games/launch-options-editor/groups/gpu-vendor-options-group.vala:71 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1284 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1285 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1286 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1287 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1298 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1299 #: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1300 #: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1301 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1310 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1311 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1312 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1313 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1314 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1315 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1316 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1317 msgid "AMD" msgstr "" #: src/widgets/games/launch-options-editor/groups/gpu-vendor-options-group.vala:56 #: src/widgets/games/launch-options-editor/groups/gpu-vendor-options-group.vala:75 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1318 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1319 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1320 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1321 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1322 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 msgid "NVIDIA" msgstr "" #: src/widgets/games/launch-options-editor/groups/gpu-vendor-options-group.vala:57 #: src/widgets/games/launch-options-editor/groups/gpu-vendor-options-group.vala:79 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1323 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 msgid "Intel" msgstr "" @@ -1591,7 +1591,7 @@ msgstr "" #. Display & launch tools #: src/widgets/games/launch-options-editor/groups/wrapper-group.vala:19 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1253 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1237 msgid "Launch backend" msgstr "" @@ -1606,23 +1606,23 @@ msgid "System default" msgstr "" #: src/widgets/games/launch-options-editor/groups/wrapper-group.vala:49 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1261 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1262 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1263 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1264 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1265 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1266 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1245 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1249 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1250 #: src/widgets/preferences/preferences-dialog.vala:444 msgid "Gamescope" msgstr "" #: src/widgets/games/launch-options-editor/groups/wrapper-group.vala:54 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1269 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1270 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1271 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1251 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1252 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1253 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1254 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1255 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1256 #: src/widgets/preferences/preferences-dialog.vala:447 msgid "ScopeBuddy" msgstr "" @@ -1651,102 +1651,102 @@ msgstr "" msgid "The selected launch backend is not supported." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:345 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:339 msgid "Requires an AMD GPU." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:346 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:340 msgid "Requires an NVIDIA GPU." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:347 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:341 msgid "Requires an Intel GPU." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:348 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:342 msgid "Requires MangoHud, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:349 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:343 msgid "Requires GameMode, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:350 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:344 msgid "Requires the CachyOS game-performance command, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:351 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:345 msgid "Requires obs-vkcapture, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:352 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:346 msgid "Requires Gamescope, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:353 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:347 msgid "Requires ScopeBuddy, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:354 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:348 msgid "Requires vkBasalt, which is not available." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:355 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:349 msgid "Requires DXVK from the selected compatibility tool." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:356 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:350 msgid "Requires VKD3D-Proton from the selected compatibility tool." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:357 -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:367 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:351 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:361 msgid "Not supported by the selected compatibility tool." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:358 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:352 msgid "" "The selected Proton build does not advertise legacy PROTON_ENABLE_HDR " "support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:359 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:353 msgid "" "The selected Proton build does not advertise automatic-HDR opt-out support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:360 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:354 msgid "" "The selected Proton build does not advertise PROTON_FSR4_UPGRADE support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:361 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:355 msgid "" "The selected Proton build does not advertise the legacy RDNA3 FSR 4 switch." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:362 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:356 msgid "" "The selected Proton build does not advertise PROTON_MLFG_UPGRADE support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:363 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:357 msgid "" "The selected Proton build does not advertise its DXVK low-latency option." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:364 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:358 msgid "" "The selected Proton build does not advertise its VKD3D-Proton low-latency " "option." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:365 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:359 msgid "" "The selected Proton build does not advertise the low-latency Vulkan layer." msgstr "" -#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:366 +#: src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala:360 msgid "The selected Proton build does not advertise its Vulkan Reflex layer." msgstr "" @@ -2266,116 +2266,116 @@ msgid "Diagnostics & raw command" msgstr "" #. Performance & monitoring -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1244 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1228 msgid "MangoHud performance overlay" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1244 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1228 msgid "Shows FPS, CPU/GPU usage, and temperatures in game." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1245 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1229 msgid "GameMode" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1245 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1229 msgid "" "Requests temporary system performance optimizations while the game is " "running." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1230 msgid "CachyOS game-performance profile" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1230 msgid "" "Runs the game with CachyOS's performance power profile and gaming sched_ext " "profile, then restores them when the game exits." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1230 msgid "Requires the game-performance command" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1231 msgid "MangoHud Vulkan environment mode" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1231 msgid "" "Enables MangoHud for Vulkan through MANGOHUD=1. Use the MangoHud wrapper for " "OpenGL; inside Gamescope, use Gamescope's MangoApp support instead." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1231 msgid "Requires MangoHud; Vulkan only" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1232 msgid "OBS Vulkan/OpenGL capture" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1232 msgid "" "Loads obs-vkcapture for Vulkan or OpenGL capture. Install the native " "package, or both the Flatpak OBS plugin and Flatpak capture-tools layer; " "NVIDIA requires modesetting and driver 515.43.04 or newer." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1232 msgid "Requires obs-vkcapture and a compatible OBS installation" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1249 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1233 msgid "High process priority" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1249 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1233 msgid "Gives the game a higher CPU priority." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1250 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1234 msgid "Per-game shader cache" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1250 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1234 msgid "Keeps this game's shader cache separate." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1253 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1237 msgid "Choose the system default, Gamescope, or ScopeBuddy." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1254 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1238 msgid "Native Wayland" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1254 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1238 msgid "Runs the game on Wayland instead of XWayland." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1255 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1239 msgid "Use desktop game profile" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1255 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1239 msgid "Uses the desktop profile instead of a Steam Deck-specific profile." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1256 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1240 msgid "vkBasalt visual effects" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1256 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1240 msgid "Adds visual effects such as sharpening and color adjustments." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1257 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1241 msgid "DXVK HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1257 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1241 msgid "" "Advertises HDR10 color space to DXVK games. Current Proton-CachyOS enables " "HDR automatically; use this only when explicit DXVK HDR exposure is needed. " @@ -2383,425 +2383,425 @@ msgid "" "575.51.02, or Intel/NVK Mesa 25.1); older Proton bundles may differ." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1257 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1241 msgid "" "Requires an HDR-capable compositor, display, Vulkan 1.3, and a compatible " "driver" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1258 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1242 msgid "Legacy custom-Proton HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1258 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1242 msgid "" "Enables the older PROTON_ENABLE_HDR path only when the selected Proton build " "still advertises it. It also enables native Wayland in Proton-GE, where " "Steam Overlay is broken and Steam Input may be unreliable." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1258 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1242 msgid "" "Only available in custom Proton builds that still support PROTON_ENABLE_HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1259 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1243 msgid "Disable custom-Proton automatic HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1259 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1243 msgid "" "Sets DXVK_NO_HDR=1 for custom Proton builds such as current Proton-CachyOS " "that automatically expose HDR. This conflicts with the explicit HDR enable " "options." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1259 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1243 msgid "" "Only available when the selected custom Proton build advertises DXVK_NO_HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1260 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1244 msgid "NVIDIA legacy HDR WSI" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1260 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1244 msgid "" "Enables the Vulkan HDR WSI layer needed by NVIDIA proprietary drivers older " "than 595. Do not enable it on driver 595 or newer." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1260 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1244 msgid "NVIDIA proprietary driver older than 595 only" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1261 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1245 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1251 msgid "Fullscreen" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1261 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1245 msgid "Runs the game in a fullscreen Gamescope session." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1261 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1262 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1263 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1264 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1265 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1266 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1245 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1249 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1250 msgid "Requires Gamescope" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1262 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1252 msgid "Output resolution" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1262 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1246 #: src/widgets/games/launch-options-editor/wrappers/gamescope.vala:51 msgid "Sets the Gamescope output resolution." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1263 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 msgid "HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1263 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1247 msgid "Outputs HDR colors through Gamescope." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1264 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 msgid "Variable refresh rate" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1264 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1270 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1248 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1254 msgid "Matches the display refresh rate to the game's FPS." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1265 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1271 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1249 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1255 #: src/widgets/games/launch-options-editor/wrappers/gamescope.vala:42 #: src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala:53 msgid "Frame limit" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1265 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1249 #: src/widgets/games/launch-options-editor/wrappers/gamescope.vala:42 msgid "Caps the frame rate inside Gamescope." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1266 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1250 #: src/widgets/games/launch-options-editor/wrappers/gamescope.vala:73 msgid "Additional Gamescope arguments" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1266 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1250 msgid "Keeps extra Gamescope flags such as output selection." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1251 msgid "Runs the game in a fullscreen ScopeBuddy session." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1269 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1270 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1271 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1251 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1252 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1253 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1254 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1255 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1256 msgid "Requires ScopeBuddy" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1252 #: src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala:65 msgid "Sets the ScopeBuddy output resolution." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1269 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1253 msgid "Automatic HDR" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1269 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1253 msgid "Enables HDR automatically when the display supports it." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1270 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1254 msgid "Automatic variable refresh rate" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1271 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1255 #: src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala:53 msgid "Caps the frame rate inside ScopeBuddy." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1256 #: src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala:79 msgid "Additional ScopeBuddy arguments" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1256 #: src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala:80 msgid "Keeps extra ScopeBuddy flags such as preferred output selection." msgstr "" #. Proton & Wine compatibility -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1275 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1259 msgid "OpenGL fallback (WineD3D)" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1275 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1259 msgid "Uses OpenGL instead of Vulkan when DXVK causes problems." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1276 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1260 msgid "D7VK for older Direct3D games" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1276 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1260 msgid "Enables D7VK for older Direct3D games." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1276 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1260 msgid "Requires a compatible Proton version" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1277 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1261 msgid "NTSync mode" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1277 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1261 msgid "" "Uses FSync instead of NTSync for games that need that compatibility mode." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1278 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1262 msgid "Large address awareness for 32-bit games" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1278 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1262 msgid "Lets supported 32-bit games use more than 2GB of memory." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1279 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1263 msgid "WoW64 mode" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1279 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1263 msgid "Enables WoW64 support for 32-bit games on 64-bit Proton builds." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1280 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1264 msgid "Write-copy memory workaround" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1280 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1264 msgid "Simulates page write protection for initialization errors." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1281 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1265 msgid "Vulkan synchronization 2" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1281 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1265 msgid "Enables WINE_VK_USE_SYNC2." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1282 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1266 msgid "Futex waitv synchronization" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1282 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1266 msgid "Enables WINE_SYNC_USE_FUTEX_WAITV." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1283 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 msgid "OptiScaler integration" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1283 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 msgid "Enables Proton OptiScaler." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1283 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1284 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1329 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1267 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1313 msgid "Requires Proton 11-1 or newer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1284 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 msgid "Discord bridge" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1284 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1268 msgid "Enables Proton's Discord bridge." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1285 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1269 msgid "Wine DLL overrides" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1285 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1269 msgid "Choose builtin or native Windows DLL behavior." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 msgid "Caps the frame rate with DXVK's built-in limiter." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1272 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1273 msgid "DXVK" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1273 msgid "Asynchronous pipeline compilation" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1273 msgid "Enables DXVK asynchronous pipeline compilation." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1273 msgid "Requires compatible patched DXVK" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1274 msgid "VKD3D shader cache" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1274 msgid "Enables VKD3D's internal shader cache." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1274 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1275 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1276 msgid "VKD3D-Proton" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1275 msgid "VKD3D GPU virtual addressing" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1275 msgid "Enables VKD3D GPU virtual addressing." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1276 msgid "VKD3D compatibility settings" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1276 msgid "Configure Direct3D 12 to Vulkan compatibility workarounds." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1277 msgid "Proton-CachyOS DX11 low latency" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1277 msgid "" "Enables the Proton-CachyOS DXVK low-latency path for Direct3D 9–11. Requires " "a selected custom Proton build that advertises this option." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1277 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1278 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1279 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1280 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1281 msgid "Proton-CachyOS" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1277 msgid "Requires a compatible Proton-CachyOS build" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1278 msgid "Proton-CachyOS DX12 low latency" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1278 msgid "" "Enables hardware-agnostic VKD3D-Proton low latency for Direct3D 12 games " "that use Reflex markers or waitable swapchains. Intel GPUs, frame " "generation, and games without markers are unsupported." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1278 msgid "" "Requires a compatible Proton-CachyOS build; not compatible with frame " "generation" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1279 msgid "Proton-CachyOS Vulkan Anti-Lag 2 layer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1279 msgid "" "Enables the low-latency Vulkan layer with VK_AMD_anti_lag exposure. The game " "must support AMD Anti-Lag 2; this does not add latency markers to " "unsupported games." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1279 msgid "" "Requires a compatible Proton-CachyOS build and game support for Anti-Lag 2" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1280 msgid "Expose Vulkan Reflex instead of Anti-Lag 2" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1280 msgid "" "Switches the Proton-CachyOS low-latency Vulkan layer from VK_AMD_anti_lag to " "VK_NV_low_latency2. Enable only for games with Vulkan Reflex support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1280 msgid "Requires the Vulkan low-latency layer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1281 msgid "Proton-CachyOS NVIDIA Reflex Vulkan layer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1281 msgid "" "Enables Proton-CachyOS's NVIDIA Reflex layer for native Vulkan games. The " "game must already support VK_NV_low_latency2." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1281 msgid "Requires NVIDIA and a compatible Proton-CachyOS build" msgstr "" #. Hardware & drivers -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1300 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1284 msgid "Use discrete GPU" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1300 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1284 msgid "Uses the AMD discrete GPU on hybrid systems." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1301 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1285 msgid "Mesa Anti-Lag" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1301 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1285 msgid "Reduces latency on supported AMD Mesa setups." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1286 msgid "FSR 4 upgrade (current path)" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1286 msgid "" "Upgrades supported FSR 3.1 games through the selected custom Proton build. " "Value 1 selects that build's default FSR 4 release; supported builds also " @@ -2810,34 +2810,34 @@ msgid "" "Proton-GE disables Anti-Lag 2 while this is active." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1286 msgid "" "Requires a custom Proton build that advertises PROTON_FSR4_UPGRADE, a " "supported game, and compatible AMD hardware/drivers" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1287 msgid "FSR 4 RDNA3 upgrade (legacy path)" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1287 msgid "" "Uses the older RDNA3-specific upgrade switch retained by some Proton-GE " "builds. New Proton-CachyOS releases removed it in favor of the current FSR 4 " "path." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1287 msgid "" "Only available when the selected custom Proton build still advertises this " "legacy switch" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 msgid "FSR 4 ML frame generation" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 msgid "" "Requests ML frame generation in supported custom Proton builds. Proton-" "CachyOS requires FSR 4.0.3 or newer; RDNA3 may require " @@ -2845,332 +2845,332 @@ msgid "" "with FSR 4 and uses value 0 to disable it." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1288 msgid "" "Requires a custom Proton build that advertises MLFG, FSR 4.0.3 or newer, and " "supported AMD hardware/drivers" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 msgid "RDNA3 ML frame-generation workaround" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 msgid "" "Enables the DXIL-SPIR-V WMMA workaround that some RDNA3 systems need for ML " "frame generation. Do not use it on other GPU generations." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1289 msgid "RDNA3 only; enable only if ML frame generation requires it" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 msgid "AMD Reflex preset: allow DXVK-NVAPI" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 msgid "" "Allows DXVK-NVAPI on non-NVIDIA drivers. Try this least-invasive Reflex " "compatibility preset first; the game must support Reflex and the low-latency " "Vulkan layer must be active." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1308 -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1309 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 msgid "AMD Reflex compatibility" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1290 msgid "May not convince games that explicitly require an NVIDIA GPU" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 msgid "AMD Reflex preset: hide AMD GPU" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 msgid "" "Makes DXVK hide the AMD GPU so some games expose Reflex. This fallback can " "break FSR 4 and ML frame generation; use only if allowing DXVK-NVAPI is " "insufficient." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1291 msgid "GPU spoofing can break FSR 4 and other vendor-specific paths" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1308 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 msgid "AMD Reflex preset: force NVAPI" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1308 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 msgid "" "Forces Proton's NVAPI path for games that still hide Reflex. This invasive " "fallback can break FSR 4 and should be used only after the safer presets " "fail." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1308 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1292 msgid "Can break FSR 4 and game-specific GPU detection" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1309 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 msgid "AMD Reflex preset: layer NVIDIA spoof" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1309 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 msgid "" "Makes the low-latency Vulkan layer report an NVIDIA GPU. Upstream recommends " "against this last-resort spoof because it can break Proton FSR 4." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1309 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1293 msgid "Last resort; can break FSR 4 and other GPU detection" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1310 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 msgid "Treat APU as a discrete GPU" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1310 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1294 msgid "" "Reports an AMD APU as a discrete GPU for games that mis-detect integrated " "graphics." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1311 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 msgid "Vulkan driver" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1311 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1295 msgid "Chooses the AMD Vulkan driver for this game." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1312 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 msgid "Staging shared memory" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1312 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1296 msgid "Enables AMD driver shared memory support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1313 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 msgid "Mesa GL threading" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1313 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1297 msgid "Enables Mesa GLThread." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1314 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1298 msgid "Mesa shader-cache control" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1314 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1298 msgid "Controls Mesa's shader cache." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1315 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1299 msgid "Experimental RADV features" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1315 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1299 msgid "Tests experimental RADV performance features." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1316 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1300 msgid "RADV workarounds and debugging" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1316 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1300 msgid "Configure RADV compatibility workarounds and debugging." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1317 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1301 msgid "ACO shader-compiler debugging" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1317 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1301 msgid "Configure AMD ACO shader compiler debugging." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1318 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 msgid "NVAPI" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1318 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1302 msgid "Lets games access NVIDIA-specific features such as DLSS." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1319 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 msgid "DLSS component updates" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1319 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1303 msgid "Updates DLSS components for supported games." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1320 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 msgid "DLSS indicator" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1320 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1304 msgid "Shows an in-game DLSS status indicator." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1321 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 msgid "NVIDIA libraries" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1321 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1305 msgid "Enables NVIDIA-specific libraries." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1322 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 msgid "Report GPU as AMD" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1322 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1306 msgid "Reports an NVIDIA GPU as AMD for affected games." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1323 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 msgid "XeSS component upgrade" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1323 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1307 msgid "Updates XeSS in supported games." msgstr "" #. Input & audio -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1326 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1310 msgid "Prefer SDL controller input" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1326 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1310 msgid "Works around controller detection issues." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1327 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1311 msgid "Bypass Steam Input" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1327 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1311 msgid "Disables Steam Input support." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1328 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1312 msgid "Sets the PulseAudio latency target." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1329 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1313 msgid "Wine ALSA output channels" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1329 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1313 msgid "Sets the Wine ALSA output channel count." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1330 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1314 msgid "Wine ALSA spatial downmix" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1330 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1314 msgid "Enables Wine ALSA spatial downmix for 4, 6, or 8 channels." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1330 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1314 msgid "Requires 4, 6, or 8 output channels" msgstr "" #. Game arguments -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1333 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1317 msgid "Skip launcher" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1333 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1317 msgid "Adds -skip-launcher for games that support it." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1334 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1318 msgid "Vulkan renderer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1334 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1318 msgid "Adds -vulkan." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1335 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1319 msgid "DirectX 11 renderer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1335 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1319 msgid "Adds -dx11." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1336 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1320 msgid "DirectX 12 renderer" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1336 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1320 msgid "Adds -dx12." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1337 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1321 msgid "Developer console" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1337 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1321 msgid "Adds -console when the game supports it." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1338 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1322 msgid "" "Adds individual custom arguments and preserves unrecognized launch options " "exactly as loaded." msgstr "" #. Diagnostics & raw command -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1341 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1325 msgid "Proton debug log" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1341 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1325 msgid "Enables Proton troubleshooting logs." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1342 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1326 msgid "DXVK log level" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1342 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1326 msgid "Controls DXVK logging." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1343 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1327 msgid "VKD3D log level" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1343 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1327 msgid "Controls VKD3D troubleshooting logs." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1344 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1328 msgid "Steam command placeholder (%command%)" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1344 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1328 msgid "Marks where Steam inserts the game's command." msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1345 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1329 msgid "Preserved unrecognized launch options" msgstr "" -#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1345 +#: src/widgets/games/launch-options-editor/launch-options-option-catalog.vala:1329 msgid "Keeps unrecognized, quoted, and opaque shell content exactly as loaded." msgstr "" diff --git a/src/cli/cli.vala b/src/cli/cli.vala index 9c1806a7..3be625cc 100644 --- a/src/cli/cli.vala +++ b/src/cli/cli.vala @@ -846,7 +846,7 @@ namespace ProtonPlus.CLI { } private void on_progress_updated (Services.InstallJob job) { - var speed = Utils.Filesystem.convert_bytes_to_string ((int64) (job.speed_kbps * 1024)); + var speed = format_size ((int64) (job.speed_kbps * 1024)); var progress = job.progress ?? ""; string eta_text; diff --git a/src/models/assets/asset.vala b/src/models/assets/asset.vala index ea72ad1e..0480e3b4 100644 --- a/src/models/assets/asset.vala +++ b/src/models/assets/asset.vala @@ -53,12 +53,8 @@ namespace ProtonPlus.Models.Assets { ); } - public static bool is_archive_name (string name) { - return Utils.ArchiveHelper.is_archive_name (name); - } - public bool is_archive () { - return is_archive_name (this.name); + return Utils.ArchiveHelper.is_archive_name (this.name); } } } diff --git a/src/models/meson.build b/src/models/meson.build index ffd3d7c8..8963972d 100644 --- a/src/models/meson.build +++ b/src/models/meson.build @@ -28,4 +28,3 @@ subdir('assets') subdir('launchers') subdir('providers') subdir('tools') -subdir('steam') diff --git a/src/models/providers/built-in-provider-definitions.vala b/src/models/providers/built-in-provider-definitions.vala index 35d1a6f1..6e7c3a5c 100644 --- a/src/models/providers/built-in-provider-definitions.vala +++ b/src/models/providers/built-in-provider-definitions.vala @@ -2,24 +2,11 @@ namespace ProtonPlus.Models.Providers { internal class BuiltInProviderDefinitions : Object { internal static ProviderDefinition[] create_all () { var definitions = new Gee.ArrayList (); - append (definitions, DxvkDefinitions.create ()); - append (definitions, Vkd3dDefinitions.create ()); - append (definitions, ProtonDefinitions.create ()); - append (definitions, WineDefinitions.create ()); - return copy_definitions (definitions); - } - - private static void append (Gee.ArrayList target, ProviderDefinition[] values) { - foreach (var value in values) - target.add (value); - } - - private static ProviderDefinition[] copy_definitions (Gee.Collection values) { - var copied = new ProviderDefinition[values.size]; - var index = 0; - foreach (var value in values) - copied[index++] = value; - return copied; + definitions.add_all_array (DxvkDefinitions.create ()); + definitions.add_all_array (Vkd3dDefinitions.create ()); + definitions.add_all_array (ProtonDefinitions.create ()); + definitions.add_all_array (WineDefinitions.create ()); + return definitions.to_array (); } } } diff --git a/src/models/providers/provider-definition.vala b/src/models/providers/provider-definition.vala index c834cf20..8f78fd88 100644 --- a/src/models/providers/provider-definition.vala +++ b/src/models/providers/provider-definition.vala @@ -34,7 +34,7 @@ namespace ProtonPlus.Models.Providers { private string[] alternate_format_values; public string[] alternate_formats { - owned get { return copy_strings (alternate_format_values); } + owned get { return alternate_format_values; } } public VariantDefinition ( @@ -50,7 +50,7 @@ namespace ProtonPlus.Models.Providers { this.format = format; this.is_default = is_default; this.compatibility = compatibility != null ? compatibility.copy () : VariantCompatibility.unspecified (); - this.alternate_format_values = copy_strings (alternate_formats); + this.alternate_format_values = alternate_formats ?? new string[0]; } public string[] get_asset_formats () { @@ -60,20 +60,6 @@ namespace ProtonPlus.Models.Providers { formats[index + 1] = alternate_format_values[index]; return formats; } - - internal VariantDefinition copy () { - return new VariantDefinition (id, name, format, is_default, compatibility, alternate_formats); - } - - private static string[] copy_strings (string[]? values) { - if (values == null) - return {}; - - var copied = new string[values.length]; - for (var index = 0; index < values.length; index++) - copied[index] = values[index]; - return copied; - } } // Ordered packaging generations. The first set with a named asset match @@ -82,16 +68,11 @@ namespace ProtonPlus.Models.Providers { private VariantDefinition[] variants; public ReleaseVariantSet (VariantDefinition[] variants) { - this.variants = new VariantDefinition[variants.length]; - for (var index = 0; index < variants.length; index++) - this.variants[index] = variants[index].copy (); + this.variants = variants; } public VariantDefinition[] get_variants () { - var copied = new VariantDefinition[variants.length]; - for (var index = 0; index < variants.length; index++) - copied[index] = variants[index].copy (); - return copied; + return variants; } } @@ -287,19 +268,19 @@ namespace ProtonPlus.Models.Providers { public bool single_archive_releases { get; private set; } public string[] asset_filters { - owned get { return copy_strings (asset_filter_values); } + owned get { return asset_filter_values; } } public string[] asset_exclusions { - owned get { return copy_strings (asset_exclusion_values); } + owned get { return asset_exclusion_values; } } public string[] legacy_endpoints { - owned get { return copy_strings (legacy_endpoint_values); } + owned get { return legacy_endpoint_values; } } public string[] legacy_titles { - owned get { return copy_strings (legacy_title_values); } + owned get { return legacy_title_values; } } public string source_id { @@ -315,30 +296,18 @@ namespace ProtonPlus.Models.Providers { this.endpoint = config.endpoint; this.repository_url = config.repository_url; this.sort_priority = config.sort_priority; - this.variants = copy_variants (config.variants); + this.variants = config.variants; this.release_variant_sets = copy_variant_sets (config.release_variant_sets); this.install_layouts = copy_install_layouts (config.install_layouts); - this.asset_filter_values = copy_strings (config.asset_filters); - this.asset_exclusion_values = copy_strings (config.asset_exclusions); + this.asset_filter_values = config.asset_filters ?? new string[0]; + this.asset_exclusion_values = config.asset_exclusions ?? new string[0]; this.tag = config.tag; this.legacy = config.legacy; this.url_template = config.url_template; this.archive_install_requirement = config.archive_install_requirement; this.single_archive_releases = config.single_archive_releases; - this.legacy_endpoint_values = copy_strings (config.legacy_endpoints); - this.legacy_title_values = copy_strings (config.legacy_titles); - } - - private static VariantDefinition[] copy_variants (VariantDefinition[] values) { - var copied = new VariantDefinition[values.length]; - for (var index = 0; index < values.length; index++) { - var value = values[index]; - copied[index] = new VariantDefinition ( - value.id, value.name, value.format, value.is_default, - value.compatibility, value.alternate_formats - ); - } - return copied; + this.legacy_endpoint_values = config.legacy_endpoints ?? new string[0]; + this.legacy_title_values = config.legacy_titles ?? new string[0]; } private static InstallLayout[] copy_install_layouts (InstallLayout[] values) { @@ -350,23 +319,13 @@ namespace ProtonPlus.Models.Providers { return copied; } - private static string[] copy_strings (string[]? values) { - if (values == null) - return {}; - - var copied = new string[values.length]; - for (var index = 0; index < values.length; index++) - copied[index] = values[index]; - return copied; - } - public VariantDefinition[] get_variants () { // Tools retain the entire identity/compatibility universe, while // release composition selects one packaging generation below. var all = new ArrayList (); var ids = new HashSet (); foreach (var variant in variants) { - all.add (variant.copy ()); + all.add (variant); ids.add (variant.id); } foreach (var set in release_variant_sets) @@ -377,7 +336,7 @@ namespace ProtonPlus.Models.Providers { } public VariantDefinition[] get_fallback_variants () { - return copy_variants (variants); + return variants; } public ReleaseVariantSet[] get_release_variant_sets () { diff --git a/src/models/providers/provider-registry.vala b/src/models/providers/provider-registry.vala index 44c777b0..9e294cfd 100644 --- a/src/models/providers/provider-registry.vala +++ b/src/models/providers/provider-registry.vala @@ -9,18 +9,11 @@ namespace ProtonPlus.Models.Providers { public ProviderDefinitionValidationResult (string provider_id, string[] messages) { this.provider_id = provider_id; - this.messages = copy_messages (messages); + this.messages = messages; } public string[] get_messages () { - return copy_messages (messages); - } - - private static string[] copy_messages (string[] values) { - var copied = new string[values.length]; - for (var index = 0; index < values.length; index++) - copied[index] = values[index]; - return copied; + return messages; } } @@ -55,7 +48,7 @@ namespace ProtonPlus.Models.Providers { var definitions = definitions_by_category.get (category); if (definitions == null) return {}; - return copy_definitions (definitions); + return definitions.to_array (); } public ProviderDefinition[] get_all () { @@ -66,11 +59,11 @@ namespace ProtonPlus.Models.Providers { foreach (var definition in get (category)) copied.add (definition); } - return copy_definitions (copied); + return copied.to_array (); } public ProviderDefinitionValidationResult[] get_validation_results () { - return copy_validation_results (validation_results); + return validation_results.to_array (); } private void initialize_categories () { @@ -125,7 +118,7 @@ namespace ProtonPlus.Models.Providers { if (messages.size > 0) { validation_results.add (new ProviderDefinitionValidationResult ( - definition.provider_id, copy_messages (messages) + definition.provider_id, messages.to_array () )); } } @@ -244,31 +237,5 @@ namespace ProtonPlus.Models.Providers { messages.add ("legacy endpoint is duplicated: %s".printf (legacy_endpoint)); } } - - private static ProviderDefinition[] copy_definitions (Collection values) { - var copied = new ProviderDefinition[values.size]; - var index = 0; - foreach (var value in values) - copied[index++] = value; - return copied; - } - - private static ProviderDefinitionValidationResult[] copy_validation_results ( - Collection values - ) { - var copied = new ProviderDefinitionValidationResult[values.size]; - var index = 0; - foreach (var value in values) - copied[index++] = value; - return copied; - } - - private static string[] copy_messages (Collection values) { - var copied = new string[values.size]; - var index = 0; - foreach (var value in values) - copied[index++] = value; - return copied; - } } } diff --git a/src/models/steam/library-folder.vala b/src/models/steam/library-folder.vala deleted file mode 100644 index 1185c702..00000000 --- a/src/models/steam/library-folder.vala +++ /dev/null @@ -1,17 +0,0 @@ -using Gee; - -namespace ProtonPlus.Models.Steam { - - public class LibraryFolder : GLib.Object { - public int id { get; set; } - public string path { get; set; } - public string label { get; set; } - public int64 totalsize { get; set; } - - public HashMap apps { get; set; } - - public LibraryFolder () { - this.apps = new HashMap (); - } - } -} diff --git a/src/models/steam/meson.build b/src/models/steam/meson.build deleted file mode 100644 index 3bb6af49..00000000 --- a/src/models/steam/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -sources += files( - 'library-folder.vala', - 'steam-library-config.vala', -) diff --git a/src/models/steam/steam-library-config.vala b/src/models/steam/steam-library-config.vala deleted file mode 100644 index 2d04283b..00000000 --- a/src/models/steam/steam-library-config.vala +++ /dev/null @@ -1,12 +0,0 @@ -using Gee; - -namespace ProtonPlus.Models.Steam { - public class SteamLibraryConfig : GLib.Object { - public ArrayList folders { get; set; } - - public SteamLibraryConfig () { - this.folders = new ArrayList (); - } - - } -} diff --git a/src/models/variant-compatibility.vala b/src/models/variant-compatibility.vala index 16120fb5..2adf576a 100644 --- a/src/models/variant-compatibility.vala +++ b/src/models/variant-compatibility.vala @@ -15,7 +15,7 @@ namespace ProtonPlus.Models { bool architecture_independent = false, Aarch64Level minimum_aarch64_level = Aarch64Level.UNKNOWN ) { - this.supported_architectures = copy_architectures (supported_architectures); + this.supported_architectures = supported_architectures ?? new CpuArchitecture[0]; this.minimum_x86_64_level = minimum_x86_64_level; this.minimum_aarch64_level = minimum_aarch64_level == Aarch64Level.UNKNOWN && supports_architecture (CpuArchitecture.AARCH64) @@ -59,7 +59,7 @@ namespace ProtonPlus.Models { } public CpuArchitecture[] get_supported_architectures () { - return copy_architectures (supported_architectures); + return supported_architectures; } public bool explicitly_supports_architecture (CpuArchitecture architecture) { @@ -229,15 +229,6 @@ namespace ProtonPlus.Models { return false; } - private static CpuArchitecture[] copy_architectures (CpuArchitecture[]? values) { - if (values == null) - return {}; - var copied = new CpuArchitecture[values.length]; - for (var index = 0; index < values.length; index++) - copied[index] = values[index]; - return copied; - } - private static string architecture_to_string (CpuArchitecture architecture) { switch (architecture) { case CpuArchitecture.X86_32: diff --git a/src/providers/sources/github-compatible-release-parser.vala b/src/providers/sources/github-compatible-release-parser.vala index edb4b6e5..9682af11 100644 --- a/src/providers/sources/github-compatible-release-parser.vala +++ b/src/providers/sources/github-compatible-release-parser.vala @@ -70,7 +70,7 @@ namespace ProtonPlus.Providers.Sources { continue; var name = object.get_string_member_with_default ("name", ""); var download_url = object.get_string_member_with_default ("browser_download_url", ""); - if (name == "" || download_url == "" || !Models.Assets.Asset.is_archive_name (name)) + if (name == "" || download_url == "" || !Utils.ArchiveHelper.is_archive_name (name)) continue; assets.add (new Models.Assets.Asset ( diff --git a/src/providers/sources/gitlab-release-source.vala b/src/providers/sources/gitlab-release-source.vala index 00927a63..09c81911 100644 --- a/src/providers/sources/gitlab-release-source.vala +++ b/src/providers/sources/gitlab-release-source.vala @@ -85,7 +85,7 @@ namespace ProtonPlus.Providers.Sources { var download_url = object.get_string_member_with_default ( "direct_asset_url", "" ).replace ("?ref_type=heads", ""); - if (name == "" || download_url == "" || !Models.Assets.Asset.is_archive_name (name)) + if (name == "" || download_url == "" || !Utils.ArchiveHelper.is_archive_name (name)) continue; assets.add (new Models.Assets.Asset ( diff --git a/src/services/install-job.vala b/src/services/install-job.vala index f5c0644e..e65b7765 100644 --- a/src/services/install-job.vala +++ b/src/services/install-job.vala @@ -41,8 +41,6 @@ namespace ProtonPlus.Services { internal string? replacement_backup_path { get; set; default = null; } public SteamTinkerLaunchContext? steam_tinker_launch_context { get; private set; default = null; } - public TinkerGameContext? tinker_game_context { get; private set; default = null; } - private Cancellable operation_cancellable = new Cancellable (); private bool _canceled = false; public bool canceled { @@ -111,8 +109,8 @@ namespace ProtonPlus.Services { if (release.kind == Models.Release.Kind.TINKER_GAME || mode == Mode.TINKER_GAME) { this.mode = Mode.TINKER_GAME; - tinker_game_context = new TinkerGameContext (tool, installation_location_override); - install_location = tinker_game_context.install_location; + install_location = installation_location_override ?? Path.build_filename ( + tool.group.launcher.get_primary_managed_tool_directory (tool.group), "TinkerGame"); } else if (is_steam_tinker_launch) { steam_tinker_launch_context = new SteamTinkerLaunchContext (tool, steam_tinker_launch_home_override); install_location = steam_tinker_launch_context.base_location; @@ -145,7 +143,7 @@ namespace ProtonPlus.Services { } public string usage_name { - owned get { return tinker_game_context != null ? "Proton-tg" : steam_tinker_launch_context != null ? "Proton-stl" : title; } + owned get { return mode == Mode.TINKER_GAME ? "Proton-tg" : steam_tinker_launch_context != null ? "Proton-stl" : title; } } public string operation_id { @@ -183,7 +181,7 @@ namespace ProtonPlus.Services { } public string get_usage_identifier () { - if (steam_tinker_launch_context != null || tinker_game_context != null) + if (steam_tinker_launch_context != null || mode == Mode.TINKER_GAME) return usage_name; var installed_identifier = tool.group.installed_tool_inventory @@ -318,7 +316,7 @@ namespace ProtonPlus.Services { internal void report_progress (bool is_percent, int64 progress, double speed_kbps, double? remaining_seconds) { this.is_percent = is_percent; - this.progress = is_percent ? "%s%%".printf (progress.to_string ()) : Utils.Filesystem.convert_bytes_to_string (progress); + this.progress = is_percent ? "%s%%".printf (progress.to_string ()) : format_size (progress); this.speed_kbps = speed_kbps; this.seconds_remaining = remaining_seconds ?? -1.0; progress_updated (); @@ -382,7 +380,7 @@ namespace ProtonPlus.Services { } private void update_install_location (string? override_location) { - if (steam_tinker_launch_context != null || tinker_game_context != null) + if (steam_tinker_launch_context != null || mode == Mode.TINKER_GAME) return; if (installation_location_override != null) { install_location = (!) installation_location_override; diff --git a/src/services/installation-service.vala b/src/services/installation-service.vala index 1f67de78..47278ba3 100644 --- a/src/services/installation-service.vala +++ b/src/services/installation-service.vala @@ -2,7 +2,7 @@ namespace ProtonPlus.Services { /// Application-level coordinator for install, update, and removal jobs. /// Workflow selection and observable lifecycle ownership stay here; the /// detailed filesystem transactions live in dedicated workflows. - public class InstallationService : Object, InstallationOperationCoordinator, InstallationLifecycleRecorder { + public class InstallationService : Object, InstallationOperationCoordinator { private static InstallationService? _instance = null; public static InstallationService instance { get { @@ -599,7 +599,7 @@ namespace ProtonPlus.Services { // This is the one workflow-selection point. SteamTinkerLaunch is // identified by its composed context, never by provider or widget. private InstallationWorkflow select_workflow (InstallJob job) { - if (job.tinker_game_context != null) + if (job.mode == InstallJob.Mode.TINKER_GAME) return tinker_game_workflow; if (job.steam_tinker_launch_context != null) return steam_tinker_launch_workflow; diff --git a/src/services/installation-workflow.vala b/src/services/installation-workflow.vala index a7d30583..4ecee27d 100644 --- a/src/services/installation-workflow.vala +++ b/src/services/installation-workflow.vala @@ -19,11 +19,9 @@ namespace ProtonPlus.Services { /// place without making workflows depend on InstallationService directly. public interface InstallationOperationCoordinator : Object { public abstract async ReturnCode install_for_update (InstallJob job); - } - /* Workflows call this only after their top-level update transaction has - * completed. Test coordinators need not implement lifecycle recording. */ - public interface InstallationLifecycleRecorder : Object { - public abstract void record_completed_update (InstallJob job); + /* Called only after a top-level update transaction completed. Test + * coordinators need not record lifecycle. */ + public virtual void record_completed_update (InstallJob job) {} } } diff --git a/src/services/meson.build b/src/services/meson.build index 89050beb..795f5377 100644 --- a/src/services/meson.build +++ b/src/services/meson.build @@ -6,7 +6,6 @@ sources += files( 'compatibility-process-guard.vala', 'archive-workflow-support.vala', 'steam-tinker-launch-context.vala', - 'tinker-game-context.vala', 'tinker-game-workflow.vala', 'tinker-game-migration.vala', 'steam-tinker-launch-yad-compatibility.vala', diff --git a/src/services/standard-archive-workflow.vala b/src/services/standard-archive-workflow.vala index 70720e1f..3c9ed7f9 100644 --- a/src/services/standard-archive-workflow.vala +++ b/src/services/standard-archive-workflow.vala @@ -311,9 +311,7 @@ namespace ProtonPlus.Services { var code = yield finalize_replaced_runner (job.install_location, backup, migrate_prefix); job.finish_operation (); if (code == ReturnCode.RUNNER_UPDATED) { - var lifecycle = coordinator as InstallationLifecycleRecorder; - if (lifecycle != null) - lifecycle.record_completed_update (job); + coordinator.record_completed_update (job); } return code; } diff --git a/src/services/steam-tinker-launch-workflow.vala b/src/services/steam-tinker-launch-workflow.vala index 4763738c..339fde9d 100644 --- a/src/services/steam-tinker-launch-workflow.vala +++ b/src/services/steam-tinker-launch-workflow.vala @@ -203,9 +203,7 @@ namespace ProtonPlus.Services { job.finish_operation (); if (code != ReturnCode.RUNNER_INSTALLED) return code; - var lifecycle = coordinator as InstallationLifecycleRecorder; - if (lifecycle != null) - lifecycle.record_completed_update (job); + coordinator.record_completed_update (job); return ReturnCode.RUNNER_UPDATED; } diff --git a/src/services/tinker-game-context.vala b/src/services/tinker-game-context.vala deleted file mode 100644 index 3466d255..00000000 --- a/src/services/tinker-game-context.vala +++ /dev/null @@ -1,9 +0,0 @@ -namespace ProtonPlus.Services { - public class TinkerGameContext : Object { - public string install_location { get; private set; } - public TinkerGameContext (Models.Tool tool, string? location = null) { - install_location = location ?? Path.build_filename ( - tool.group.launcher.get_primary_managed_tool_directory (tool.group), "TinkerGame"); - } - } -} diff --git a/src/services/tinker-game-migration.vala b/src/services/tinker-game-migration.vala index 8608f761..d4232828 100644 --- a/src/services/tinker-game-migration.vala +++ b/src/services/tinker-game-migration.vala @@ -9,7 +9,7 @@ namespace ProtonPlus.Services { job.state == InstallJob.State.BUSY_REMOVING) return ReturnCode.OPERATION_IN_PROGRESS; job.refresh_state (); - if (job.tinker_game_context == null || job.state != InstallJob.State.UP_TO_DATE) + if (job.mode != InstallJob.Mode.TINKER_GAME || job.state != InstallJob.State.UP_TO_DATE) return ReturnCode.RUNNER_NOT_INSTALLED; if (!yield TinkerGameWorkflow.validate_runtime_async (job.install_location, true)) return ReturnCode.INVALID_DATA; diff --git a/src/services/tinker-game-workflow.vala b/src/services/tinker-game-workflow.vala index b012cab7..7e129e65 100644 --- a/src/services/tinker-game-workflow.vala +++ b/src/services/tinker-game-workflow.vala @@ -3,7 +3,7 @@ namespace ProtonPlus.Services { // registration rollback are therefore the same atomic directory transaction. public class TinkerGameWorkflow : StandardArchiveWorkflow { public override ReturnCode validate_install (InstallJob job, bool replace_existing) { - if (job.tinker_game_context == null) + if (job.mode != InstallJob.Mode.TINKER_GAME) return ReturnCode.INVALID_CONFIGURATION; if (Globals.IS_STEAM_OS || Globals.IS_FLATPAK || job.tool.group.launcher.installation_type != Models.Launcher.InstallationTypes.SYSTEM) { @@ -218,9 +218,7 @@ namespace ProtonPlus.Services { job.finish_operation (); if (result != ReturnCode.RUNNER_INSTALLED) return result; - var recorder = coordinator as InstallationLifecycleRecorder; - if (recorder != null) - recorder.record_completed_update (job); + coordinator.record_completed_update (job); return ReturnCode.RUNNER_UPDATED; } diff --git a/src/utils/filesystem.vala b/src/utils/filesystem.vala index df024f97..9b03c12d 100644 --- a/src/utils/filesystem.vala +++ b/src/utils/filesystem.vala @@ -190,10 +190,6 @@ namespace ProtonPlus.Utils { } } - public static string convert_bytes_to_string (int64 size) { - return format_size (size); - } - public async static bool make_symlink (string link_location, string target_path) { var link_file = File.new_for_path (link_location); if (link_file.query_exists (null)) { diff --git a/src/utils/system.vala b/src/utils/system.vala index ead0b931..330e79f0 100644 --- a/src/utils/system.vala +++ b/src/utils/system.vala @@ -265,24 +265,6 @@ namespace ProtonPlus.Utils { } } - public static string run_command_sync (string command) { - string output = ""; - try { - var argv = get_command_argv (command); - - var subprocess = new Subprocess.newv (argv, SubprocessFlags.STDOUT_PIPE | SubprocessFlags.STDERR_MERGE); - Bytes stdout_bytes; - subprocess.communicate (null, null, out stdout_bytes, null); - - if (stdout_bytes != null) - output = Parser.data_to_string (stdout_bytes.get_data ()); - } catch (Error e) { - warning (e.message); - } - - return output; - } - /* This remains a command-execution seam, but callers can distinguish * an unavailable read-only host query from a successful empty result. */ public static CommandResult run_command_sync_result (string command) { @@ -463,8 +445,8 @@ namespace ProtonPlus.Utils { if (!Globals.IS_FLATPAK) return Environment.find_program_in_path (name) != null; - var output = run_command_sync ("which %s".printf (Shell.quote (name))); - return output != "" && !output.contains ("which: no"); + var result = run_command_sync_result ("which %s".printf (Shell.quote (name))); + return result.exit_status == 0 && result.stdout != "" && !result.stdout.contains ("which: no"); } public static GpuVendor get_gpu_vendor_from_pci_devices (string pci_devices) { diff --git a/src/widgets/games/launch-options-editor/groups/base-options-group.vala b/src/widgets/games/launch-options-editor/groups/base-options-group.vala index 4ddb4544..d2fe1eef 100644 --- a/src/widgets/games/launch-options-editor/groups/base-options-group.vala +++ b/src/widgets/games/launch-options-editor/groups/base-options-group.vala @@ -7,8 +7,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor.Groups { protected bool presentation_movable; LaunchOptionCatalog catalog; public signal void changed (); - public signal void advanced_changed (); - internal bool is_advanced_group { get; set; default = false; } public BaseOptionsGroup ( diff --git a/src/widgets/games/launch-options-editor/groups/gpu-vendor-nvidia-options-group.vala b/src/widgets/games/launch-options-editor/groups/gpu-vendor-nvidia-options-group.vala index 291eaa9e..b570547d 100644 --- a/src/widgets/games/launch-options-editor/groups/gpu-vendor-nvidia-options-group.vala +++ b/src/widgets/games/launch-options-editor/groups/gpu-vendor-nvidia-options-group.vala @@ -12,9 +12,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor.Groups { public GpuVendorNvidiaOptionsGroup (LaunchOptionsList launch_option_handlers, LaunchOptionPresentationRegistry? presentation_registry = null) { base (launch_option_handlers, true, presentation_registry, false); nvapi_tile = create_tile ("nvidia-nvapi"); - // gpu_vendor_bindings.append (new LaunchOptionBinding ({ "PROTON_ENABLE_NVAPI=1" }, nvapi_tile.toggle)); nvidia_ngx_updater_tile = create_tile ("nvidia-dlss-updater"); - // gpu_vendor_bindings.append (new LaunchOptionBinding ({ "PROTON_ENABLE_NGX_UPDATER=1" }, nvidia_ngx_updater_tile.toggle)); nvidia_hide_gpu_tile = create_tile ("nvidia-report-amd"); dlss_indicator_tile = create_tile ("nvidia-dlss-indicator"); nvidia_libs_tile = create_tile ("nvidia-libraries"); diff --git a/src/widgets/games/launch-options-editor/launch-command-composer.vala b/src/widgets/games/launch-options-editor/launch-command-composer.vala index 9a923119..6ecc7478 100644 --- a/src/widgets/games/launch-options-editor/launch-command-composer.vala +++ b/src/widgets/games/launch-options-editor/launch-command-composer.vala @@ -467,7 +467,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { var values = selection.get_values (); /* Composite metadata can declare an automatic form through its * selectable value. That form emits only fixed outputs. */ - if (values.length == 1 && values[0] == "auto" && contains (semantics.selectable_values, "auto")) { + if (values.length == 1 && values[0] == "auto" && "auto" in semantics.selectable_values) { foreach (var output in automatic_outputs) { foreach (var token in output.fixed_tokens) { if (output.environment_key == "" || !safe (diagnostics, selection.option_id, token)) @@ -513,7 +513,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { void add_selected_wrapper (ArrayList diagnostics, string option_id, string wrapper_id, string[] allowed, LaunchCommandCapabilityContext capabilities, HashMap selected) { - if (wrapper_id == "" || !contains (allowed, wrapper_id) || catalog.lookup_wrapper (wrapper_id) == null) { + if (wrapper_id == "" || !(wrapper_id in allowed) || catalog.lookup_wrapper (wrapper_id) == null) { add (diagnostics, LaunchCommandCompositionDiagnosticCode.INVALID_WRAPPER_SELECTION, option_id, "Launch option '%s' has an invalid wrapper selection.".printf (option_id)); return; } @@ -579,7 +579,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { void append_fixed_tokens (ArrayList diagnostics, string id, string[] tokens, ArrayList output) { foreach (var token in tokens) if (safe (diagnostics, id, token)) output.add (token); } bool valid_selectable (ArrayList diagnostics, string id, string value, string[] selectable) { - if (selectable.length == 0 || contains (selectable, value)) return true; + if (selectable.length == 0 || value in selectable) return true; add (diagnostics, LaunchCommandCompositionDiagnosticCode.UNSUPPORTED_SELECTABLE_VALUE, id, "Value '%s' is not selectable for '%s'.".printf (value, id)); return false; } @@ -609,7 +609,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { } output.add (raw); } - bool contains (string[] values, string value) { foreach (var candidate in values) if (candidate == value) return true; return false; } void add (ArrayList diagnostics, LaunchCommandCompositionDiagnosticCode code, string id, string message) { diagnostics.add (new LaunchCommandCompositionDiagnostic (code, id, message)); } diff --git a/src/widgets/games/launch-options-editor/launch-command-parser.vala b/src/widgets/games/launch-options-editor/launch-command-parser.vala index e5503bc4..0614ba57 100644 --- a/src/widgets/games/launch-options-editor/launch-command-parser.vala +++ b/src/widgets/games/launch-options-editor/launch-command-parser.vala @@ -361,7 +361,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { break; } if (entry.semantics.kind == LaunchOptionSemanticKind.WRAPPER_SELECTOR - && contains (entry.semantics.selectable_wrapper_ids, invocation.wrapper_id)) + && invocation.wrapper_id in entry.semantics.selectable_wrapper_ids) owner = entry; } if (owner == null) @@ -482,7 +482,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { if (invocation.wrapper_id == semantics.wrapper_id && invocation.argument_indexes.size > 0) has_owner_arguments = true; } - if (!matched_arguments && !has_owner_arguments && contains (semantics.selectable_values, "auto")) { + if (!matched_arguments && !has_owner_arguments && "auto" in semantics.selectable_values) { var automatic_indexes = new ArrayList (); automatic_indexes.add (environment_index); result.occurrences.add (new LaunchCommandOptionOccurrence ( @@ -689,14 +689,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { return string.joinv (",", values.to_array ()); } - bool contains (string[] values, string candidate) { - foreach (var value in values) { - if (value == candidate) - return true; - } - return false; - } - void add_diagnostic ( LaunchCommandParseResult result, LaunchCommandParseDiagnosticCode code, string message, int token_index = -1 diff --git a/src/widgets/games/launch-options-editor/launch-command-writer.vala b/src/widgets/games/launch-options-editor/launch-command-writer.vala index dfb20809..6df80f1f 100644 --- a/src/widgets/games/launch-options-editor/launch-command-writer.vala +++ b/src/widgets/games/launch-options-editor/launch-command-writer.vala @@ -564,18 +564,12 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { if (semantics.wrapper_id == wrapper_id) return true; if (semantics.kind == LaunchOptionSemanticKind.WRAPPER_SELECTOR - && contains (semantics.selectable_wrapper_ids, wrapper_id)) + && wrapper_id in semantics.selectable_wrapper_ids) return true; } return false; } - bool contains (string[] values, string candidate) { - foreach (var value in values) - if (value == candidate) return true; - return false; - } - bool is_environment (LaunchCommandOptionOccurrence occurrence) { return occurrence.semantic_kind == LaunchOptionSemanticKind.ENVIRONMENT_ASSIGNMENT; } diff --git a/src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala b/src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala index 03b8d0c1..c532d381 100644 --- a/src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala +++ b/src/widgets/games/launch-options-editor/launch-option-capability-resolver.vala @@ -281,11 +281,11 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { if (semantics == null) return values; foreach (var capability in semantics.get_required_capabilities ()) - if (!contains_capability (values, capability)) + if (!(capability in values)) values = append_capability (values, capability); if (semantics.wrapper_id != "") { var wrapper = catalog.lookup_wrapper (semantics.wrapper_id); - if (wrapper != null && !contains_capability (values, wrapper.required_capability)) + if (wrapper != null && !(wrapper.required_capability in values)) values = append_capability (values, wrapper.required_capability); } return values; @@ -301,12 +301,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { return expanded; } - bool contains_capability (LaunchOptionCapability[] values, LaunchOptionCapability capability) { - foreach (var value in values) - if (value == capability) return true; - return false; - } - LaunchOptionEligibilityKind kind_for (LaunchOptionCapability capability) { switch (capability) { case LaunchOptionCapability.AMD: diff --git a/src/widgets/games/launch-options-editor/launch-options-option-catalog.vala b/src/widgets/games/launch-options-editor/launch-options-option-catalog.vala index cdcb63b0..98940ebe 100644 --- a/src/widgets/games/launch-options-editor/launch-options-option-catalog.vala +++ b/src/widgets/games/launch-options-editor/launch-options-option-catalog.vala @@ -554,7 +554,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { var other = lookup (conflict_id); if (other == null || other.semantics == null) continue; - if (!contains_id (other.semantics.conflicts, entry.id) + if (!(entry.id in other.semantics.conflicts) && (semantics.conflict_group == "" || semantics.conflict_group != other.semantics.conflict_group)) diagnostics.add ("Conflict '%s' declared by '%s' is not reciprocal.".printf (conflict_id, entry.id)); } @@ -565,14 +565,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { } } - bool contains_id (string[] values, string id) { - foreach (var value in values) { - if (value == id) - return true; - } - return false; - } - void add_option ( string id, string title, string description, LaunchOptionCategory category, uint rank, string[] raw_tokens, string[] aliases = {}, @@ -1179,7 +1171,7 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { diagnostics.add ("Game argument '%s' has an incompatible emission mode.".printf (entry.id)); if (semantics.kind == LaunchOptionSemanticKind.WRAPPER_ARGUMENT) { var wrapper = lookup_wrapper (semantics.wrapper_id); - if (wrapper != null && !has_capability (semantics.get_required_capabilities (), wrapper.required_capability)) + if (wrapper != null && !(wrapper.required_capability in semantics.get_required_capabilities ())) diagnostics.add ("Wrapper argument '%s' does not require wrapper capability '%s'.".printf (entry.id, semantics.wrapper_id)); } validate_parse_shape (entry.id, semantics.parse_shape, diagnostics); @@ -1204,14 +1196,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor { } } - bool has_capability (LaunchOptionCapability[] capabilities, LaunchOptionCapability capability) { - foreach (var candidate in capabilities) { - if (candidate == capability) - return true; - } - return false; - } - void validate_composite_outputs ( LaunchOptionMetadata entry, LaunchOptionSemantics semantics, Gee.List diagnostics diff --git a/src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala b/src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala index e51d41c8..0631daa3 100644 --- a/src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala +++ b/src/widgets/games/launch-options-editor/wrappers/scopebuddy.vala @@ -98,7 +98,6 @@ namespace ProtonPlus.Widgets.Games.LaunchOptionsEditor.Wrappers { this.add_child (auto_vrr_tile); this.add_child (framerate_tile); this.add_child (resolution_field); - // this.add_child (args_field); cached_page = group; return group; diff --git a/src/widgets/header/header-downloads-indicator.vala b/src/widgets/header/header-downloads-indicator.vala index 5988f265..58c1ce30 100644 --- a/src/widgets/header/header-downloads-indicator.vala +++ b/src/widgets/header/header-downloads-indicator.vala @@ -170,7 +170,7 @@ namespace ProtonPlus.Widgets.Header { private void update_limit_label (int64 speed_limit_bps) { if (speed_limit_bps > 0) - limit_label.set_label (_("Limit: %s/s").printf (Utils.Filesystem.convert_bytes_to_string (speed_limit_bps))); + limit_label.set_label (_("Limit: %s/s").printf (format_size (speed_limit_bps))); else limit_label.set_label (""); } @@ -323,7 +323,7 @@ namespace ProtonPlus.Widgets.Header { var speed = "--"; if (job.step == Services.InstallJob.Step.DOWNLOADING) { - speed = "%s/s".printf (Utils.Filesystem.convert_bytes_to_string ( + speed = "%s/s".printf (format_size ( (int64) (job.speed_kbps * 1024) )); } diff --git a/src/widgets/header/header-presentation.vala b/src/widgets/header/header-presentation.vala index d2f47c94..a82c80f3 100644 --- a/src/widgets/header/header-presentation.vala +++ b/src/widgets/header/header-presentation.vala @@ -6,7 +6,6 @@ namespace ProtonPlus.Widgets.Header { public weak Gtk.Widget? back_widget { get; private set; } public signal void back_requested (); - public signal void back_widget_changed (Gtk.Widget? widget); public Presentation (Gtk.Widget title_widget, bool can_navigate_back = true) { this.title_widget = title_widget; @@ -27,7 +26,6 @@ namespace ProtonPlus.Widgets.Header { if (back_widget == widget) return; back_widget = widget; - back_widget_changed (widget); } } } diff --git a/src/widgets/tools/tools-release-row.vala b/src/widgets/tools/tools-release-row.vala index a46f6206..249a8872 100644 --- a/src/widgets/tools/tools-release-row.vala +++ b/src/widgets/tools/tools-release-row.vala @@ -247,7 +247,7 @@ namespace ProtonPlus.Widgets.Tools { } bool has_legacy_installation () { - if (job.tinker_game_context == null) + if (job.mode != Services.InstallJob.Mode.TINKER_GAME) return false; foreach (var tool in job.tool.group.tools) if (tool is Models.Tools.SteamTinkerLaunch && tool.is_installed ()) @@ -695,7 +695,7 @@ namespace ProtonPlus.Widgets.Tools { bool supports_update_check () { return job.mode == Services.InstallJob.Mode.LATEST || - job.steam_tinker_launch_context != null || job.tinker_game_context != null; + job.mode == Services.InstallJob.Mode.TINKER_GAME || job.steam_tinker_launch_context != null; } int usage_count () { @@ -992,7 +992,7 @@ namespace ProtonPlus.Widgets.Tools { } speed_label.set_label (job.download_phase != Utils.Web.DownloadPhase.DOWNLOADING ? job.download_status : _("Speed: %s/s").printf ( - Utils.Filesystem.convert_bytes_to_string ( + format_size ( (int64) (job.speed_kbps * 1024) ) )); diff --git a/tests/downloads-presentation-test.vala b/tests/downloads-presentation-test.vala index 205b8093..686cf115 100644 --- a/tests/downloads-presentation-test.vala +++ b/tests/downloads-presentation-test.vala @@ -198,7 +198,7 @@ int main (string[] args) { check_stacked_layout (content, job); var status = check_complete_label (content, "63%"); var speed = "%s/s".printf ( - Utils.Filesystem.convert_bytes_to_string ((int64) (job.speed_kbps * 1024))); + format_size ((int64) (job.speed_kbps * 1024))); var metrics_text = "%s · %s".printf (speed, etas[i]); var metrics = check_complete_label (content, metrics_text); assert (metrics.label == metrics_text); diff --git a/tests/system-path-test.vala b/tests/system-path-test.vala index a6189ede..a378c098 100644 --- a/tests/system-path-test.vala +++ b/tests/system-path-test.vala @@ -29,6 +29,7 @@ namespace AppTests.SystemPathTest { Test.add_func ("/system/flatpak-dependency/exact-id", test_flatpak_exact_id); Test.add_func ("/system/flatpak-dependency/command-status", test_flatpak_command_status); Test.add_func ("/system/components/native-command-detection", test_native_command_detection); + Test.add_func ("/system/components/flatpak-host-command-detection", test_flatpak_host_command_detection); Test.add_func ("/system/components/flatpak-snapshot", test_flatpak_snapshot); Test.add_func ("/system/components/scopebuddy-alias", test_scopebuddy_alias); } @@ -82,6 +83,42 @@ namespace AppTests.SystemPathTest { assert (calls == 1); } + private void test_flatpak_host_command_detection () { + if (!Test.subprocess ()) { + Test.trap_subprocess (null, 5000000, TestSubprocessFlags.DEFAULT); + Test.trap_assert_passed (); + return; + } + + // Exercise the real host probe with a fixture on the child's PATH. + try { + var root = DirUtils.make_tmp ("protonplus-host-command-test-XXXXXX"); + var spawn = Path.build_filename (root, "flatpak-spawn"); + FileUtils.set_contents (spawn, """#!/bin/sh +[ "$1" = --host ] && [ "$2" = which ] || exit 2 +case "$3" in + present) printf '/usr/bin/present\n'; printf 'host warning\n' >&2 ;; + spawn-error) printf 'host command could not start\n' >&2; exit 1 ;; + command-error) printf 'host command failed\n'; exit 1 ;; +esac +"""); + assert (Posix.chmod (spawn, 0700) == 0); + Environment.set_variable ("PATH", root, true); + ProtonPlus.Globals.IS_FLATPAK = true; + var present = ProtonPlus.Utils.System.check_dependency_sync ("present"); + var found_after_spawn_error = ProtonPlus.Utils.System.check_dependency_sync ("spawn-error"); + var found_after_command_error = ProtonPlus.Utils.System.check_dependency_sync ("command-error"); + + FileUtils.unlink (spawn); + DirUtils.remove (root); + assert (present); + assert (!found_after_spawn_error); + assert (!found_after_command_error); + } catch (Error e) { + error ("%s", e.message); + } + } + private void test_flatpak_snapshot () { var backend = new FixtureComponentDetectionBackend (new CommandResult ( MANGOHUD_ID + "\n" + MANGOHUD_ID + "\ncom.github.Matoking.protontricks\n" +