TagSpaces is an offline, open source, document manager with tagging support
fix: code cleanup for perspective settings
Ilian Sapundshiev799e1954ad74
diff --git a/app/perspectives/grid-perspective/components/GridSettingsDialog.tsx b/app/perspectives/grid-perspective/components/GridSettingsDialog.tsxindex 6f5c945a5..179f5e14c 100644--- a/app/perspectives/grid-perspective/components/GridSettingsDialog.tsx+++ b/app/perspectives/grid-perspective/components/GridSettingsDialog.tsx@@ -22,7 +22,6 @@ import {DialogActions,DialogContent,DialogTitle,- withMobileDialog,FormControl,FormControlLabel,FormGroup,@@ -40,9 +39,8 @@ import ThumbnailCoverIcon from '@material-ui/icons/PhotoSizeSelectActual';import ThumbnailContainIcon from '@material-ui/icons/PhotoSizeSelectLarge';import RadioCheckedIcon from '@material-ui/icons/RadioButtonChecked';import RadioUncheckedIcon from '@material-ui/icons/RadioButtonUnchecked';-import List from '@material-ui/core/List';-import ListItem from '@material-ui/core/ListItem';import { withStyles } from '@material-ui/core/styles';+import DialogCloseButton from '-/components/dialogs/DialogCloseButton';import i18n from '-/services/i18n';const styles: any = {@@ -64,7 +62,6 @@ const styles: any = {interface Props {open: boolean;- fullScreen: boolean;gridPageLimit: number;onClose: () => void;setGridPageLimit: (number) => void;@@ -87,7 +84,6 @@ const GridSettingsDialog = (props: Props) => {const {open,onClose,- fullScreen,gridPageLimit,toggleShowDirectories,showDirectories,@@ -124,17 +120,12 @@ const GridSettingsDialog = (props: Props) => {return parsed;}- const { classes } = props;-return (- <Dialog- open={open}- onClose={onClose}- fullScreen={fullScreen}- keepMounted- scroll="paper"- >- <DialogTitle>{i18n.t('core:perspectiveSettingsTitle')}</DialogTitle>+ <Dialog open={open} onClose={onClose} keepMounted scroll="paper">+ <DialogTitle>+ {i18n.t('core:perspectiveSettingsTitle')}+ <DialogCloseButton onClose={onClose} />+ </DialogTitle><DialogContent><FormGroup><FormControlLabel@@ -271,8 +262,7 @@ const GridSettingsDialog = (props: Props) => {<Divider /><FormControlfullWidth={true}- /* error={this.state.inputError} */- style={{ overflow: 'visible' }}+ style={{ overflow: 'visible', marginTop: 20 }}><InputLabel shrink htmlFor="pageLimit">{i18n.t('core:pageLimit')}@@ -291,12 +281,11 @@ const GridSettingsDialog = (props: Props) => {<FormHelperText>{i18n.t('core:pageLimitHelp')}</FormHelperText></FormControl></DialogContent>- <DialogActions>+ <DialogActions style={{ justifyContent: 'space-between' }}><Buttondata-tid="gridPerspectiveHelp"title={i18n.t('core:help')}onClick={openHelpWebPage}- color="primary">{i18n.t('core:help')}</Button>@@ -313,6 +302,4 @@ const GridSettingsDialog = (props: Props) => {);};-export default withMobileDialog()(- withStyles(styles, { withTheme: true })(GridSettingsDialog)-);+export default withStyles(styles, { withTheme: true })(GridSettingsDialog);diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsxindex 51ecd1ede..6771db4c8 100644--- a/app/perspectives/grid-perspective/components/MainContainer.tsx+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx@@ -267,11 +267,6 @@ const GridPerspective = (props: Props) => {setSortingContextMenuAnchorEl(anchor);};- const handleOptionsMenu = event => {- const anchor = event ? event.currentTarget : null;- setOptionsContextMenuAnchorEl(anchor);- };-const handleExportCsvMenu = () => {if (Pro) {Pro.exportAsCsv.ExportAsCsv(props.directoryContent);@@ -738,7 +733,6 @@ const GridPerspective = (props: Props) => {openMoveCopyFilesDialog={openMoveCopyFilesDialog}openDeleteFileDialog={openDeleteFileDialog}handleSortingMenu={handleSortingMenu}- handleOptionsMenu={handleOptionsMenu}handleExportCsvMenu={handleExportCsvMenu}isDesktopMode={props.isDesktopMode}openSettings={openSettings}diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsxindex 1d7a957cb..1d84f740f 100644--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx@@ -48,7 +48,6 @@ interface Props {openMoveCopyFilesDialog: () => void;openDeleteFileDialog: () => void;handleSortingMenu: (event: Object) => void;- handleOptionsMenu: (event: Object) => void;handleExportCsvMenu: () => void;layoutType: string;isDesktopMode: boolean;@@ -70,7 +69,6 @@ const MainToolbar = (props: Props) => {openDeleteFileDialog,fileOperationsEnabled,handleSortingMenu,- handleOptionsMenu,isDesktopMode,openSettings} = props;