organize ui

src/main/events/library/add-game-to-library.ts

@@ -11,8 +11,7 @@ const addGameToLibrary = async (
   _event: Electron.IpcMainInvokeEvent,
   objectID: string,
   title: string,
-  shop: GameShop,
+  shop: GameShop
-  executablePath: string | null
 ) => {
   return gameRepository
     .update(
@@ -22,7 +21,6 @@ const addGameToLibrary = async (
       {
         shop,
         status: null,
-        executablePath,
         isDeleted: false,
       }
     )
@@ -42,7 +40,6 @@ const addGameToLibrary = async (
             iconUrl,
             objectID,
             shop,
-            executablePath,
           })
           .then(() => {
             if (iconUrl) {

src/preload/index.ts

@@ -61,19 +61,8 @@ contextBridge.exposeInMainWorld("electron", {
   syncDownloadSources: () => ipcRenderer.invoke("syncDownloadSources"),
 
   /* Library */
-  addGameToLibrary: (
+  addGameToLibrary: (objectID: string, title: string, shop: GameShop) =>
-    objectID: string,
+    ipcRenderer.invoke("addGameToLibrary", objectID, title, shop),
-    title: string,
-    shop: GameShop,
-    executablePath: string
-  ) =>
-    ipcRenderer.invoke(
-      "addGameToLibrary",
-      objectID,
-      title,
-      shop,
-      executablePath
-    ),
   createGameShortcut: (id: number) =>
     ipcRenderer.invoke("createGameShortcut", id),
   updateExecutablePath: (id: number, executablePath: string) =>

src/renderer/src/declaration.d.ts

@@ -56,8 +56,7 @@ declare global {
     addGameToLibrary: (
       objectID: string,
       title: string,
-      shop: GameShop,
+      shop: GameShop
-      executablePath: string | null
     ) => Promise<void>;
     createGameShortcut: (id: number) => Promise<boolean>;
     updateExecutablePath: (id: number, executablePath: string) => Promise<void>;

src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx

@@ -79,12 +79,7 @@ export function HeroPanelActions() {
       if (game) {
         await removeGameFromLibrary(game.id);
       } else {
-        await window.electron.addGameToLibrary(
+        await window.electron.addGameToLibrary(objectID!, gameTitle, "steam");
-          objectID!,
-          gameTitle,
-          "steam",
-          null
-        );
       }
 
       updateLibrary();

src/renderer/src/pages/game-details/modals/game-options-modal.tsx

@@ -11,6 +11,7 @@ import { gameDetailsContext } from "../game-details.context";
 import {
   FileDirectoryOpenFillIcon,
   FileSymlinkFileIcon,
+  PencilIcon,
   TrashIcon,
 } from "@primer/octicons-react";
 import { DeleteGameModal } from "@renderer/pages/downloads/delete-game-modal";
@@ -54,6 +55,7 @@ export function GameOptionsModal({
 
   const handleDeleteGame = async () => {
     await removeGameInstaller(game.id);
+    updateGame();
   };
 
   const handleOpenGameInstallerPath = async () => {
@@ -78,9 +80,18 @@ export function GameOptionsModal({
             display: "flex",
             flexDirection: "column",
             gap: `${SPACING_UNIT}px`,
-            width: "700px",
+            width: "100%",
           }}
         >
+          <div className={styles.downloadSourceField}>
+            <Button
+              onClick={openRepacksModal}
+              theme="outline"
+              disabled={deleting}
+            >
+              {t("open_download_options")}
+            </Button>
+          </div>
           <div className={styles.downloadSourceField}>
             <TextField
               label="Caminho do executável"
@@ -90,37 +101,44 @@ export function GameOptionsModal({
               disabled
               placeholder="Selecione um executável"
             />
-          </div>
-
-          <div className={styles.downloadSourceField}>
-            <Button
-              type="button"
-              theme="outline"
-              style={{ alignSelf: "flex-end" }}
-              onClick={handleOpenGameExecutablePath}
-            >
-              <FileDirectoryOpenFillIcon />
-              {"Abrir pasta"}
-            </Button>
-
             <Button
               type="button"
               theme="outline"
               style={{ alignSelf: "flex-end" }}
               onClick={handleChangeExecutableLocation}
+              title={
+                game.executablePath
+                  ? "Trocar executável"
+                  : "Selecionar executável"
+              }
             >
-              <FileSymlinkFileIcon />
+              <PencilIcon />
-              {"Alterar"}
             </Button>
             <Button
-              onClick={handleCreateShortcut}
+              type="button"
               theme="outline"
-              disabled={deleting}
+              style={{ alignSelf: "flex-end" }}
+              onClick={handleOpenGameExecutablePath}
+              disabled={!game.executablePath}
+              title={"Abrir pasta"}
             >
-              {"Criar atalho"}
+              <FileDirectoryOpenFillIcon />
+            </Button>
+
+            <Button
+              onClick={handleCreateShortcut}
+              style={{ alignSelf: "flex-end" }}
+              theme="outline"
+              disabled={deleting || !game.executablePath}
+              title={"Criar atalho"}
+            >
+              <FileSymlinkFileIcon />
             </Button>
           </div>
 
+          <div className={styles.downloadSourceField}></div>
+
+          {game.folderName && (
             <div className={styles.downloadSourceField}>
               <TextField
                 label="Caminho do instalador"
@@ -136,32 +154,25 @@ export function GameOptionsModal({
                 theme="outline"
                 style={{ alignSelf: "flex-end" }}
                 onClick={handleOpenGameInstallerPath}
+                disabled={!game.downloadPath}
+                title={"Abrir pasta"}
               >
                 <FileDirectoryOpenFillIcon />
-              {"Abrir pasta"}
               </Button>
               <Button
                 type="button"
                 theme="outline"
                 style={{ alignSelf: "flex-end" }}
+                disabled={!game.downloadPath}
                 onClick={() => {
                   setShowDeleteModal(true);
                 }}
+                title={"Remover instalador"}
               >
                 <TrashIcon />
-              {"Remover"}
-            </Button>
-          </div>
-
-          <div className={styles.downloadSourceField}>
-            <Button
-              onClick={openRepacksModal}
-              theme="outline"
-              disabled={deleting}
-            >
-              {t("open_download_options")}
               </Button>
             </div>
+          )}
         </div>
       </Modal>
     </>