TagSpaces is an offline, open source, document manager with tagging support
chore: refactoring items and menus
Ilian Sapundshiev8fa97f21a10d
diff --git a/src/renderer/components/CommonIcons.tsx b/src/renderer/components/CommonIcons.tsxindex 0c82bd513..524773274 100644--- a/src/renderer/components/CommonIcons.tsx+++ b/src/renderer/components/CommonIcons.tsx@@ -72,7 +72,7 @@ export { default as OpenNewWindowIcon } from '@mui/icons-material/OpenInBrowser'export { default as ReloadIcon } from '@mui/icons-material/Refresh';-export { default as DeleteIcon } from '@mui/icons-material/DeleteForever';+export { default as DeleteIcon } from '@mui/icons-material/Delete';export { default as LinkIcon } from '@mui/icons-material/Link';@@ -135,3 +135,5 @@ export { default as PauseIcon } from '@mui/icons-material/Pause';export { default as SaveIcon } from '@mui/icons-material/Save';export { default as DownloadIcon } from '@mui/icons-material/DownloadForOffline';++export { default as TagIcon } from '@mui/icons-material/LocalOffer';diff --git a/src/renderer/components/menus/DirectoryMenu.tsx b/src/renderer/components/menus/DirectoryMenu.tsxindex ee0ec618f..e8e7de53f 100644--- a/src/renderer/components/menus/DirectoryMenu.tsx+++ b/src/renderer/components/menus/DirectoryMenu.tsx@@ -18,7 +18,7 @@import React, { useRef } from 'react';import { useDispatch } from 'react-redux';-import Menu from '@mui/material/Menu';+import { Menu, MenuList } from '@mui/material';import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';import AppConfig from '-/AppConfig';import {@@ -440,24 +440,22 @@ Do you want to continue?`));return (- <div style={{ overflowY: 'hidden' }}>- <Menu- anchorEl={anchorEl}- open={open}- onClose={onClose}- anchorReference={mouseY && mouseX ? 'anchorPosition' : undefined}- anchorPosition={- mouseY && mouseX ? { top: mouseY, left: mouseX } : undefined- }- >- {menuItems}- </Menu>+ <Menu+ anchorEl={anchorEl}+ open={open}+ onClose={onClose}+ anchorReference={mouseY && mouseX ? 'anchorPosition' : undefined}+ anchorPosition={+ mouseY && mouseX ? { top: mouseY, left: mouseX } : undefined+ }+ >+ <MenuList>{menuItems}</MenuList><FileUploadContainerid="dirMenuId"ref={fileUploadContainerRef}directoryPath={directoryPath}/>- </div>+ </Menu>);}diff --git a/src/renderer/components/menus/FileMenu.tsx b/src/renderer/components/menus/FileMenu.tsxindex 0cba242f5..c74085e2b 100644--- a/src/renderer/components/menus/FileMenu.tsx+++ b/src/renderer/components/menus/FileMenu.tsx@@ -20,14 +20,12 @@ import React from 'react';import ListItemIcon from '@mui/material/ListItemIcon';import ListItemText from '@mui/material/ListItemText';import ShareIcon from '@mui/icons-material/Share';-import Menu from '@mui/material/Menu';-import MenuItem from '@mui/material/MenuItem';+import { Menu, MenuList, MenuItem } from '@mui/material';import Divider from '@mui/material/Divider';import OpenFile from '@mui/icons-material/SubdirectoryArrowRight';import OpenFileNatively from '@mui/icons-material/Launch';import { ParentFolderIcon } from '-/components/CommonIcons';import OpenFolderInternally from '@mui/icons-material/Folder';-import AddRemoveTags from '@mui/icons-material/Loyalty';import MoveCopy from '@mui/icons-material/FileCopy';import MoveToTopIcon from '@mui/icons-material/VerticalAlignTop';import MoveToBottomIcon from '@mui/icons-material/VerticalAlignBottom';@@ -54,6 +52,7 @@ import {OpenNewWindowIcon,DeleteIcon,LinkIcon,+ TagIcon,} from '-/components/CommonIcons';import PropertiesIcon from '@mui/icons-material/Info';import { useTranslation } from 'react-i18next';@@ -379,7 +378,7 @@ function FileMenu(props: Props) {onClick={showAddRemoveTagsDialog}><ListItemIcon>- <AddRemoveTags />+ <TagIcon /></ListItemIcon><ListItemText primary={t('core:addRemoveTags')} /><MenuKeyBinding keyBinding={keyBindings['addRemoveTags']} />@@ -562,7 +561,7 @@ function FileMenu(props: Props) {open={open}onClose={onClose}>- {menuItems}+ <MenuList>{menuItems}</MenuList></Menu>);}diff --git a/src/renderer/perspectives/common/DirectoryMenuItems.tsx b/src/renderer/perspectives/common/DirectoryMenuItems.tsxindex b1cdc6f4a..f517fa8c3 100644--- a/src/renderer/perspectives/common/DirectoryMenuItems.tsx+++ b/src/renderer/perspectives/common/DirectoryMenuItems.tsx@@ -8,7 +8,6 @@ import ListItemText from '@mui/material/ListItemText';import RenameFolderIcon from '@mui/icons-material/FormatTextdirectionLToR';import AppConfig from '-/AppConfig';import OpenFolderNativelyIcon from '@mui/icons-material/Launch';-import AddRemoveTags from '@mui/icons-material/Loyalty';import Divider from '@mui/material/Divider';import { Pro } from '-/pro';import ImageIcon from '@mui/icons-material/Image';@@ -25,6 +24,7 @@ import {NewFileIcon,NewFolderIcon,AddExistingFileIcon,+ TagIcon,} from '-/components/CommonIcons';import { getKeyBindingObject } from '-/reducers/settings';import MenuKeyBinding from '-/components/menus/MenuKeyBinding';@@ -203,8 +203,8 @@ export function getDirectoryMenuItems(</MenuItem>,);}+ menuItems.push(<Divider key="divider1" />);if (!isReadOnlyMode && !perspectiveMode) {- menuItems.push(<Divider key="divider1" />);if (createNewFile) {menuItems.push(<MenuItem@@ -334,7 +334,7 @@ export function getDirectoryMenuItems(}}><ListItemIcon>- <AddRemoveTags />+ <TagIcon /></ListItemIcon><ListItemText primary={t('core:addRemoveTags')} /><MenuKeyBinding keyBinding={keyBindings['addRemoveTags']} />diff --git a/src/renderer/perspectives/grid/components/MainToolbar.tsx b/src/renderer/perspectives/grid/components/MainToolbar.tsxindex 6eba8b06c..58b5dc7d1 100644--- a/src/renderer/perspectives/grid/components/MainToolbar.tsx+++ b/src/renderer/perspectives/grid/components/MainToolbar.tsx@@ -24,15 +24,15 @@ import { Toolbar, Box, Divider, Badge } from '@mui/material/';import Tooltip from '-/components/Tooltip';import IconButton from '@mui/material/IconButton';import SortingIcon from '@mui/icons-material/SwapVerticalCircle';-import TagIcon from '@mui/icons-material/LocalOffer';import ShareIcon from '@mui/icons-material/Share';import {SelectedIcon,UnSelectedIcon,DownloadIcon,+ TagIcon,+ DeleteIcon,} from '-/components/CommonIcons';import CopyIcon from '@mui/icons-material/FileCopy';-import DeleteIcon from '@mui/icons-material/Delete';import ExportIcon from '@mui/icons-material/AssignmentReturn';import {ParentFolderIcon,