TagSpaces is an offline, open source, document manager with tagging support
TSN542 - Clear / reset folder color (#1396)
Stanimirf001eedabc59
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsxindex d84294e1c..f91faf48d 100644--- a/app/components/EntryProperties.tsx+++ b/app/components/EntryProperties.tsx@@ -38,6 +38,7 @@ import DOMPurify from 'dompurify';import Select from '@material-ui/core/Select';import Input from '@material-ui/core/Input';import MenuItem from '@material-ui/core/MenuItem';+import ClearColorIcon from '@material-ui/icons/Backspace';import ListItemIcon from '@material-ui/core/ListItemIcon';import DefaultPerspectiveIcon from '@material-ui/icons/GridOn';import LayersClearIcon from '@material-ui/icons/LayersClear';@@ -55,6 +56,7 @@ import {withLeaflet} from 'react-leaflet';import OpenLocationCode from 'open-location-code-typescript';+import { IconButton } from '@material-ui/core';import TagDropContainer from './TagDropContainer';import ColorPickerDialog from './dialogs/ColorPickerDialog';import MoveCopyFilesDialog from './dialogs/MoveCopyFilesDialog';@@ -83,6 +85,7 @@ import { savePerspective } from '-/utils/metaoperations';import MarkerIcon from '-/assets/icons/marker-icon.png';import Marker2xIcon from '-/assets/icons/marker-icon-2x.png';import MarkerShadowIcon from '-/assets/icons/marker-shadow.png';+import ConfirmDialog from '-/components/dialogs/ConfirmDialog';const ThumbnailChooserDialog =Pro && Pro.UI ? Pro.UI.ThumbnailChooserDialog : false;@@ -109,7 +112,9 @@ const styles: any = (theme: any) => ({minHeight: 35,width: '100%',border: '1px solid lightgray',- margin: '0 8px 0 0'+ margin: '0 8px 0 0',+ textTransform: 'none',+ fontWeight: 'lighter'},textField: {marginLeft: theme.spacing(1),@@ -252,6 +257,10 @@ const EntryProperties = (props: Props) => {const [isMoveCopyFilesDialogOpened, setMoveCopyFilesDialogOpened] = useState<boolean>(false);+ const [+ isConfirmResetColorDialogOpened,+ setConfirmResetColorDialogOpened+ ] = useState<boolean>(false);const [isFileThumbChooseDialogOpened,setFileThumbChooseDialogOpened@@ -873,12 +882,9 @@ const EntryProperties = (props: Props) => {</FormControl></Grid>- <Grid item xs={12}>- <div className={classes.fluidGrid}>- <div- className={classes.gridItem}- style={{ width: '50%', alignSelf: 'baseline' }}- >+ <Grid container item xs={12}>+ <Grid item xs={6}>+ <div className={classes.gridItem}><Typographyvariant="caption"className={classes.header}@@ -889,78 +895,120 @@ const EntryProperties = (props: Props) => {<strong>{ldtm}</strong></Typography></div>+ </Grid>- {currentEntry.isFile ? (- <div className={classes.gridItem} style={{ width: '50%' }}>- <Typography- variant="caption"- className={classes.header}- style={{ display: 'block' }}- >- {i18n.t('core:fileSize')}- <br />- <strong>{formatFileSize(currentEntry.size)}</strong>- </Typography>- </div>- ) : (- <div className={classes.gridItem} style={{ width: '50%' }}>- <Typography- variant="caption"- style={{ display: 'block' }}- className={classes.header}- >- {i18n.t('core:changeBackgroundColor')}- </Typography>- <FormControl fullWidth={true} className={classes.formControl}>- <TransparentBackground>- <Button- fullWidth={true}- className={[- classes.colorChooserButton,- classes.button- ].join(' ')}- style={{- backgroundColor: currentEntry.color- }}- onClick={toggleBackgroundColorPicker}- />- {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'- ]}- />- )}- </TransparentBackground>- </FormControl>- </div>- )}- </div>+ {currentEntry.isFile ? (+ <Grid item xs={6}>+ <Typography+ variant="caption"+ className={classes.header}+ style={{ display: 'block' }}+ >+ {i18n.t('core:fileSize')}+ <br />+ <strong>{formatFileSize(currentEntry.size)}</strong>+ </Typography>+ </Grid>+ ) : (+ <Grid item xs={6}>+ <Typography+ variant="caption"+ style={{ display: 'block', paddingLeft: 6 }}+ className={classes.header}+ >+ {i18n.t('core:backgroundColor')}+ </Typography>+ <Grid container item xs={12}>+ <Grid item xs={10}>+ <FormControl fullWidth={true} className={classes.formControl}>+ <TransparentBackground>+ <Button+ fullWidth={true}+ className={[+ classes.colorChooserButton,+ classes.button+ ].join(' ')}+ style={{+ backgroundColor: currentEntry.color+ }}+ onClick={toggleBackgroundColorPicker}+ >+ {i18n.t('core:changeBackgroundColor')}+ </Button>+ </TransparentBackground>+ </FormControl>+ </Grid>+ <Grid item xs={2}>+ {currentEntry.color && (+ <>+ <Tooltip title="Clears the background color of this folder">+ <IconButton+ aria-label="clear"+ size="small"+ style={{ marginTop: 5 }}+ onClick={() => setConfirmResetColorDialogOpened(true)}+ >+ <ClearColorIcon />+ </IconButton>+ </Tooltip>+ {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"+ />+ )}+ </>+ )}+ </Grid>+ </Grid>+ {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><Grid item xs={12}>diff --git a/app/components/dialogs/AddRemoveTagsDialog.tsx b/app/components/dialogs/AddRemoveTagsDialog.tsxindex c7b5dc56a..415829d4b 100644--- a/app/components/dialogs/AddRemoveTagsDialog.tsx+++ b/app/components/dialogs/AddRemoveTagsDialog.tsx@@ -27,13 +27,14 @@ import DialogTitle from '@material-ui/core/DialogTitle';import List from '@material-ui/core/List';import ListItem from '@material-ui/core/ListItem';import ListItemIcon from '@material-ui/core/ListItemIcon';+import FolderIcon from '@material-ui/icons/FolderOpen';import FileIcon from '@material-ui/icons/InsertDriveFileOutlined';import Typography from '@material-ui/core/Typography';import Dialog from '@material-ui/core/Dialog';import { Tag } from '-/reducers/taglibrary';import TagsSelect from '../TagsSelect';import i18n from '-/services/i18n';-import { extractFileName } from '-/utils/paths';+import { extractFileName, extractDirectoryName } from '-/utils/paths';import PlatformIO from '-/services/platform-io';interface Props {@@ -134,13 +135,18 @@ const AddRemoveTagsDialog = (props: Props) => {selectedEntries.map(entry => (<ListItem key={entry.path} title={entry.path}><ListItemIcon>- <FileIcon />+ {entry.isFile ? <FileIcon /> : <FolderIcon />}</ListItemIcon><Typography variant="inherit" noWrap>- {extractFileName(- entry.path || '',- PlatformIO.getDirSeparator()- )}+ {entry.isFile+ ? extractFileName(+ entry.path || '',+ PlatformIO.getDirSeparator()+ )+ : extractDirectoryName(+ entry.path || '',+ PlatformIO.getDirSeparator()+ )}</Typography></ListItem>))}diff --git a/app/locales/en/core.json b/app/locales/en/core.jsonindex 4809d9290..23da18170 100644--- a/app/locales/en/core.json+++ b/app/locales/en/core.json@@ -282,6 +282,7 @@"cameraTakePicture": "Take Picture","deleteConfirmationTitle": "Confirm Delete","deleteConfirmationContent": "The selected entries will be permanently deleted. Are you sure?",+ "backgroundColor": "Background Color","changeBackgroundColor": "Change Background Color","moreOperations": "More Operations","options": "Options",@@ -528,5 +529,6 @@"verifyTOTP": "Verify","TOTPEnabled": "TOTP Is Enabled","disableTOTP": "disable TOTP",+ "confirmResetColor": "Do you really want to clear this color?","-": "-"}diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsxindex 95b99bd35..0bb0b95e1 100644--- a/app/perspectives/grid-perspective/components/MainContainer.tsx+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx@@ -472,6 +472,8 @@ const GridPerspective = (props: Props) => {...selectedEntries.filter(entry => entry.uuid !== fsEntry.uuid),fsEntry]);+ } else {+ props.setSelectedEntries([fsEntry]);}// selectedEntry.current = fsEntry;setDirContextMenuAnchorEl(event.currentTarget);diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex 8c76edecd..a72640347 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -1525,7 +1525,11 @@ export const actions = {}entryForOpening.shouldReload = fsEntryMeta.shouldReload;if (fsEntryMeta.color) {- entryForOpening.color = fsEntryMeta.color;+ if (fsEntryMeta.color === 'transparent') {+ entryForOpening.color = undefined;+ } else {+ entryForOpening.color = fsEntryMeta.color;+ }}if (fsEntryMeta.description !== undefined) {entryForOpening.description = fsEntryMeta.description;