#8: Add tooltips to settings [partial]

This commit is contained in:
2019-08-30 16:51:49 -05:00
parent 42515a08c3
commit 7e6e3cbc49
6 changed files with 116 additions and 6 deletions

View File

@@ -7,6 +7,7 @@ import DependencyList from './components/DependencyList/DependencyList';
import DownloadProgress from './components/DownloadProgress/DownloadProgress';
import ErrorDetails from './components/ErrorDetails/ErrorDetails';
import Grid from './components/UI/Grid/Grid';
import InfoDetails from './components/InfoDetails/InfoDetails';
import IPCContainer from './containers/IPCContainer/IPCContainer';
import Loading from './components/UI/Loading/Loading';
import Modal from './components/UI/Modal/Modal';
@@ -121,6 +122,7 @@ class App extends IPCContainer {
!this.props.DismissDependencies &&
this.props.AllowMount;
const infoDisplay = this.createModalConditionally(this.props.DisplayInfo, <InfoDetails/>, true);
const rebootDisplay = this.createModalConditionally(this.props.RebootRequired, <Reboot />);
const configDisplay = this.createModalConditionally(showConfig, <Configuration version={selectedVersion} />);
const dependencyDisplay = this.createModalConditionally(showDependencies, <DependencyList/>);
@@ -156,12 +158,13 @@ class App extends IPCContainer {
return (
<div className={'App'}>
{selectAppPlatformDisplay}
{errorDisplay}
{dependencyDisplay}
{upgradeDisplay}
{downloadDisplay}
{configDisplay}
{infoDisplay}
{downloadDisplay}
{rebootDisplay}
{errorDisplay}
<div className={'AppContainer'}>
<div className={'AppHeader'}>
<Box>
@@ -203,6 +206,7 @@ const mapStateToProps = state => {
DismissDependencies: state.install.DismissDependencies,
DisplayConfiguration: state.mounts.DisplayConfiguration,
DisplayError: state.error.DisplayError,
DisplayInfo: state.error.DisplayInfo,
DisplaySelectAppPlatform: state.common.DisplaySelectAppPlatform,
DownloadActive: state.download.DownloadActive,
InstallActive: state.install.InstallActive,