TagSpaces is an offline, open source, document manager with tagging support
polish: refactoring settings dialog
Ilian Sapundshiev0e28fa6eae80
diff --git a/app/components/dialogs/settings/SettingsDialog.tsx b/app/components/dialogs/settings/SettingsDialog.tsxindex 04323f866..aa6472e50 100644--- a/app/components/dialogs/settings/SettingsDialog.tsx+++ b/app/components/dialogs/settings/SettingsDialog.tsx@@ -23,6 +23,7 @@ import { withStyles } from '@material-ui/core/styles';import AppBar from '@material-ui/core/AppBar';import Tabs from '@material-ui/core/Tabs';import Tab from '@material-ui/core/Tab';+import Dialog from '@material-ui/core/Dialog';import DialogActions from '@material-ui/core/DialogActions';import DialogContent from '@material-ui/core/DialogContent';import DialogTitle from '@material-ui/core/DialogTitle';@@ -32,7 +33,6 @@ import withMobileDialog from '@material-ui/core/withMobileDialog';import uuidv1 from 'uuid';import { useStateWithCallbackLazy } from 'use-state-with-callback';import ConfirmDialog from '../ConfirmDialog';-import GenericDialog from '../GenericDialog';import SettingsGeneral from '../settings/SettingsGeneral';import SettingsKeyBindings from '../settings/SettingsKeyBindings';import SettingsFileTypes from '../settings/SettingsFileTypes';@@ -186,7 +186,7 @@ const SettingsDialog = (props: Props) => {};const renderTitle = () => (- <React.Fragment>+ <><DialogTitle>{i18n.t('core:settings')}{' '}<IconButton@@ -222,7 +222,7 @@ const SettingsDialog = (props: Props) => {/></Tabs></AppBar>- </React.Fragment>+ </>);const renderContent = () => (@@ -327,14 +327,17 @@ const SettingsDialog = (props: Props) => {const { fullScreen, open, onClose } = props;return (- <GenericDialog+ <Dialog+ fullScreen={fullScreen}open={open}+ keepMounted+ scroll="paper"onClose={onClose}- fullScreen={fullScreen}- renderTitle={renderTitle}- renderContent={renderContent}- renderActions={renderActions}- />+ >+ {renderTitle()}+ {renderContent()}+ {renderActions()}+ </Dialog>);};diff --git a/app/components/dialogs/settings/SettingsGeneral.tsx b/app/components/dialogs/settings/SettingsGeneral.tsxindex fddc43c35..90b38e879 100644--- a/app/components/dialogs/settings/SettingsGeneral.tsx+++ b/app/components/dialogs/settings/SettingsGeneral.tsx@@ -23,6 +23,7 @@ import { withStyles } from '@material-ui/core/styles';import List from '@material-ui/core/List';import ListItem from '@material-ui/core/ListItem';import ListItemText from '@material-ui/core/ListItemText';+import Typography from '@material-ui/core/Typography';import MenuItem from '@material-ui/core/MenuItem';import Switch from '@material-ui/core/Switch';import Tooltip from '@material-ui/core/Tooltip';@@ -30,6 +31,7 @@ import Input from '@material-ui/core/Input';import Select from '@material-ui/core/Select';import Button from '@material-ui/core/Button';import InfoIcon from '@material-ui/icons/InfoOutlined';+import CheckIcon from '@material-ui/icons/Check';import ToggleButton from '@material-ui/lab/ToggleButton';import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup';import i18n from '-/services/i18n';@@ -41,7 +43,6 @@ import {import ColorPickerDialog from '../ColorPickerDialog';import TransparentBackground from '../../TransparentBackground';import AppConfig from '-/config';-import Typography from '@material-ui/core/Typography';const styles: any = {root: {@@ -106,7 +107,7 @@ const SettingsGeneral = (props: Props) => {props.setMaxSearchResult(event.target.value);};- const { classes } = props;+ const { classes, persistTagsInSidecarFile } = props;return (<List className={classes.root}>@@ -151,13 +152,11 @@ const SettingsGeneral = (props: Props) => {<ListItemText primary="File tagging method" />{AppConfig.useSidecarsForFileTaggingDisableSetting ? (<Button size="small" variant="outlined" disabled>- {props.persistTagsInSidecarFile- ? 'Use Sidecar Files'- : 'Rename Files'}+ {persistTagsInSidecarFile ? 'Use Sidecar Files' : 'Rename Files'}</Button>) : (<ToggleButtonGroup- value={props.persistTagsInSidecarFile}+ value={persistTagsInSidecarFile}size="small"exclusive>@@ -177,7 +176,8 @@ const SettingsGeneral = (props: Props) => {}><div style={{ display: 'flex' }}>- Rename Files + {!persistTagsInSidecarFile && <CheckIcon />}+ Rename Files <InfoIcon /></div></Tooltip>@@ -199,7 +199,8 @@ const SettingsGeneral = (props: Props) => {}><div style={{ display: 'flex' }}>- Use Sidecar Files + {persistTagsInSidecarFile && <CheckIcon />}+ Use Sidecar Files <InfoIcon /></div></Tooltip>