TagSpaces is an offline, open source, document manager with tagging support
chore: refactoring dialogs
Ilian Sapundshiev0a4d7a3b1bf6
diff --git a/src/renderer/components/EntryContainerNav.tsx b/src/renderer/components/EntryContainerNav.tsxindex e3af11043..874c98083 100644--- a/src/renderer/components/EntryContainerNav.tsx+++ b/src/renderer/components/EntryContainerNav.tsx@@ -1,17 +1,15 @@-import React from 'react';-import { useSelector } from 'react-redux';-import { useTheme } from '@mui/material/styles';-import TsIconButton from '-/components/TsIconButton';import {CloseIcon,- PrevDocumentIcon,NextDocumentIcon,+ PrevDocumentIcon,} from '-/components/CommonIcons';-import Tooltip from '-/components/Tooltip';-import { useTranslation } from 'react-i18next';+import TsIconButton from '-/components/TsIconButton';+import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';import { getKeyBindingObject } from '-/reducers/settings';import { TS } from '-/tagspaces.namespace';-import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';+import { useTheme } from '@mui/material/styles';+import { useTranslation } from 'react-i18next';+import { useSelector } from 'react-redux';interface Props {isFile: boolean;diff --git a/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsx b/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsxindex dd837c83c..33590cc83 100644--- a/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsx+++ b/src/renderer/components/dialogs/AddTagToTagGroupDialog.tsx@@ -77,6 +77,10 @@ function AddTagToTagGroupDialog(props: Props) {onClick={onConfirm}data-tid="createTagsConfirmButton"variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/ColorPickerDialog.tsx b/src/renderer/components/dialogs/ColorPickerDialog.tsxindex 2d6b7c827..ca93eba8a 100644--- a/src/renderer/components/dialogs/ColorPickerDialog.tsx+++ b/src/renderer/components/dialogs/ColorPickerDialog.tsx@@ -85,6 +85,10 @@ function ColorPickerDialog(props: Props) {variant="contained"onClick={onConfirm}data-tid="colorPickerConfirm"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/CreateDirectoryDialog.tsx b/src/renderer/components/dialogs/CreateDirectoryDialog.tsxindex f9c0db2c7..d2b92eb0c 100644--- a/src/renderer/components/dialogs/CreateDirectoryDialog.tsx+++ b/src/renderer/components/dialogs/CreateDirectoryDialog.tsx@@ -16,34 +16,34 @@**/-import React, { useState, useRef, useReducer } from 'react';-import { styled, useTheme } from '@mui/material/styles';+import DraggablePaper from '-/components/DraggablePaper';+import TsButton from '-/components/TsButton';+import TsIconButton from '-/components/TsIconButton';+import TsTextField from '-/components/TsTextField';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';+import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';+import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';+import { useIOActionsContext } from '-/hooks/useIOActionsContext';+import { useNotificationContext } from '-/hooks/useNotificationContext';+import { dirNameValidation } from '-/services/utils-io';+import { TS } from '-/tagspaces.namespace';+import SetBackgroundIcon from '@mui/icons-material/OpacityOutlined';import {+ Box,Dialog,- FormControl,DialogContent,+ FormControl,FormHelperText,InputAdornment,+ Paper,inputBaseClasses,useMediaQuery,- Box,- Paper,} from '@mui/material';-import TsDialogActions from '-/components/dialogs/components/TsDialogActions';-import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';-import DraggablePaper from '-/components/DraggablePaper';-import SetBackgroundIcon from '@mui/icons-material/OpacityOutlined';+import { styled, useTheme } from '@mui/material/styles';import { joinPaths } from '@tagspaces/tagspaces-common/paths';-import TsTextField from '-/components/TsTextField';-import TsIconButton from '-/components/TsIconButton';-import TsButton from '-/components/TsButton';+import { useReducer, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';-import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';-import { useIOActionsContext } from '-/hooks/useIOActionsContext';-import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';-import { useNotificationContext } from '-/hooks/useNotificationContext';-import { TS } from '-/tagspaces.namespace';-import { dirNameValidation } from '-/services/utils-io';const FolderColorTextField = styled(TsTextField)(({ theme }) => ({[`& .${inputBaseClasses.root}`]: {@@ -169,7 +169,10 @@ function CreateDirectoryDialog(props: Props) {data-tid="confirmCreateNewDirectory"id="confirmCreateNewDirectory"variant="contained"- //variant={smallScreen ? 'outlined' : 'contained'}+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/CreateEditLocationDialog.tsx b/src/renderer/components/dialogs/CreateEditLocationDialog.tsxindex 56e01af92..f7b9e9960 100644--- a/src/renderer/components/dialogs/CreateEditLocationDialog.tsx+++ b/src/renderer/components/dialogs/CreateEditLocationDialog.tsx@@ -16,68 +16,67 @@**/-import React, { ChangeEvent, useEffect, useState } from 'react';-import { styled } from '@mui/material/styles';-import CryptoJS from 'crypto-js';-import Paper from '@mui/material/Paper';+import AppConfig from '-/AppConfig';+import { ExpandIcon, IDIcon } from '-/components/CommonIcons';+import DraggablePaper from '-/components/DraggablePaper';+import { BetaLabel, ProLabel, ProTooltip } from '-/components/HelperComponents';+import InfoIcon from '-/components/InfoIcon';+import Tooltip from '-/components/Tooltip';import TsButton from '-/components/TsButton';+import TsIconButton from '-/components/TsIconButton';import TsSelect from '-/components/TsSelect';+import TsTextField from '-/components/TsTextField';+import ConfirmDialog from '-/components/dialogs/ConfirmDialog';+import MaxLoopsSelect from '-/components/dialogs/MaxLoopsSelect';+import ObjectStoreForm from '-/components/dialogs/components/ObjectStoreForm';import TsDialogActions from '-/components/dialogs/components/TsDialogActions';+import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';+import WebdavForm from '-/components/dialogs/components/WebdavForm';+import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';+import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';+import { useNotificationContext } from '-/hooks/useNotificationContext';+import { useTagGroupsLocationContext } from '-/hooks/useTagGroupsLocationContext';+import { Pro } from '-/pro';+import { getPersistTagsInSidecarFile, isDevMode } from '-/reducers/settings';+import { TS } from '-/tagspaces.namespace';+import { CommonLocation } from '-/utils/CommonLocation';+import useFirstRender from '-/utils/useFirstRender';+import CheckIcon from '@mui/icons-material/Check';+import PasswordIcon from '@mui/icons-material/Password';+import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';+import Visibility from '@mui/icons-material/Visibility';+import VisibilityOff from '@mui/icons-material/VisibilityOff';+import {+ Accordion,+ AccordionDetails,+ AccordionSummary,+ FormLabel,+ MenuItem,+} from '@mui/material';+import Dialog from '@mui/material/Dialog';import DialogContent from '@mui/material/DialogContent';-import Switch from '@mui/material/Switch';import FormControl from '@mui/material/FormControl';import FormControlLabel from '@mui/material/FormControlLabel';import FormGroup from '@mui/material/FormGroup';-import Typography from '@mui/material/Typography';-import Tooltip from '-/components/Tooltip';-import Dialog from '@mui/material/Dialog';+import InputAdornment from '@mui/material/InputAdornment';import List from '@mui/material/List';import ListItem from '@mui/material/ListItem';import ListItemIcon from '@mui/material/ListItemIcon';import ListItemText from '@mui/material/ListItemText';-import TsTextField from '-/components/TsTextField';-import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';+import Paper from '@mui/material/Paper';+import Switch from '@mui/material/Switch';import ToggleButton from '@mui/material/ToggleButton';-import CheckIcon from '@mui/icons-material/Check';-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';-import InputAdornment from '@mui/material/InputAdornment';-import TsIconButton from '-/components/TsIconButton';-import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';-import { useSelector } from 'react-redux';-import { locationType } from '@tagspaces/tagspaces-common/misc';-import AppConfig from '-/AppConfig';-import {- Accordion,- AccordionDetails,- AccordionSummary,- MenuItem,- FormLabel,-} from '@mui/material';-import { Pro } from '-/pro';-import DraggablePaper from '-/components/DraggablePaper';-import ObjectStoreForm from '-/components/dialogs/components/ObjectStoreForm';-import LocalForm from './components/LocalForm';-import useFirstRender from '-/utils/useFirstRender';-import { TS } from '-/tagspaces.namespace';-import InfoIcon from '-/components/InfoIcon';-import { ProLabel, BetaLabel, ProTooltip } from '-/components/HelperComponents';-import { getPersistTagsInSidecarFile, isDevMode } from '-/reducers/settings';-import ConfirmDialog from '-/components/dialogs/ConfirmDialog';-import WebdavForm from '-/components/dialogs/components/WebdavForm';+import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';+import Typography from '@mui/material/Typography';import { useTheme } from '@mui/material/styles';import useMediaQuery from '@mui/material/useMediaQuery';+import { locationType } from '@tagspaces/tagspaces-common/misc';import { getUuid } from '@tagspaces/tagspaces-common/utils-io';-import { ExpandIcon, IDIcon } from '-/components/CommonIcons';-import MaxLoopsSelect from '-/components/dialogs/MaxLoopsSelect';+import CryptoJS from 'crypto-js';+import React, { ChangeEvent, useEffect, useState } from 'react';import { useTranslation } from 'react-i18next';-import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';-import { useNotificationContext } from '-/hooks/useNotificationContext';-import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';-import { useTagGroupsLocationContext } from '-/hooks/useTagGroupsLocationContext';-import { CommonLocation } from '-/utils/CommonLocation';-import Visibility from '@mui/icons-material/Visibility';-import VisibilityOff from '@mui/icons-material/VisibilityOff';-import PasswordIcon from '@mui/icons-material/Password';+import { useSelector } from 'react-redux';+import LocalForm from './components/LocalForm';interface Props {open: boolean;@@ -567,7 +566,11 @@ function CreateEditLocationDialog(props: Props) {disabled={disableConfirmButton()}onClick={preConfirm}data-tid="confirmLocationCreation"- variant={smallScreen ? 'outlined' : 'contained'}+ variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/CreateTagGroupDialog.tsx b/src/renderer/components/dialogs/CreateTagGroupDialog.tsxindex bf2e9f0b1..95eff67a4 100644--- a/src/renderer/components/dialogs/CreateTagGroupDialog.tsx+++ b/src/renderer/components/dialogs/CreateTagGroupDialog.tsx@@ -151,6 +151,10 @@ function CreateTagGroupDialog(props: Props) {onClick={onConfirm}variant="contained"data-tid="createTagGroupConfirmButton"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/CreateTagsDialog.tsx b/src/renderer/components/dialogs/CreateTagsDialog.tsxindex e0e392994..f71505782 100644--- a/src/renderer/components/dialogs/CreateTagsDialog.tsx+++ b/src/renderer/components/dialogs/CreateTagsDialog.tsx@@ -93,6 +93,10 @@ function CreateTagsDialog(props: Props) {onClick={onConfirm}data-tid="createTagsConfirmButton"variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/DownloadUrlDialog.tsx b/src/renderer/components/dialogs/DownloadUrlDialog.tsxindex a59fd41b3..305f1f794 100644--- a/src/renderer/components/dialogs/DownloadUrlDialog.tsx+++ b/src/renderer/components/dialogs/DownloadUrlDialog.tsx@@ -16,31 +16,31 @@**/-import React, { useRef, useState } from 'react';-import { saveAs } from 'file-saver';-import DialogContent from '@mui/material/DialogContent';-import Dialog from '@mui/material/Dialog';-import Paper from '@mui/material/Paper';+import AppConfig from '-/AppConfig';import DraggablePaper from '-/components/DraggablePaper';-import { useTheme } from '@mui/material/styles';-import useMediaQuery from '@mui/material/useMediaQuery';-import TargetPath from '-/components/dialogs/components/TargetPath';-import { TargetPathContextProvider } from '-/components/dialogs/hooks/TargetPathContextProvider';-import { useTranslation } from 'react-i18next';import TsButton from '-/components/TsButton';+import TsTextField from '-/components/TsTextField';+import TargetPath from '-/components/dialogs/components/TargetPath';import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';-import AppConfig from '-/AppConfig';-import { actions as AppActions, AppDispatch } from '-/reducers/app';-import TsTextField from '-/components/TsTextField';+import { TargetPathContextProvider } from '-/components/dialogs/hooks/TargetPathContextProvider';+import { useFileUploadDialogContext } from '-/components/dialogs/hooks/useFileUploadDialogContext';+import { useTargetPathContext } from '-/components/dialogs/hooks/useTargetPathContext';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';+import { useEditedEntryContext } from '-/hooks/useEditedEntryContext';import { useIOActionsContext } from '-/hooks/useIOActionsContext';import { useNotificationContext } from '-/hooks/useNotificationContext';-import { useFileUploadDialogContext } from '-/components/dialogs/hooks/useFileUploadDialogContext';-import { useDispatch } from 'react-redux';-import { useTargetPathContext } from '-/components/dialogs/hooks/useTargetPathContext';+import { actions as AppActions, AppDispatch } from '-/reducers/app';import { TS } from '-/tagspaces.namespace';-import { useEditedEntryContext } from '-/hooks/useEditedEntryContext';+import Dialog from '@mui/material/Dialog';+import DialogContent from '@mui/material/DialogContent';+import Paper from '@mui/material/Paper';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';+import { saveAs } from 'file-saver';+import React, { useRef, useState } from 'react';+import { useTranslation } from 'react-i18next';+import { useDispatch } from 'react-redux';interface Props {open: boolean;@@ -148,6 +148,10 @@ function DownloadUrlDialog(props: Props) {variant="contained"data-tid={'downloadFileUrlTID'}onClick={() => downloadURL()}+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/EditTagDialog.tsx b/src/renderer/components/dialogs/EditTagDialog.tsxindex a38dfb5c2..85c7a9cdd 100644--- a/src/renderer/components/dialogs/EditTagDialog.tsx+++ b/src/renderer/components/dialogs/EditTagDialog.tsx@@ -120,6 +120,10 @@ function EditTagDialog(props: Props) {onClick={onConfirm}data-tid="editTagConfirm"variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/EditTagGroupDialog.tsx b/src/renderer/components/dialogs/EditTagGroupDialog.tsxindex ae03d28ba..08ccd4c77 100644--- a/src/renderer/components/dialogs/EditTagGroupDialog.tsx+++ b/src/renderer/components/dialogs/EditTagGroupDialog.tsx@@ -139,6 +139,10 @@ function EditTagGroupDialog(props: Props) {onClick={onConfirm}data-tid="editTagGroupConfirmButton"variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/KeyboardDialog.tsx b/src/renderer/components/dialogs/KeyboardDialog.tsxindex 062b9487d..9cb8cba65 100644--- a/src/renderer/components/dialogs/KeyboardDialog.tsx+++ b/src/renderer/components/dialogs/KeyboardDialog.tsx@@ -76,6 +76,10 @@ function KeyboardDialog(props: Props) {data-tid="closeKeyboardDialog"onClick={onClose}variant="outlined"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/NewFileDialog.tsx b/src/renderer/components/dialogs/NewFileDialog.tsxindex 19b53a17f..1e1806fb9 100644--- a/src/renderer/components/dialogs/NewFileDialog.tsx+++ b/src/renderer/components/dialogs/NewFileDialog.tsx@@ -16,31 +16,31 @@**/-import React, { useReducer, useRef } from 'react';-import {- locationType,- formatDateTime4Tag,-} from '@tagspaces/tagspaces-common/misc';-import DialogContent from '@mui/material/DialogContent';-import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';-import Dialog from '@mui/material/Dialog';-import Paper from '@mui/material/Paper';+import AppConfig from '-/AppConfig';import DraggablePaper from '-/components/DraggablePaper';-import { useTheme } from '@mui/material/styles';-import useMediaQuery from '@mui/material/useMediaQuery';+import TsButton from '-/components/TsButton';import CreateFile from '-/components/dialogs/components/CreateFile';+import CreateLink from '-/components/dialogs/components/CreateLink';import TargetPath from '-/components/dialogs/components/TargetPath';-import { useTranslation } from 'react-i18next';-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';+import TsDialogActions from '-/components/dialogs/components/TsDialogActions';+import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';+import { useTargetPathContext } from '-/components/dialogs/hooks/useTargetPathContext';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';-import { useTargetPathContext } from '-/components/dialogs/hooks/useTargetPathContext';-import TsButton from '-/components/TsButton';-import TsDialogActions from '-/components/dialogs/components/TsDialogActions';-import AppConfig from '-/AppConfig';-import versionMeta from '-/version.json';+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { TS } from '-/tagspaces.namespace';-import CreateLink from '-/components/dialogs/components/CreateLink';+import versionMeta from '-/version.json';+import Dialog from '@mui/material/Dialog';+import DialogContent from '@mui/material/DialogContent';+import Paper from '@mui/material/Paper';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';+import {+ formatDateTime4Tag,+ locationType,+} from '@tagspaces/tagspaces-common/misc';+import { useReducer, useRef } from 'react';+import { useTranslation } from 'react-i18next';interface Props {open: boolean;@@ -120,11 +120,15 @@ function NewFileDialog(props: Props) {const okButton = (<TsButtondata-tid="createTID"- variant={smallScreen ? 'outlined' : 'contained'}+ variant="contained"onClick={() => {createFile(fileType, targetDirectoryPath);}}disabled={haveError.current}+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/OpenLinkDialog.tsx b/src/renderer/components/dialogs/OpenLinkDialog.tsxindex 5d7fe2a3b..f1ad9336c 100644--- a/src/renderer/components/dialogs/OpenLinkDialog.tsx+++ b/src/renderer/components/dialogs/OpenLinkDialog.tsx@@ -16,20 +16,20 @@**/-import React, { useState, useEffect } from 'react';-import useMediaQuery from '@mui/material/useMediaQuery';-import { useTheme } from '@mui/material/styles';+import InfoIcon from '-/components/InfoIcon';import TsButton from '-/components/TsButton';+import TsTextField from '-/components/TsTextField';import TsDialogActions from '-/components/dialogs/components/TsDialogActions';import TsDialogTitle from '-/components/dialogs/components/TsDialogTitle';+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';+import Dialog from '@mui/material/Dialog';import DialogContent from '@mui/material/DialogContent';import FormControl from '@mui/material/FormControl';import InputAdornment from '@mui/material/InputAdornment';-import Dialog from '@mui/material/Dialog';-import InfoIcon from '-/components/InfoIcon';-import TsTextField from '-/components/TsTextField';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';+import { useEffect, useState } from 'react';import { useTranslation } from 'react-i18next';-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';interface Props {open: boolean;@@ -92,6 +92,10 @@ function OpenLinkDialog(props: Props) {onClick={onConfirm}data-tid="confirmOpenLink"variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:open')}</TsButton>diff --git a/src/renderer/components/dialogs/RenameEntryDialog.tsx b/src/renderer/components/dialogs/RenameEntryDialog.tsxindex 5c7b6ad75..5d44a8c0b 100644--- a/src/renderer/components/dialogs/RenameEntryDialog.tsx+++ b/src/renderer/components/dialogs/RenameEntryDialog.tsx@@ -156,6 +156,10 @@ function RenameEntryDialog(props: Props) {onClick={onConfirm}data-tid="confirmRenameEntry"variant="contained"+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}>{t('core:ok')}</TsButton>diff --git a/src/renderer/components/dialogs/ThirdPartyLibsDialog.tsx b/src/renderer/components/dialogs/ThirdPartyLibsDialog.tsxindex 948cf7762..30399509a 100644--- a/src/renderer/components/dialogs/ThirdPartyLibsDialog.tsx+++ b/src/renderer/components/dialogs/ThirdPartyLibsDialog.tsx@@ -39,7 +39,14 @@ function ThirdPartyLibsDialog(props: Props) {const theme = useTheme();const smallScreen = useMediaQuery(theme.breakpoints.down('md'));const okButton = (- <TsButton data-tid="confirmThirdPartyLibsDialog" onClick={onClose}>+ <TsButton+ style={{+ // @ts-ignore+ WebkitAppRegion: 'no-drag',+ }}+ data-tid="confirmThirdPartyLibsDialog"+ onClick={onClose}+ >{t('core:ok')}</TsButton>);diff --git a/src/renderer/components/dialogs/components/TsDialogActions.tsx b/src/renderer/components/dialogs/components/TsDialogActions.tsxindex 93750779c..83cd1d633 100644--- a/src/renderer/components/dialogs/components/TsDialogActions.tsx+++ b/src/renderer/components/dialogs/components/TsDialogActions.tsx@@ -16,13 +16,11 @@**/-import React from 'react';-import { useSelector } from 'react-redux';-import useMediaQuery from '@mui/material/useMediaQuery';-import { useTheme } from '@mui/material/styles';-import DialogActions, { DialogActionsProps } from '@mui/material/DialogActions';import { isDesktopMode } from '-/reducers/settings';-import AppConfig from '-/AppConfig';+import DialogActions, { DialogActionsProps } from '@mui/material/DialogActions';+import { useTheme } from '@mui/material/styles';+import useMediaQuery from '@mui/material/useMediaQuery';+import { useSelector } from 'react-redux';export type TSDialogActions = DialogActionsProps & {};@@ -36,7 +34,7 @@ function TSDialogActions(props: TSDialogActions) {<DialogActions{...props}style={{- padding: smallScreen ? '10px 30px 30px 30px' : 'inherited',+ padding: smallScreen ? '10px 20px 20px 30px' : 'inherited',...style,}}>diff --git a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsxindex fae672dcf..ab62c056e 100644--- a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx+++ b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx@@ -366,6 +366,9 @@ function GridSettingsDialog(props: Props) {saveSettings(true);onClose();}}+ style={{+ marginTop: AppConfig.defaultSpaceBetweenButtons,+ }}>{t('core:defaultSettings')}</TsButton>@@ -376,7 +379,10 @@ function GridSettingsDialog(props: Props) {saveSettings(false);onClose();}}- style={{ marginLeft: AppConfig.defaultSpaceBetweenButtons }}+ style={{+ marginTop: AppConfig.defaultSpaceBetweenButtons,+ marginLeft: AppConfig.defaultSpaceBetweenButtons,+ }}>{t('core:directorySettings')}</TsButton>