Skip to content

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

feature: adding beta and pro components (#1476)

Ilianf99ef3c92a6e
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index 797a47ef6..1bfe7fb3e 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -87,6 +87,7 @@ import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import { TS } from '-/tagspaces.namespace';
import NoTileServer from '-/components/NoTileServer';
import InfoIcon from '-/components/InfoIcon';
+import { ProTooltip } from '-/components/HelperComponents';
const ThumbnailChooserDialog =
Pro && Pro.UI ? Pro.UI.ThumbnailChooserDialog : false;
@@ -365,7 +366,7 @@ const EntryProperties = (props: Props) => {
const toggleThumbFilesDialog = () => {
if (!Pro) {
- props.showNotification(i18n.t('core:needProVersion'));
+ props.showNotification(i18n.t('core:thisFunctionalityIsAvailableInPro'));
return true;
}
if (
@@ -810,15 +811,18 @@ const EntryProperties = (props: Props) => {
{i18n.t('core:cancel')}
</Button>
)}
- <Button
- color="primary"
- className={classes.button}
- onClick={toggleEditDescriptionField}
- >
- {editDescription !== undefined
- ? i18n.t('core:confirmSaveButton')
- : i18n.t('core:edit')}
- </Button>
+ <ProTooltip>
+ <Button
+ color="primary"
+ className={classes.button}
+ disabled={!Pro}
+ onClick={toggleEditDescriptionField}
+ >
+ {editDescription !== undefined
+ ? i18n.t('core:confirmSaveButton')
+ : i18n.t('core:edit')}
+ </Button>
+ </ProTooltip>
</div>
)}
</div>
@@ -874,9 +878,7 @@ const EntryProperties = (props: Props) => {
// eslint-disable-next-line no-nested-ternary
__html: currentEntry.description
? marked(DOMPurify.sanitize(currentEntry.description))
- : Pro
- ? i18n.t('core:addMarkdownDescription')
- : i18n.t('core:addDescription')
+ : i18n.t('core:addMarkdownDescription')
}}
onDoubleClick={() => {
if (!currentEntry.editMode && editName === undefined) {
@@ -1256,14 +1258,17 @@ const EntryProperties = (props: Props) => {
!currentEntry.editMode &&
editName === undefined &&
editDescription === undefined && (
- <Button
- color="primary"
- className={classes.button}
- style={{ whiteSpace: 'nowrap' }}
- onClick={toggleThumbFilesDialog}
- >
- {i18n.t('core:changeThumbnail')}
- </Button>
+ <ProTooltip>
+ <Button
+ disabled={!Pro}
+ color="primary"
+ className={classes.button}
+ style={{ whiteSpace: 'nowrap' }}
+ onClick={toggleThumbFilesDialog}
+ >
+ {i18n.t('core:changeThumbnail')}
+ </Button>
+ </ProTooltip>
)}
</div>
<div className={classes.fluidGrid}>
diff --git a/app/components/HelperComponents.tsx b/app/components/HelperComponents.tsx
new file mode 100644
index 000000000..c9d7adff4
--- /dev/null
+++ b/app/components/HelperComponents.tsx
@@ -0,0 +1,54 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2021-present TagSpaces UG (haftungsbeschraenkt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import React from 'react';
+import Tooltip from '@material-ui/core/Tooltip';
+import Typography from '@material-ui/core/Typography';
+import i18n from '../services/i18n';
+import { Pro } from '-/pro';
+
+export const BetaLabel = () => (
+ <Tooltip arrow placement="top" title="This features is in BETA status">
+ <Typography style={{ display: 'initial' }}>
+ <sup style={{ marginLeft: 5 }}>BETA</sup>
+ </Typography>
+ </Tooltip>
+);
+
+export const ProLabel = () =>
+ !Pro && (
+ <Tooltip
+ arrow
+ placement="top"
+ title={i18n.t('thisFunctionalityIsAvailableInPro')}
+ >
+ <Typography style={{ display: 'initial' }}>
+ <sup style={{ marginLeft: 5 }}>PRO</sup>
+ </Typography>
+ </Tooltip>
+ );
+
+export const ProTooltip = props => (
+ <Tooltip
+ arrow
+ placement="top"
+ title={Pro ? '' : i18n.t('thisFunctionalityIsAvailableInPro')}
+ >
+ <span {...props} />
+ </Tooltip>
+);
diff --git a/app/components/Search.tsx b/app/components/Search.tsx
index 5d29cc266..e61364722 100644
--- a/app/components/Search.tsx
+++ b/app/components/Search.tsx
@@ -77,6 +77,7 @@ import { isPlusCode, parseLatLon } from '-/utils/misc';
import { AppConfig } from '-/config';
import { actions as SearchActions, getSearches } from '-/reducers/searches';
import { TS } from '-/tagspaces.namespace';
+import { ProLabel, BetaLabel, ProTooltip } from '-/components/HelperComponents';
const SaveSearchDialog = Pro && Pro.UI ? Pro.UI.SaveSearchDialog : false;
@@ -705,7 +706,7 @@ const Search = (props: Props) => {
>
<div>{i18n.t('globalSearch')}</div>
</Tooltip>
- <sub>{Pro ? ' BETA' : ' PRO'}</sub>
+ {Pro ? <BetaLabel /> : <ProLabel />}
</ToggleButton>
</ToggleButtonGroup>
</FormControl>
@@ -842,232 +843,228 @@ const Search = (props: Props) => {
/>
</FormControl>
{AppConfig.showAdvancedSearch && (
- <React.Fragment>
+ <>
<FormControl
className={classes.formControl}
disabled={indexing || !Pro}
- title={
- !Pro
- ? i18n.t('core:thisFunctionalityIsAvailableInPro')
- : undefined
- }
>
- <InputLabel htmlFor="file-type">
- {i18n.t('core:fileType')}
- </InputLabel>
- <Select
- value={JSON.stringify(fileTypes.current)}
- onChange={handleFileTypeChange}
- input={<Input name="fileTypes" id="file-type" />}
- >
- <MenuItem value={JSON.stringify(FileTypeGroups.any)}>
- {i18n.t('core:anyType')}
- </MenuItem>
- <MenuItem value={JSON.stringify(FileTypeGroups.folders)}>
- <IconButton>
- <FolderIcon />
- </IconButton>
- {i18n.t('core:searchFolders')}
- </MenuItem>
- <MenuItem value={JSON.stringify(FileTypeGroups.files)}>
- <IconButton>
- <FileIcon />
- </IconButton>
- {i18n.t('core:searchFiles')}
- </MenuItem>
- <MenuItem value={JSON.stringify(FileTypeGroups.untagged)}>
- <IconButton>
- <UntaggedIcon />
- </IconButton>
- {i18n.t('core:searchUntaggedEntries')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.images)}
- title={FileTypeGroups.images.toString()}
- >
- <IconButton>
- <PictureIcon />
- </IconButton>
- {i18n.t('core:searchPictures')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.documents)}
- title={FileTypeGroups.documents.toString()}
- >
- <IconButton>
- <DocumentIcon />
- </IconButton>
- {i18n.t('core:searchDocuments')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.notes)}
- title={FileTypeGroups.notes.toString()}
- >
- <IconButton>
- <NoteIcon />
- </IconButton>
- {i18n.t('core:searchNotes')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.audio)}
- title={FileTypeGroups.audio.toString()}
- >
- <IconButton>
- <AudioIcon />
- </IconButton>
- {i18n.t('core:searchAudio')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.video)}
- title={FileTypeGroups.video.toString()}
- >
- <IconButton>
- <VideoIcon />
- </IconButton>
- {i18n.t('core:searchVideoFiles')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.archives)}
- title={FileTypeGroups.archives.toString()}
- >
- <IconButton>
- <ArchiveIcon />
- </IconButton>
- {i18n.t('core:searchArchives')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.bookmarks)}
- title={FileTypeGroups.bookmarks.toString()}
- >
- <IconButton>
- <BookmarkIcon />
- </IconButton>
- {i18n.t('core:searchBookmarks')}
- </MenuItem>
- <MenuItem
- value={JSON.stringify(FileTypeGroups.ebooks)}
- title={FileTypeGroups.ebooks.toString()}
+ <ProTooltip>
+ <InputLabel htmlFor="file-type">
+ {i18n.t('core:fileType')}
+ </InputLabel>
+ <Select
+ style={{ width: '100%' }}
+ value={JSON.stringify(fileTypes.current)}
+ onChange={handleFileTypeChange}
+ input={<Input name="fileTypes" id="file-type" />}
>
- <IconButton>
- <BookIcon />
- </IconButton>
- {i18n.t('core:searchEbooks')}
- </MenuItem>
- </Select>
- {/* <FormHelperText>{i18n.t('core:searchFileTypes')}</FormHelperText> */}
+ <MenuItem value={JSON.stringify(FileTypeGroups.any)}>
+ {i18n.t('core:anyType')}
+ </MenuItem>
+ <MenuItem value={JSON.stringify(FileTypeGroups.folders)}>
+ <IconButton>
+ <FolderIcon />
+ </IconButton>
+ {i18n.t('core:searchFolders')}
+ </MenuItem>
+ <MenuItem value={JSON.stringify(FileTypeGroups.files)}>
+ <IconButton>
+ <FileIcon />
+ </IconButton>
+ {i18n.t('core:searchFiles')}
+ </MenuItem>
+ <MenuItem value={JSON.stringify(FileTypeGroups.untagged)}>
+ <IconButton>
+ <UntaggedIcon />
+ </IconButton>
+ {i18n.t('core:searchUntaggedEntries')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.images)}
+ title={FileTypeGroups.images.toString()}
+ >
+ <IconButton>
+ <PictureIcon />
+ </IconButton>
+ {i18n.t('core:searchPictures')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.documents)}
+ title={FileTypeGroups.documents.toString()}
+ >
+ <IconButton>
+ <DocumentIcon />
+ </IconButton>
+ {i18n.t('core:searchDocuments')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.notes)}
+ title={FileTypeGroups.notes.toString()}
+ >
+ <IconButton>
+ <NoteIcon />
+ </IconButton>
+ {i18n.t('core:searchNotes')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.audio)}
+ title={FileTypeGroups.audio.toString()}
+ >
+ <IconButton>
+ <AudioIcon />
+ </IconButton>
+ {i18n.t('core:searchAudio')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.video)}
+ title={FileTypeGroups.video.toString()}
+ >
+ <IconButton>
+ <VideoIcon />
+ </IconButton>
+ {i18n.t('core:searchVideoFiles')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.archives)}
+ title={FileTypeGroups.archives.toString()}
+ >
+ <IconButton>
+ <ArchiveIcon />
+ </IconButton>
+ {i18n.t('core:searchArchives')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.bookmarks)}
+ title={FileTypeGroups.bookmarks.toString()}
+ >
+ <IconButton>
+ <BookmarkIcon />
+ </IconButton>
+ {i18n.t('core:searchBookmarks')}
+ </MenuItem>
+ <MenuItem
+ value={JSON.stringify(FileTypeGroups.ebooks)}
+ title={FileTypeGroups.ebooks.toString()}
+ >
+ <IconButton>
+ <BookIcon />
+ </IconButton>
+ {i18n.t('core:searchEbooks')}
+ </MenuItem>
+ </Select>
+ {/* <FormHelperText>{i18n.t('core:searchFileTypes')}</FormHelperText> */}
+ </ProTooltip>
</FormControl>
<FormControl
className={classes.formControl}
disabled={indexing || !Pro}
- title={i18n.t('core:thisFunctionalityIsAvailableInPro')}
>
- <InputLabel shrink htmlFor="file-size">
- {i18n.t('core:sizeSearchTitle')}
- </InputLabel>
- <Select
- value={fileSize.current}
- onChange={handleFileSizeChange}
- input={<Input name="fileSize" id="file-size" />}
- displayEmpty
- >
- <MenuItem value="">{i18n.t('core:sizeAny')}</MenuItem>
- <MenuItem value="sizeEmpty">
- {i18n.t('core:sizeEmpty')}
- </MenuItem>
- <MenuItem value="sizeTiny">
- {i18n.t('core:sizeTiny')}
- &nbsp;(&lt;&nbsp;10KB)
- </MenuItem>
- <MenuItem value="sizeVerySmall">
- {i18n.t('core:sizeVerySmall')}
- &nbsp;(&lt;&nbsp;100KB)
- </MenuItem>
- <MenuItem value="sizeSmall">
- {i18n.t('core:sizeSmall')}
- &nbsp;(&lt;&nbsp;1MB)
- </MenuItem>
- <MenuItem value="sizeMedium">
- {i18n.t('core:sizeMedium')}
- &nbsp;(&lt;&nbsp;50MB)
- </MenuItem>
- <MenuItem value="sizeLarge">
- {i18n.t('core:sizeLarge')}
- &nbsp;(&lt;&nbsp;1GB)
- </MenuItem>
- <MenuItem value="sizeHuge">
- {i18n.t('core:sizeHuge')}
- &nbsp;(&gt;&nbsp;1GB)
- </MenuItem>
- </Select>
+ <ProTooltip>
+ <InputLabel shrink htmlFor="file-size">
+ {i18n.t('core:sizeSearchTitle')}
+ </InputLabel>
+ <Select
+ style={{ width: '100%' }}
+ value={fileSize.current}
+ onChange={handleFileSizeChange}
+ input={<Input name="fileSize" id="file-size" />}
+ displayEmpty
+ >
+ <MenuItem value="">{i18n.t('core:sizeAny')}</MenuItem>
+ <MenuItem value="sizeEmpty">
+ {i18n.t('core:sizeEmpty')}
+ </MenuItem>
+ <MenuItem value="sizeTiny">
+ {i18n.t('core:sizeTiny')}
+ &nbsp;(&lt;&nbsp;10KB)
+ </MenuItem>
+ <MenuItem value="sizeVerySmall">
+ {i18n.t('core:sizeVerySmall')}
+ &nbsp;(&lt;&nbsp;100KB)
+ </MenuItem>
+ <MenuItem value="sizeSmall">
+ {i18n.t('core:sizeSmall')}
+ &nbsp;(&lt;&nbsp;1MB)
+ </MenuItem>
+ <MenuItem value="sizeMedium">
+ {i18n.t('core:sizeMedium')}
+ &nbsp;(&lt;&nbsp;50MB)
+ </MenuItem>
+ <MenuItem value="sizeLarge">
+ {i18n.t('core:sizeLarge')}
+ &nbsp;(&lt;&nbsp;1GB)
+ </MenuItem>
+ <MenuItem value="sizeHuge">
+ {i18n.t('core:sizeHuge')}
+ &nbsp;(&gt;&nbsp;1GB)
+ </MenuItem>
+ </Select>
+ </ProTooltip>
</FormControl>
<FormControl
className={classes.formControl}
disabled={indexing || !Pro}
- title={
- !Pro
- ? i18n.t('core:thisFunctionalityIsAvailableInPro')
- : undefined
- }
>
- <InputLabel shrink htmlFor="modification-date">
- {i18n.t('core:lastModifiedSearchTitle')}
- </InputLabel>
- <Select
- value={lastModified.current}
- onChange={handleLastModifiedChange}
- input={<Input name="lastModified" id="modification-date" />}
- displayEmpty
- >
- <MenuItem value="">{i18n.t('core:anyTime')}</MenuItem>
- <MenuItem value="today">{i18n.t('core:today')}</MenuItem>
- <MenuItem value="yesterday">
- {i18n.t('core:yesterday')}
- </MenuItem>
- <MenuItem value="past7Days">
- {i18n.t('core:past7Days')}
- </MenuItem>
- <MenuItem value="past30Days">
- {i18n.t('core:past30Days')}
- </MenuItem>
- <MenuItem value="past6Months">
- {i18n.t('core:past6Months')}
- </MenuItem>
- <MenuItem value="pastYear">{i18n.t('core:pastYear')}</MenuItem>
- <MenuItem value="moreThanYear">
- {i18n.t('core:moreThanYear')}
- </MenuItem>
- </Select>
+ <ProTooltip>
+ <InputLabel shrink htmlFor="modification-date">
+ {i18n.t('core:lastModifiedSearchTitle')}
+ </InputLabel>
+ <Select
+ value={lastModified.current}
+ style={{ width: '100%' }}
+ onChange={handleLastModifiedChange}
+ input={<Input name="lastModified" id="modification-date" />}
+ displayEmpty
+ >
+ <MenuItem value="">{i18n.t('core:anyTime')}</MenuItem>
+ <MenuItem value="today">{i18n.t('core:today')}</MenuItem>
+ <MenuItem value="yesterday">
+ {i18n.t('core:yesterday')}
+ </MenuItem>
+ <MenuItem value="past7Days">
+ {i18n.t('core:past7Days')}
+ </MenuItem>
+ <MenuItem value="past30Days">
+ {i18n.t('core:past30Days')}
+ </MenuItem>
+ <MenuItem value="past6Months">
+ {i18n.t('core:past6Months')}
+ </MenuItem>
+ <MenuItem value="pastYear">
+ {i18n.t('core:pastYear')}
+ </MenuItem>
+ <MenuItem value="moreThanYear">
+ {i18n.t('core:moreThanYear')}
+ </MenuItem>
+ </Select>
+ </ProTooltip>
</FormControl>
- <FormControl
- className={classes.formControl}
- title={
- !Pro
- ? i18n.t('core:thisFunctionalityIsAvailableInPro')
- : undefined
- }
- >
- <TextField
- id="tagTimePeriod"
- label={i18n.t('Enter time period')}
- value={tagTimePeriod.current}
- disabled={indexing || !Pro}
- onChange={handleTimePeriodChange}
- onKeyDown={startSearch}
- helperText={tagTimePeriodHelper.current}
- error={tagTimePeriodHelper.current.length < 1}
- InputProps={{
- endAdornment: (
- <InputAdornment
- position="end"
- title="201905 for May 2019 / 20190412 for 12th of April 2019 / 20190501~124523 for specific time"
- >
- <IconButton>
- <DateIcon />
- </IconButton>
- </InputAdornment>
- )
- }}
- />
+ <FormControl className={classes.formControl}>
+ <ProTooltip>
+ <TextField
+ id="tagTimePeriod"
+ label={i18n.t('Enter time period')}
+ value={tagTimePeriod.current}
+ disabled={indexing || !Pro}
+ onChange={handleTimePeriodChange}
+ onKeyDown={startSearch}
+ helperText={tagTimePeriodHelper.current}
+ error={tagTimePeriodHelper.current.length < 1}
+ style={{ width: '100%' }}
+ InputProps={{
+ endAdornment: (
+ <InputAdornment
+ position="end"
+ title="201905 for May 2019 / 20190412 for 12th of April 2019 / 20190501~124523 for specific time"
+ >
+ <IconButton>
+ <DateIcon />
+ </IconButton>
+ </InputAdornment>
+ )
+ }}
+ />
+ </ProTooltip>
{/* <TextField
id="tagPlace"
label={i18n.t('GPS coordinates or plus code')}
@@ -1094,38 +1091,29 @@ const Search = (props: Props) => {
<FormControl
className={classes.formControl}
disabled={indexing || !Pro}
- title={
- !Pro
- ? i18n.t('core:thisFunctionalityIsAvailableInPro')
- : undefined
- }
>
- <InputLabel shrink htmlFor="saved-searches">
- {i18n.t('core:savedSearchesTitle')}
- </InputLabel>
- <Select
- onChange={handleSavedSearchChange}
- input={<Input name="savedSearch" id="saved-searches" />}
- displayEmpty
- value={props.searchQuery.uuid ? props.searchQuery.uuid : -1}
- >
- <MenuItem value={-1} style={{ display: 'none' }} />
- {props.searches.length < 1 && (
- <MenuItem>{i18n.t('noSearchesFound')}</MenuItem>
- )}
- {props.searches.map(search => (
- <MenuItem key={search.uuid} value={search.uuid}>
- <span style={{ width: '100%' }}>{search.title}</span>
- {/* <IconButton
- onClick={event =>
- handleSavedSearchEdit(event, search.uuid)
- }
- >
- <FolderIcon />
- </IconButton> */}
- </MenuItem>
- ))}
- </Select>
+ <ProTooltip>
+ <InputLabel shrink htmlFor="saved-searches">
+ {i18n.t('core:savedSearchesTitle')}
+ </InputLabel>
+ <Select
+ style={{ width: '100%' }}
+ onChange={handleSavedSearchChange}
+ input={<Input name="savedSearch" id="saved-searches" />}
+ displayEmpty
+ value={props.searchQuery.uuid ? props.searchQuery.uuid : -1}
+ >
+ <MenuItem value={-1} style={{ display: 'none' }} />
+ {props.searches.length < 1 && (
+ <MenuItem>{i18n.t('noSearchesFound')}</MenuItem>
+ )}
+ {props.searches.map(search => (
+ <MenuItem key={search.uuid} value={search.uuid}>
+ <span style={{ width: '100%' }}>{search.title}</span>
+ </MenuItem>
+ ))}
+ </Select>
+ </ProTooltip>
</FormControl>
{Pro && (
<FormControl className={classes.formControl}>
@@ -1217,7 +1205,7 @@ const Search = (props: Props) => {
searches={props.searches}
/>
)}
- </React.Fragment>
+ </>
)}
</div>
</div>
diff --git a/app/components/TagGroupContainer.tsx b/app/components/TagGroupContainer.tsx
index de8026106..524205bf0 100644
--- a/app/components/TagGroupContainer.tsx
+++ b/app/components/TagGroupContainer.tsx
@@ -52,7 +52,6 @@ const TagGroupContainer = (props: Props) => {
style={{
margin: 0,
padding: 0,
- paddingTop: 3,
borderRadius: 5,
minHeight: 20,
border,
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index f44d7c922..02790bb01 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -42,7 +42,6 @@ import Input from '@material-ui/core/Input';
import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup';
import ToggleButton from '@material-ui/lab/ToggleButton';
import CheckIcon from '@material-ui/icons/Check';
-import HelpIcon from '@material-ui/icons/InfoOutlined';
import RemoveIcon from '@material-ui/icons/RemoveCircleOutline';
import i18n from '-/services/i18n';
import { Pro } from '-/pro';
@@ -56,6 +55,7 @@ import { getLocationPath } from '-/utils/paths';
import IgnorePatternDialog from '-/components/dialogs/IgnorePatternDialog';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import InfoIcon from '-/components/InfoIcon';
+import { ProLabel, BetaLabel } from '-/components/HelperComponents';
const styles: any = theme => ({
formControl: {
@@ -396,18 +396,18 @@ const CreateEditLocationDialog = (props: Props) => {
<DialogCloseButton onClose={onClose} />
</DialogTitle>
<DialogContent
- style={{ overflow: AppConfig.isFirefox ? 'auto' : 'overlay' }}
+ style={{
+ overflow: AppConfig.isFirefox ? 'auto' : 'overlay',
+ minWidth: 500
+ }}
>
<Grid container spacing={2}>
- <Grid item xs={2} style={{ marginTop: 13, textAlign: 'left' }}>
+ <Grid item xs={2} style={{ marginTop: 10, textAlign: 'left' }}>
<Typography>{i18n.t('core:locationType')}</Typography>
</Grid>
<Grid item xs={10}>
<FormControl disabled={disableLocationTypeSwitch}>
<RadioGroup
- title={
- Pro ? '' : i18n.t('core:thisFunctionalityIsAvailableInPro')
- }
aria-label={i18n.t('core:locationType')}
name="type"
value={type}
@@ -427,7 +427,12 @@ const CreateEditLocationDialog = (props: Props) => {
value={locationType.TYPE_CLOUD}
control={<Radio />}
title={i18n.t('core:objectStorageTitle')}
- label={i18n.t('core:objectStorage')}
+ label={
+ <>
+ {i18n.t('core:objectStorage')}
+ <ProLabel />
+ </>
+ }
/>
</RadioGroup>
</FormControl>
@@ -467,8 +472,10 @@ const CreateEditLocationDialog = (props: Props) => {
/>
}
label={
- i18n.t('core:createFullTextIndex') +
- (Pro ? '' : ' - ' + i18n.t('core:proFeature'))
+ <>
+ {i18n.t('core:createFullTextIndex')}
+ {Pro ? <BetaLabel /> : <ProLabel />}
+ </>
}
/>
<FormControlLabel
@@ -487,8 +494,10 @@ const CreateEditLocationDialog = (props: Props) => {
/>
}
label={
- i18n.t('core:watchForChangesInLocation') +
- (Pro ? '' : ' - ' + i18n.t('core:proFeature'))
+ <>
+ {i18n.t('core:watchForChangesInLocation')}
+ <ProLabel />
+ </>
}
/>
{showAdvancedMode && (
@@ -508,8 +517,10 @@ const CreateEditLocationDialog = (props: Props) => {
/>
}
label={
- i18n.t('core:readonlyModeSwitch') +
- (Pro ? '' : ' - ' + i18n.t('core:proFeature'))
+ <>
+ {i18n.t('core:readonlyModeSwitch')}
+ <ProLabel />
+ </>
}
/>
)}
@@ -530,8 +541,10 @@ const CreateEditLocationDialog = (props: Props) => {
/>
}
label={
- i18n.t('core:persistIndexSwitch') +
- (Pro ? '' : ' - ' + i18n.t('core:proFeature'))
+ <>
+ {i18n.t('core:persistIndexSwitch')}
+ <ProLabel />
+ </>
}
/>
)}
@@ -613,7 +626,6 @@ const CreateEditLocationDialog = (props: Props) => {
<div style={{ display: 'flex' }}>
{persistTagsInSidecarFile === null && <CheckIcon />}
&nbsp;{i18n.t('core:default')}&nbsp;&nbsp;
- {/* <HelpIcon /> */}
</div>
</Tooltip>
</ToggleButton>
@@ -636,7 +648,6 @@ const CreateEditLocationDialog = (props: Props) => {
{persistTagsInSidecarFile !== null &&
!persistTagsInSidecarFile && <CheckIcon />}
&nbsp;Rename Files&nbsp;&nbsp;
- {/* <HelpIcon /> */}
</div>
</Tooltip>
</ToggleButton>
@@ -661,7 +672,6 @@ const CreateEditLocationDialog = (props: Props) => {
{persistTagsInSidecarFile !== null &&
persistTagsInSidecarFile && <CheckIcon />}
&nbsp;Use Sidecar Files&nbsp;&nbsp;
- {/* <HelpIcon /> */}
</div>
</Tooltip>
</ToggleButton>
diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsx
index c17898bd6..10853d3d4 100644
--- a/app/components/menus/DirectoryMenu.tsx
+++ b/app/components/menus/DirectoryMenu.tsx
@@ -51,7 +51,6 @@ import {
extractContainingDirectoryPath,
extractDirectoryName,
getThumbFileLocationForDirectory,
- getThumbFileLocationForFile,
normalizePath
} from '-/utils/paths';
import PlatformIO from '-/services/platform-io';
@@ -63,14 +62,12 @@ import {
} from '-/reducers/app';
import IOActions from '-/reducers/io-actions';
import TaggingActions from '-/reducers/tagging-actions';
-import {
- getAllPropertiesPromise,
- setFolderThumbnailPromise
-} from '-/services/utils-io';
+import { getAllPropertiesPromise } from '-/services/utils-io';
import FileUploadContainer, {
FileUploadContainerRef
} from '-/components/FileUploadContainer';
import { TS } from '-/tagspaces.namespace';
+import { ProLabel, BetaLabel } from '-/components/HelperComponents';
interface Props {
open: boolean;
@@ -253,7 +250,11 @@ Do you want to continue?`)
props.toggleProgressDialog();
});
} else {
- props.showNotification(i18n.t('core:proFeature'), 'default', true);
+ props.showNotification(
+ i18n.t('core:thisFunctionalityIsAvailableInPro'),
+ 'default',
+ true
+ );
return true;
}
}
@@ -520,7 +521,14 @@ Do you want to continue?`)
<ListItemIcon>
<ImportTagsIcon />
</ListItemIcon>
- <ListItemText primary={i18n.t('core:importMacTags')} />
+ <ListItemText
+ primary={
+ <>
+ {i18n.t('core:importMacTags')}
+ {Pro ? <BetaLabel /> : <ProLabel />}
+ </>
+ }
+ />
</MenuItem>
);
}
diff --git a/app/components/menus/TagGroupMenu.tsx b/app/components/menus/TagGroupMenu.tsx
index 51eb75cb5..45d8e6dbf 100644
--- a/app/components/menus/TagGroupMenu.tsx
+++ b/app/components/menus/TagGroupMenu.tsx
@@ -39,7 +39,7 @@ import { actions as AppActions } from '-/reducers/app';
import { actions as LocationIndexActions } from '-/reducers/location-index';
import { TS } from '-/tagspaces.namespace';
import InfoIcon from '-/components/InfoIcon';
-
+import { ProLabel } from '-/components/HelperComponents';
interface Props {
classes?: any;
anchorEl: Element;
@@ -162,14 +162,17 @@ const TagGroupMenu = (props: Props) => {
<MenuItem
data-tid="collectTags"
onClick={handleCollectTags}
- title={Pro ? '' : i18n.t('core:needProVersion')}
+ title={i18n.t('collectTagsFromLocationTitle')}
>
<ListItemIcon>
<CollectTagsIcon />
</ListItemIcon>
<ListItemText
primary={
- i18n.t('core:collectTagsFromLocation') + (Pro ? '' : ' PRO')
+ <>
+ {i18n.t('core:collectTagsFromLocation')}
+ <ProLabel />
+ </>
}
/>
</MenuItem>
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index 171710647..ee31b7fb0 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -262,7 +262,6 @@
"documentation": "Documentation",
"selectFile": "Please select a file first.",
"geoTaggingNotPossible": "Geo Tagging not possible!",
- "needProVersion": "This feature is available in TagSpaces PRO.",
"sizeInBytes": "bytes",
"error": "Error",
"warning": "Warning",
@@ -309,7 +308,6 @@
"confirmSelectedTagsDeletion": "Are you sure you want to delete the selected tags?",
"confirmAllTagsDeletion": "Are you sure you want to remove all tags?",
"existingTags": "Existing tags",
- "addDescription": "Adding description with markdown support available in TagSpaces PRO",
"addMarkdownDescription": "Double click to add description",
"addEntryTags": "Add",
"modifiedDate": "Last modified",
@@ -365,9 +363,8 @@
"forceReindexing": "Force reindexing",
"readonlyModeSwitch": "Open this location in read-only mode",
"persistIndexSwitch": "Switch to manual index creation with persisted search index",
- "createFullTextIndex": "Enable full text search for TXT, MD and HTML files (BETA)",
+ "createFullTextIndex": "Enable full text search for TXT, MD and HTML files",
"watchForChangesInLocation": "Watch for external changes in this location",
- "proFeature": "feature available in the PRO version",
"collectedTags": "Collected Tags",
"pauseResumePlayback": "Pause/Resume Playback",
"showTagSpaces": "Show TagSpaces",
@@ -432,6 +429,7 @@
"atLeastOneOfTheseTags": "At least one of these tags",
"noneOfTheseTags": "None of these tags",
"collectTagsFromLocation": "Collect Tags From Current Location",
+ "collectTagsFromLocationTitle": "Collects all tags found on files or folders in the current location",
"searchCurrentFolderWithSubFolders": "Search in the current folder including sub folders",
"searchInAllLocations": "Search in all locations",
"dndDisabledReadOnlyMode": "Importing files is disabled because the location is in read-only mode.",
diff --git a/app/reducers/io-actions.ts b/app/reducers/io-actions.ts
index a0fe263a6..ee7d12da7 100644
--- a/app/reducers/io-actions.ts
+++ b/app/reducers/io-actions.ts
@@ -48,7 +48,11 @@ const actions = {
) => (dispatch: (actions: any) => void, getState: () => any) => {
const { currentDirectoryEntries } = getState().app;
if (!Pro || !Pro.ContentExtractor) {
- dispatch(AppActions.showNotification(i18n.t('core:needProVersion')));
+ dispatch(
+ AppActions.showNotification(
+ i18n.t('core:thisFunctionalityIsAvailableInPro')
+ )
+ );
return false;
}
Pro.ContentExtractor.extractContent(
diff --git a/app/reducers/tagging-actions.ts b/app/reducers/tagging-actions.ts
index 98718eba6..8723cb0b4 100644
--- a/app/reducers/tagging-actions.ts
+++ b/app/reducers/tagging-actions.ts
@@ -81,7 +81,9 @@ const actions = {
dispatch(AppActions.toggleEditTagDialog(tag));
} else {
dispatch(
- AppActions.showNotification(i18n.t('core:needProVersion'))
+ AppActions.showNotification(
+ i18n.t('core:thisFunctionalityIsAvailableInPro')
+ )
);
}
} else if (tag.functionality === 'dateTagging') {
@@ -92,7 +94,9 @@ const actions = {
dispatch(AppActions.toggleEditTagDialog(tag));
} else {
dispatch(
- AppActions.showNotification(i18n.t('core:needProVersion'))
+ AppActions.showNotification(
+ i18n.t('core:thisFunctionalityIsAvailableInPro')
+ )
);
}
} else {
@@ -721,7 +725,7 @@ const actions = {
if (!Pro || !Pro.Indexer || !Pro.Indexer.collectTagsFromIndex) {
dispatch(
AppActions.showNotification(
- i18n.t('core:needProVersion'),
+ i18n.t('core:thisFunctionalityIsAvailableInPro'),
'error',
true
)