TagSpaces is an offline, open source, document manager with tagging support
chore: redesign of the left panel
Ilian Sapundshieve0abf8693c63
diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex 4763432c9..4046adb42 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -1,12 +1,12 @@{"name": "tagspaces",- "version": "6.4.0",+ "version": "6.4.1","lockfileVersion": 2,"requires": true,"packages": {"": {"name": "tagspaces",- "version": "6.4.0",+ "version": "6.4.1","hasInstallScript": true,"license": "AGPL-3.0","dependencies": {diff --git a/src/renderer/components/CommonIcons.tsx b/src/renderer/components/CommonIcons.tsxindex a9539139e..2e9daa81c 100644--- a/src/renderer/components/CommonIcons.tsx+++ b/src/renderer/components/CommonIcons.tsx@@ -54,7 +54,7 @@ export { default as RemoveIcon } from '@mui/icons-material/DeleteOutline';export { default as HistoryIcon } from '@mui/icons-material/History';-export { default as SettingsIcon } from '@mui/icons-material/Settings';+export { default as SettingsIcon } from '@mui/icons-material/SettingsOutlined';export { default as PerspectiveSettingsIcon } from '@mui/icons-material/DisplaySettings';diff --git a/src/renderer/components/MobileNavigation.tsx b/src/renderer/components/MobileNavigation.tsxindex 9cd5216cb..73e032961 100644--- a/src/renderer/components/MobileNavigation.tsx+++ b/src/renderer/components/MobileNavigation.tsx@@ -45,11 +45,9 @@ import LocationManager from '-/components/LocationManager';import ProTeaser from '-/components/ProTeaser';import StoredSearches from '-/components/StoredSearches';import TagLibrary from '-/components/TagLibrary';-import Tooltip from '-/components/Tooltip';import TsButton from '-/components/TsButton';-import TsIconButton from '-/components/TsIconButton';import TsMenuList from '-/components/TsMenuList';-import UserDetailsPopover from '-/components/UserDetailsPopover';+import TsToolbarButton from '-/components/TsToolbarButton';import { useCreateDirectoryDialogContext } from '-/components/dialogs/hooks/useCreateDirectoryDialogContext';import { useCreateEditLocationDialogContext } from '-/components/dialogs/hooks/useCreateEditLocationDialogContext';import { useDownloadUrlDialogContext } from '-/components/dialogs/hooks/useDownloadUrlDialogContext';@@ -70,7 +68,7 @@ import {} from '-/reducers/settings';import { createNewInstance } from '-/services/utils-io';import { ClickAwayListener } from '@mui/base/ClickAwayListener';-import { Divider } from '@mui/material';+import { Divider, Popover } from '@mui/material';import Box from '@mui/material/Box';import ButtonGroup from '@mui/material/ButtonGroup';import Grow from '@mui/material/Grow';@@ -78,32 +76,13 @@ import ListItemIcon from '@mui/material/ListItemIcon';import ListItemText from '@mui/material/ListItemText';import MenuItem from '@mui/material/MenuItem';import Paper from '@mui/material/Paper';-import Popover from '@mui/material/Popover';import Popper from '@mui/material/Popper';-import ToggleButton from '@mui/material/ToggleButton';-import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';-import { alpha, styled, useTheme } from '@mui/material/styles';-import classNames from 'classnames';+import { alpha, useTheme } from '@mui/material/styles';import React, { useState } from 'react';import { useTranslation } from 'react-i18next';import { useDispatch, useSelector } from 'react-redux';--const PREFIX = 'MobileNavigation';--const classes = {- button: `${PREFIX}-button`,- selectedButton: `${PREFIX}-selectedButton`,-};--const Root = styled(Box)(({ theme }) => ({- [`& .${classes.button}`]: {- padding: 8,- margin: 0,- },- [`& .${classes.selectedButton}`]: {- backgroundColor: theme.palette.primary.light,- },-}));+import TsIconButton from './TsIconButton';+import UserDetailsPopover from './UserDetailsPopover';interface Props {hideDrawer?: () => void;@@ -147,14 +126,12 @@ function MobileNavigation(props: Props) {) {return;}-setOpenCreateMenu(false);};return (- <Root+ <Boxstyle={{- // backgroundColor: theme.palette.background.default,background: alpha(theme.palette.background.default, 0.85),backdropFilter: 'blur(5px)',height: '100%',@@ -166,7 +143,7 @@ function MobileNavigation(props: Props) {<Boxstyle={{overflow: 'hidden',- height: showProTeaser ? 'calc(100% - 186px)' : 'calc(100% - 55px)',+ height: showProTeaser ? 'calc(100% - 190px)' : 'calc(100% - 55px)',}}><Box>@@ -177,10 +154,10 @@ function MobileNavigation(props: Props) {aria-label="split button"style={{textAlign: 'center',+ marginRight: AppConfig.defaultSpaceBetweenButtons,}}><TsButton- //tooltip={t('core:createNew')}aria-controls={openedCreateMenu ? 'split-button-menu' : undefined}@@ -231,6 +208,44 @@ function MobileNavigation(props: Props) {</Box></TsButton></ButtonGroup>+ {currentUser ? (+ <>+ <TsIconButton+ tooltip={t('core:userAccount')}+ data-tid="accountCircleIconTID"+ onClick={(event: React.MouseEvent<HTMLButtonElement>) =>+ setAnchorUser(event.currentTarget)+ }+ title={t('core:userAccount')}+ >+ <AccountIcon />+ </TsIconButton>+ <Popover+ open={Boolean(anchorUser)}+ anchorEl={anchorUser}+ onClose={() => setAnchorUser(null)}+ anchorOrigin={{+ vertical: 'bottom',+ horizontal: 'center',+ }}+ transformOrigin={{+ vertical: 'bottom',+ horizontal: 'center',+ }}+ >+ <UserDetailsPopover onClose={() => setAnchorUser(null)} />+ </Popover>+ </>+ ) : (+ <TsIconButton+ tooltip={t('core:switchTheme')}+ data-tid="switchTheme"+ onClick={switchTheme}+ title={t('core:switchTheme')}+ >+ <ThemingIcon />+ </TsIconButton>+ )}</Box></Box>@@ -444,7 +459,7 @@ function MobileNavigation(props: Props) {</Popper></ClickAwayListener><LocationManager- reduceHeightBy={140}+ reduceHeightBy={150}show={currentOpenedPanel === 'locationManagerPanel'}/>{currentOpenedPanel === 'tagLibraryPanel' && (@@ -459,130 +474,93 @@ function MobileNavigation(props: Props) {</Box><Boxstyle={{- textAlign: 'center',+ display: 'flex',+ flexDirection: 'column',+ marginTop: -12,}}>{showProTeaser && (<ProTeaser setShowTeaserBanner={setShowTeaserBanner} />)}- <TsIconButton- tooltip={t('core:settings')}- id="verticalNavButton"- data-tid="settings"- onClick={() => {- openSettingsDialog();+ <Box+ style={{+ display: 'flex',+ flexDirection: 'row',+ alignSelf: 'anchor-center',}}- style={{ marginTop: -15, marginRight: 2 }}- size="large">- <SettingsIcon />- </TsIconButton>- <ToggleButtonGroup exclusive>- <ToggleButton+ <TsToolbarButton+ title={t('core:locationManager')}+ tooltip={t('core:locationManager')}+ keyBinding={keyBindings['showLocationManager']}onClick={() => showPanel('locationManagerPanel')}- className={- currentOpenedPanel === 'locationManagerPanel'- ? classNames(classes.button, classes.selectedButton)- : classes.button- }+ style={{+ backgroundColor:+ currentOpenedPanel === 'locationManagerPanel'+ ? theme.palette.primary.light+ : 'inherit',+ }}data-tid="locationManager"- value="check">- <Tooltip- title={t('core:locationManager')}- keyBinding={keyBindings['showLocationManager']}- >- <LocalLocationIcon />- </Tooltip>- </ToggleButton>- <ToggleButton+ <LocalLocationIcon />+ </TsToolbarButton>+ <TsToolbarButtondata-tid="tagLibrary"+ title={t('core:tagLibrary')}+ tooltip={t('core:tagLibrary')}+ keyBinding={keyBindings['showTagLibrary']}onClick={() => showPanel('tagLibraryPanel')}- className={- currentOpenedPanel === 'tagLibraryPanel'- ? classNames(classes.button, classes.selectedButton)- : classes.button- }- value="check"+ style={{+ backgroundColor:+ currentOpenedPanel === 'tagLibraryPanel'+ ? theme.palette.primary.light+ : 'inherit',+ }}>- <Tooltip- title={t('core:tagLibrary')}- keyBinding={keyBindings['showTagLibrary']}- >- <TagLibraryIcon />- </Tooltip>- </ToggleButton>- <ToggleButton+ <TagLibraryIcon />+ </TsToolbarButton>+ <TsToolbarButton+ title={t('core:quickAccess')}+ tooltip={t('core:quickAccess')}data-tid="quickAccessButton"onClick={() => showPanel('searchPanel')}- className={- currentOpenedPanel === 'searchPanel'- ? classNames(classes.button, classes.selectedButton)- : classes.button- }- value="check"+ style={{+ backgroundColor:+ currentOpenedPanel === 'searchPanel'+ ? theme.palette.primary.light+ : 'inherit',+ }}>- <Tooltip title={t('core:quickAccess')}>- <RecentThingsIcon />- </Tooltip>- </ToggleButton>- <ToggleButton+ <RecentThingsIcon />+ </TsToolbarButton>+ <TsToolbarButton+ tooltip={t('core:helpFeedback')}+ title={t('core:help')}data-tid="helpFeedback"onClick={() => showPanel('helpFeedbackPanel')}- className={- currentOpenedPanel === 'helpFeedbackPanel'- ? classNames(classes.button, classes.selectedButton)- : classes.button- }- value="check"+ style={{+ backgroundColor:+ currentOpenedPanel === 'helpFeedbackPanel'+ ? theme.palette.primary.light+ : 'inherit',+ }}>- <Tooltip title={t('core:helpFeedback')}>- <HelpIcon />- </Tooltip>- </ToggleButton>- </ToggleButtonGroup>- {currentUser ? (- <>- <TsIconButton- tooltip={t('core:userAccount')}- data-tid="accountCircleIconTID"- onClick={(event: React.MouseEvent<HTMLButtonElement>) =>- setAnchorUser(event.currentTarget)- }- style={{ marginTop: -15, marginRight: 2 }}- size="large"- >- <AccountIcon />- </TsIconButton>- <Popover- open={Boolean(anchorUser)}- anchorEl={anchorUser}- onClose={() => setAnchorUser(null)}- anchorOrigin={{- vertical: 'top',- horizontal: 'center',- }}- transformOrigin={{- vertical: 'bottom',- horizontal: 'center',- }}- >- <UserDetailsPopover onClose={() => setAnchorUser(null)} />- </Popover>- </>- ) : (- <TsIconButton- tooltip={t('core:switchTheme')}- data-tid="switchTheme"- onClick={switchTheme}- style={{ marginTop: -15, marginRight: 2 }}- size="large"+ <HelpIcon />+ </TsToolbarButton>+ <TsToolbarButton+ tooltip={t('core:settings')}+ id="verticalNavButton"+ data-tid="settings"+ onClick={() => {+ openSettingsDialog();+ }}+ title={t('core:settings')}>- <ThemingIcon />- </TsIconButton>- )}+ <SettingsIcon />+ </TsToolbarButton>+ </Box></Box>- </Root>+ </Box>);}export default MobileNavigation;diff --git a/src/renderer/components/ProTeaser.tsx b/src/renderer/components/ProTeaser.tsxindex ffd1de7e3..dcff65e0c 100644--- a/src/renderer/components/ProTeaser.tsx+++ b/src/renderer/components/ProTeaser.tsx@@ -23,7 +23,7 @@ import CameraTwoToneIcon from '@mui/icons-material/CameraTwoTone';import CloseIcon from '@mui/icons-material/Close';import MapTwoToneIcon from '@mui/icons-material/MapTwoTone';import ViewKanbanTwoToneIcon from '@mui/icons-material/ViewKanbanTwoTone';-import { ButtonGroup } from '@mui/material';+import { Box, ButtonGroup } from '@mui/material';import CardActions from '@mui/material/CardActions';import CardContent from '@mui/material/CardContent';import IconButton from '@mui/material/IconButton';@@ -41,7 +41,7 @@ function ProTeaser(props: Props) {const { t } = useTranslation();return (- <>+ <Box style={{ display: 'block', marginBottom: 0 }}><CardContentstyle={{paddingLeft: 5,@@ -121,7 +121,7 @@ function ProTeaser(props: Props) {</TsButton></ButtonGroup></CardActions>- </>+ </Box>);}diff --git a/src/renderer/components/TsToolbarButton.tsx b/src/renderer/components/TsToolbarButton.tsxindex 947440cd5..f57f479c8 100644--- a/src/renderer/components/TsToolbarButton.tsx+++ b/src/renderer/components/TsToolbarButton.tsx@@ -51,13 +51,14 @@ function TsToolbarButton(props: TSIconButtonProps) {disabled={disabled}style={{borderRadius: AppConfig.defaultCSSRadius,+ padding: 8,display: 'block',...style,}}sx={{'& .MuiSvgIcon-root ': {- width: showTitle ? '0.8em' : '1em',- heigh: showTitle ? '0.8em' : '1em',+ width: showTitle ? '0.9em' : '1em',+ heigh: showTitle ? '0.9em' : '1em',},// border: '1px solid transparent',// '&:hover': {@@ -69,7 +70,18 @@ function TsToolbarButton(props: TSIconButtonProps) {>{children}{showTitle && (- <Typography style={{ display: 'block', fontSize: 11, marginTop: -5 }}>+ <Typography+ style={{+ display: 'block',+ fontSize: 11,+ marginTop: -5,+ width: 45,+ padding: 0,+ whiteSpace: 'nowrap',+ textOverflow: 'ellipsis',+ overflow: 'hidden',+ }}+ >{title}</Typography>)}diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.jsonindex 10a99a537..346328a5e 100644--- a/src/renderer/locales/en/core.json+++ b/src/renderer/locales/en/core.json@@ -951,6 +951,6 @@"doubleClickToEdit": "Double-click to edit","tsLinksHelp": "TagSpaces links begin with ts://? and are used for internal sharing of files and folders","pasteImageFromClipboard": "Paste an image from clipboard by pressing",- "parentFolder": "Parent",+ "parentFolder": "Go to parent","-": "-"}diff --git a/src/renderer/perspectives/grid/components/MainToolbar.tsx b/src/renderer/perspectives/grid/components/MainToolbar.tsxindex ed5f0ff33..ab9b13b17 100644--- a/src/renderer/perspectives/grid/components/MainToolbar.tsx+++ b/src/renderer/perspectives/grid/components/MainToolbar.tsx@@ -179,7 +179,7 @@ function MainToolbar(props: Props) {<Box sx={{ display: selectedEntries.length < 1 ? 'none' : 'flex' }}>{!readOnlyMode && (<TsToolbarButton- tooltip={t('core:tagSelectedEntries')}+ tooltip={t('core:fileTags')}title={t('core:fileTags')}keyBinding={keyBindings['addRemoveTags']}aria-label={t('core:tagSelectedEntries')}@@ -203,7 +203,9 @@ function MainToolbar(props: Props) {{!readOnlyMode && (<TsToolbarButtontooltip={t('core:copyMoveSelectedEntries')}- title={t('core:copyEntriesButton')}+ title={+ t('core:copyEntriesButton') + '/' + t('core:moveEntriesButton')+ }keyBinding={keyBindings['copyMoveSelectedEntries']}aria-label={t('core:copyMoveSelectedEntries')}data-tid={prefixDataTID + 'PerspectiveCopySelectedFiles'}@@ -282,7 +284,7 @@ function MainToolbar(props: Props) {onClick={() => {setNativeDragModeEnabled(!nativeDragModeEnabled);}}- title={t('Drag outside')}+ title={t('core:dragMode')}>{nativeDragModeEnabled ? <DragOnIcon /> : <DragOffIcon />}</TsToolbarButton>