From 251d38db5bafc6aabfd7c3aeed1deb3c68115f59 Mon Sep 17 00:00:00 2001
From: Boris Sekachev <boris.sekachev@yandex.ru>
Date: Fri, 27 Mar 2020 00:20:46 +0300
Subject: [PATCH] Titles for object list header

---
 .../objects-side-bar/objects-list-header.tsx  | 29 +++++++++++++------
 .../objects-side-bar/objects-list.tsx         |  7 ++++-
 .../objects-side-bar/objects-list.tsx         |  4 ++-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx
index 56b29a26..df150d9f 100644
--- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx
+++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx
@@ -10,6 +10,7 @@ import Text from 'antd/lib/typography/Text';
 
 import AnnotationsFiltersInput from 'components/annotation-page/annotations-filters-input';
 import { StatesOrdering } from 'reducers/interfaces';
+import { Tooltip } from 'antd';
 
 interface StatesOrderingSelectorComponentProps {
     statesOrdering: StatesOrdering;
@@ -56,6 +57,8 @@ interface Props {
     statesLocked: boolean;
     statesCollapsed: boolean;
     statesOrdering: StatesOrdering;
+    switchLockAllShortcut: string;
+    switchHiddenAllShortcut: string;
     changeStatesOrdering(value: StatesOrdering): void;
     lockAllStates(): void;
     unlockAllStates(): void;
@@ -71,6 +74,8 @@ function ObjectListHeader(props: Props): JSX.Element {
         statesLocked,
         statesCollapsed,
         statesOrdering,
+        switchLockAllShortcut,
+        switchHiddenAllShortcut,
         changeStatesOrdering,
         lockAllStates,
         unlockAllStates,
@@ -89,19 +94,25 @@ function ObjectListHeader(props: Props): JSX.Element {
             </Row>
             <Row type='flex' justify='space-between' align='middle'>
                 <Col span={2}>
-                    { statesLocked
-                        ? <Icon type='lock' onClick={unlockAllStates} />
-                        : <Icon type='unlock' onClick={lockAllStates} />}
+                    <Tooltip title={`Switch lock property for all ${switchLockAllShortcut}`}>
+                        { statesLocked
+                            ? <Icon type='lock' onClick={unlockAllStates} />
+                            : <Icon type='unlock' onClick={lockAllStates} />}
+                    </Tooltip>
                 </Col>
                 <Col span={2}>
-                    { statesHidden
-                        ? <Icon type='eye-invisible' onClick={showAllStates} />
-                        : <Icon type='eye' onClick={hideAllStates} />}
+                    <Tooltip title={`Switch hidden property for all ${switchHiddenAllShortcut}`}>
+                        { statesHidden
+                            ? <Icon type='eye-invisible' onClick={showAllStates} />
+                            : <Icon type='eye' onClick={hideAllStates} />}
+                    </Tooltip>
                 </Col>
                 <Col span={2}>
-                    { statesCollapsed
-                        ? <Icon type='caret-down' onClick={expandAllStates} />
-                        : <Icon type='caret-up' onClick={collapseAllStates} />}
+                    <Tooltip title='Expand/collapse all'>
+                        { statesCollapsed
+                            ? <Icon type='caret-down' onClick={expandAllStates} />
+                            : <Icon type='caret-up' onClick={collapseAllStates} />}
+                    </Tooltip>
                 </Col>
                 <StatesOrderingSelector
                     statesOrdering={statesOrdering}
diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
index 5bf4dc0b..f91989ad 100644
--- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
+++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
@@ -8,7 +8,6 @@ import { StatesOrdering } from 'reducers/interfaces';
 import ObjectItemContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/object-item';
 import ObjectListHeader from './objects-list-header';
 
-
 interface Props {
     listHeight: number;
     statesHidden: boolean;
@@ -16,6 +15,8 @@ interface Props {
     statesCollapsed: boolean;
     statesOrdering: StatesOrdering;
     sortedStatesID: number[];
+    switchLockAllShortcut: string;
+    switchHiddenAllShortcut: string;
     changeStatesOrdering(value: StatesOrdering): void;
     lockAllStates(): void;
     unlockAllStates(): void;
@@ -33,6 +34,8 @@ function ObjectListComponent(props: Props): JSX.Element {
         statesCollapsed,
         statesOrdering,
         sortedStatesID,
+        switchLockAllShortcut,
+        switchHiddenAllShortcut,
         changeStatesOrdering,
         lockAllStates,
         unlockAllStates,
@@ -49,6 +52,8 @@ function ObjectListComponent(props: Props): JSX.Element {
                 statesLocked={statesLocked}
                 statesCollapsed={statesCollapsed}
                 statesOrdering={statesOrdering}
+                switchLockAllShortcut={switchLockAllShortcut}
+                switchHiddenAllShortcut={switchHiddenAllShortcut}
                 changeStatesOrdering={changeStatesOrdering}
                 lockAllStates={lockAllStates}
                 unlockAllStates={unlockAllStates}
diff --git a/cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx b/cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
index fd549e04..eb2fdae5 100644
--- a/cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
+++ b/cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
@@ -6,6 +6,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { GlobalHotKeys, ExtendedKeyMapOptions } from 'react-hotkeys';
 
+import { formatShortcuts } from 'utils/shortcuts';
 import ObjectsListComponent from 'components/annotation-page/standard-workspace/objects-side-bar/objects-list';
 import {
     updateAnnotationsAsync,
@@ -15,7 +16,6 @@ import {
     copyShape as copyShapeAction,
     propagateObject as propagateObjectAction,
 } from 'actions/annotation-actions';
-
 import { CombinedState, StatesOrdering, ObjectType } from 'reducers/interfaces';
 
 interface StateToProps {
@@ -410,6 +410,8 @@ class ObjectsListContainer extends React.PureComponent<Props, State> {
                     {...this.props}
                     statesOrdering={statesOrdering}
                     sortedStatesID={sortedStatesID}
+                    switchHiddenAllShortcut={formatShortcuts(keyMap.SWITCH_ALL_HIDDEN)}
+                    switchLockAllShortcut={formatShortcuts(keyMap.SWITCH_ALL_LOCK)}
                     changeStatesOrdering={this.onChangeStatesOrdering}
                     lockAllStates={this.onLockAllStates}
                     unlockAllStates={this.onUnlockAllStates}