diff options
Diffstat (limited to 'src/components/services/tabs/TabItem.js')
-rw-r--r-- | src/components/services/tabs/TabItem.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index ed8430b89..3ea6c5da2 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -132,6 +132,7 @@ class TabItem extends Component { | |||
132 | hibernateService: PropTypes.func.isRequired, | 132 | hibernateService: PropTypes.func.isRequired, |
133 | wakeUpService: PropTypes.func.isRequired, | 133 | wakeUpService: PropTypes.func.isRequired, |
134 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 134 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
135 | showServiceNameSetting: PropTypes.bool.isRequired, | ||
135 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 136 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
136 | stores: PropTypes.shape({ | 137 | stores: PropTypes.shape({ |
137 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 138 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
@@ -219,6 +220,7 @@ class TabItem extends Component { | |||
219 | wakeUpService, | 220 | wakeUpService, |
220 | openSettings, | 221 | openSettings, |
221 | showMessageBadgeWhenMutedSetting, | 222 | showMessageBadgeWhenMutedSetting, |
223 | showServiceNameSetting, | ||
222 | showMessageBadgesEvenWhenMuted, | 224 | showMessageBadgesEvenWhenMuted, |
223 | } = this.props; | 225 | } = this.props; |
224 | const { intl } = this.props; | 226 | const { intl } = this.props; |
@@ -331,6 +333,13 @@ class TabItem extends Component { | |||
331 | ); | 333 | ); |
332 | } | 334 | } |
333 | 335 | ||
336 | let errorBadge = null; | ||
337 | if ( service.isError ) { | ||
338 | errorBadge=( | ||
339 | <i className = " mdi mdi-exclamation tab-item__error-icon"/> | ||
340 | ) | ||
341 | } | ||
342 | |||
334 | return ( | 343 | return ( |
335 | <li | 344 | <li |
336 | className={classnames({ | 345 | className={classnames({ |
@@ -340,6 +349,7 @@ class TabItem extends Component { | |||
340 | 'is-active': service.isActive, | 349 | 'is-active': service.isActive, |
341 | 'has-custom-icon': service.hasCustomIcon, | 350 | 'has-custom-icon': service.hasCustomIcon, |
342 | 'is-disabled': !service.isEnabled, | 351 | 'is-disabled': !service.isEnabled, |
352 | 'is-label-enabled': showServiceNameSetting, | ||
343 | })} | 353 | })} |
344 | onClick={clickHandler} | 354 | onClick={clickHandler} |
345 | onContextMenu={() => menu.popup()} | 355 | onContextMenu={() => menu.popup()} |
@@ -349,8 +359,14 @@ class TabItem extends Component { | |||
349 | : '' | 359 | : '' |
350 | }`} | 360 | }`} |
351 | > | 361 | > |
352 | <img src={service.icon} className="tab-item__icon" alt="" /> | 362 | |
363 | {showServiceNameSetting? <div> | ||
364 | <img src={service.icon} className="tab-item__icon" alt="" /> | ||
365 | <span className="tab-item__label">{service.name}</span> | ||
366 | </div> : <img src={service.icon} className="tab-item__icon" alt="" />} | ||
367 | |||
353 | {notificationBadge} | 368 | {notificationBadge} |
369 | {errorBadge} | ||
354 | {IS_SERVICE_DEBUGGING_ENABLED && ( | 370 | {IS_SERVICE_DEBUGGING_ENABLED && ( |
355 | <> | 371 | <> |
356 | <div | 372 | <div |