Skip to content

Commit 8bbe559

Browse files
authored
[UI/UX] Fix some issues when uninstalling games (#1950)
* Fix library status after uninstall, prevent some actions during unintall * Update i18n
1 parent 7c30d0b commit 8bbe559

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+85
-13
lines changed

public/locales/az/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"queued": "Queued",
171171
"reparing": "Oyun Təmir edilir, zəhmət olmasa gözləyin",
172172
"totalDownloaded": "Toplam Endirilib",
173+
"uninstalling": "Uninstalling",
173174
"updating": "Oyun Yenilənir"
174175
},
175176
"submenu": {

public/locales/be/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Ідзе рамонт гульні, пачакайце",
171171
"totalDownloaded": "Усяго спампавана",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Абнаўленне гульні"
173174
},
174175
"submenu": {

public/locales/bg/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Поправяне на играта; моля, изчакайте",
171171
"totalDownloaded": "Общо свалено",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Обновяване на играта"
173174
},
174175
"submenu": {

public/locales/bs/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"queued": "Queued",
171171
"reparing": "Popravljanje video igre, molimo čekajte",
172172
"totalDownloaded": "Ukupno preuzeto",
173+
"uninstalling": "Uninstalling",
173174
"updating": "Ažuriranje video igre"
174175
},
175176
"submenu": {

public/locales/ca/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "S'està reparant el joc. Espereu.",
171171
"totalDownloaded": "Total baixat",
172+
"uninstalling": "Uninstalling",
172173
"updating": "S'està actualitzant el joc"
173174
},
174175
"submenu": {

public/locales/cs/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Opravuji hru, čekejte prosím",
171171
"totalDownloaded": "Celkově staženo",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Aktualizuji hru"
173174
},
174175
"submenu": {

public/locales/de/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Spiel wird repariert, bitte warten",
171171
"totalDownloaded": "Insgesamt heruntergeladen",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Spiel wird aktualisiert"
173174
},
174175
"submenu": {

public/locales/el/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Επιδιόρθωση παιχνιδιού, παρακαλώ περιμένετε",
171171
"totalDownloaded": "Σύνολο ληφθέντων",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Ενημέρωση παιχνιδιού"
173174
},
174175
"submenu": {

public/locales/en/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Repairing Game, please wait",
171171
"totalDownloaded": "Total Downloaded",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Updating Game"
173174
},
174175
"submenu": {

public/locales/es/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Reparando el juego, por favor espere",
171171
"totalDownloaded": "Total descargado",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Actualización de juego"
173174
},
174175
"submenu": {

public/locales/et/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Mängu parandamine, palun oodake",
171171
"totalDownloaded": "Allalaaditud kokku",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Mängu uuendamine"
173174
},
174175
"submenu": {

public/locales/eu/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"queued": "Queued",
171171
"reparing": "Jokoaren konponketa, mesedez",
172172
"totalDownloaded": "Deskargatutakoa, guztira",
173+
"uninstalling": "Uninstalling",
173174
"updating": "Jokoa eguneratzea"
174175
},
175176
"submenu": {

public/locales/fa/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "در حال تعمیر بازی، لطفا صبر کنید",
171171
"totalDownloaded": "حجم کل دانلود شده",
172+
"uninstalling": "Uninstalling",
172173
"updating": "در حال به روزرسانی بازی"
173174
},
174175
"submenu": {

public/locales/fi/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Korjataan peliä, odota",
171171
"totalDownloaded": "Ladattu yhteensä",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Päivitetään peliä"
173174
},
174175
"submenu": {

public/locales/fr/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Réparation du jeu en cours, veuillez patienter",
171171
"totalDownloaded": "Total Téléchargé",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Mise à jour du jeu en cours"
173174
},
174175
"submenu": {

public/locales/gl/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Reparando xogo, agarda",
171171
"totalDownloaded": "Total descargado",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Actualización do xogo"
173174
},
174175
"submenu": {

public/locales/hr/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Popravljanje igrice, molimo pričekajte",
171171
"totalDownloaded": "Sveukupno preuzeto",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Ažuriranje igrice"
173174
},
174175
"submenu": {

public/locales/hu/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Játék javítása, kérlek várj",
171171
"totalDownloaded": "Teljesen letöltve",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Játék frissítése"
173174
},
174175
"submenu": {

public/locales/id/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Memperbaiki Gim, harap tunggu",
171171
"totalDownloaded": "Jumlah yang Diunduh",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Memperbarui Gim"
173174
},
174175
"submenu": {

public/locales/it/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Riparazione del gioco in corso, per favore attendi",
171171
"totalDownloaded": "Totale scaricato",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Aggiornamento in corso"
173174
},
174175
"submenu": {

public/locales/ja/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "ゲームを修復しています、お待ちください",
171171
"totalDownloaded": "ダウンロードの総数",
172+
"uninstalling": "Uninstalling",
172173
"updating": "ゲームを更新しています"
173174
},
174175
"submenu": {

public/locales/ko/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "게임을 복구 중입니다, 잠시만 기다려 주세요",
171171
"totalDownloaded": "총 다운로드",
172+
"uninstalling": "Uninstalling",
172173
"updating": "게임 업데이트 중"
173174
},
174175
"submenu": {

public/locales/ml/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "കളി നന്നാക്കുന്നു, ഒന്നു കാക്കൂ",
171171
"totalDownloaded": "ആകെ ഇറക്കിയെടുത്തത്",
172+
"uninstalling": "Uninstalling",
172173
"updating": "കളി പുതുക്കുന്നു"
173174
},
174175
"submenu": {

public/locales/nb_NO/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"queued": "Queued",
171171
"reparing": "Reparerer spillet, vennligst vent",
172172
"totalDownloaded": "Totalt nedlastede",
173+
"uninstalling": "Uninstalling",
173174
"updating": "Oppdaterer spillet"
174175
},
175176
"submenu": {

public/locales/nl/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Spel aan het repareren, even geduld",
171171
"totalDownloaded": "Totaal gedownload",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Spel aan het updaten"
173174
},
174175
"submenu": {

public/locales/pl/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Naprawianie gry, proszę czekać",
171171
"totalDownloaded": "Łącznie pobrane",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Aktualizowanie gry"
173174
},
174175
"submenu": {

public/locales/pt/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Reparando jogo, por favor espere",
171171
"totalDownloaded": "Total Baixado",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Atualizando jogo"
173174
},
174175
"submenu": {

public/locales/pt_BR/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Reparando Jogo, Por favor Aguarde",
171171
"totalDownloaded": "Total Baixado",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Atualizando Jogo"
173174
},
174175
"submenu": {

public/locales/ro/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"queued": "Queued",
171171
"reparing": "Reparare joc, vă rugăm așteptați",
172172
"totalDownloaded": "Descărcat total",
173+
"uninstalling": "Uninstalling",
173174
"updating": "Joc in curs de actualizare"
174175
},
175176
"submenu": {

public/locales/ru/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Восстановление игры. Пожалуйста, подождите",
171171
"totalDownloaded": "Всего загружено",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Обновление игры"
173174
},
174175
"submenu": {

public/locales/sk/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Oprava hry, čakajte prosím",
171171
"totalDownloaded": "Celkom stiahnutých",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Aktualizácia hry"
173174
},
174175
"submenu": {

public/locales/sv/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Reparerar spelet, vänligen vänta",
171171
"totalDownloaded": "Nedladdning",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Updaterar spelet"
173174
},
174175
"submenu": {

public/locales/ta/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "விளையாட்டு பழுதுபார்க்கப்படுகிறது, தயவுசெய்து காத்திருக்கவும்",
171171
"totalDownloaded": "மொத்த பதிவிறக்கம்",
172+
"uninstalling": "Uninstalling",
172173
"updating": "விளையாட்டு புதுப்பிக்கப்படுகிறது"
173174
},
174175
"submenu": {

public/locales/tr/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Oyun onarılıyor, lütfen bekleyin",
171171
"totalDownloaded": "Toplam İndirilen",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Oyun Güncelleniyor"
173174
},
174175
"submenu": {

public/locales/uk/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Відновлюю гру, будь ласка зачекайте",
171171
"totalDownloaded": "Всього завантажено",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Оновлюю гру"
173174
},
174175
"submenu": {

public/locales/vi/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "Đang sửa game, vui lòng đợi",
171171
"totalDownloaded": "Tổng số đã tải",
172+
"uninstalling": "Uninstalling",
172173
"updating": "Đang cập nhật Game"
173174
},
174175
"submenu": {

public/locales/zh_Hans/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "正在修复游戏,请稍等",
171171
"totalDownloaded": "下载总计",
172+
"uninstalling": "Uninstalling",
172173
"updating": "游戏更新中"
173174
},
174175
"submenu": {

public/locales/zh_Hant/gamepage.json

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
"queued": "Queued",
170170
"reparing": "遊戲修復中,請稍等",
171171
"totalDownloaded": "總共已下載",
172+
"uninstalling": "Uninstalling",
172173
"updating": "遊戲更新中"
173174
},
174175
"submenu": {

src/backend/api/library.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ export const uninstall = async (
1515
const [appName, shouldRemovePrefix, runner] = args
1616
if (runner === 'sideload') {
1717
return ipcRenderer.invoke('removeApp', { appName, shouldRemovePrefix })
18+
} else {
19+
return ipcRenderer.invoke('uninstall', args)
1820
}
19-
ipcRenderer.invoke('uninstall', args)
2021
}
2122
export const repair = async (appName: string, runner: Runner) =>
2223
ipcRenderer.invoke('repair', appName, runner)

src/frontend/screens/Game/GamePage/index.tsx

+27-10
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ export default function GamePage(): JSX.Element | null {
9999
const isQueued = status === 'queued'
100100
const isReparing = status === 'repairing'
101101
const isMoving = status === 'moving'
102+
const isUninstalling = status === 'uninstalling'
102103

103104
const backRoute = location.state?.fromDM ? '/download-manager' : '/'
104105

@@ -390,6 +391,16 @@ export default function GamePage(): JSX.Element | null {
390391
</div>
391392
<TimeContainer game={appName} />
392393
<div className="gameStatus">
394+
{isUninstalling && (
395+
<p
396+
style={{
397+
color: 'var(--danger)',
398+
fontStyle: 'italic'
399+
}}
400+
>
401+
{t('status.uninstalling', 'Uninstalling')}
402+
</p>
403+
)}
393404
{isInstalling ||
394405
(isUpdating && (
395406
<progress
@@ -427,15 +438,15 @@ export default function GamePage(): JSX.Element | null {
427438
<Anticheat gameInfo={gameInfo} />
428439
<div className="buttonsWrapper">
429440
{is_installed && (
430-
<>
431-
<button
432-
disabled={isReparing || isMoving || isUpdating}
433-
onClick={handlePlay()}
434-
className={`button ${getPlayBtnClass()}`}
435-
>
436-
{getPlayLabel()}
437-
</button>
438-
</>
441+
<button
442+
disabled={
443+
isReparing || isMoving || isUpdating || isUninstalling
444+
}
445+
onClick={handlePlay()}
446+
className={`button ${getPlayBtnClass()}`}
447+
>
448+
{getPlayLabel()}
449+
</button>
439450
)}
440451
{is_installed ? (
441452
<Link
@@ -454,7 +465,13 @@ export default function GamePage(): JSX.Element | null {
454465
) : (
455466
<button
456467
onClick={async () => handleInstall(is_installed)}
457-
disabled={isPlaying || isUpdating || isReparing || isMoving}
468+
disabled={
469+
isPlaying ||
470+
isUpdating ||
471+
isReparing ||
472+
isMoving ||
473+
isUninstalling
474+
}
458475
className={`button ${getButtonClass(is_installed)}`}
459476
>
460477
{`${getButtonLabel(is_installed)}`}

0 commit comments

Comments
 (0)