Skip to content

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

chore: ui polish, fix showing confirm delete dialog on empty selection

Ilian Sapundshiev3fd6857e1bb6
diff --git a/app/components/CustomLogo.tsx b/app/components/CustomLogo.tsx
index 5575f6659..0e2871f19 100644
--- a/app/components/CustomLogo.tsx
+++ b/app/components/CustomLogo.tsx
@@ -61,11 +61,7 @@ if (AppConfig.customLogo) {
const CustomLogo = (props: Props) => (
<Tooltip title={i18n.t('core:aboutTitle')}>
- <AppVersionBadge
- onClick={props.toggleAboutDialog}
- badgeContent={'v' + versionMeta.version}
- color="primary"
- >
+ <AppVersionBadge badgeContent={'v' + versionMeta.version} color="primary">
<IconButton
onClick={props.toggleAboutDialog}
style={{ padding: 0, paddingLeft: 5, height: 50 }}
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index e045ffa41..d072e213f 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -551,7 +551,7 @@ const FolderContainer = (props: Props) => {
/> */}
<Tooltip
title={
- i18n.t('showSearch')
+ i18n.t('showSearch') + ' (CTRL/⌘+SHIFT+F)'
// +
// ' - ' +
// keyBindings['openSearch'].toUpperCase()
diff --git a/app/components/SearchInline.tsx b/app/components/SearchInline.tsx
index 45a486443..fe2b413ec 100644
--- a/app/components/SearchInline.tsx
+++ b/app/components/SearchInline.tsx
@@ -380,7 +380,7 @@ const SearchInline = (props: Props) => {
InputProps={{
endAdornment: (
<InputAdornment position="end">
- <Tooltip title={i18n.t('clearSearch')}>
+ <Tooltip title={i18n.t('clearSearch') + ' (ESC)'}>
<IconButton
id="clearSearchID"
onClick={clearSearch}
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index b4145db18..d16d6c062 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -233,8 +233,10 @@ const GridPerspective = (props: Props) => {
selectionContainsDirectories = selectedEntries.some(
entry => !entry.isFile
);
+ return !selectionContainsDirectories;
+ } else {
+ return false;
}
- return !selectionContainsDirectories;
};
const folderOperationsEnabled = () => {
diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsx
index f7d15b1ad..d555afca0 100644
--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx
+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx
@@ -110,8 +110,9 @@ const MainToolbar = (props: Props) => {
<Tooltip
title={
i18n.t('core:toggleSelectAllFiles') +
- ' - ' +
- keyBindings['selectAll'].toUpperCase()
+ ' (' +
+ keyBindings['selectAll'].toUpperCase() +
+ ')'
}
>
<IconButton
@@ -124,8 +125,9 @@ const MainToolbar = (props: Props) => {
<Tooltip
title={
i18n.t('core:navigateToParentDirectory') +
- ' - ' +
- keyBindings['openParentDirectory'].toUpperCase()
+ ' (' +
+ keyBindings['openParentDirectory'].toUpperCase() +
+ ')'
}
>
<IconButton
@@ -184,8 +186,9 @@ const MainToolbar = (props: Props) => {
<Tooltip
title={
i18n.t('core:tagSelectedEntries') +
- ' - ' +
- keyBindings['addRemoveTags'].toUpperCase()
+ ' (' +
+ keyBindings['addRemoveTags'].toUpperCase() +
+ ')'
}
>
<IconButton
@@ -214,8 +217,9 @@ const MainToolbar = (props: Props) => {
<Tooltip
title={
i18n.t('core:deleteSelectedEntries') +
- ' - ' +
- keyBindings['deleteDocument'].toUpperCase()
+ ' (' +
+ keyBindings['deleteDocument'].toUpperCase() +
+ ')'
}
>
<IconButton
diff --git a/app/perspectives/list/components/MainContainer.tsx b/app/perspectives/list/components/MainContainer.tsx
index ed17d1209..e43dd1ef0 100644
--- a/app/perspectives/list/components/MainContainer.tsx
+++ b/app/perspectives/list/components/MainContainer.tsx
@@ -233,8 +233,10 @@ const GridPerspective = (props: Props) => {
selectionContainsDirectories = selectedEntries.some(
entry => !entry.isFile
);
+ return !selectionContainsDirectories;
+ } else {
+ return false;
}
- return !selectionContainsDirectories;
};
const folderOperationsEnabled = () => {