Skip to content

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

chore: exchanging icons

Ilian Sapundshievdb4371cf8307
diff --git a/src/renderer/components/CommonIcons.tsx b/src/renderer/components/CommonIcons.tsx
index 83a5d743f..d38a32920 100644
--- a/src/renderer/components/CommonIcons.tsx
+++ b/src/renderer/components/CommonIcons.tsx
@@ -159,8 +159,6 @@ export { default as PreviewIcon } from '@mui/icons-material/Preview';
export { default as RestoreIcon } from '@mui/icons-material/SettingsBackupRestore';
-export { default as CloseEntryIcon } from '@mui/icons-material/HighlightOffOutlined';
-
import ExpandCircleDownOutlined from '@mui/icons-material/ExpandCircleDownOutlined';
export const PrevDocumentIcon = (props) => (
@@ -233,3 +231,7 @@ export { default as ArrowLeftIcon } from '@mui/icons-material/ArrowCircleLeftOut
export { default as ArrowRightIcon } from '@mui/icons-material/ArrowCircleRightOutlined';
export { default as PlayIcon } from '@mui/icons-material/PlayCircleFilledWhiteOutlined';
+
+export { default as FullScreenIcon } from '@mui/icons-material/ZoomOutMap';
+
+export { default as FullWidthIcon } from '@mui/icons-material/SettingsEthernet';
diff --git a/src/renderer/components/EntryContainerMenu.tsx b/src/renderer/components/EntryContainerMenu.tsx
index 35128b429..ad67c6af4 100644
--- a/src/renderer/components/EntryContainerMenu.tsx
+++ b/src/renderer/components/EntryContainerMenu.tsx
@@ -1,50 +1,45 @@
-import React, { useState } from 'react';
-import {
- baseName,
- extractFileName,
- extractDirectoryName,
-} from '@tagspaces/tagspaces-common/paths';
-import {
- ListItemIcon,
- ListItemText,
- Menu,
- MenuItem,
- Divider,
-} from '@mui/material';
-import { useSelector } from 'react-redux';
import AppConfig from '-/AppConfig';
import {
+ CloseIcon,
DeleteIcon,
+ DownloadIcon,
+ FullScreenIcon,
+ FullWidthIcon,
LinkIcon,
NavigateToFolderIcon,
+ OpenEntryNativelyIcon,
OpenNewWindowIcon,
ParentFolderIcon,
ReloadIcon,
- CloseIcon,
- DownloadIcon,
} from '-/components/CommonIcons';
-import ExpandIcon from '@mui/icons-material/SettingsEthernet';
-import OpenNativelyIcon from '@mui/icons-material/Launch';
-import FullScreenIcon from '@mui/icons-material/ZoomOutMap';
+import TsMenuList from '-/components/TsMenuList';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import MenuKeyBinding from '-/components/menus/MenuKeyBinding';
+import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
+import { useFullScreenContext } from '-/hooks/useFullScreenContext';
+import { useIOActionsContext } from '-/hooks/useIOActionsContext';
+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import {
+ getKeyBindingObject,
getWarningOpeningFilesExternally,
isDesktopMode,
} from '-/reducers/settings';
-import { useTranslation } from 'react-i18next';
-import { getKeyBindingObject } from '-/reducers/settings';
-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
-import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
-import { useNotificationContext } from '-/hooks/useNotificationContext';
-import { useIOActionsContext } from '-/hooks/useIOActionsContext';
import {
createNewInstance,
openDirectoryMessage,
openFileMessage,
} from '-/services/utils-io';
-import TsMenuList from '-/components/TsMenuList';
-import { useFullScreenContext } from '-/hooks/useFullScreenContext';
+import {
+ Divider,
+ ListItemIcon,
+ ListItemText,
+ Menu,
+ MenuItem,
+} from '@mui/material';
+import { extractDirectoryName } from '@tagspaces/tagspaces-common/paths';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useSelector } from 'react-redux';
interface Props {
anchorEl: null | HTMLElement;
@@ -207,7 +202,7 @@ function EntryContainerMenu(props: Props) {
}}
>
<ListItemIcon>
- <ExpandIcon />
+ <FullWidthIcon />
</ListItemIcon>
<ListItemText primary={t('core:openInFullWidth')} />
<MenuKeyBinding keyBinding={keyBindings['openInFullWidth']} />
@@ -293,7 +288,7 @@ function EntryContainerMenu(props: Props) {
onClick={openNatively}
>
<ListItemIcon>
- <OpenNativelyIcon />
+ <OpenEntryNativelyIcon />
</ListItemIcon>
<ListItemText
primary={t(
@@ -368,7 +363,7 @@ function EntryContainerMenu(props: Props) {
onClick={openNatively}
>
<ListItemIcon>
- <OpenNativelyIcon />
+ <OpenEntryNativelyIcon />
</ListItemIcon>
<ListItemText primary={t('core:openDirectoryExternally')} />
</MenuItem>,
@@ -386,7 +381,7 @@ function EntryContainerMenu(props: Props) {
}}
>
<ListItemIcon>
- <ExpandIcon />
+ <FullWidthIcon />
</ListItemIcon>
<ListItemText primary={t('core:openInFullWidth')} />
<MenuKeyBinding keyBinding={keyBindings['openInFullWidth']} />
diff --git a/src/renderer/components/FileView.tsx b/src/renderer/components/FileView.tsx
index 3da1d5006..9cba6fb27 100644
--- a/src/renderer/components/FileView.tsx
+++ b/src/renderer/components/FileView.tsx
@@ -16,28 +16,25 @@
*
*/
-import React, {
+import AppConfig from '-/AppConfig';
+import { CloseIcon } from '-/components/CommonIcons';
+import { useResolveConflictContext } from '-/components/dialogs/hooks/useResolveConflictContext';
+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
+import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
+import { useFullScreenContext } from '-/hooks/useFullScreenContext';
+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
+import useEventListener from '-/utils/useEventListener';
+import { rgbToHex, useTheme } from '@mui/material/styles';
+import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
+import fscreen from 'fscreen';
+import {
MutableRefObject,
useCallback,
useEffect,
useReducer,
useRef,
} from 'react';
-import { rgbToHex, useTheme } from '@mui/material/styles';
-import CloseIcon from '@mui/icons-material/Close';
import { useTranslation } from 'react-i18next';
-import fscreen from 'fscreen';
-import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
-import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
-import AppConfig from '-/AppConfig';
-import useEventListener from '-/utils/useEventListener';
-import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
-import { useFullScreenContext } from '-/hooks/useFullScreenContext';
-import { useResolveConflictContext } from '-/components/dialogs/hooks/useResolveConflictContext';
-import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
-import useFirstRender from '-/utils/useFirstRender';
-import { useEditedEntryContext } from '-/hooks/useEditedEntryContext';
interface Props {
fileViewer: MutableRefObject<HTMLIFrameElement>;