Skip to content

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

chore: adding clarification information, adjusting the PRO teaser

Ilian Sapundshieve294f56a4959
diff --git a/app/components/dialogs/ProTeaserDialog.tsx b/app/components/dialogs/ProTeaserDialog.tsx
index d50a32494..5fb4d1360 100644
--- a/app/components/dialogs/ProTeaserDialog.tsx
+++ b/app/components/dialogs/ProTeaserDialog.tsx
@@ -370,7 +370,7 @@ function Slide(props: SlideProps) {
function ProTeaserDialog(props: Props) {
const [activeStep, setActiveStep] = useState<number>(0);
- const maxSteps = 8;
+ const maxSteps = 7;
const handleNext = () => {
setActiveStep(activeStep + 1);
@@ -416,7 +416,7 @@ function ProTeaserDialog(props: Props) {
<Slide {...slidesEN['mapique']} openURL={openURLExternally} />
<Slide {...slidesEN['annotation']} openURL={openURLExternally} />
<Slide {...slidesEN['search']} openURL={openURLExternally} />
- <Slide {...slidesEN['objectstorage']} openURL={openURLExternally} />
+ {/* <Slide {...slidesEN['objectstorage']} openURL={openURLExternally} /> */}
<Slide {...slidesEN['folderColor']} openURL={openURLExternally} />
<Slide {...slidesEN['enterprise']} openURL={openURLExternally} />
</SwipeableViews>
diff --git a/app/components/dialogs/settings/SettingsGeneral.tsx b/app/components/dialogs/settings/SettingsGeneral.tsx
index 2ee1ebd21..1fb15f91c 100644
--- a/app/components/dialogs/settings/SettingsGeneral.tsx
+++ b/app/components/dialogs/settings/SettingsGeneral.tsx
@@ -30,7 +30,8 @@ import Tooltip from '-/components/Tooltip';
import Input from '@mui/material/Input';
import Select from '@mui/material/Select';
import Button from '@mui/material/Button';
-import InfoIcon from '@mui/icons-material/InfoOutlined';
+import InfoMuiIcon from '@mui/icons-material/InfoOutlined';
+import InfoIcon from '-/components/InfoIcon';
import CheckIcon from '@mui/icons-material/Check';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
@@ -247,7 +248,7 @@ function SettingsGeneral(props: Props) {
<div style={{ display: 'flex' }}>
{!persistTagsInSidecarFile && <CheckIcon />}
&nbsp;{i18n.t('core:renameFile')}&nbsp;&nbsp;
- <InfoIcon />
+ <InfoMuiIcon />
</div>
</Tooltip>
</ToggleButton>
@@ -266,7 +267,7 @@ function SettingsGeneral(props: Props) {
<div style={{ display: 'flex' }}>
{persistTagsInSidecarFile && <CheckIcon />}
&nbsp;{i18n.t('core:useSidecarFile')}&nbsp;&nbsp;
- <InfoIcon />
+ <InfoMuiIcon />
</div>
</Tooltip>
</ToggleButton>
@@ -377,7 +378,14 @@ function SettingsGeneral(props: Props) {
</ListItem>
{AppConfig.isElectron && (
<ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:useTrashCan')} />
+ <ListItemText
+ primary={
+ <Typography>
+ {i18n.t('core:useTrashCan')}
+ <InfoIcon tooltip={i18n.t('core:useTrashCanInfo')} />
+ </Typography>
+ }
+ />
<Switch
data-tid="settingsSetUseTrashCan"
onClick={() => props.setUseTrashCan(!props.settings.useTrashCan)}
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index b671c7684..7d133c49c 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -105,7 +105,8 @@
"enablingUsingMetaFolder": "Enable the use of a hidden folder(.ts) for storing meta data and thumbnails",
"persistTagsInSidecarFile": "Do not rename files on tagging (use sidecar files)",
"addTagsToLibrary": "Collect new tags in the tag library",
- "useTrashCan": "Move deleted files or folders to trash bin",
+ "useTrashCan": "Move deleted files or folders to trash bin if available",
+ "useTrashCanInfo": "Files and folders from e.g. S3 buckets will be deleted directly since there is no trash bin support",
"invalidImportFile": "The imported file has invalid format",
"invalidPath": "Invalid Path",
"importGroupTagsTitle": "Import tags from file",