Skip to content

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

chore: finetunning v5

Ilian Sapundshiev844fdc16fd62
diff --git a/app/components/SearchBox.tsx b/app/components/SearchBox.tsx
index 99edcca0b..66dedd9e2 100644
--- a/app/components/SearchBox.tsx
+++ b/app/components/SearchBox.tsx
@@ -16,51 +16,15 @@
*
*/
-import React, { useEffect, useRef, useState } from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import makeStyles from '@mui/styles/makeStyles';
-import ClearSearchIcon from '@mui/icons-material/Close';
-import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import Button from '@mui/material/Button';
+import React from 'react';
import Tooltip from '-/components/Tooltip';
import IconButton from '@mui/material/IconButton';
-import InputAdornment from '@mui/material/InputAdornment';
-import Typography from '@mui/material/Typography';
-import {
- escapeRegExp,
- parseTextQuery,
- removeAllTagsFromSearchQuery
-} from '@tagspaces/tagspaces-platforms/misc';
-import { actions as AppActions, getDirectoryPath } from '../reducers/app';
-import {
- actions as LocationIndexActions,
- getIndexedEntriesCount,
- isIndexing,
- getSearchQuery
-} from '../reducers/location-index';
-import {
- isDesktopMode,
- getMaxSearchResults,
- getShowUnixHiddenEntries,
- getCurrentLanguage
-} from '-/reducers/settings';
import i18n from '-/services/i18n';
-import { FileTypeGroups } from '-/services/search';
-import { TS } from '-/tagspaces.namespace';
-import { Pro } from '../pro';
-import useFirstRender from '-/utils/useFirstRender';
-import MainSearchField from '-/components/MainSearchField';
-import SavedSearchesMenu from '-/components/menus/SavedSearchesMenu';
import SearchInline from '-/components/SearchInline';
-import AdvancedSearchIcon from '@mui/icons-material/ManageSearch';
+import AdvancedSearchIcon from '@mui/icons-material/TuneOutlined';
+import DropDownIcon from '@mui/icons-material/ArrowDropDownOutlined';
import Popover from '@mui/material/Popover';
import SearchPopover from '-/components/SearchPopover';
-import SearchIcon from '@mui/icons-material/Search';
-import withStyles from '@mui/styles/withStyles';
-
-// type PropsClasses = Record<keyof StyleProps, string>;
interface Props {
open: boolean;
@@ -68,14 +32,6 @@ interface Props {
anchorSearch: HTMLButtonElement | null;
}
-const CustomButton: any = withStyles(theme => ({
- root: {
- // borderRadius: 15,
- // minWidth: 45,
- // height: 40
- }
-}))(IconButton);
-
function SearchBox(props: Props) {
return (
<>
@@ -83,7 +39,7 @@ function SearchBox(props: Props) {
{props.open && (
<>
<Tooltip title={i18n.t('core:advancedSearch')}>
- <CustomButton
+ <IconButton
id="advancedButton"
data-tid="advancedSearch"
onClick={(event: React.MouseEvent<HTMLButtonElement>) =>
@@ -91,7 +47,8 @@ function SearchBox(props: Props) {
}
>
<AdvancedSearchIcon />
- </CustomButton>
+ <DropDownIcon />
+ </IconButton>
</Tooltip>
<Popover
open={Boolean(props.anchorSearch)}
diff --git a/app/components/SearchInline.tsx b/app/components/SearchInline.tsx
index 7c4072177..e9ce8a0db 100644
--- a/app/components/SearchInline.tsx
+++ b/app/components/SearchInline.tsx
@@ -475,18 +475,15 @@ function SearchInline(props: Props) {
endAdornment: (
<InputAdornment position="end">
{isDesktop && (
- <>
- <Tooltip title={i18n.t('core:savedSearchesTitle')}>
- <IconButton
- id="basic-button"
- size="small"
- edge="end"
- onClick={handleOpenSavedSearches}
- >
- <ExpandMoreIcon style={{ color: 'lightgray' }} />
- </IconButton>
- </Tooltip>
- </>
+ <Tooltip title={i18n.t('core:savedSearchesTitle')}>
+ <IconButton
+ size="small"
+ edge="end"
+ onClick={handleOpenSavedSearches}
+ >
+ <ExpandMoreIcon />
+ </IconButton>
+ </Tooltip>
)}
<Tooltip title={i18n.t('clearSearch') + ' (ESC)'}>
<IconButton
diff --git a/app/components/SearchPopover.tsx b/app/components/SearchPopover.tsx
index 930cc9972..3ebc96524 100644
--- a/app/components/SearchPopover.tsx
+++ b/app/components/SearchPopover.tsx
@@ -541,7 +541,7 @@ function SearchPopover(props: Props) {
>
<div className={classes.toolbar}>
<Typography variant="button" style={{ margin: '12px 0 10px 10px' }}>
- {i18n.t('core:searchTitle')}
+ {i18n.t('core:advancedSearch')}
</Typography>
<IconButton
size="medium"
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index 5f0d0ccac..5741d45c2 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -269,7 +269,7 @@
"info": "Info",
"signOut": "Sign Out",
"setAsThumbnail": "Use as Thumbnail for Current Folder",
- "setAsBackground": "Use as Background for Current Folder",
+ "setAsBackground": "Use as Background Image",
"setAsParentFolderThumbnail": "Use as Thumbnail for Parent Folder",
"fileExtension": "File Ext.",
"fileTitle": "Title",