Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UX/Tech] Use Proton-GE instead of Wine-GE as default and as recommended #4185

Merged
merged 1 commit into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 2 additions & 5 deletions src/backend/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
20 changes: 10 additions & 10 deletions src/frontend/screens/WineManager/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -57,14 +57,14 @@ export default function WineManager(): JSX.Element | null {
}

const [repository, setRepository] = useState<WineManagerUISettings>(
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 }
])

Expand Down Expand Up @@ -114,20 +114,20 @@ export default function WineManager(): JSX.Element | null {
case 'Wine-GE':
return (
<div className="infoBox">
<FontAwesomeIcon icon={faCheck} color={'green'} />
<FontAwesomeIcon icon={faWarning} color={'orange'} />
{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.'
)}
</div>
)
case 'Proton-GE':
return (
<div className="infoBox">
<FontAwesomeIcon icon={faWarning} color={'orange'} />
<FontAwesomeIcon icon={faCheck} color={'green'} />
{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).'
)}
</div>
)
Expand Down
Loading