Skip to content

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

chore: disable lookupselection menu and small ui improvements in entry container

Ilian Sapundshievdcb224e5bf1d
diff --git a/app/components/EntryContainerMenu.tsx b/app/components/EntryContainerMenu.tsx
index 42b6acf4a..7435ebdd8 100644
--- a/app/components/EntryContainerMenu.tsx
+++ b/app/components/EntryContainerMenu.tsx
@@ -185,6 +185,22 @@ function EntryContainerMenu(props: Props) {
const menuItems = [];
if (openedEntry.isFile) {
+ menuItems.push(
+ <MenuItem
+ key={'reloadPropertiesKey'}
+ data-tid="reloadPropertiesTID"
+ aria-label={t('core:reloadFile')}
+ onClick={() => {
+ reloadDocument();
+ handleClose();
+ }}
+ >
+ <ListItemIcon>
+ <ReloadIcon />
+ </ListItemIcon>
+ <ListItemText primary={t('core:reloadFile')} />
+ </MenuItem>
+ );
menuItems.push(
<MenuItem
key={'downloadFileKey'}
@@ -233,6 +249,25 @@ function EntryContainerMenu(props: Props) {
</MenuItem>
);
}
+ if (!readOnlyMode) {
+ menuItems.push(<Divider key={'divider3'} />);
+ menuItems.push(
+ <MenuItem
+ key={'deleteEntryKey'}
+ data-tid="deleteEntryTID"
+ aria-label={t('core:deleteEntry')}
+ onClick={() => {
+ setDeleteEntryModalOpened(true);
+ handleClose();
+ }}
+ >
+ <ListItemIcon>
+ <DeleteIcon />
+ </ListItemIcon>
+ <ListItemText primary={t('core:deleteEntry')} />
+ </MenuItem>
+ );
+ }
menuItems.push(<Divider key={'divider2'} />);
menuItems.push(
<MenuItem
@@ -298,11 +333,13 @@ function EntryContainerMenu(props: Props) {
</MenuItem>
);
}
+ } else {
+ // folder
menuItems.push(
<MenuItem
- key={'reloadPropertiesKey'}
- data-tid="reloadPropertiesTID"
- aria-label={t('core:reloadFile')}
+ key={'reloadFolderKey'}
+ data-tid="reloadFolderTID"
+ aria-label={t('core:reloadDirectory')}
onClick={() => {
reloadDocument();
handleClose();
@@ -311,30 +348,10 @@ function EntryContainerMenu(props: Props) {
<ListItemIcon>
<ReloadIcon />
</ListItemIcon>
- <ListItemText primary={t('core:reloadFile')} />
+ <ListItemText primary={t('core:reloadDirectory')} />
</MenuItem>
);
- if (!readOnlyMode) {
- menuItems.push(<Divider key={'divider3'} />);
- menuItems.push(
- <MenuItem
- key={'deleteEntryKey'}
- data-tid="deleteEntryTID"
- aria-label={t('core:deleteEntry')}
- onClick={() => {
- setDeleteEntryModalOpened(true);
- handleClose();
- }}
- >
- <ListItemIcon>
- <DeleteIcon />
- </ListItemIcon>
- <ListItemText primary={t('core:deleteEntry')} />
- </MenuItem>
- );
- }
- } else {
- // folder
+ menuItems.push(<Divider key={'divider6'} />);
menuItems.push(
<MenuItem
key={'openInMainAreaKey'}
@@ -402,24 +419,8 @@ function EntryContainerMenu(props: Props) {
</MenuItem>
);
}
- menuItems.push(<Divider key={'divider4'} />);
- menuItems.push(
- <MenuItem
- key={'reloadFolderKey'}
- data-tid="reloadFolderTID"
- aria-label={t('core:reloadDirectory')}
- onClick={() => {
- reloadDocument();
- handleClose();
- }}
- >
- <ListItemIcon>
- <ReloadIcon />
- </ListItemIcon>
- <ListItemText primary={t('core:reloadDirectory')} />
- </MenuItem>
- );
if (!readOnlyMode) {
+ menuItems.push(<Divider key={'divider4'} />);
menuItems.push(
<MenuItem
key={'deleteFolderKey'}
diff --git a/app/components/EntryContainerTitle.tsx b/app/components/EntryContainerTitle.tsx
index 9e5366fc2..9b41eec54 100644
--- a/app/components/EntryContainerTitle.tsx
+++ b/app/components/EntryContainerTitle.tsx
@@ -136,7 +136,7 @@ function EntryContainerTitle(props: Props) {
paddingLeft: 5,
display: 'flex',
alignItems: 'center',
- marginRight: openedFile.isFile ? 90 : 0,
+ marginRight: openedFile.isFile ? 100 : 0,
flexDirection: 'row',
flex: '1 1',
overflowX: 'auto',
diff --git a/app/main.dev.ts b/app/main.dev.ts
index e72030a77..74333f44f 100644
--- a/app/main.dev.ts
+++ b/app/main.dev.ts
@@ -45,6 +45,7 @@ const contextMenu = require('electron-context-menu');
contextMenu({
showInspectElement: false,
showSearchWithGoogle: false,
+ showLookUpSelection: false,
showServices: false
});