TagSpaces is an offline, open source, document manager with tagging support
TSN910---Add-ability-to-set-an-image-or-gradient-as-a-background-of-a… (#1732)
Stanimir875826261a02
diff --git a/app/components/EntryContainer.tsx b/app/components/EntryContainer.tsxindex 9936dcb2a..58af9c440 100644--- a/app/components/EntryContainer.tsx+++ b/app/components/EntryContainer.tsx@@ -29,7 +29,7 @@ import { bindActionCreators } from 'redux';import { GlobalHotKeys } from 'react-hotkeys';import fscreen from 'fscreen';import Button from '@mui/material/Button';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import IconButton from '@mui/material/IconButton';import BookmarkIcon from '@mui/icons-material/BookmarkTwoTone';import BookmarkAddIcon from '@mui/icons-material/BookmarkAddTwoTone';@@ -1130,6 +1130,13 @@ function EntryContainer(props: Props) {);}forceUpdate();+ } else {+ showNotification(+ i18n.t('core:toggleBookmark') ++ ' - ' ++ i18n.t('thisFunctionalityIsAvailableInPro'),+ NotificationTypes.default+ );}}}>diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsxindex 4ed585f98..96faa6d80 100644--- a/app/components/EntryProperties.tsx+++ b/app/components/EntryProperties.tsx@@ -16,19 +16,12 @@**/-import React, {- ChangeEvent,- useEffect,- useReducer,- useRef,- useState-} from 'react';+import React, { ChangeEvent, useEffect, useRef, useState } from 'react';import { useStateWithCallbackLazy } from 'use-state-with-callback';-import { Theme } from '@mui/material/styles';+import { getBgndFileLocationForDirectory } from '@tagspaces/tagspaces-common/paths';+import { v1 as uuidv1 } from 'uuid';import L from 'leaflet';-import classNames from 'classnames';-import createStyles from '@mui/styles/createStyles';import withStyles from '@mui/styles/withStyles';import Grid from '@mui/material/Grid';import FormControl from '@mui/material/FormControl';@@ -37,11 +30,10 @@ import TextField from '@mui/material/TextField';import Button from '@mui/material/Button';import InputAdornment from '@mui/material/InputAdornment';import ShareIcon from '@mui/icons-material/Link';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import LocationIcon from '@mui/icons-material/WorkOutline';import EditIcon from '@mui/icons-material/Edit';import CloudLocationIcon from '@mui/icons-material/CloudQueue';-import Select from '@mui/material/Select';import MenuItem from '@mui/material/MenuItem';import ClearColorIcon from '@mui/icons-material/Backspace';import {@@ -64,7 +56,6 @@ import {} from '@tagspaces/tagspaces-platforms/paths';import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';import TagDropContainer from './TagDropContainer';-import ColorPickerDialog from './dialogs/ColorPickerDialog';import MoveCopyFilesDialog from './dialogs/MoveCopyFilesDialog';import i18n from '../services/i18n';import { enhanceOpenedEntry, convertMarkDown } from '-/services/utils-io';@@ -88,9 +79,14 @@ import NoTileServer from '-/components/NoTileServer';import InfoIcon from '-/components/InfoIcon';import { ProTooltip } from '-/components/HelperComponents';import PerspectiveSelector from '-/components/PerspectiveSelector';+import FormControlLabel from '@mui/material/FormControlLabel';const ThumbnailChooserDialog =Pro && Pro.UI ? Pro.UI.ThumbnailChooserDialog : false;+const CustomBackgroundDialog =+ Pro && Pro.UI ? Pro.UI.CustomBackgroundDialog : false;+const BgndImgChooserDialog =+ Pro && Pro.UI ? Pro.UI.BgndImgChooserDialog : false;const styles: any = (theme: any) => ({entryProperties: {@@ -98,6 +94,7 @@ const styles: any = (theme: any) => ({overflowX: 'hidden',flexGrow: 1,padding: 7,+ paddingRight: 14,height: '100%'},tags: {@@ -217,6 +214,9 @@ function EntryProperties(props: Props) {isFileThumbChooseDialogOpened,setFileThumbChooseDialogOpened] = useState<boolean>(false);+ const [isBgndImgChooseDialogOpened, setBgndImgChooseDialogOpened] = useState<+ boolean+ >(false);const [displayColorPicker, setDisplayColorPicker] = useState<boolean>(false);useEffect(() => {@@ -327,6 +327,20 @@ function EntryProperties(props: Props) {}};+ const toggleBgndImgDialog = () => {+ if (!Pro) {+ props.showNotification(i18n.t('core:thisFunctionalityIsAvailableInPro'));+ return true;+ }+ if (+ !currentEntry.editMode &&+ editName === undefined &&+ editDescription === undefined+ ) {+ setBgndImgChooseDialogOpened(!isBgndImgChooseDialogOpened);+ }+ };+const setThumb = (filePath, thumbFilePath) => {if (filePath !== undefined) {if (@@ -459,6 +473,14 @@ function EntryProperties(props: Props) {PlatformIO.getDirSeparator());}++ let bgndPath;+ if (!currentEntry.isFile) {+ bgndPath = getBgndFileLocationForDirectory(+ currentEntry.path,+ PlatformIO.getDirSeparator()+ );+ }/*** normalize path for URL is always '/'* TODO move this in common module@@ -472,12 +494,16 @@ function EntryProperties(props: Props) {return url;}let url;+ let bgndUrl;if (PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport()) {url = PlatformIO.getURLforPath(thumbPath);+ bgndUrl = PlatformIO.getURLforPath(bgndPath);} else {url = normalizeUrl(thumbPath) + '?' + new Date().getTime();+ bgndUrl = normalizeUrl(bgndPath) + '?' + new Date().getTime();}const thumbPathUrl = thumbPath ? 'url("' + url + '")' : '';+ const bgndPathUrl = bgndPath ? 'url("' + bgndUrl + '")' : '';const ldtm = currentEntry.lmdt? new Date(currentEntry.lmdt)@@ -806,121 +832,21 @@ function EntryProperties(props: Props) {}}/></Grid>-- {currentEntry.isFile ? (- <Grid item xs={6}>- <TextField- margin="dense"- fullWidth={true}- value={formatFileSize(currentEntry.size)}- label={i18n.t('core:fileSize')}- InputProps={{- readOnly: true- }}- />- </Grid>- ) : (- <Grid item xs={6}>- <TextField- margin="dense"- name="path"- label={i18n.t('core:backgroundColor')}- fullWidth- InputProps={{- readOnly: true,- startAdornment: (- <InputAdornment position="start">- <TransparentBackground>- <Button- fullWidth- style={{- width: '100%',- backgroundColor: currentEntry.color- }}- onClick={toggleBackgroundColorPicker}- >- {i18n.t('core:changeBackgroundColor')}- </Button>- </TransparentBackground>- </InputAdornment>- ),- endAdornment: (- <InputAdornment position="end">- {currentEntry.color && (- <>- <ProTooltip tooltip={i18n.t('clearFolderColor')}>- <IconButton- disabled={!Pro}- aria-label="clear"- size="small"- style={{ marginTop: 5 }}- onClick={() =>- setConfirmResetColorDialogOpened(true)- }- >- <ClearColorIcon />- </IconButton>- </ProTooltip>- {isConfirmResetColorDialogOpened && (- <ConfirmDialog- open={isConfirmResetColorDialogOpened}- onClose={() => {- setConfirmResetColorDialogOpened(false);- }}- title={i18n.t('core:confirm')}- content={i18n.t('core:confirmResetColor')}- confirmCallback={result => {- if (result) {- handleChangeColor('transparent');- } else {- setConfirmResetColorDialogOpened(false);- }- }}- cancelDialogTID="cancelConfirmResetColorDialog"- confirmDialogTID="confirmConfirmResetColorDialog"- confirmDialogContentTID="confirmResetColorDialogContent"- />- )}- </>- )}- </InputAdornment>- )- }}- />- {displayColorPicker && (- <ColorPickerDialog- color={currentEntry.color}- open={displayColorPicker}- setColor={handleChangeColor}- onClose={toggleBackgroundColorPicker}- presetColors={[- 'transparent',- '#FFFFFF44',- '#00000044',- '#ac725e44',- '#f83a2244',- '#fa573c44',- '#ff753744',- '#ffad4644',- '#42d69244',- '#00800044',- '#7bd14844',- '#fad16544',- '#92e1c044',- '#9fe1e744',- '#9fc6e744',- '#4986e744',- '#9a9cff44',- '#c2c2c244',- '#cca6ac44',- '#f691b244',- '#cd74e644',- '#a47ae244'- ]}- />- )}- </Grid>- )}+ <Grid item xs={6}>+ <TextField+ margin="dense"+ fullWidth={true}+ value={+ currentEntry.isFile+ ? formatFileSize(currentEntry.size)+ : i18n.t('core:notAvailable')+ }+ label={i18n.t('core:fileSize')}+ InputProps={{+ readOnly: true+ }}+ />+ </Grid></Grid><Grid item xs={12}>@@ -1091,23 +1017,97 @@ function EntryProperties(props: Props) {)}<Grid item xs={12}>- <ThumbnailTextField+ <TextFieldmargin="dense"- label={i18n.t('core:thumbnail')}+ name="path"+ label={i18n.t('core:backgroundColor')}fullWidth- value=""- style={{- marginTop: 13,- minHeight: thumbPath ? AppConfig.maxThumbSize + 20 : 20,- maxHeight: AppConfig.maxThumbSize + 20- }}InputProps={{readOnly: true,startAdornment: (<InputAdornment position="start">+ <TransparentBackground>+ <Button+ fullWidth+ style={{+ width: '100%',+ background: currentEntry.color+ }}+ onClick={toggleBackgroundColorPicker}+ >+ {i18n.t('core:changeBackgroundColor')}+ </Button>+ </TransparentBackground>+ </InputAdornment>+ ),+ endAdornment: (+ <InputAdornment position="end">+ {currentEntry.color && (+ <>+ <ProTooltip tooltip={i18n.t('clearFolderColor')}>+ <IconButton+ disabled={!Pro}+ aria-label="clear"+ size="small"+ style={{ marginTop: 5 }}+ onClick={() => setConfirmResetColorDialogOpened(true)}+ >+ <ClearColorIcon />+ </IconButton>+ </ProTooltip>+ {isConfirmResetColorDialogOpened && (+ <ConfirmDialog+ open={isConfirmResetColorDialogOpened}+ onClose={() => {+ setConfirmResetColorDialogOpened(false);+ }}+ title={i18n.t('core:confirm')}+ content={i18n.t('core:confirmResetColor')}+ confirmCallback={result => {+ if (result) {+ handleChangeColor('transparent');+ } else {+ setConfirmResetColorDialogOpened(false);+ }+ }}+ cancelDialogTID="cancelConfirmResetColorDialog"+ confirmDialogTID="confirmConfirmResetColorDialog"+ confirmDialogContentTID="confirmResetColorDialogContent"+ />+ )}+ </>+ )}+ </InputAdornment>+ )+ }}+ />+ </Grid>+ <Grid item xs={6}>+ <FormControl component="fieldset" fullWidth={true} variant="outlined">+ <FormControlLabel+ label={i18n.t('core:thumbnail')}+ labelPlacement="top"+ control={+ <>+ {!isReadOnlyMode &&+ !currentEntry.editMode &&+ editName === undefined &&+ editDescription === undefined && (+ <ProTooltip tooltip={i18n.t('changeThumbnail')}>+ <IconButton+ disabled={!Pro}+ color="primary"+ className={classes.button}+ style={{ whiteSpace: 'nowrap' }}+ onClick={toggleThumbFilesDialog}+ >+ <EditIcon />+ </IconButton>+ </ProTooltip>+ )}{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/control-has-associated-label */}<div- onClick={toggleThumbFilesDialog}+ // onClick={toggleThumbFilesDialog}role="button"title={i18n.t('core:changeThumbnail')}tabIndex={0}@@ -1120,34 +1120,56 @@ function EntryProperties(props: Props) {maxHeight: AppConfig.maxThumbSize,minWidth: AppConfig.maxThumbSize,maxWidth: AppConfig.maxThumbSize,- display: 'block',+ // display: 'block',marginBottom: 5}}/>- </InputAdornment>- ),- endAdornment: (- <InputAdornment position="end">+ </>+ }+ />+ </FormControl>+ </Grid>+ <Grid item xs={6}>+ <FormControl component="fieldset" fullWidth={true} variant="outlined">+ <FormControlLabel+ label={i18n.t('core:backgroundImage')}+ labelPlacement="top"+ control={+ <>{!isReadOnlyMode &&!currentEntry.editMode &&editName === undefined &&editDescription === undefined && (- <ProTooltip tooltip={i18n.t('changeThumbnail')}>+ <ProTooltip tooltip={i18n.t('changeBackgroundImage')}><IconButtondisabled={!Pro}color="primary"className={classes.button}style={{ whiteSpace: 'nowrap' }}- onClick={toggleThumbFilesDialog}+ onClick={toggleBgndImgDialog}><EditIcon /></IconButton></ProTooltip>)}- </InputAdornment>- )- }}- />+ <div+ style={{+ backgroundSize: 'contain',+ backgroundRepeat: 'no-repeat',+ backgroundImage: bgndPathUrl,+ backgroundPosition: 'center',+ minHeight: thumbPath ? AppConfig.maxThumbSize : 20,+ maxHeight: AppConfig.maxThumbSize,+ minWidth: AppConfig.maxThumbSize,+ maxWidth: AppConfig.maxThumbSize,+ marginBottom: 5+ // display: 'block',+ }}+ />+ </>+ }+ />+ </FormControl></Grid></Grid>{isMoveCopyFilesDialogOpened && (@@ -1158,7 +1180,7 @@ function EntryProperties(props: Props) {selectedFiles={[currentEntry.path]}/>)}- {ThumbnailChooserDialog && isFileThumbChooseDialogOpened && (+ {ThumbnailChooserDialog && (<ThumbnailChooserDialogopen={isFileThumbChooseDialogOpened}onClose={toggleThumbFilesDialog}@@ -1166,11 +1188,51 @@ function EntryProperties(props: Props) {setThumb={setThumb}/>)}+ {BgndImgChooserDialog && (+ <BgndImgChooserDialog+ open={isBgndImgChooseDialogOpened}+ onClose={toggleBgndImgDialog}+ currentDirectoryPath={currentEntry.path}+ />+ )}+ {CustomBackgroundDialog && (+ <CustomBackgroundDialog+ color={currentEntry.color}+ open={displayColorPicker}+ setColor={handleChangeColor}+ onClose={toggleBackgroundColorPicker}+ currentDirectoryPath={currentEntry.path}+ /*presetColors={[+ 'transparent',+ '#FFFFFF44',+ '#00000044',+ '#ac725e44',+ '#f83a2244',+ '#fa573c44',+ '#ff753744',+ '#ffad4644',+ '#42d69244',+ '#00800044',+ '#7bd14844',+ '#fad16544',+ '#92e1c044',+ '#9fe1e744',+ '#9fc6e744',+ '#4986e744',+ '#9a9cff44',+ '#c2c2c244',+ '#cca6ac44',+ '#f691b244',+ '#cd74e644',+ '#a47ae244'+ ]}*/+ />+ )}</div>);}-const ThumbnailTextField = withStyles((theme: Theme) =>+/*const ThumbnailTextField = withStyles((theme: Theme) =>createStyles({root: {'& .MuiInputBase-root': {@@ -1178,7 +1240,7 @@ const ThumbnailTextField = withStyles((theme: Theme) =>}}})-)(TextField);+)(TextField);*/export default withLeaflet(withStyles(styles, { withTheme: true })(EntryProperties)diff --git a/app/components/MobileNavigation.tsx b/app/components/MobileNavigation.tsxindex fb0b12d22..2ff35ff2b 100644--- a/app/components/MobileNavigation.tsx+++ b/app/components/MobileNavigation.tsx@@ -188,7 +188,9 @@ function MobileNavigation(props: Props) {);} else {toggleCreateFileDialog();- hideDrawer();+ if (hideDrawer) {+ hideDrawer();+ }}}}size="small"diff --git a/app/components/dialogs/ColorPickerDialog.tsx b/app/components/dialogs/ColorPickerDialog.tsxindex 2e420b6dd..a60fe3c89 100644--- a/app/components/dialogs/ColorPickerDialog.tsx+++ b/app/components/dialogs/ColorPickerDialog.tsx@@ -114,7 +114,8 @@ function ColorPickerDialog(props: Props) {data-tid="colorPickerDialogContent"style={{marginLeft: 'auto',- marginRight: 'auto'+ marginRight: 'auto',+ overflowX: 'hidden'}}><SketchPickerdiff --git a/app/components/dialogs/CreateDialog.tsx b/app/components/dialogs/CreateDialog.tsxindex 06924c913..ffc4bc3bb 100644--- a/app/components/dialogs/CreateDialog.tsx+++ b/app/components/dialogs/CreateDialog.tsx@@ -55,8 +55,7 @@ const styles: any = () => ({},grid: {flexGrow: 1,- width: '100%',- height: '100%'+ width: '100%'},createButton: {minHeight: 100,diff --git a/app/locales/en/core.json b/app/locales/en/core.jsonindex 1f7984109..66c39f983 100644--- a/app/locales/en/core.json+++ b/app/locales/en/core.json@@ -676,6 +676,10 @@"folderWithCustomPerspectiveSetting": "Current folder has custom settings for this perspective","cancelSubscription": "Cancel Subscription","toggleBookmark": "Toggle Bookmark",+ "chooseBackground": "Choose New Background",+ "backgroundImage": "Background Image",+ "changeBackgroundImage": "Change Background Image","noItems": "No items found",+ "notAvailable": "Not available","-": "-"}diff --git a/app/package.json b/app/package.jsonindex 5b570893b..e81faad89 100644--- a/app/package.json+++ b/app/package.json@@ -16,7 +16,7 @@"@tagspaces/extensions": "1.0.32"},"nodeDependencies": {- "@tagspaces/tagspaces-ws": "2.0.15",+ "@tagspaces/tagspaces-ws": "2.0.19","@tagspaces/extensions": "1.0.32","sharp": "^0.30.7"}diff --git a/app/perspectives/grid-perspective/components/CellContent.tsx b/app/perspectives/grid-perspective/components/CellContent.tsxindex e36297e43..7ca220528 100644--- a/app/perspectives/grid-perspective/components/CellContent.tsx+++ b/app/perspectives/grid-perspective/components/CellContent.tsx@@ -21,7 +21,7 @@ import classNames from 'classnames';import Grid from '@mui/material/Grid';import Typography from '@mui/material/Typography';import Paper from '@mui/material/Paper';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import FolderIcon from '@mui/icons-material/Folder';import SelectedIcon from '@mui/icons-material/CheckBox';import UnSelectedIcon from '@mui/icons-material/CheckBoxOutlineBlank';@@ -154,7 +154,7 @@ function CellContent(props: Props) {return (<divstyle={{- backgroundColor: fsEntryBgColor,+ background: fsEntryBgColor,opacity: fsEntry.isIgnored ? 0.3 : 1}}>diff --git a/app/perspectives/grid-perspective/components/GridPagination.tsx b/app/perspectives/grid-perspective/components/GridPagination.tsxindex dc33d1b84..02f18246b 100644--- a/app/perspectives/grid-perspective/components/GridPagination.tsx+++ b/app/perspectives/grid-perspective/components/GridPagination.tsx@@ -19,7 +19,7 @@import React, { useEffect, useRef } from 'react';import { connect } from 'react-redux';import Typography from '@mui/material/Typography';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Pagination from '@mui/material/Pagination';import { bindActionCreators } from 'redux';import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';@@ -27,9 +27,10 @@ import {getMetaFileLocationForDir,getMetaFileLocationForFile,getThumbFileLocationForDirectory,+ getBgndFileLocationForDirectory,getThumbFileLocationForFile,extractDirectoryName-} from '@tagspaces/tagspaces-platforms/paths';+} from '@tagspaces/tagspaces-common/paths';import i18n from '-/services/i18n';import {actions as AppActions,@@ -294,10 +295,13 @@ function GridPagination(props: Props) {PlatformIO.getDirSeparator());- const folderBgndPath = folderTmbPath.replace(- AppConfig.folderThumbFile,- 'tsb.jpg'+ const folderBgndPath = encodeURI(+ getBgndFileLocationForDirectory(+ currentDirectoryPath,+ PlatformIO.getDirSeparator()+ ));+ const dirColor = currentDirectoryColor || 'transparent';return (// eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-noninteractive-element-interactions,jsx-a11y/no-static-element-interactions@@ -313,12 +317,12 @@ function GridPagination(props: Props) {height: '100%',// @ts-ignoreoverflowY: AppConfig.isFirefox ? 'auto' : 'overlay',- backgroundColor: currentDirectoryColor || 'transparent',- background:- 'linear-gradient(62deg, rgb(65, 88, 208) 0%, rgb(200, 80, 192) 46%, rgb(255, 204, 112) 100%)',- backgroundImage: 'url(' + folderBgndPath + ')',+ backgroundImage: `url(${folderBgndPath}?${new Date().getTime()})`,+ backgroundColor: `${dirColor}`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat'+ /*background:+ 'linear-gradient(62deg, rgb(65, 88, 208) 0%, rgb(200, 80, 192) 46%, rgb(255, 204, 112) 100%)',*/}}>{showDetails && (@@ -491,6 +495,7 @@ function mapActionCreatorsToProps(dispatch) {const areEqual = (prevProp: Props, nextProp: Props) =>nextProp.theme === prevProp.theme &&+ nextProp.currentDirectoryPath === prevProp.currentDirectoryPath &&nextProp.isMetaLoaded === prevProp.isMetaLoaded &&nextProp.showDirectories === prevProp.showDirectories &&nextProp.showTags === prevProp.showTags &&diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsxindex 465644e50..06a002ee0 100644--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx@@ -22,9 +22,7 @@ import Tooltip from '-/components/Tooltip';import SettingsIcon from '@mui/icons-material/Settings';import IconButton from '@mui/material/IconButton';import ParentDirIcon from '@mui/icons-material/SubdirectoryArrowLeft';-import ViewGridIcon from '@mui/icons-material/ViewModule';import SwapVertIcon from '@mui/icons-material/SwapVert';-import ViewListIcon from '@mui/icons-material/ViewList';import TagIcon from '@mui/icons-material/LocalOffer';import SelectAllIcon from '@mui/icons-material/CheckBox';import DeSelectAllIcon from '@mui/icons-material/CheckBoxOutlineBlank';@@ -194,28 +192,32 @@ function MainToolbar(props: Props) {')'}>- <IconButton- aria-label={i18n.t('core:tagSelectedEntries')}- data-tid="gridPerspectiveAddRemoveTags"- disabled={selectedEntries.length < 1}- onClick={openAddRemoveTagsDialog}- size="large"- >- <TagIcon />- </IconButton>+ <span>+ <IconButton+ aria-label={i18n.t('core:tagSelectedEntries')}+ data-tid="gridPerspectiveAddRemoveTags"+ disabled={selectedEntries.length < 1}+ onClick={openAddRemoveTagsDialog}+ size="large"+ >+ <TagIcon />+ </IconButton>+ </span></Tooltip>)}{!isReadOnlyMode && (<Tooltip title={i18n.t('core:copyMoveSelectedEntries')}>- <IconButton- aria-label={i18n.t('core:copyMoveSelectedEntries')}- data-tid="gridPerspectiveCopySelectedFiles"- disabled={!fileOperationsEnabled}- onClick={openMoveCopyFilesDialog}- size="large"- >- <CopyIcon />- </IconButton>+ <span>+ <IconButton+ aria-label={i18n.t('core:copyMoveSelectedEntries')}+ data-tid="gridPerspectiveCopySelectedFiles"+ disabled={!fileOperationsEnabled}+ onClick={openMoveCopyFilesDialog}+ size="large"+ >+ <CopyIcon />+ </IconButton>+ </span></Tooltip>)}{!isReadOnlyMode && (@@ -227,15 +229,17 @@ function MainToolbar(props: Props) {')'}>- <IconButton- aria-label={i18n.t('core:deleteSelectedEntries')}- data-tid="gridPerspectiveDeleteMultipleFiles"- disabled={!fileOperationsEnabled}- onClick={openDeleteFileDialog}- size="large"- >- <DeleteIcon />- </IconButton>+ <span>+ <IconButton+ aria-label={i18n.t('core:deleteSelectedEntries')}+ data-tid="gridPerspectiveDeleteMultipleFiles"+ disabled={!fileOperationsEnabled}+ onClick={openDeleteFileDialog}+ size="large"+ >+ <DeleteIcon />+ </IconButton>+ </span></Tooltip>)}<Tooltip title={i18n.t('core:sort')}>diff --git a/package-lock.json b/package-lock.jsonindex 37981a945..4e093f432 100644--- a/package-lock.json+++ b/package-lock.json@@ -19,7 +19,7 @@"@mui/lab": "^5.0.0-alpha.92","@mui/material": "^5.9.2","@mui/styles": "^5.9.2",- "@tagspaces/tagspaces-platforms": "2.0.17",+ "@tagspaces/tagspaces-platforms": "2.0.19","aws-amplify": "^4.3.8","aws-sdk": "^2.1036.0","babel-polyfill": "^6.26.0",@@ -58,6 +58,7 @@"rc-table": "^7.8.0","react": "17.0.2","react-beautiful-dnd": "^13.1.0",+ "react-best-gradient-color-picker": "^2.0.17","react-color": "^2.19.3","react-dnd": "^14.0.4","react-dnd-html5-backend": "^14.0.2",@@ -11720,9 +11721,9 @@}},"node_modules/@tagspaces/tagspaces-platforms": {- "version": "2.0.17",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.0.17.tgz",- "integrity": "sha512-3KOdnUnvNY1UaZ99L7FrBODwhmFuK8G4JkBD4OuW19g2PDOs95mAngJt4l/VZDMDjH7nUKW2XHqRFj+i+xkwyw==",+ "version": "2.0.19",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.0.19.tgz",+ "integrity": "sha512-ig93bpmQDRtJan7BN74PVVtwa/QtnLi0NWlttUoAEzT2Mbcvl9/DdCAk+KuZ0gmwCGFYYKSoqIyAYvxVwO9Juw==","hasInstallScript": true},"node_modules/@testim/chrome-version": {@@ -31687,8 +31688,7 @@"node_modules/lodash.throttle": {"version": "4.1.1","resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",- "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",- "peer": true+ "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="},"node_modules/lodash.uniq": {"version": "4.5.0",@@ -40766,6 +40766,20 @@}}},+ "node_modules/react-best-gradient-color-picker": {+ "version": "2.0.17",+ "resolved": "https://registry.npmjs.org/react-best-gradient-color-picker/-/react-best-gradient-color-picker-2.0.17.tgz",+ "integrity": "sha512-FxEOl/2McKTK4cuZ4eBSt4lrAjL30QlJieYiLOMSKOfWiYOCPDjkpd4d3pga4ZTkcGE9g3FVH+YWZ0X32FWy6w==",+ "dependencies": {+ "lodash.throttle": "^4.1.1",+ "prop-types": "^15.8.1",+ "react-color-eye-dropper": "^1.0.1",+ "tinycolor2": "^1.4.2"+ },+ "peerDependencies": {+ "react": "^16.3.0 || ^17.0.0 || ^18.0.0"+ }+ },"node_modules/react-color": {"version": "2.19.3","resolved": "https://registry.npmjs.org/react-color/-/react-color-2.19.3.tgz",@@ -40783,6 +40797,18 @@"react": "*"}},+ "node_modules/react-color-eye-dropper": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/react-color-eye-dropper/-/react-color-eye-dropper-1.0.1.tgz",+ "integrity": "sha512-NP/RF6zx2vEqsTe3CVbOv0vC85BqFdvAmtZpfa2rLLiESkkUJaciKwkdwpCPTjsOecl/whRK7j5P3aPKPmbHig==",+ "dependencies": {+ "html2canvas": "^1.4.1",+ "robofox-react-portal": "^1.0.1"+ },+ "peerDependencies": {+ "react": "^16.3.0 || ^17.0.0 || ^18.0.0"+ }+ },"node_modules/react-devtools-core": {"version": "4.24.0","resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.0.tgz",@@ -42320,6 +42346,17 @@"dev": true,"optional": true},+ "node_modules/robofox-react-portal": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/robofox-react-portal/-/robofox-react-portal-1.0.3.tgz",+ "integrity": "sha512-yb52PCwg3WtccNS5mcm1UgS8HOn851op11RJkWf6rQNYX64C58iqu5fJd5mE2UBf3nB7PiMEC3RSZ3Pt7bJeTg==",+ "dependencies": {+ "uuid": "^8.3.2"+ },+ "peerDependencies": {+ "react": "^16.3.0 || ^17.0.0 || ^18.0.0"+ }+ },"node_modules/robust-predicates": {"version": "3.0.1","resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",@@ -59559,9 +59596,9 @@}},"@tagspaces/tagspaces-platforms": {- "version": "2.0.17",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.0.17.tgz",- "integrity": "sha512-3KOdnUnvNY1UaZ99L7FrBODwhmFuK8G4JkBD4OuW19g2PDOs95mAngJt4l/VZDMDjH7nUKW2XHqRFj+i+xkwyw=="+ "version": "2.0.19",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.0.19.tgz",+ "integrity": "sha512-ig93bpmQDRtJan7BN74PVVtwa/QtnLi0NWlttUoAEzT2Mbcvl9/DdCAk+KuZ0gmwCGFYYKSoqIyAYvxVwO9Juw=="},"@testim/chrome-version": {"version": "1.1.2",@@ -75378,8 +75415,7 @@"lodash.throttle": {"version": "4.1.1","resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",- "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",- "peer": true+ "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="},"lodash.uniq": {"version": "4.5.0",@@ -82260,6 +82296,17 @@}}},+ "react-best-gradient-color-picker": {+ "version": "2.0.17",+ "resolved": "https://registry.npmjs.org/react-best-gradient-color-picker/-/react-best-gradient-color-picker-2.0.17.tgz",+ "integrity": "sha512-FxEOl/2McKTK4cuZ4eBSt4lrAjL30QlJieYiLOMSKOfWiYOCPDjkpd4d3pga4ZTkcGE9g3FVH+YWZ0X32FWy6w==",+ "requires": {+ "lodash.throttle": "^4.1.1",+ "prop-types": "^15.8.1",+ "react-color-eye-dropper": "^1.0.1",+ "tinycolor2": "^1.4.2"+ }+ },"react-color": {"version": "2.19.3","resolved": "https://registry.npmjs.org/react-color/-/react-color-2.19.3.tgz",@@ -82274,6 +82321,15 @@"tinycolor2": "^1.4.1"}},+ "react-color-eye-dropper": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/react-color-eye-dropper/-/react-color-eye-dropper-1.0.1.tgz",+ "integrity": "sha512-NP/RF6zx2vEqsTe3CVbOv0vC85BqFdvAmtZpfa2rLLiESkkUJaciKwkdwpCPTjsOecl/whRK7j5P3aPKPmbHig==",+ "requires": {+ "html2canvas": "^1.4.1",+ "robofox-react-portal": "^1.0.1"+ }+ },"react-devtools-core": {"version": "4.24.0","resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.0.tgz",@@ -83504,6 +83560,14 @@}}},+ "robofox-react-portal": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/robofox-react-portal/-/robofox-react-portal-1.0.3.tgz",+ "integrity": "sha512-yb52PCwg3WtccNS5mcm1UgS8HOn851op11RJkWf6rQNYX64C58iqu5fJd5mE2UBf3nB7PiMEC3RSZ3Pt7bJeTg==",+ "requires": {+ "uuid": "^8.3.2"+ }+ },"robust-predicates": {"version": "3.0.1","resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",diff --git a/package.json b/package.jsonindex f0c7ee24a..2a0274fd7 100644--- a/package.json+++ b/package.json@@ -156,7 +156,7 @@"@mui/lab": "^5.0.0-alpha.92","@mui/material": "^5.9.2","@mui/styles": "^5.9.2",- "@tagspaces/tagspaces-platforms": "2.0.17",+ "@tagspaces/tagspaces-platforms": "2.0.19","aws-amplify": "^4.3.8","aws-sdk": "^2.1036.0","babel-polyfill": "^6.26.0",@@ -195,6 +195,7 @@"rc-table": "^7.8.0","react": "17.0.2","react-beautiful-dnd": "^13.1.0",+ "react-best-gradient-color-picker": "^2.0.17","react-color": "^2.19.3","react-dnd": "^14.0.4","react-dnd-html5-backend": "^14.0.2",