Merge branch 'dev' into early-unstable

EmuDeck · Sep 7, 2024 · 7c1833d · 7c1833d
2 parents e609041 + f346f37
commit 7c1833d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EmuDeck",
-  "version": "2.2.33",
+  "version": "2.2.34",
   "description": "Play all your RetroGames",
   "license": "MIT",
   "author": {

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -520,8 +520,8 @@ export default function App() {
       deckyromlauncher: {
         id: 'deckyromlauncher',
         status: true,
-        name: 'Rom Library',
-        desc: 'A separate Rom Library that does not interfiere with your Games Library. All games and artwork are detected automatically.',
+        name: 'Retro Library',
+        desc: 'A separate Retro Library that does not interfiere with your Games Library. All games and artwork are detected automatically.',
       },
 
       steam: {
@@ -543,7 +543,7 @@ export default function App() {
       multiemulator: 'ra',
       dreamcast: 'multiemulator',
     },
-    controllerLayout: 'bayx',
+    controllerLayout: 'baxy',
     revertParsers: false,
     resolutions: {
       dolphin: '720P',

diff --git a/src/renderer/components b/src/renderer/components
diff --git a/src/renderer/pages/CloudSyncConfigPage.jsx b/src/renderer/pages/CloudSyncConfigPage.jsx
@@ -159,6 +159,7 @@ function CloudSyncPageConfig() {
     ipcChannel.sendMessage('emudeck', [`cloudSyncHealth|||cloudSyncHealth`]);
 
     ipcChannel.once('cloudSyncHealth', (message) => {
+      console.log({ message });
       const { stdout } = message;
       let modalData;
       if (stdout.includes('true')) {

diff --git a/src/renderer/pages/DeckyRomLauncherInstallPage.jsx b/src/renderer/pages/DeckyRomLauncherInstallPage.jsx
@@ -89,7 +89,7 @@ function DeckyRomLauncherInstallPage() {
   const installDeckyRomLauncher = () => {
     const modalData = {
       active: true,
-      header: <span className="h4">Installing Rom Library</span>,
+      header: <span className="h4">Installing Retro Library</span>,
       body: <p>Please wait while we install the plugin</p>,
       footer: <ProgressBar css="progress--success" infinite max="100" />,
       css: 'emumodal--xs',
@@ -111,7 +111,7 @@ function DeckyRomLauncherInstallPage() {
         modalData = {
           active: true,
           header: <span className="h4">Success!</span>,
-          body: <p>Rom Library Installed</p>,
+          body: <p>Retro Library Installed</p>,
           css: 'emumodal--xs',
         };
 
@@ -171,7 +171,7 @@ function DeckyRomLauncherInstallPage() {
 
   return (
     <Wrapper>
-      <Header title="Configure Rom Library" />
+      <Header title="Configure Retro Library" />
       <DeckyRomLauncher
         installClick={installDeckyRomLauncher}
         sudoPass={sudoPass}

diff --git a/src/renderer/pages/DeckyRomLauncherPage.jsx b/src/renderer/pages/DeckyRomLauncherPage.jsx
@@ -91,7 +91,7 @@ function DeckyRomLauncherPage() {
   const installDeckyRomLauncher = () => {
     const modalData = {
       active: true,
-      header: <span className="h4">Installing Rom Library</span>,
+      header: <span className="h4">Installing Retro Library</span>,
       body: <p>Please wait while we install the plugin</p>,
       footer: <ProgressBar css="progress--success" infinite max="100" />,
       css: 'emumodal--xs',
@@ -113,7 +113,7 @@ function DeckyRomLauncherPage() {
         modalData = {
           active: true,
           header: <span className="h4">Success!</span>,
-          body: <p>Rom Library Installed</p>,
+          body: <p>Retro Library Installed</p>,
           css: 'emumodal--xs',
         };
 
@@ -158,7 +158,7 @@ function DeckyRomLauncherPage() {
 
   return (
     <Wrapper>
-      <Header title="Configure Rom Library" />
+      <Header title="Configure Retro Library" />
       <DeckyRomLauncher
         installClick={installDeckyRomLauncher}
         sudoPass={sudoPass}

diff --git a/src/renderer/pages/FinishPage.jsx b/src/renderer/pages/FinishPage.jsx
@@ -21,7 +21,11 @@ function FinishPage() {
 
   return (
     <Wrapper aside={second === true}>
-      <Header title={`${t('FinishPage.title')}<img src=${yoshi} alt="" />`} />
+      <Header
+        title={`${t(
+          'FinishPage.title'
+        )}<img src=${yoshi} style="width:30px" alt="" />`}
+      />
       <Main>
         <p className="lead">
           {t('FinishPage.line1')}

diff --git a/src/renderer/pages/FrontendSelectorPage.jsx b/src/renderer/pages/FrontendSelectorPage.jsx
@@ -25,7 +25,7 @@ const images = {
 function FrontendSelectorPage() {
   const { t, i18n } = useTranslation();
   const { state, setState } = useContext(GlobalContext);
-  const { device, installFrontends, mode, system } = state;
+  const { device, installFrontends, mode, system, branch } = state;
 
   const [statePage, setStatePage] = useState({
     disabledNext: false,
@@ -215,7 +215,7 @@ function FrontendSelectorPage() {
   }, [installFrontends]);
 
   const nextPage = () => {
-    if (installFrontends.deckyromlauncher.status) {
+    if (installFrontends.deckyromlauncher.status && branch != 'main') {
       return 'decky-rom-launcher-install';
     }
     if (installFrontends.pegasus.status && installFrontends.esde.status) {