From 8153acfbaae0559d5ce3ad2810b579f4cb4d63b8 Mon Sep 17 00:00:00 2001 From: Ariel Juodziukynas Date: Thu, 19 Dec 2024 17:39:43 -0300 Subject: [PATCH] Use Proton-GE instead of Wine-GE as default and as recommended --- public/locales/en/translation.json | 4 ++-- src/backend/utils.ts | 7 ++----- src/frontend/screens/WineManager/index.tsx | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index bdcac18ef2..c262da7478 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -911,8 +911,8 @@ "size": "Size" }, "wineExplanation": { - "proton-ge": "Proton-GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used in Steam, but some games outside Steam may work better with this variant. It provides mostly useless logs for troubleshooting.", - "wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It is the recommended Wine to be used outside Steam. This provides useful logs when troubleshooting." + "proton-ge": "Proton-GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).", + "wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of Proton-GE with the UMU launcher." }, "winetricks": { "install": "Install", diff --git a/src/backend/utils.ts b/src/backend/utils.ts index 753f43fac0..d7950a98c0 100644 --- a/src/backend/utils.ts +++ b/src/backend/utils.ts @@ -917,13 +917,10 @@ export async function downloadDefaultWine() { await updateWineVersionInfos(true) // get list of wines on wineDownloaderInfoStore const availableWine = wineDownloaderInfoStore.get('wine-releases', []) - // use Wine-GE type if on Linux and Wine-Crossover if on Mac + // use Proton-GE type if on Linux and GamePortingToolkit if on Mac const release = availableWine.filter((version) => { if (isLinux) { - return ( - version.version.includes('Wine-GE-Proton') && - !version.version.endsWith('-LoL') - ) + return version.version.includes('Proton-GE-Proton') } else if (isMac) { return version.version.includes('Game-Porting-Toolkit') } diff --git a/src/frontend/screens/WineManager/index.tsx b/src/frontend/screens/WineManager/index.tsx index b75fb64f3b..cd81c40e7f 100644 --- a/src/frontend/screens/WineManager/index.tsx +++ b/src/frontend/screens/WineManager/index.tsx @@ -45,9 +45,9 @@ export default function WineManager(): JSX.Element | null { useContext(ContextProvider) const isLinux = platform === 'linux' - const winege: WineManagerUISettings = { - type: 'Wine-GE', - value: 'winege', + const protonge: WineManagerUISettings = { + type: 'Proton-GE', + value: 'protonge', enabled: isLinux } const gamePortingToolkit: WineManagerUISettings = { @@ -57,14 +57,14 @@ export default function WineManager(): JSX.Element | null { } const [repository, setRepository] = useState( - isLinux ? winege : gamePortingToolkit + isLinux ? protonge : gamePortingToolkit ) const [wineManagerSettings, setWineManagerSettings] = useState< WineManagerUISettings[] >([ + protonge, { type: 'Wine-GE', value: 'winege', enabled: isLinux }, - { type: 'Proton-GE', value: 'protonge', enabled: isLinux }, - { type: 'Game-Porting-Toolkit', value: 'gpt', enabled: !isLinux }, + gamePortingToolkit, { type: 'Wine-Crossover', value: 'winecrossover', enabled: !isLinux } ]) @@ -114,20 +114,20 @@ export default function WineManager(): JSX.Element | null { case 'Wine-GE': return (
- + {t( 'wineExplanation.wine-ge', - 'Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It is the recommended Wine to be used outside Steam. This provides useful logs when troubleshooting.' + 'Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of Proton-GE with the UMU launcher.' )}
) case 'Proton-GE': return (
- + {t( 'wineExplanation.proton-ge', - 'Proton-GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used in Steam, but some games outside Steam may work better with this variant. It provides mostly useless logs for troubleshooting.' + 'Proton-GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the UMU launcher (default in Heroic).' )}
)