Skip to content

[UI/UX] Sidebar Improvements, consistency fixes and Advanced Settings #1199

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

Merged
merged 12 commits into from
Apr 11, 2022
40 changes: 30 additions & 10 deletions electron/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import { DXVK, Winetricks } from './tools'
import { Game } from './games'
import { GameConfig } from './game_config'
import { GlobalConfig } from './config'
import { LegendaryLibrary, runLegendaryCommand } from './legendary/library'
import { LegendaryLibrary } from './legendary/library'
import { LegendaryUser } from './legendary/user'
import { GOGUser } from './gog/user'
import { GOGLibrary } from './gog/library'
Expand Down Expand Up @@ -1144,21 +1144,35 @@ ipcMain.handle('egsSync', async (event, args) => {
if (isWindows) {
const egl_manifestPath =
'C:\\ProgramData\\Epic\\EpicGamesLauncher\\Data\\Manifests'

if (!existsSync(egl_manifestPath)) {
mkdirSync(egl_manifestPath, { recursive: true })
}
}

let legendaryArgs = Array<string>()
if (args !== 'unlink') {
legendaryArgs = isWindows
? ['--enable-sync']
: ['--enable-sync', `--egl-wine-prefix ${args}`]
} else {
legendaryArgs = ['--unlink']
}
const linkArgs = isWindows
? `--enable-sync`
: `--enable-sync --egl-wine-prefix ${args}`
const unlinkArgs = `--unlink`
const isLink = args !== 'unlink'
const command = isLink ? linkArgs : unlinkArgs
const { bin, dir } = getLegendaryBin()
const legendary = path.join(dir, bin)

return runLegendaryCommand(['egl-sync', ...legendaryArgs, '-y'])
try {
const { stderr, stdout } = await execAsync(
`${legendary} egl-sync ${command} -y`
)
logInfo(`${stdout}`, LogPrefix.Legendary)
if (stderr.includes('ERROR')) {
logError(`${stderr}`, LogPrefix.Legendary)
return 'Error'
}
return `${stdout} - ${stderr}`
} catch (error) {
logError(`${error}`, LogPrefix.Legendary)
return 'Error'
}
})

ipcMain.on(
Expand Down Expand Up @@ -1307,6 +1321,12 @@ ipcMain.handle('gamepadAction', async (event, args) => {
}
})

/*
Other Keys that should go into translation files:
t('box.error.generic.title')
t('box.error.generic.message')
*/

/*
* INSERT OTHER IPC HANLDER HERE
*/
Expand Down
1 change: 1 addition & 0 deletions public/locales/bg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Журналът е отрязан. Показани са последните 1000 реда!"
},
"navbar": {
"advanced": "Advanced",
"general": "Общи",
"log": "Log",
"other": "Други",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ca/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "S'ha truncat el registre, es mostren les últimes 1.000 línies."
},
"navbar": {
"advanced": "Advanced",
"general": "General",
"log": "Registre",
"other": "Altres",
Expand Down
1 change: 1 addition & 0 deletions public/locales/cs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "Obecné",
"log": "Log",
"other": "Ostatní",
Expand Down
1 change: 1 addition & 0 deletions public/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log abgeschnitten, die letzten 1000 Zeilen werden angezeigt!"
},
"navbar": {
"advanced": "Advanced",
"general": "Allgemein",
"log": "Log",
"other": "Andere",
Expand Down
1 change: 1 addition & 0 deletions public/locales/el/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Το αρχείο καταγραφής ελαττώθηκε, εμφάνιση τελευταίων 1000 γραμμών!"
},
"navbar": {
"advanced": "Advanced",
"general": "Γενικά",
"log": "Log",
"other": "Άλλα",
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "General",
"log": "Log",
"other": "Other",
Expand Down
1 change: 1 addition & 0 deletions public/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Registro truncado. ¡Se mostrarán las últimas 1000 líneas!"
},
"navbar": {
"advanced": "Advanced",
"general": "General",
"log": "Registro",
"other": "Otro",
Expand Down
1 change: 1 addition & 0 deletions public/locales/et/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Logi on kärbitud, näidatakse viimased 1000 rida!"
},
"navbar": {
"advanced": "Advanced",
"general": "Üldine",
"log": "Logi",
"other": "Muu",
Expand Down
13 changes: 7 additions & 6 deletions public/locales/fa/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"choose": "انتخاب",
"choose-egs-prefix": "انتخاب محل نصب شده EGS",
"choose-gogdl-binary": "انتخاب باینری GOGDL (نیازمند راه‌اندازی مجدد)",
"choose-gogdl-binary": "انتخاب باینری GOGDL (نیازمند راهاندازی مجدد)",
"choose-legendary-binary": "انتخاب باینری Legendary",
"customWine": "انتخاب فایل باینری Wine یا Proton",
"default-install-path": "انتخاب محل پیشفرض نصب",
Expand All @@ -36,7 +36,7 @@
"launch": "خطا در هنگام اجرای بازی، لاگها را چک کنید!",
"no-offline-mode": {
"message": "اجرا متوقف شد! بازی برای اجرا به اتصال اینترنت نیاز دارد.",
"title": "حالت آفلاین پشتیبانی نمی‌شود."
"title": "حالت آفلاین پشتیبانی نمیشود."
},
"title": "خطا",
"wine-not-found": {
Expand Down Expand Up @@ -97,7 +97,7 @@
},
"Downloading": "در حال دانلود",
"epic": {
"offline-notification-body": "به علت آفلاین بودن سرورهای اپیک گیمز سرویس‌های آنلاین ممکن است کار نکنند!",
"offline-notification-body": "به علت آفلاین بودن سرورهای اپیک گیمز سرویسهای آنلاین ممکن است کار نکنند!",
"offline-notification-title": "offline"
},
"Epic Games": "اپیک گیمز",
Expand Down Expand Up @@ -217,7 +217,7 @@
"setting": {
"adddesktopshortcuts": "افزودن خودکار میانبرهای دسکتاپ",
"addgamestostartmenu": "افزودن خودکار میانبرهای منوی استارت",
"alt-gogdl-bin": "انتخاب باینری GOGDL جایگزین برای استفاده (نیازمند راه‌اندازی مجدد)",
"alt-gogdl-bin": "انتخاب باینری GOGDL جایگزین برای استفاده (نیازمند راهاندازی مجدد)",
"alt-legendary-bin": "انتخاب باینری Legendary جایگزین (نیازمند راهاندازی مجدد)",
"audiofix": "تنظیم صدا (تاخیر Pulse Audio)",
"autodxvk": "نصب/بهروزرسانی خودکار DXVK در Prefix",
Expand Down Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "لاگ کوتاه شد، ١٠٠٠ خط آخر نمایش داده شدهاند!"
},
"navbar": {
"advanced": "Advanced",
"general": "عمومی",
"log": "Log",
"other": "بقیه",
Expand All @@ -297,7 +298,7 @@
"logging": "در حال وارد شدن..."
},
"store": "فروشگاه اپیک",
"stores": "فروشگاه‌ها",
"stores": "فروشگاهها",
"title": {
"allGames": "همه بازیها",
"allUnreal": "Unreal - همهچیز",
Expand Down Expand Up @@ -332,7 +333,7 @@
"discord": "Discord",
"logout": "خروج از حساب",
"logout_confirmation": "آیا میخواهید از حساب خود خارج شوید؟",
"manageaccounts": "مدیریت حساب‌ها",
"manageaccounts": "مدیریت حسابها",
"quit": "خروج"
},
"webview": {
Expand Down
1 change: 1 addition & 0 deletions public/locales/fi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Loki typistetty, viimeiset 1000 riviä näytetään!"
},
"navbar": {
"advanced": "Advanced",
"general": "Yleiset",
"log": "Log",
"other": "Muut",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "Général",
"log": "Log",
"other": "Autre",
Expand Down
1 change: 1 addition & 0 deletions public/locales/gl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "Xeral",
"log": "Log",
"other": "Outro",
Expand Down
1 change: 1 addition & 0 deletions public/locales/hr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "",
"log": "Log",
"other": "",
Expand Down
1 change: 1 addition & 0 deletions public/locales/hu/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "A napló rövidítve van, az utolsó 1000 sor van megjelenítve!"
},
"navbar": {
"advanced": "Advanced",
"general": "Általános",
"log": "Napló",
"other": "Egyéb",
Expand Down
1 change: 1 addition & 0 deletions public/locales/id/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log terpotong, 1000 baris terakhir akan ditampilkan!"
},
"navbar": {
"advanced": "Advanced",
"general": "Umum",
"log": "Log",
"other": "Lainnya",
Expand Down
1 change: 1 addition & 0 deletions public/locales/it/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "Generale",
"log": "Log",
"other": "Altro",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "一般",
"log": "Log",
"other": "他",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ko/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "로그 잘림, 마지막 1000줄이 표시됩니다!"
},
"navbar": {
"advanced": "Advanced",
"general": "일반",
"log": "Log",
"other": "기타",
Expand Down
3 changes: 2 additions & 1 deletion public/locales/ml/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"platform": ""
},
"help": {
"general": "എപിക് ഗെയിം കടയുടെ കുഴപ്പമൊന്നുില്ലാത്ത ഒരു നടീല്\u200d മറ്റെവിടെയെങ്കിലും ഉണ്ടെങ്കില്\u200d നിങ്ങളുടെ കളികള്\u200d വീണ്ടും ഇറക്കിയെടുക്കുന്നത് ഒഴിവാക്കാനായി EGSുമായി ഒന്നിപ്പിക്കുക.",
"general": "എപിക് ഗെയിം കടയുടെ കുഴപ്പമൊന്നുില്ലാത്ത ഒരു നടീല് മറ്റെവിടെയെങ്കിലും ഉണ്ടെങ്കില് നിങ്ങളുടെ കളികള് വീണ്ടും ഇറക്കിയെടുക്കുന്നത് ഒഴിവാക്കാനായി EGSുമായി ഒന്നിപ്പിക്കുക.",
"other": {
"part1": "കളി ഓടിക്കുന്നതിനുമുന്പുള്ള വിളികള്ക്കായി ",
"part2": "ഉയര്ന്ന ക്രമീകരണങ്ങള്",
Expand Down Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "പൊതുവായവ",
"log": "Log",
"other": "മറ്റുള്ളവ",
Expand Down
1 change: 1 addition & 0 deletions public/locales/nl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "Algemeen",
"log": "Log",
"other": "Overig",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log skrócony, wyświetlam ostatnie 1000 linijek!"
},
"navbar": {
"advanced": "Advanced",
"general": "Główne",
"log": "Log",
"other": "Inne",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "Geral",
"log": "Log",
"other": "Outros",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt_BR/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncado, últimas 1000 linhas serão mostradas!"
},
"navbar": {
"advanced": "Advanced",
"general": "Config. Gerais",
"log": "Log",
"other": "Outros",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Журнал урезан, показаны последние 1000 строк!"
},
"navbar": {
"advanced": "Advanced",
"general": "Основные",
"log": "Журнал",
"other": "Другие",
Expand Down
1 change: 1 addition & 0 deletions public/locales/sv/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Loggen avkortad , enbart senaste 1000 rader visas!"
},
"navbar": {
"advanced": "Advanced",
"general": "Allmänt",
"log": "Logg",
"other": "Övrigt",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ta/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "பொதுவானவை",
"log": "Log",
"other": "மற்றவை",
Expand Down
1 change: 1 addition & 0 deletions public/locales/tr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Günlük kısaltıldı, son 1000 satır gösteriliyor!"
},
"navbar": {
"advanced": "Advanced",
"general": "Genel",
"log": "Log",
"other": "Diğer",
Expand Down
1 change: 1 addition & 0 deletions public/locales/uk/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Лог усічений, показані останні 1000 рядків!"
},
"navbar": {
"advanced": "Advanced",
"general": "Загальні",
"log": "Лог",
"other": "Інше",
Expand Down
1 change: 1 addition & 0 deletions public/locales/vi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log bị cắt ngắn, hiển thị 1000 dòng cuối!"
},
"navbar": {
"advanced": "Advanced",
"general": "Tổng quan",
"log": "Log",
"other": "Khác",
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh_Hans/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "日志被截断,显示最后 1000 行!"
},
"navbar": {
"advanced": "Advanced",
"general": "常规",
"log": "Log",
"other": "其它",
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh_Hant/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
"long-log-hint": "Log truncated, last 1000 lines are shown!"
},
"navbar": {
"advanced": "Advanced",
"general": "一般",
"log": "Log",
"other": "其它",
Expand Down
4 changes: 2 additions & 2 deletions src/components/UI/FormControl/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
font-size: 14px;
text-transform: uppercase;
font-weight: 600;
color: var(--text-default);
color: var(--accent);
}

.FormControl--segmented > button:not(:disabled):hover {
Expand All @@ -79,7 +79,7 @@

.FormControl--segmented > button:not(.non-important):active,
.FormControl--segmented > button:not(.non-important).active {
color: var(--accent);
color: var(--text-default);
}

.FormControl--segmented > button:not(:first-child) {
Expand Down
Loading