Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: ui improvements of dialogs

Ilian Sapundshievdaf4388adbc3
diff --git a/app/components/dialogs/AboutDialog.tsx b/app/components/dialogs/AboutDialog.tsx
index 9ca99b9ed..d1c8a16eb 100644
--- a/app/components/dialogs/AboutDialog.tsx
+++ b/app/components/dialogs/AboutDialog.tsx
@@ -37,6 +37,7 @@ import Links from '-/content/links';
import useMediaQuery from '@mui/material/useMediaQuery';
import useTheme from '@mui/styles/useTheme';
import AppConfig from '-/AppConfig';
+import { Fullscreen } from '@mui/icons-material';
interface Props {
open: boolean;
@@ -222,7 +223,9 @@ function AboutDialog(props: Props) {
</Button>
</Typography>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
{!Pro && (
<Button
data-tid="checkForUpdates"
diff --git a/app/components/dialogs/AddRemoveTagsDialog.tsx b/app/components/dialogs/AddRemoveTagsDialog.tsx
index a6d41c2b4..eb71a1c9a 100644
--- a/app/components/dialogs/AddRemoveTagsDialog.tsx
+++ b/app/components/dialogs/AddRemoveTagsDialog.tsx
@@ -167,7 +167,9 @@ function AddRemoveTagsDialog(props: Props) {
))}
</List>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
<Button
data-tid="cancelTagsMultipleEntries"
onClick={() => onCloseDialog()}
@@ -178,7 +180,6 @@ function AddRemoveTagsDialog(props: Props) {
data-tid="cleanTagsMultipleEntries"
disabled={selectedEntries.length < 1}
color="primary"
- variant="contained"
onClick={removeAllTags}
>
{i18n.t('core:tagOperationCleanTags')}
@@ -187,7 +188,6 @@ function AddRemoveTagsDialog(props: Props) {
data-tid="removeTagsMultipleEntries"
disabled={disabledButtons}
color="primary"
- variant="contained"
onClick={removeTags}
>
{i18n.t('core:tagOperationRemoveTag')}
diff --git a/app/components/dialogs/AddTagToTagGroupDialog.tsx b/app/components/dialogs/AddTagToTagGroupDialog.tsx
index 3b956f4d5..86f748a40 100644
--- a/app/components/dialogs/AddTagToTagGroupDialog.tsx
+++ b/app/components/dialogs/AddTagToTagGroupDialog.tsx
@@ -17,6 +17,7 @@
*/
import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
import Button from '@mui/material/Button';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
@@ -27,15 +28,12 @@ import InputLabel from '@mui/material/InputLabel';
import Select from '@mui/material/Select';
import Input from '@mui/material/Input';
import MenuItem from '@mui/material/MenuItem';
-import IconButton from '@mui/material/IconButton';
-import CloseIcon from '@mui/icons-material/Close';
-import { connect } from 'react-redux';
-// import { getTagGroups } from '-/reducers/taglibrary';
+import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import i18n from '-/services/i18n';
import { getTagColor, getTagTextColor } from '-/reducers/settings';
import { TS } from '-/tagspaces.namespace';
-import useTheme from '@mui/styles/useTheme';
-import useMediaQuery from '@mui/material/useMediaQuery';
+// import useTheme from '@mui/styles/useTheme';
+// import useMediaQuery from '@mui/material/useMediaQuery';
import { getTagLibrary } from '-/services/taglibrary-utils';
interface Props {
@@ -45,18 +43,19 @@ interface Props {
selectedTag: TS.Tag;
defaultBackgroundColor?: string;
defaultTextColor?: string;
- // tagGroups: Array<TS.TagGroup>;
}
function AddTagToTagGroupDialog(props: Props) {
const [tagGroup, setTagGroup] = useState<string>(undefined);
+ const defaultBackgroundColor = useSelector(getTagColor);
+ const defaultTextColor = useSelector(getTagTextColor);
const handleTagGroupChange = (event: React.ChangeEvent<HTMLInputElement>) => {
setTagGroup(event.target.value);
};
const onConfirm = () => {
- const { defaultBackgroundColor, defaultTextColor, selectedTag } = props;
+ const { selectedTag } = props;
if (!selectedTag.textcolor) {
selectedTag.textcolor = defaultTextColor;
}
@@ -69,13 +68,13 @@ function AddTagToTagGroupDialog(props: Props) {
const { open, onClose } = props;
- const theme = useTheme();
- const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
+ // const theme = useTheme();
+ // const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
open={open}
onClose={onClose}
- fullScreen={fullScreen}
+ // fullScreen={fullScreen}
keepMounted
scroll="paper"
onKeyDown={event => {
@@ -83,27 +82,17 @@ function AddTagToTagGroupDialog(props: Props) {
event.preventDefault();
event.stopPropagation();
onConfirm();
- } /*else if (event.key === 'Escape') {
- onClose();
- }*/
+ }
}}
>
<DialogTitle>
{i18n.t('core:addTagToTagGroup') + ': ' + props.selectedTag.title}
- <IconButton
- aria-label="close"
- style={{
- position: 'absolute',
- right: 5,
- top: 5
- }}
- onClick={onClose}
- size="large"
- >
- <CloseIcon />
- </IconButton>
+ <DialogCloseButton
+ testId="closeAddTagToGroupDialogTID"
+ onClose={onClose}
+ />
</DialogTitle>
- <DialogContent style={{ minWidth: 400 }}>
+ <DialogContent style={{ paddingTop: 10, minWidth: 350 }}>
<FormControl fullWidth={true}>
<InputLabel htmlFor="addTagToTagGroupInput">
{i18n.t('core:chooseTagGroup')}
@@ -135,10 +124,4 @@ function AddTagToTagGroupDialog(props: Props) {
);
}
-const mapStateToProps = state => ({
- // tagGroups: getTagGroups(state),
- defaultBackgroundColor: getTagColor(state),
- defaultTextColor: getTagTextColor(state)
-});
-
-export default connect(mapStateToProps)(AddTagToTagGroupDialog);
+export default AddTagToTagGroupDialog;
diff --git a/app/components/dialogs/ColorPickerDialog.tsx b/app/components/dialogs/ColorPickerDialog.tsx
index 7df70335b..0e42b59ce 100644
--- a/app/components/dialogs/ColorPickerDialog.tsx
+++ b/app/components/dialogs/ColorPickerDialog.tsx
@@ -21,7 +21,6 @@ import Button from '@mui/material/Button';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
-import withStyles from '@mui/styles/withStyles';
import Dialog from '@mui/material/Dialog';
import { SketchPicker } from 'react-color';
import i18n from '-/services/i18n';
@@ -56,7 +55,6 @@ const presetColors = [
];
interface Props {
- classes: any;
open: boolean;
color: string;
setColor: (color: string) => void;
@@ -64,14 +62,6 @@ interface Props {
onClose: () => void;
}
-const styles = {
- noBorder: {
- padding: '0 !important',
- boxShadow: 'none !important',
- backgroundColor: 'transparent !important'
- }
-};
-
function ColorPickerDialog(props: Props) {
const [color, setColor] = useState(undefined);
const [colorHex, setColorHex] = useState(undefined);
@@ -101,9 +91,7 @@ function ColorPickerDialog(props: Props) {
event.preventDefault();
event.stopPropagation();
onConfirm();
- } /*else if (event.key === 'Escape') {
- onClose();
- }*/
+ }
}}
>
<DialogTitle data-tid="colorPickerDialogTitle">
@@ -119,7 +107,11 @@ function ColorPickerDialog(props: Props) {
}}
>
<SketchPicker
- className={props.classes.noBorder}
+ style={{
+ padding: '0 !important',
+ boxShadow: 'none !important',
+ backgroundColor: 'transparent !important'
+ }}
name="color"
presetColors={props.presetColors ? props.presetColors : presetColors}
color={color || props.color}
@@ -143,4 +135,4 @@ function ColorPickerDialog(props: Props) {
);
}
-export default withStyles(styles)(ColorPickerDialog);
+export default ColorPickerDialog;
diff --git a/app/components/dialogs/CreateDirectoryDialog.tsx b/app/components/dialogs/CreateDirectoryDialog.tsx
index 18db8eb8c..af4ddf485 100644
--- a/app/components/dialogs/CreateDirectoryDialog.tsx
+++ b/app/components/dialogs/CreateDirectoryDialog.tsx
@@ -104,13 +104,13 @@ function CreateDirectoryDialog(props: Props) {
setDisableConfirmButton(true);
}
- const theme = useTheme();
- const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
+ // const theme = useTheme();
+ // const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
open={open}
onClose={onClose}
- fullScreen={fullScreen}
+ // fullScreen={fullScreen}
keepMounted
scroll="paper"
onKeyDown={event => {
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index 4ee11a5c6..1ccb5ab19 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -1001,7 +1001,9 @@ function CreateEditLocationDialog(props: Props) {
</AccordionDetails>
</Accordion>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
<Button onClick={() => onClose()}>{i18n.t('core:cancel')}</Button>
<Button
disabled={disableConfirmButton()}
diff --git a/app/components/dialogs/CreateTagGroupDialog.tsx b/app/components/dialogs/CreateTagGroupDialog.tsx
index 848276240..3d80d362b 100644
--- a/app/components/dialogs/CreateTagGroupDialog.tsx
+++ b/app/components/dialogs/CreateTagGroupDialog.tsx
@@ -17,6 +17,7 @@
*/
import React, { ChangeEvent, useReducer, useRef, useState } from 'react';
+import { useSelector } from 'react-redux';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import DialogActions from '@mui/material/DialogActions';
@@ -27,15 +28,15 @@ import FormHelperText from '@mui/material/FormHelperText';
import Dialog from '@mui/material/Dialog';
import MenuItem from '@mui/material/MenuItem';
import Select from '@mui/material/Select';
-import { connect } from 'react-redux';
import ColorPickerDialog from './ColorPickerDialog';
import i18n from '-/services/i18n';
import TransparentBackground from '../TransparentBackground';
import { TS } from '-/tagspaces.namespace';
import { getLocations } from '-/reducers/locations';
+import { getSaveTagInLocation } from '-/reducers/settings';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
-import useTheme from '@mui/styles/useTheme';
-import useMediaQuery from '@mui/material/useMediaQuery';
+// import useTheme from '@mui/styles/useTheme';
+// import useMediaQuery from '@mui/material/useMediaQuery';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
interface Props {
@@ -45,12 +46,14 @@ interface Props {
color: string;
textcolor: string;
locations: Array<TS.Location>;
- saveTagsInLocation: boolean;
}
const defaultTagGroupLocation = 'TAG_LIBRARY';
function CreateTagGroupDialog(props: Props) {
+ const locations = useSelector(getLocations);
+ const saveTagsInLocation = useSelector(getSaveTagInLocation);
+
const [displayColorPicker, setDisplayColorPicker] = useState<boolean>(false);
const [displayTextColorPicker, setDisplayTextColorPicker] = useState<boolean>(
false
@@ -65,7 +68,7 @@ function CreateTagGroupDialog(props: Props) {
// eslint-disable-next-line no-unused-vars
const [ignored, forceUpdate] = useReducer(x => x + 1, 0);
- const { open, saveTagsInLocation, onClose, createTagGroup } = props;
+ const { open, onClose, createTagGroup } = props;
const handleTagGroupTitleChange = (
event: React.ChangeEvent<HTMLInputElement>
@@ -167,13 +170,13 @@ function CreateTagGroupDialog(props: Props) {
}
};
- const theme = useTheme();
- const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
+ // const theme = useTheme();
+ // const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
open={open}
onClose={onClose}
- fullScreen={fullScreen}
+ // fullScreen={fullScreen}
keepMounted
scroll="paper"
onKeyDown={event => {
@@ -208,7 +211,7 @@ function CreateTagGroupDialog(props: Props) {
</FormHelperText>
)}
</FormControl>
- {props.saveTagsInLocation && (
+ {saveTagsInLocation && (
<FormControl fullWidth={true} error={inputError}>
<FormHelperText style={styles.helpText}>
{i18n.t('core:tagGroupLocation')}
@@ -229,7 +232,7 @@ function CreateTagGroupDialog(props: Props) {
>
{i18n.t('tagLibrary')}
</MenuItem>
- {props.locations.map(location => (
+ {locations.map(location => (
<MenuItem
key={location.uuid}
value={location.uuid}
@@ -289,7 +292,7 @@ function CreateTagGroupDialog(props: Props) {
</FormControl>
</DialogContent>
<DialogActions>
- <Button data-tid="createTagGroupCancelButton" onClick={props.onClose}>
+ <Button data-tid="createTagGroupCancelButton" onClick={onClose}>
{i18n.t('core:cancel')}
</Button>
<Button
@@ -306,11 +309,4 @@ function CreateTagGroupDialog(props: Props) {
);
}
-function mapStateToProps(state) {
- return {
- locations: getLocations(state),
- saveTagsInLocation: state.settings.saveTagInLocation
- };
-}
-
-export default connect(mapStateToProps)(CreateTagGroupDialog);
+export default CreateTagGroupDialog;
diff --git a/app/components/dialogs/CreateTagsDialog.tsx b/app/components/dialogs/CreateTagsDialog.tsx
index afb2d2aee..c746a59d6 100644
--- a/app/components/dialogs/CreateTagsDialog.tsx
+++ b/app/components/dialogs/CreateTagsDialog.tsx
@@ -40,6 +40,7 @@ interface Props {
}
function CreateTagsDialog(props: Props) {
+ const { open, onClose, addTag, selectedTagGroupEntry } = props;
const [inputError, setInputError] = useState<boolean>(false);
const [tagTitle, setTagTitle] = useState<string>('');
@@ -74,20 +75,18 @@ function CreateTagsDialog(props: Props) {
const onConfirm = () => {
if (!inputError) {
- props.addTag(tagTitle, props.selectedTagGroupEntry.uuid);
- props.onClose();
+ addTag(tagTitle, selectedTagGroupEntry.uuid);
+ onClose();
}
};
- const { open, onClose } = props;
-
- const theme = useTheme();
- const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
+ // const theme = useTheme();
+ // const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
open={open}
onClose={onClose}
- fullScreen={fullScreen}
+ // fullScreen={fullScreen}
keepMounted
scroll="paper"
onKeyDown={event => {
@@ -95,16 +94,14 @@ function CreateTagsDialog(props: Props) {
event.preventDefault();
event.stopPropagation();
onConfirm();
- } /*else if (event.key === 'Escape') {
- onClose();
- }*/
+ }
}}
>
<DialogTitle>
{i18n.t('core:addTagsToGroupTitle')}
<DialogCloseButton testId="closeCreateTagTID" onClose={onClose} />
</DialogTitle>
- <DialogContent style={{ minWidth: 400, paddingTop: 10 }}>
+ <DialogContent style={{ minWidth: 350, paddingTop: 10 }}>
<FormControl fullWidth={true} error={inputError}>
<TextField
error={inputError}
diff --git a/app/components/dialogs/EditTagDialog.tsx b/app/components/dialogs/EditTagDialog.tsx
index bc9b27f5d..fd69d8220 100644
--- a/app/components/dialogs/EditTagDialog.tsx
+++ b/app/components/dialogs/EditTagDialog.tsx
@@ -125,12 +125,12 @@ function EditTagDialog(props: Props) {
}
};
- const theme = useTheme();
- const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
+ // const theme = useTheme();
+ // const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
open={open}
- fullScreen={fullScreen}
+ // fullScreen={fullScreen}
onClose={onClose}
keepMounted
scroll="paper"
diff --git a/app/components/dialogs/EditTagGroupDialog.tsx b/app/components/dialogs/EditTagGroupDialog.tsx
index f324411d0..a3e4e1b9b 100644
--- a/app/components/dialogs/EditTagGroupDialog.tsx
+++ b/app/components/dialogs/EditTagGroupDialog.tsx
@@ -286,12 +286,12 @@ function EditTagGroupDialog(props: Props) {
</DialogActions>
);
- const theme = useTheme();
- const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
+ // const theme = useTheme();
+ // const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
open={props.open}
- fullScreen={fullScreen}
+ // fullScreen={fullScreen}
onClose={props.onClose}
onKeyDown={event => {
if (event.key === 'Enter' || event.keyCode === 13) {
diff --git a/app/components/dialogs/FileUploadDialog.tsx b/app/components/dialogs/FileUploadDialog.tsx
index 829c83bb3..db365e9d1 100644
--- a/app/components/dialogs/FileUploadDialog.tsx
+++ b/app/components/dialogs/FileUploadDialog.tsx
@@ -242,7 +242,7 @@ function FileUploadDialog(props: Props) {
);
})}
</DialogContent>
- <DialogActions>
+ <DialogActions style={{ padding: '10px 30px 30px 30px' }}>
{!haveProgress && (
<Button
data-tid="uploadCloseAndClearTID"
diff --git a/app/components/dialogs/ImportExportTagGroupsDialog.tsx b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
index 112d5fdcd..29159532c 100644
--- a/app/components/dialogs/ImportExportTagGroupsDialog.tsx
+++ b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
@@ -37,15 +37,6 @@ import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import useTheme from '@mui/styles/useTheme';
import useMediaQuery from '@mui/material/useMediaQuery';
-const styles: any = {
- root: {
- width: 400,
- height: '100%',
- overflowY: 'auto',
- marginBottom: 30
- }
-};
-
interface Props {
classes: any;
open: boolean;
@@ -129,41 +120,6 @@ function ImportExportTagGroupsDialog(props: Props) {
</div>
);
- const renderTitle = () => (
- <DialogTitle>
- {props.dialogModeImport
- ? i18n.t('core:importGroupTagsTitle')
- : i18n.t('core:exportGroupTagsTitle')}
- <DialogCloseButton testId="closeIETagGroupsTID" onClose={onClose} />
- </DialogTitle>
- );
-
- const renderContent = () => (
- <DialogContent className={props.classes.root}>
- <Button color="primary" onClick={handleToggleSelectAll}>
- {i18n.t('core:selectAllTagGroups')}
- </Button>
- <FormControl fullWidth={true}>
- {tagGroupList.map(renderTagGroups)}
- </FormControl>
- </DialogContent>
- );
-
- const renderActions = () => (
- <DialogActions>
- <Button onClick={props.onClose}>{i18n.t('core:cancel')}</Button>
- <Button
- disabled={!isSelected()}
- onClick={onConfirm}
- data-tid="confirmImportExport"
- color="primary"
- variant="contained"
- >
- {props.dialogModeImport ? 'Import' : 'Export'}
- </Button>
- </DialogActions>
- );
-
const { onClose, open } = props;
const theme = useTheme();
const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
@@ -174,11 +130,36 @@ function ImportExportTagGroupsDialog(props: Props) {
onClose={onClose}
// onEnterKey={(event) => onEnterKeyHandler(event, this.onConfirm)}
>
- {renderTitle()}
- {renderContent()}
- {renderActions()}
+ <DialogTitle>
+ {props.dialogModeImport
+ ? i18n.t('core:importGroupTagsTitle')
+ : i18n.t('core:exportGroupTagsTitle')}
+ <DialogCloseButton testId="closeIETagGroupsTID" onClose={onClose} />
+ </DialogTitle>
+ <DialogContent>
+ <Button color="primary" onClick={handleToggleSelectAll}>
+ {i18n.t('core:selectAllTagGroups')}
+ </Button>
+ <FormControl fullWidth={true}>
+ {tagGroupList.map(renderTagGroups)}
+ </FormControl>
+ </DialogContent>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
+ <Button onClick={props.onClose}>{i18n.t('core:cancel')}</Button>
+ <Button
+ disabled={!isSelected()}
+ onClick={onConfirm}
+ data-tid="confirmImportExport"
+ color="primary"
+ variant="contained"
+ >
+ {props.dialogModeImport ? 'Import' : 'Export'}
+ </Button>
+ </DialogActions>
</Dialog>
);
}
-export default withStyles(styles)(ImportExportTagGroupsDialog);
+export default ImportExportTagGroupsDialog;
diff --git a/app/components/dialogs/KeyboardDialog.tsx b/app/components/dialogs/KeyboardDialog.tsx
index 87bacf83d..ce80b5947 100644
--- a/app/components/dialogs/KeyboardDialog.tsx
+++ b/app/components/dialogs/KeyboardDialog.tsx
@@ -28,7 +28,6 @@ import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
import ListItemText from '@mui/material/ListItemText';
import withStyles from '@mui/styles/withStyles';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { getKeyBindingObject } from '-/reducers/settings';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
@@ -87,7 +86,9 @@ function KeyboardDialog(props: Props) {
))}
</List>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
<Button
data-tid="closeKeyboardDialog"
onClick={onClose}
diff --git a/app/components/dialogs/LicenseDialog.tsx b/app/components/dialogs/LicenseDialog.tsx
index 836ff2744..7f7649b2e 100644
--- a/app/components/dialogs/LicenseDialog.tsx
+++ b/app/components/dialogs/LicenseDialog.tsx
@@ -22,7 +22,6 @@ import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { Pro } from '-/pro';
import LicenseContent from '-/LICENSE.txt';
@@ -80,7 +79,9 @@ function LicenseDialog(props: Props) {
{Pro ? Pro.EULAContent : LicenseContent}
</pre>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
{/* <Button
onClick={printLicense}
color="primary"
diff --git a/app/components/dialogs/LinkGeneratorDialog.tsx b/app/components/dialogs/LinkGeneratorDialog.tsx
index 82ca79fed..bdc8e74a2 100644
--- a/app/components/dialogs/LinkGeneratorDialog.tsx
+++ b/app/components/dialogs/LinkGeneratorDialog.tsx
@@ -35,8 +35,6 @@ import InputAdornment from '@mui/material/InputAdornment';
import TextField from '@mui/material/TextField';
import MenuItem from '@mui/material/MenuItem';
import PlatformIO from '-/services/platform-facade';
-import AppConfig from '-/AppConfig';
-import useFirstRender from '-/utils/useFirstRender';
interface Props {
open: boolean;
@@ -177,7 +175,9 @@ function LinkGeneratorDialog(props: Props) {
}}
/>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
<Button
data-tid="closeLinkTID"
onClick={onClose}
diff --git a/app/components/dialogs/MoveCopyFilesDialog.tsx b/app/components/dialogs/MoveCopyFilesDialog.tsx
index 3ef4c313a..314d24efa 100644
--- a/app/components/dialogs/MoveCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveCopyFilesDialog.tsx
@@ -304,9 +304,7 @@ function MoveCopyFilesDialog(props: Props) {
/>
</DialogContent>
<DialogActions
- // style={{
- // justifyContent: 'space-between'
- // }}
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
>
<Button data-tid="closeMoveCopyDialog" onClick={() => props.onClose()}>
{i18n.t('core:cancel')}
diff --git a/app/components/dialogs/MoveOrCopyFilesDialog.tsx b/app/components/dialogs/MoveOrCopyFilesDialog.tsx
index a6530b35f..e9ad032aa 100644
--- a/app/components/dialogs/MoveOrCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveOrCopyFilesDialog.tsx
@@ -93,7 +93,9 @@ function MoveOrCopyFilesDialog(props: Props) {
))}
</List>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
<Button
data-tid="closeMoveOrCopyDialog"
onClick={() => props.onClose()}
diff --git a/app/components/dialogs/OpenLinkDialog.tsx b/app/components/dialogs/OpenLinkDialog.tsx
index 3854f399d..85e3da24a 100644
--- a/app/components/dialogs/OpenLinkDialog.tsx
+++ b/app/components/dialogs/OpenLinkDialog.tsx
@@ -83,7 +83,7 @@ function OpenLinkDialog(props: Props) {
setDisableConfirmButton(true);
}
- const theme = useTheme();
+ // const theme = useTheme();
// const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<Dialog
diff --git a/app/components/dialogs/ResolveConflictDialog.tsx b/app/components/dialogs/ResolveConflictDialog.tsx
index 2a9fae811..3ca7d461f 100644
--- a/app/components/dialogs/ResolveConflictDialog.tsx
+++ b/app/components/dialogs/ResolveConflictDialog.tsx
@@ -93,7 +93,9 @@ function ResolveConflictDialog(props: Props) {
i18n.t('core:resolveConflictDesc')
)}
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
{isSaveAs ? (
<>
<Button
diff --git a/app/components/dialogs/ThirdPartyLibsDialog.tsx b/app/components/dialogs/ThirdPartyLibsDialog.tsx
index d7d0fcec0..ce3b80afb 100644
--- a/app/components/dialogs/ThirdPartyLibsDialog.tsx
+++ b/app/components/dialogs/ThirdPartyLibsDialog.tsx
@@ -54,7 +54,9 @@ function ThirdPartyLibsDialog(props: Props) {
{ThirdPartyLibs}
</pre>
</DialogContent>
- <DialogActions>
+ <DialogActions
+ style={fullScreen ? { padding: '10px 30px 30px 30px' } : {}}
+ >
<Button
data-tid="confirmThirdPartyLibsDialog"
onClick={onClose}
diff --git a/app/reducers/settings.ts b/app/reducers/settings.ts
index efb18dc52..9906da0cb 100644
--- a/app/reducers/settings.ts
+++ b/app/reducers/settings.ts
@@ -901,6 +901,8 @@ export const isDesktopMode = (state: any) => state.settings.desktopMode;
export const getStoredSearchesVisible = (state: any) =>
state.settings.storedSearchesVisible;
export const getShowBookmarks = (state: any) => state.settings.showBookmarks;
+export const getSaveTagInLocation = (state: any) =>
+ state.settings.saveTagInLocation;
export const getFileOpenHistory = (state: any) =>
state.settings.fileOpenHistory;
export const getFolderOpenHistory = (state: any) =>