Skip to content

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

polish: added close button to some dialogs

Ilian Sapundshiev63e025b8e47f
diff --git a/app/components/dialogs/KeyboardDialog.tsx b/app/components/dialogs/KeyboardDialog.tsx
index 5cd90352e..54e0b8aa2 100644
--- a/app/components/dialogs/KeyboardDialog.tsx
+++ b/app/components/dialogs/KeyboardDialog.tsx
@@ -23,6 +23,8 @@ import Button from '@material-ui/core/Button';
import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
+import IconButton from '@material-ui/core/IconButton';
+import CloseIcon from '@material-ui/icons/Close';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
@@ -64,7 +66,20 @@ const KeyboardDialog = (props: Props) => {
keepMounted
scroll="paper"
>
- <DialogTitle>{i18n.t('core:shortcutKeys')}</DialogTitle>
+ <DialogTitle>
+ {i18n.t('core:shortcutKeys')}
+ <IconButton
+ aria-label="close"
+ style={{
+ position: 'absolute',
+ right: 5,
+ top: 5
+ }}
+ onClick={onClose}
+ >
+ <CloseIcon />
+ </IconButton>
+ </DialogTitle>
<DialogContent
className={props.classes.root}
data-tid="keyboardShortCutsDialog"
diff --git a/app/components/dialogs/LicenseDialog.tsx b/app/components/dialogs/LicenseDialog.tsx
index 9eb5fb7ee..7c80118ed 100644
--- a/app/components/dialogs/LicenseDialog.tsx
+++ b/app/components/dialogs/LicenseDialog.tsx
@@ -73,7 +73,7 @@ const LicenseDialog = (props: Props) => {
// }}
style={{ overflow: AppConfig.isFirefox ? 'auto' : 'overlay' }}
>
- <pre style={{ whiteSpace: 'pre-wrap' }}>
+ <pre style={{ whiteSpace: 'pre-wrap', userSelect: 'text' }}>
{Pro ? Pro.EULAContent : LicenseContent}
</pre>
</DialogContent>
diff --git a/app/components/dialogs/OnboardingDialog.tsx b/app/components/dialogs/OnboardingDialog.tsx
index af9b256ac..88ed73800 100644
--- a/app/components/dialogs/OnboardingDialog.tsx
+++ b/app/components/dialogs/OnboardingDialog.tsx
@@ -24,6 +24,8 @@ import Button from '@material-ui/core/Button';
import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
+import IconButton from '@material-ui/core/IconButton';
+import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Radio from '@material-ui/core/Radio';
import RadioGroup from '@material-ui/core/RadioGroup';
@@ -94,6 +96,17 @@ const OnboardingDialog = (props: Props) => {
>
<DialogTitle style={{ justifyContent: 'center', textAlign: 'center' }}>
Welcome to TagSpaces
+ <IconButton
+ aria-label="close"
+ style={{
+ position: 'absolute',
+ right: 5,
+ top: 5
+ }}
+ onClick={onClose}
+ >
+ <CloseIcon />
+ </IconButton>
</DialogTitle>
<DialogContent
style={{
diff --git a/app/components/dialogs/ProTeaserDialog.tsx b/app/components/dialogs/ProTeaserDialog.tsx
index 27a3f6179..dd248eb30 100644
--- a/app/components/dialogs/ProTeaserDialog.tsx
+++ b/app/components/dialogs/ProTeaserDialog.tsx
@@ -21,6 +21,9 @@ import SwipeableViews from 'react-swipeable-views';
import Button from '@material-ui/core/Button';
import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import IconButton from '@material-ui/core/IconButton';
+import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import withMobileDialog from '@material-ui/core/withMobileDialog';
import MobileStepper from '@material-ui/core/MobileStepper';
@@ -73,6 +76,19 @@ const ProTeaserDialog = (props: Props) => {
keepMounted
scroll="paper"
>
+ <DialogTitle style={{ justifyContent: 'center', textAlign: 'center' }}>
+ <IconButton
+ aria-label="close"
+ style={{
+ position: 'absolute',
+ right: 5,
+ top: 5
+ }}
+ onClick={onClose}
+ >
+ <CloseIcon />
+ </IconButton>
+ </DialogTitle>
<DialogContent style={{ paddingBottom: 0 }}>
<SwipeableViews
index={activeStep}