diff --git a/src/renderer/components/available-versions/available-version-item.component.tsx b/src/renderer/components/available-versions/available-version-item.component.tsx index fea4a672..59103549 100644 --- a/src/renderer/components/available-versions/available-version-item.component.tsx +++ b/src/renderer/components/available-versions/available-version-item.component.tsx @@ -1,6 +1,5 @@ import { BSVersion } from "main/services/bs-version-manager.service"; import './available-version-item.component.css'; -import { SteamIcon } from "../svgs/steam-icon.component"; import { useEffect, useState, memo } from "react"; import { BsDownloaderService } from "renderer/services/bs-downloader.service"; import { distinctUntilChanged } from "rxjs"; @@ -9,6 +8,7 @@ import dateFormat from "dateformat"; import { BsmImage } from "../shared/bsm-image.component"; import { IpcService } from "renderer/services/ipc.service"; import { useTranslation } from "renderer/hooks/use-translation.hook"; +import { BsmIcon } from "../svgs/bsm-icon.component"; export const AvailableVersionItem = memo(function AvailableVersionItem(props: {version: BSVersion}) { @@ -51,7 +51,7 @@ export const AvailableVersionItem = memo(function AvailableVersionItem(props: {v { props.version.ReleaseURL && ( { e.stopPropagation(); openReleasePage(); }} className="relative flex flex-row justify-between items-center rounded-full bg-black bg-opacity-30 text-white pb-[1px] hover:bg-opacity-50"> - + {t("pages.available-versions.steam-release")} )} diff --git a/src/renderer/components/nav-bar/bs-version-item.component.tsx b/src/renderer/components/nav-bar/bs-version-item.component.tsx index 060d4a8b..a77cdddb 100644 --- a/src/renderer/components/nav-bar/bs-version-item.component.tsx +++ b/src/renderer/components/nav-bar/bs-version-item.component.tsx @@ -1,7 +1,5 @@ import { BSVersion } from "main/services/bs-version-manager.service"; import { Link, useLocation } from "react-router-dom"; -import { BsNoteFill } from "../svgs/bs-note-fill.component"; -import { SteamIcon } from "../svgs/steam-icon.component"; import { BsDownloaderService } from "renderer/services/bs-downloader.service"; import { useEffect, useState } from "react"; import { combineLatest } from "rxjs"; @@ -10,6 +8,7 @@ import { ConfigurationService } from "renderer/services/configuration.service"; import { BsmButton } from "../shared/bsm-button.component"; import { BSUninstallerService } from "renderer/services/bs-uninstaller.service"; import { BSVersionManagerService } from "renderer/services/bs-version-manager.service"; +import { BsmIcon } from "../svgs/bsm-icon.component"; export function BsVersionItem(props: {version: BSVersion}) { @@ -29,7 +28,6 @@ export function BsVersionItem(props: {version: BSVersion}) { } const handleDoubleClick = () => { - if(state.steam){ return; } launcherService.launch( state, !!configService.get(LaunchMods.OCULUS_MOD), @@ -63,12 +61,12 @@ export function BsVersionItem(props: {version: BSVersion}) { return ( -
+
- {props.version.steam && } - {!props.version.steam && } + {props.version.steam && } + {!props.version.steam && } {props.version.BSVersion} {downloading && } @@ -76,6 +74,4 @@ export function BsVersionItem(props: {version: BSVersion}) {
) -} - -// className={`z-[1] flex cursor-pointer w-full justify-center content-center rounded-full items-center p-[3px] pl-2 pr-2 active:translate-y-[1px] hover:bg-light-main-color-3 dark:hover:bg-main-color-3 ${downloading && 'bg-black'} ${(isActive() && !downloading) && "bg-light-main-color-3 dark:bg-main-color-3"}`} +} \ No newline at end of file diff --git a/src/renderer/components/svgs/bsm-icon.component.tsx b/src/renderer/components/svgs/bsm-icon.component.tsx index bcfaa6bc..38a9f23c 100644 --- a/src/renderer/components/svgs/bsm-icon.component.tsx +++ b/src/renderer/components/svgs/bsm-icon.component.tsx @@ -1,19 +1,27 @@ -import { SettingIcon } from "./setting-icon.component" -import { TrashIcon } from "./trash-icon.component" -import { FavoriteIcon } from "./favorite-icon.component" -import { FolderIcon } from "./folder-icon.component"; -import { BsNoteFill } from "./bs-note-fill.component"; -import { TerminalIcon } from "./terminal-icon.component"; -import { DesktopIcon } from "./desktop-icon.component"; -import { OculusIcon } from "./oculus-icon.component"; -import { AddIcon } from "./add-icon.component"; -import CrossIcon from "./cross-icon.component"; +import { SettingIcon } from "./icons/setting-icon.component" +import { TrashIcon } from "./icons/trash-icon.component" +import { FavoriteIcon } from "./icons/favorite-icon.component" +import { FolderIcon } from "./icons/folder-icon.component"; +import { BsNoteFill } from "./icons/bs-note-fill.component"; +import { TerminalIcon } from "./icons/terminal-icon.component"; +import { DesktopIcon } from "./icons/desktop-icon.component"; +import { OculusIcon } from "./icons/oculus-icon.component"; +import { AddIcon } from "./icons/add-icon.component"; +import CrossIcon from "./icons/cross-icon.component"; import { FranceIcon } from "./flags/france-icon.component"; import { SpainIcon } from "./flags/spain-icon.component"; import { UsaIcon } from "./flags/usa-icon.component"; import { UkIcon } from "./flags/uk-icon.component"; +import { TaskIcon } from "./icons/task-icon.component"; +import { CopyIcon } from "./icons/copy-icon.component"; +import { SteamIcon } from "./icons/steam-icon.component"; -export type BsmIconType = "settings"|"trash"|"favorite"|"folder"|"bsNote"|"terminal"|"desktop"|"oculus"|"add"|"cross"|"fr-FR-flag"|"es-ES-flag"|"en-US-flag"|"en-EN-flag"; +export type BsmIconType = ( + "settings"|"trash"|"favorite"|"folder"|"bsNote"| + "terminal"|"desktop"|"oculus"|"add"|"cross"|"task"| + "copy"|"steam"| + "fr-FR-flag"|"es-ES-flag"|"en-US-flag"|"en-EN-flag" +); export function BsmIcon({className, icon}: {className?: string, icon: BsmIconType}) { @@ -32,6 +40,10 @@ export function BsmIcon({className, icon}: {className?: string, icon: BsmIconTyp if(icon === "es-ES-flag"){ return } if(icon === "en-US-flag"){ return } if(icon === "en-EN-flag"){ return } + if(icon === "task"){ return } + if(icon === "copy"){ return } + if(icon === "steam"){ return } + return } return ( diff --git a/src/renderer/components/svgs/add-icon.component.tsx b/src/renderer/components/svgs/icons/add-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/add-icon.component.tsx rename to src/renderer/components/svgs/icons/add-icon.component.tsx diff --git a/src/renderer/components/svgs/bs-note-fill.component.tsx b/src/renderer/components/svgs/icons/bs-note-fill.component.tsx similarity index 100% rename from src/renderer/components/svgs/bs-note-fill.component.tsx rename to src/renderer/components/svgs/icons/bs-note-fill.component.tsx diff --git a/src/renderer/components/svgs/icons/copy-icon.component.tsx b/src/renderer/components/svgs/icons/copy-icon.component.tsx new file mode 100644 index 00000000..4ad4ef40 --- /dev/null +++ b/src/renderer/components/svgs/icons/copy-icon.component.tsx @@ -0,0 +1,7 @@ +export function CopyIcon(props: {className?: string}) { + return ( + + + + ) +} diff --git a/src/renderer/components/svgs/cross-icon.component.tsx b/src/renderer/components/svgs/icons/cross-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/cross-icon.component.tsx rename to src/renderer/components/svgs/icons/cross-icon.component.tsx diff --git a/src/renderer/components/svgs/desktop-icon.component.tsx b/src/renderer/components/svgs/icons/desktop-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/desktop-icon.component.tsx rename to src/renderer/components/svgs/icons/desktop-icon.component.tsx diff --git a/src/renderer/components/svgs/favorite-icon.component.tsx b/src/renderer/components/svgs/icons/favorite-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/favorite-icon.component.tsx rename to src/renderer/components/svgs/icons/favorite-icon.component.tsx diff --git a/src/renderer/components/svgs/folder-icon.component.tsx b/src/renderer/components/svgs/icons/folder-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/folder-icon.component.tsx rename to src/renderer/components/svgs/icons/folder-icon.component.tsx diff --git a/src/renderer/components/svgs/oculus-icon.component.tsx b/src/renderer/components/svgs/icons/oculus-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/oculus-icon.component.tsx rename to src/renderer/components/svgs/icons/oculus-icon.component.tsx diff --git a/src/renderer/components/svgs/setting-icon.component.tsx b/src/renderer/components/svgs/icons/setting-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/setting-icon.component.tsx rename to src/renderer/components/svgs/icons/setting-icon.component.tsx diff --git a/src/renderer/components/svgs/steam-icon.component.tsx b/src/renderer/components/svgs/icons/steam-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/steam-icon.component.tsx rename to src/renderer/components/svgs/icons/steam-icon.component.tsx diff --git a/src/renderer/components/svgs/icons/task-icon.component.tsx b/src/renderer/components/svgs/icons/task-icon.component.tsx new file mode 100644 index 00000000..d02c002c --- /dev/null +++ b/src/renderer/components/svgs/icons/task-icon.component.tsx @@ -0,0 +1,7 @@ +export function TaskIcon(props: {className?: string}) { + return ( + + + + ) +} diff --git a/src/renderer/components/svgs/terminal-icon.component.tsx b/src/renderer/components/svgs/icons/terminal-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/terminal-icon.component.tsx rename to src/renderer/components/svgs/icons/terminal-icon.component.tsx diff --git a/src/renderer/components/svgs/trash-icon.component.tsx b/src/renderer/components/svgs/icons/trash-icon.component.tsx similarity index 100% rename from src/renderer/components/svgs/trash-icon.component.tsx rename to src/renderer/components/svgs/icons/trash-icon.component.tsx