Added settings tooltip

main
Boris Sekachev 6 years ago
parent 0fda72bb99
commit ba97952801

@ -4,26 +4,18 @@
import './styles.scss'; import './styles.scss';
import React from 'react'; import React from 'react';
import { RouteComponentProps } from 'react-router'; import { RouteComponentProps } from 'react-router';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
import { import { Row, Col } from 'antd/lib/grid';
Layout, import Layout from 'antd/lib/layout';
Icon, import Icon from 'antd/lib/icon';
Button, import Button from 'antd/lib/button';
Menu, import Menu from 'antd/lib/menu';
Dropdown, import Dropdown from 'antd/lib/dropdown';
Modal, import Modal from 'antd/lib/modal';
Row,
Col,
} from 'antd';
import Text from 'antd/lib/typography/Text'; import Text from 'antd/lib/typography/Text';
import { import { CVATLogo, AccountIcon } from 'icons';
CVATLogo,
AccountIcon,
} from 'icons';
interface HeaderContainerProps { interface HeaderContainerProps {
onLogout: () => void; onLogout: () => void;
@ -40,6 +32,7 @@ interface HeaderContainerProps {
coreVersion: string; coreVersion: string;
canvasVersion: string; canvasVersion: string;
uiVersion: string; uiVersion: string;
switchSettingsShortcut: string;
} }
type Props = HeaderContainerProps & RouteComponentProps; type Props = HeaderContainerProps & RouteComponentProps;
@ -60,6 +53,7 @@ function HeaderContainer(props: Props): JSX.Element {
uiVersion, uiVersion,
onLogout, onLogout,
logoutFetching, logoutFetching,
switchSettingsShortcut,
} = props; } = props;
const renderModels = installedAutoAnnotation const renderModels = installedAutoAnnotation
@ -131,6 +125,7 @@ function HeaderContainer(props: Props): JSX.Element {
const menu = ( const menu = (
<Menu className='cvat-header-menu' mode='vertical'> <Menu className='cvat-header-menu' mode='vertical'>
<Menu.Item <Menu.Item
title={`Press ${switchSettingsShortcut} to switch`}
onClick={ onClick={
(): void => props.history.push('/settings') (): void => props.history.push('/settings')
} }

@ -4,14 +4,11 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import {
SupportedPlugins,
CombinedState,
} from 'reducers/interfaces';
import getCore from 'cvat-core'; import getCore from 'cvat-core';
import HeaderComponent from 'components/header/header'; import HeaderComponent from 'components/header/header';
import { SupportedPlugins, CombinedState } from 'reducers/interfaces';
import { logoutAsync } from 'actions/auth-actions'; import { logoutAsync } from 'actions/auth-actions';
import { formatShortcuts } from 'utils/shortcuts';
const core = getCore(); const core = getCore();
@ -29,6 +26,7 @@ interface StateToProps {
coreVersion: string; coreVersion: string;
canvasVersion: string; canvasVersion: string;
uiVersion: string; uiVersion: string;
switchSettingsShortcut: string;
} }
interface DispatchToProps { interface DispatchToProps {
@ -50,6 +48,9 @@ function mapStateToProps(state: CombinedState): StateToProps {
server, server,
packageVersion, packageVersion,
}, },
shortcuts: {
keyMap,
},
} = state; } = state;
return { return {
@ -66,6 +67,7 @@ function mapStateToProps(state: CombinedState): StateToProps {
coreVersion: packageVersion.core, coreVersion: packageVersion.core,
canvasVersion: packageVersion.canvas, canvasVersion: packageVersion.canvas,
uiVersion: packageVersion.ui, uiVersion: packageVersion.ui,
switchSettingsShortcut: formatShortcuts(keyMap.OPEN_SETTINGS),
}; };
} }

Loading…
Cancel
Save